Quickfix

archipelago/Logic.py

@@ -1538,7 +1538,7 @@ def CanFreeChunky(self):
             return self.IsKong(self.settings.chunky_freeing_kong) or self.settings.free_trade_items
         # Otherwise you need the right slam level (usually 1)
         else:
-            return self.hasMoveSwitchsanity(Switches.FactoryFreeKong, level=Levels.FranticFactory, default_slam_level=1) and (self.slope_resets or self.handstand)
+            return self.hasMoveSwitchsanity(Switches.FactoryFreeKong, level=Levels.FranticFactory, default_slam_level=1)
 
     def CanOpenForestLobbyGoneDoor(self):
         """Check if the player can open the door to the gone pad in forest lobby."""

randomizer/Enums/Events.jsonc

@@ -237,6 +237,7 @@
         "HelmLobbyW1aTagged": 206,
         "HelmLobbyW1bTagged": 207,
         "KilledRabbit": 208,
-        "LankyMushroomSlamSwitch": 209
+        "LankyMushroomSlamSwitch": 209,
+        "ChunkyFreed": 210
     }
 }

randomizer/Logic.py

@@ -974,7 +974,7 @@ def CanFreeChunky(self):
             return self.IsKong(self.settings.chunky_freeing_kong) or self.settings.free_trade_items
         # Otherwise you need the right slam level (usually 1)
         else:
-            return self.hasMoveSwitchsanity(Switches.FactoryFreeKong, level=Levels.FranticFactory, default_slam_level=1) and (self.slope_resets or self.handstand)
+            return self.hasMoveSwitchsanity(Switches.FactoryFreeKong, level=Levels.FranticFactory, default_slam_level=1)
 
     def CanOpenForestLobbyGoneDoor(self):
         """Check if the player can open the door to the gone pad in forest lobby."""

randomizer/LogicFiles/FranticFactory.py

@@ -142,8 +142,8 @@
     ]),
 
     Regions.BeyondHatch: Region("Beyond Hatch", HintRegion.Storage, Levels.FranticFactory, True, -1, [
-        LocationLogic(Locations.ChunkyKong, lambda l: l.CanFreeChunky()),
-        LocationLogic(Locations.FactoryLankyFreeChunky, lambda l: l.CanFreeChunky()),
+        LocationLogic(Locations.ChunkyKong, lambda l: Events.ChunkyFreed in l.Events),
+        LocationLogic(Locations.FactoryLankyFreeChunky, lambda l: Events.ChunkyFreed in l.Events),
         LocationLogic(Locations.FactoryChunkyDarkRoom, lambda l: ((l.punch and l.chunky) or l.CanPhase()) and ((l.punch and l.CanSlamSwitch(Levels.FranticFactory, 1)) or l.generalclips) and l.ischunky),
         LocationLogic(Locations.RainbowCoin_Location02, lambda l: (l.punch and l.chunky) or l.CanPhase()),
         LocationLogic(Locations.FactoryKasplatStorage, lambda l: not l.settings.kasplat_rando),
@@ -173,7 +173,7 @@
     ]),
 
     Regions.FactoryStoragePipe: Region("Factory Storage Pipe", HintRegion.Storage, Levels.FranticFactory, False, None, [], [
-        # If we were to move the switch to Chunky's cage back up this pipe, the event would go here.
+        Event(Events.ChunkyFreed, lambda l: l.CanFreeChunky())
     ], [
         TransitionFront(Regions.BeyondHatch, lambda _: True),
     ]),

randomizer/Patching/ApplyRandomizer.py

@@ -67,6 +67,7 @@
 from randomizer.Patching.KongRando import apply_kongrando_cosmetic
 from randomizer.Patching.Library.Generic import setItemReferenceName, addNewScript, IsItemSelected, getProgHintBarrierItem, getHintRequirementBatch, IsDDMSSelected
 from randomizer.Patching.Library.Assets import CompTextFiles, ItemPreview
+from randomizer.Patching.Library.Image import getImageFile
 from randomizer.Patching.MiscSetupChanges import (
     randomize_setup,
     updateKrushaMoveNames,
@@ -673,7 +674,6 @@
     randomize_coins(spoiler, ROM_COPY)
     place_mayhem_coins(spoiler, ROM_COPY)
     ApplyShopRandomizer(spoiler, ROM_COPY)
-    showWinCondition(spoiler.settings, ROM_COPY)
     remove5DSCameraPoint(spoiler, ROM_COPY)
     alterTextboxRequirements(spoiler)
     spoiler.arcade_item_reward = Items.NintendoCoin
@@ -729,6 +729,7 @@
         applyKongModelSwaps(spoiler.settings, ROM_COPY)
         updateHelmFaces(spoiler.settings, ROM_COPY)
         updateSnidePanel(spoiler.settings, ROM_COPY)
+        showWinCondition(spoiler.settings, ROM_COPY)
 
         patchAssembly(ROM_COPY, spoiler)
         ApplyMirrorMode(spoiler.settings, ROM_COPY)

typings/randomizer/Enums/Events.d.ts

@@ -208,4 +208,5 @@ export enum Events {
     HelmLobbyW1bTagged = 207,
     KilledRabbit = 208,
     LankyMushroomSlamSwitch = 209,
+    ChunkyFreed = 210,
 }

typings/randomizer/Enums/Events.pyi

@@ -210,3 +210,4 @@ class Events(IntEnum):
     HelmLobbyW1bTagged = 207
     KilledRabbit = 208
     LankyMushroomSlamSwitch = 209
+    ChunkyFreed = 210