Compatibility with Dash Count Mod total / fewest dash count in journal

Author: maddie480

UI/OuiJournalCollabProgressDashCountMod.cs

@@ -11,5 +11,17 @@ static class OuiJournalCollabProgressDashCountMod {
         internal static bool IsDashCountEnabled() {
             return false;
         }
+
+        // those depend on Dash Count Mod settings / save data, and will be implemented by Dash Count Mod itself.
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        internal static bool DisplaysTotalDashes() {
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        internal static int GetLevelDashesForJournalProgress(AreaStats stats) {
+            return stats.BestTotalDashes;
+        }
     }
 }

UI/OuiJournalCollabProgressInLobby.cs

@@ -185,9 +185,10 @@ public static List<OuiJournalCollabProgressInLobby> GeneratePages(OuiJournal jou
                 }
 
                 if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
-                    if (item.Modes[0].SingleRunCompleted) {
-                        row.Add(new TextCell(Dialog.Deaths(item.Modes[0].BestDashes), currentPage.TextJustify, 0.5f, currentPage.TextColor));
-                        sumOfBestDashes += item.Modes[0].BestDashes;
+                    if ((OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() && item.TotalTimePlayed > 0) || item.Modes[0].SingleRunCompleted) {
+                        row.Add(new TextCell(Dialog.Deaths(OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(item)),
+                            currentPage.TextJustify, 0.5f, currentPage.TextColor));
+                        sumOfBestDashes += OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(item);
                     } else {
                         row.Add(new IconCell("dot"));
                     }
@@ -252,7 +253,8 @@ public static List<OuiJournalCollabProgressInLobby> GeneratePages(OuiJournal jou
                     .Add(new TextCell(allLevelsDone ? Dialog.Deaths(sumOfBestDeaths) : "-", currentPage.TextJustify, 0.6f, currentPage.TextColor));
 
                 if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
-                    totalsRow.Add(new TextCell(allLevelsDone ? Dialog.Deaths(sumOfBestDashes) : "-", currentPage.TextJustify, 0.6f, currentPage.TextColor));
+                    totalsRow.Add(new TextCell(OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() || allLevelsDone ? Dialog.Deaths(sumOfBestDashes) : "-",
+                        currentPage.TextJustify, 0.6f, currentPage.TextColor));
                 }
 
                 totalsRow

UI/OuiJournalCollabProgressInOverworld.cs

@@ -82,7 +82,7 @@ public OuiJournalCollabProgressInOverworld(OuiJournal journal)
                     int lobbyTotalStrawberries = areaData.Mode[0].TotalStrawberries;
                     int lobbyDeaths = item.Modes[0].Deaths;
                     int lobbySumOfBestDeaths = 0;
-                    int lobbySumOfBestDashes = 0;
+                    int lobbySumOfBestDashes = OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() ? OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(item) : 0;
                     long lobbyTotalTime = item.TotalTimePlayed;
                     long lobbySumOfBestTimes = 0;
                     bool lobbyLevelsDone = true;
@@ -125,7 +125,7 @@ public OuiJournalCollabProgressInOverworld(OuiJournal journal)
                             lobbySumOfBestDeaths += lobbyMap.Modes[0].BestDeaths;
                         }
 
-                        lobbySumOfBestDashes += lobbyMap.Modes[0].BestDashes;
+                        lobbySumOfBestDashes += OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(lobbyMap);
 
                         if (!lobbyMap.Modes[0].HeartGem) {
                             lobbyLevelsDone = false;
@@ -174,22 +174,24 @@ public OuiJournalCollabProgressInOverworld(OuiJournal journal)
                         } else {
                             row.Add(new IconCell("dot"));
                         }
-
-                        if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
-                            if (lobbyMapLevelSet == null) {
-                                row.Add(new TextCell(Dialog.Deaths(item.Modes[0].BestDashes), TextJustify, 0.5f, TextColor));
-                                sumOfBestDashes += item.Modes[0].BestDashes;
-                            } else if (lobbyAllMapsCompletedInSingleRun) {
-                                row.Add(new TextCell(Dialog.Deaths(lobbySumOfBestDashes), TextJustify, 0.5f, TextColor));
-                            } else {
-                                row.Add(new IconCell("dot"));
-                            }
-                        }
                     } else {
                         row.Add(new IconCell("dot"));
                         allLevelsDone = false;
+                    }
 
-                        if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
+
+                    if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
+                        if (lobbyMapLevelSet == null) {
+                            if ((OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() && item.TotalTimePlayed > 0) || item.Modes[0].SingleRunCompleted) {
+                                row.Add(new TextCell(Dialog.Deaths(OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(item)),
+                                TextJustify, 0.5f, TextColor));
+                                sumOfBestDashes += OuiJournalCollabProgressDashCountMod.GetLevelDashesForJournalProgress(item);
+                            } else {
+                                row.Add(new IconCell("dot"));
+                            }
+                        } else if ((OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() && item.TotalTimePlayed > 0) || lobbyAllMapsCompletedInSingleRun) {
+                            row.Add(new TextCell(Dialog.Deaths(lobbySumOfBestDashes), TextJustify, 0.5f, TextColor));
+                        } else {
                             row.Add(new IconCell("dot"));
                         }
                     }
@@ -238,7 +240,8 @@ public OuiJournalCollabProgressInOverworld(OuiJournal journal)
                 .Add(new TextCell(allLevelsDone && allMapsCompletedInSingleRun ? Dialog.Deaths(sumOfBestDeaths) : "-", TextJustify, 0.6f, TextColor));
 
             if (OuiJournalCollabProgressDashCountMod.IsDashCountEnabled()) {
-                totalsRow.Add(new TextCell(allLevelsDone && allMapsCompletedInSingleRun ? Dialog.Deaths(sumOfBestDashes) : "-", TextJustify, 0.6f, TextColor));
+                totalsRow.Add(new TextCell(OuiJournalCollabProgressDashCountMod.DisplaysTotalDashes() || (allLevelsDone && allMapsCompletedInSingleRun) ?
+                    Dialog.Deaths(sumOfBestDashes) : "-", TextJustify, 0.6f, TextColor));
             }
 
             totalsRow

everest.yaml

@@ -1,5 +1,5 @@
 - Name: CollabUtils2
-  Version: 1.6.9
+  Version: 1.6.10
   DLL: bin/Debug/net452/CollabUtils2.dll
   Dependencies:
     - Name: Everest