- Fixed the Gourmand Frog checks sometimes missing the first check

agilbert1412 · Oct 22, 2024 · 5bdf069 · 5bdf069
1 parent 5426a8f
commit 5bdf069
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/StardewArchipelago/Locations/CodeInjections/Vanilla/Walnutsanity/WalnutPuzzleInjections.cs b/StardewArchipelago/Locations/CodeInjections/Vanilla/Walnutsanity/WalnutPuzzleInjections.cs
@@ -200,7 +200,11 @@ public static bool GiveReward_GourmandCheckInsteadOfNuts_Prefix(IslandFarmCave _
                 ++__instance.gourmandRequestsFulfilled.Value;
                 for (var i = 0; i < __instance.gourmandRequestsFulfilled.Value; i++)
                 {
-                    _locationChecker.AddWalnutCheckedLocation(gourmandChecks[__instance.gourmandRequestsFulfilled.Value]);
+                    if (i >= gourmandChecks.Length)
+                    {
+                        continue;
+                    }
+                    _locationChecker.AddWalnutCheckedLocation(gourmandChecks[i]);
                 }
 
                 Game1.player.team.MarkCollectedNut($"IslandGourmand{__instance.gourmandRequestsFulfilled.Value}");

diff --git a/StardewArchipelago/ModEntry.cs b/StardewArchipelago/ModEntry.cs
@@ -38,6 +38,7 @@
 using StardewValley;
 using StardewValley.Delegates;
 using StardewValley.Internal;
+using StardewValley.Locations;
 using StardewValley.TerrainFeatures;
 using StardewValley.Triggers;
 
@@ -491,16 +492,15 @@ private void DoArchipelagoDayStartedProcesses()
 
         private void DoBugsCleanup()
         {
-            if (_archipelago.SlotData.Mods.HasMod(ModNames.ARCHAEOLOGY))
+            var islandFarmCave = (IslandFarmCave)Game1.getLocationFromName("IslandFarmCave");
+            var gourmandChecks = new[] { "Gourmand Frog Melon", "Gourmand Frog Wheat", "Gourmand Frog Garlic" };
+            for (var i = 0; i < islandFarmCave.gourmandRequestsFulfilled.Value; i++)
             {
-                if (_locationChecker.IsLocationNotChecked("Read Digging Like Worms"))
+                if (i >= gourmandChecks.Length)
                 {
-                    _locationChecker.AddCheckedLocation("Read Digging Like Worms");
-                }
-                if (_locationChecker.IsLocationNotChecked("Shipsanity: Digging Like Worms"))
-                {
-                    _locationChecker.AddCheckedLocation("Shipsanity: Digging Like Worms");
+                    continue;
                 }
+                _locationChecker.AddWalnutCheckedLocation(gourmandChecks[i]);
             }
         }