Merge pull request #2894 from GreenestBeen/silly-haha-allsanity-seed

Author: UmedMuzl

randomizer/Enums/Regions.jsonc

@@ -313,6 +313,7 @@
     "SnideSecondGroup": 287,
     "SnideThirdGroup": 288,
     "SnideFourthGroup": 289,
-    "SnideLastGroup": 290
+    "SnideLastGroup": 290,
+    "FactoryArcadePole": 291
   }
 }

randomizer/Lists/MapsAndExits.py

@@ -266,6 +266,7 @@
     Regions.SnideThirdGroup: Maps.Snide,
     Regions.SnideFourthGroup: Maps.Snide,
     Regions.SnideLastGroup: Maps.Snide,
+    Regions.FactoryArcadePole: Maps.FranticFactory,
 }
 
 LevelMapTable = {

randomizer/Lists/ShufflableExit.py

@@ -122,8 +122,8 @@ def __init__(self, name: str, region: Regions, back: TransitionBack, category: O
     Transitions.FactoryPowerToChunkyRoom: ShufflableExit("Frantic Factory Power Room to Chunky Room", Regions.PowerHut, TransitionBack(Regions.ChunkyRoomPlatform, "From Power Shed", "Frantic Factory Main from Power Shed", Transitions.FactoryChunkyRoomToPower)),
     Transitions.FactoryLowerCoreToInsideCore: ShufflableExit("Frantic Factory Main to Crusher Room", Regions.LowerCore, TransitionBack(Regions.InsideCore, "From Factory Main", "Frantic Factory Crusher Room", Transitions.FactoryInsideCoreToLowerCore), ExitCategories.FactoryExterior, regionKongs={Kongs.donkey, Kongs.lanky}),
     Transitions.FactoryInsideCoreToLowerCore: ShufflableExit("Frantic Factory Crusher Room to Main", Regions.InsideCore, TransitionBack(Regions.LowerCore, "From Crusher Room", "Frantic Factory Main from Crusher Room", Transitions.FactoryLowerCoreToInsideCore)),
-    Transitions.FactoryStorageToArcade: ShufflableExit("Frantic Factory Storage to Arcade", Regions.BeyondHatch, TransitionBack(Regions.FactoryArcadeTunnel, "From Tiny BP Area (To Arcade Area)", "Frantic Factory Arcade from Storage", Transitions.FactoryArcadeToStorage), ExitCategories.FactoryExterior, move=True),
-    Transitions.FactoryArcadeToStorage: ShufflableExit("Frantic Factory Arcade to Storage", Regions.FactoryArcadeTunnel, TransitionBack(Regions.BeyondHatch, "From Arcade Area (near Tiny BP)", "Frantic Factory Storage from Arcade", Transitions.FactoryStorageToArcade), ExitCategories.FactoryExterior),
+    Transitions.FactoryStorageToArcade: ShufflableExit("Frantic Factory Storage to Arcade", Regions.BeyondHatch, TransitionBack(Regions.FactoryArcadePole, "From Tiny BP Area (To Arcade Area)", "Frantic Factory Arcade from Storage", Transitions.FactoryArcadeToStorage), ExitCategories.FactoryExterior, move=True),
+    Transitions.FactoryArcadeToStorage: ShufflableExit("Frantic Factory Arcade to Storage", Regions.FactoryArcadePole, TransitionBack(Regions.BeyondHatch, "From Arcade Area (near Tiny BP)", "Frantic Factory Storage from Arcade", Transitions.FactoryStorageToArcade), ExitCategories.FactoryExterior),
     # Transitions.FactoryMainToBBlast: ShufflableExit("Frantic Factory Main to BBlast", Regions.BeyondHatch, TransitionBack(Regions.FactoryBaboonBlast, "From Factory Main", "Frantic Factory Baboon Blast"), ExitCategories.FactoryExterior, entryKongs={Kongs.donkey}, regionKongs={Kongs.donkey}, move=True),
 
     # Gloomy Galleon Exits

randomizer/LogicFiles/FranticFactory.py

@@ -162,7 +162,7 @@
         Event(Events.TestingGateOpened, lambda l: l.Slam),
         Event(Events.FactoryW1bTagged, lambda _: True),
     ], [
-        TransitionFront(Regions.FactoryArcadeTunnel, lambda l: l.climbing, Transitions.FactoryStorageToArcade),
+        TransitionFront(Regions.FactoryArcadePole, lambda l: l.climbing, Transitions.FactoryStorageToArcade),
         TransitionFront(Regions.LowerCore, lambda _: True),
         TransitionFront(Regions.ChunkyRoomPlatform, lambda l: l.CanMoonkick() or (l.twirl and l.istiny and l.monkey_maneuvers) or (l.isdiddy and l.monkey_maneuvers)),
         TransitionFront(Regions.CrankyFactory, lambda l: l.crankyAccess),
@@ -178,6 +178,12 @@
         TransitionFront(Regions.BeyondHatch, lambda _: True),
     ]),
 
+    # Fake region because actually getting out of the loading zone requires Climbing
+    Regions.FactoryArcadePole: Region("Factory Arcade Upper Pole", HintRegion.Storage, Levels.FranticFactory, False, None, [], [], [
+        TransitionFront(Regions.FactoryArcadeTunnel, lambda l: l.climbing),
+        TransitionFront(Regions.BeyondHatch, lambda _: True, Transitions.FactoryArcadeToStorage)
+    ]),
+
     Regions.FactoryArcadeTunnel: Region("Arcade Tunnel", HintRegion.Storage, Levels.FranticFactory, False, None, [
         LocationLogic(Locations.NintendoCoin, lambda l: Events.ArcadeLeverSpawned in l.Events and l.grab and l.isdonkey and (l.GetCoins(Kongs.donkey) >= 2)),
         LocationLogic(Locations.FactoryTinybyArcade, lambda l: (l.mini and l.tiny) or l.CanPhase()),
@@ -186,7 +192,7 @@
     ], [
         Event(Events.FactoryW5aTagged, lambda _: True),
     ], [
-        TransitionFront(Regions.BeyondHatch, lambda _: True, Transitions.FactoryArcadeToStorage),
+        TransitionFront(Regions.FactoryArcadePole, lambda _: True),
     ]),
 
     Regions.FactoryBaboonBlast: Region("Factory Baboon Blast", HintRegion.Storage, Levels.FranticFactory, False, None, [

typings/randomizer/Enums/Regions.d.ts

@@ -289,4 +289,5 @@ export enum Regions {
     SnideThirdGroup = 288,
     SnideFourthGroup = 289,
     SnideLastGroup = 290,
+    FactoryArcadePole = 291,
 }

typings/randomizer/Enums/Regions.pyi

@@ -291,3 +291,4 @@ class Regions(IntEnum):
     SnideThirdGroup = 288
     SnideFourthGroup = 289
     SnideLastGroup = 290
+    FactoryArcadePole = 291