New Forest Region

Author: UmedMuzl

randomizer/CollectibleLogicFiles/FungiForest.py

@@ -93,11 +93,13 @@
     Regions.MushroomUpperExterior: [
         Collectible(Collectibles.bunch, Kongs.donkey, lambda _: True, None, 1),  # Upper Warp 5
         Collectible(Collectibles.banana, Kongs.diddy, lambda _: True, None, 10),
-        Collectible(Collectibles.bunch, Kongs.lanky, lambda l: l.handstand, None, 1),  # Top of mushroom
 
         Collectible(Collectibles.coin, Kongs.diddy, lambda _: True, None, 3),  # Around crown pad
         Collectible(Collectibles.coin, Kongs.chunky, lambda _: True, None, 3),  # On switch to face puzzle room
     ],
+    Regions.MushroomVeryTopExterior: [
+        Collectible(Collectibles.bunch, Kongs.lanky, lambda _: True, None, 1),  # Top of mushroom
+    ],
     Regions.MushroomChunkyRoom: [
         Collectible(Collectibles.bunch, Kongs.chunky, lambda _: True, None, 1),
         Collectible(Collectibles.balloon, Kongs.chunky, lambda l: l.pineapple, None, 1),

randomizer/CompileHints.py

@@ -1924,6 +1924,7 @@ def compileHints(spoiler: Spoiler) -> bool:
                 Regions.ForestTopOfMill,
                 Regions.MillArea,
                 Regions.ThornvineArea,
+                Regions.MushroomVeryTopExterior,
             ],
             [Regions.CrystalCavesEntryHandler, Regions.CrystalCavesMain, Regions.IglooArea, Regions.CabinArea],
             [Regions.CreepyCastleEntryHandler, Regions.CreepyCastleMain, Regions.CastleWaterfall],

randomizer/Enums/Events.jsonc

@@ -236,6 +236,7 @@
         "AirSpaceEntered": 205,
         "HelmLobbyW1aTagged": 206,
         "HelmLobbyW1bTagged": 207,
-        "KilledRabbit": 208
+        "KilledRabbit": 208,
+        "LankyMushroomSlamSwitch": 209
     }
 }

randomizer/Enums/Regions.jsonc

@@ -314,6 +314,7 @@
     "SnideThirdGroup": 288,
     "SnideFourthGroup": 289,
     "SnideLastGroup": 290,
-    "FactoryArcadePole": 291
+    "FactoryArcadePole": 291,
+    "MushroomVeryTopExterior": 292
   }
 }

randomizer/Lists/BananaCoinLocations.py

@@ -5274,8 +5274,8 @@ def __init__(
             map_id=Maps.FungiForest,
             name="On the Giant Mushroom top",
             konglist=[Kongs.diddy, Kongs.lanky],
-            region=Regions.MushroomUpperExterior,
-            logic=lambda l: (l.jetpack and l.isdiddy) or (l.islanky and l.handstand),
+            region=Regions.MushroomVeryTopExterior,
+            logic=lambda _: True,
             locations=[
                 [1.0, 1078, 1432, 1177],
                 [1.0, 1142, 1429, 1034],

randomizer/Lists/CBLocations/FungiForestCBLocations.py

@@ -799,8 +799,8 @@
         map_id=Maps.FungiForest,
         name="Around Lanky switch on top of giant mushroom",
         konglist=[Kongs.diddy, Kongs.lanky],
-        region=Regions.MushroomUpperExterior,
-        logic=lambda l: (l.handstand and l.islanky) or (l.jetpack and l.isdiddy),
+        region=Regions.MushroomVeryTopExterior,
+        logic=lambda _: True,
         locations=[
             [1, 1.0, 980, 1500, 980],
             [1, 1.0, 945, 1500, 949],
@@ -1548,9 +1548,9 @@
         map_id=Maps.FungiForest,
         name="On Giant mushroom top switch (Lanky)",
         konglist=[Kongs.diddy, Kongs.lanky],
-        region=Regions.MushroomUpperExterior,
+        region=Regions.MushroomVeryTopExterior,
         vanilla=True,
-        logic=lambda l: (l.jetpack and l.isdiddy) or (l.handstand and l.islanky),
+        logic=lambda _: True,
         locations=[[5, 1.0, 913.51025390625, 1520.0, 1020.1333618164062]],
     ),
     ColoredBananaGroup(
@@ -2482,17 +2482,17 @@
         map_id=Maps.FungiForest,
         name="Top of mushroom to zinger bounce room",
         konglist=[Kongs.lanky],
-        region=Regions.MushroomUpperExterior,
-        logic=lambda l: l.handstand,
+        region=Regions.MushroomVeryTopExterior,
+        logic=lambda _: True,
         locations=[[1, 1.0, 855, 1385, 1347], [1, 1.0, 863, 1412, 1292], [1, 1.0, 872, 1439, 1238], [1, 1.0, 880, 1465, 1183], [1, 1.0, 888, 1492, 1129]],
     ),
     ColoredBananaGroup(
         group=199,
         map_id=Maps.FungiForest,
         name="Top of mushroom to colored slam room",
         konglist=[Kongs.lanky],
-        region=Regions.MushroomUpperExterior,
-        logic=lambda l: l.handstand,
+        region=Regions.MushroomVeryTopExterior,
+        logic=lambda _: True,
         locations=[[1, 1.0, 962, 1384, 700], [1, 1.0, 953, 1411, 755], [1, 1.0, 945, 1438, 810], [1, 1.0, 936, 1465, 865], [1, 1.0, 928, 1492, 920]],
     ),
     ColoredBananaGroup(

randomizer/Lists/KasplatLocations.py

@@ -997,8 +997,8 @@ def setKasplat(self, state=True):
             xmax=962,
             zmin=974,
             zmax=1063,
-            region=Regions.MushroomUpperExterior,
-            additional_logic=lambda l: l.jetpack or l.handstand,
+            region=Regions.MushroomVeryTopExterior,
+            additional_logic=lambda _: True,
         ),
         KasplatLocation(
             name="Forest Kasplat: On Mill Roof",

randomizer/LogicFiles/FungiForest.py

@@ -209,23 +209,32 @@
         LocationLogic(Locations.ForestMainEnemy_NearFacePuzzle, lambda _: True),
         LocationLogic(Locations.ForestMainEnemy_NearCrown, lambda _: True),
         LocationLogic(Locations.ForestMainEnemy_NearHighWarp5, lambda _: True),
-        LocationLogic(Locations.ForestMainEnemy_TopOfMushroom, lambda l: (l.jetpack and l.isdiddy) or (l.handstand and l.islanky)),
         LocationLogic(Locations.KremKap_ForestMainEnemy_NearFacePuzzle, lambda l: l.camera),
         LocationLogic(Locations.KremKap_ForestMainEnemy_NearCrown, lambda l: l.camera),
         LocationLogic(Locations.KremKap_ForestMainEnemy_NearHighWarp5, lambda l: l.camera),
-        LocationLogic(Locations.KremKap_ForestMainEnemy_TopOfMushroom, lambda l: l.camera and ((l.jetpack and l.isdiddy) or (l.handstand and l.islanky))),
     ], [
         Event(Events.ForestW5aTagged, lambda _: True),
     ], [
         TransitionFront(Regions.MushroomUpper, lambda _: True, Transitions.ForestUpperExteriorToUpperMushroom),
         TransitionFront(Regions.MushroomNightExterior, lambda l: (l.istiny and l.twirl) or not l.IsHardFallDamage()),
         TransitionFront(Regions.GiantMushroomArea, lambda _: True),
+        TransitionFront(Regions.MushroomVeryTopExterior, lambda l: (l.jetpack and l.isdiddy) or (l.handstand and l.islanky) or (l.slope_resets and l.diddy)),
         TransitionFront(Regions.MushroomChunkyRoom, lambda l: (l.CanSlamSwitch(Levels.FungiForest, 2) and l.ischunky) or l.CanPhase() or l.CanOStandTBSNoclip(), Transitions.ForestExteriorToChunky),
-        TransitionFront(Regions.MushroomLankyZingersRoom, lambda l: (l.handstand and l.CanSlamSwitch(Levels.FungiForest, 2) and l.islanky) or l.CanOStandTBSNoclip(), Transitions.ForestExteriorToZingers),
-        TransitionFront(Regions.MushroomLankyMushroomsRoom, lambda l: (l.handstand and l.CanSlamSwitch(Levels.FungiForest, 2) and l.islanky) or l.CanPhase() or l.CanOStandTBSNoclip(), Transitions.ForestExteriorToMushrooms),
+        TransitionFront(Regions.MushroomLankyZingersRoom, lambda l: Events.LankyMushroomSlamSwitch in l.Events or l.CanOStandTBSNoclip(), Transitions.ForestExteriorToZingers),
+        TransitionFront(Regions.MushroomLankyMushroomsRoom, lambda l: Events.LankyMushroomSlamSwitch in l.Events or l.CanPhase() or l.CanOStandTBSNoclip(), Transitions.ForestExteriorToMushrooms),
         TransitionFront(Regions.ForestBossLobby, lambda l: not l.settings.tns_location_rando),
     ]),
 
+    Regions.MushroomVeryTopExterior: Region("Very Top of Mushroom", HintRegion.MushroomExterior, Levels.FungiForest, True, -1, [
+        LocationLogic(Locations.ForestMainEnemy_TopOfMushroom, lambda _: True),
+        LocationLogic(Locations.KremKap_ForestMainEnemy_TopOfMushroom, lambda l: l.camera),
+
+    ], [
+        Event(Events.LankyMushroomSlamSwitch, lambda l: l.CanSlamSwitch(Levels.FungiForest, 2) and l.islanky)
+    ], [
+        TransitionFront(Regions.MushroomUpperExterior, lambda _: True),
+    ]),
+
     Regions.MushroomChunkyRoom: Region("Mushroom Chunky Room", HintRegion.MushroomInterior, Levels.FungiForest, False, -1, [
         LocationLogic(Locations.ForestChunkyFacePuzzle, lambda l: l.pineapple and l.CanSlamSwitch(Levels.FungiForest, 2) and l.ischunky),
         LocationLogic(Locations.ForestFacePuzzleEnemy_Enemy, lambda _: True),

requirement_data.js

@@ -312,14 +312,14 @@ const requirement_data = {
                 [Moves.Rocket, Moves.Grape],
                 [Moves.Grape, Moves.CheckOfLegends],
             ]),
-            new Requirement(5, [ // 1 bunch in MushroomUpperExterior
+            new Requirement(5, [ // 1 bunch in MushroomVeryTopExterior
                 [Moves.ClimbingCheck, Moves.Orangstand],
                 [Moves.Rocket, Moves.Orangstand],
                 [Moves.Orangstand, Moves.CheckOfLegends],
             ]),
             new Requirement(15, [ // 1 bunch in MushroomLankyMushroomsRoom; 2 bunches in MushroomLankyZingersRoom
+                [Moves.LevelSlam, Moves.Rocket],
                 [Moves.ClimbingCheck, Moves.LevelSlam, Moves.Orangstand],
-                [Moves.LevelSlam, Moves.Rocket, Moves.Orangstand],
                 [Moves.LevelSlam, Moves.Orangstand, Moves.CheckOfLegends],
             ]),
         ],

typings/randomizer/Enums/Events.d.ts

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