Force the strawberry to be golden in chapter panel when all the straw…

…berries in the map are goldens
EverestAPI · Oct 18, 2021 · 22312c5 · 22312c5
1 parent 967f211
commit 22312c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/UI/InGameOverworldHelper.cs b/UI/InGameOverworldHelper.cs
@@ -580,8 +580,9 @@ private static void OnChapterPanelUpdateStats(On.Celeste.OuiChapterPanel.orig_Up
 
 
             if (isPanelShowingLobby(self) || Engine.Scene == overworldWrapper?.Scene) {
-                // turn strawberry counter into golden if there is no berry in the map
-                if (AreaData.Get(self.Area).Mode[0].TotalStrawberries == 0) {
+                // turn strawberry counter into golden if there only are golden berries in the map
+                MapData mapData = AreaData.Get(self.Area).Mode[0].MapData;
+                if (mapData.GetDetectedStrawberriesIncludingUntracked() == mapData.Goldenberries.Count) {
                     StrawberriesCounter strawberriesCounter = new DynData<OuiChapterPanel>(self).Get<StrawberriesCounter>("strawberries");
                     strawberriesCounter.Golden = true;
                     strawberriesCounter.ShowOutOf = false;

diff --git a/everest.yaml b/everest.yaml
@@ -1,5 +1,5 @@
 - Name: CollabUtils2
-  Version: 1.5.9
+  Version: 1.5.10
   DLL: bin/Debug/net452/CollabUtils2.dll
   Dependencies:
     - Name: Everest