Fix WJ bigs

PoryGoneDev · Jul 9, 2024 · 78e4b99 · 78e4b99
1 parent 454f8a7
commit 78e4b99
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/worlds/sa2b/Locations.py b/worlds/sa2b/Locations.py
@@ -1847,16 +1847,22 @@ class SA2BLocation(Location):
     LocationName.lost_colony_big: 0xFF1B15,
     LocationName.weapons_bed_big: 0xFF1B16,
     LocationName.security_hall_big: 0xFF1B17,
-    LocationName.white_jungle_big: 0xFF1B18,
+    LocationName.white_jungle_big_1: 0xFF1B18,
     LocationName.sky_rail_big: 0xFF1B1A,
     LocationName.mad_space_big: 0xFF1B1B,
     LocationName.cosmic_wall_big: 0xFF1B1C,
     LocationName.final_chase_big: 0xFF1B1D,
 
     LocationName.cannon_core_big_1: 0xFF1B1E,
+
+    LocationName.white_jungle_big_2: 0xFF1B38,
+
     LocationName.cannon_core_big_2: 0xFF1B3E,
+
     LocationName.cannon_core_big_3: 0xFF1B5E,
+
     LocationName.cannon_core_big_4: 0xFF1B7E,
+
     LocationName.cannon_core_big_5: 0xFF1B9E,
 }
 

diff --git a/worlds/sa2b/Names/LocationName.py b/worlds/sa2b/Names/LocationName.py
@@ -892,7 +892,8 @@
 white_jungle_itembox_6    = "White Jungle - Item Box 6"
 white_jungle_itembox_7    = "White Jungle - Item Box 7"
 white_jungle_itembox_8    = "White Jungle - Item Box 8"
-white_jungle_big          = "White Jungle - Big"
+white_jungle_big_1        = "White Jungle - Big 1"
+white_jungle_big_2        = "White Jungle - Big 2"
 white_jungle_upgrade      = "White Jungle - Upgrade"
 sky_rail_1                = "Sky Rail - 1"
 sky_rail_2                = "Sky Rail - 2"

diff --git a/worlds/sa2b/Regions.py b/worlds/sa2b/Regions.py
@@ -1096,7 +1096,8 @@ def create_regions(multiworld: MultiWorld, world: World, player: int, active_loc
         LocationName.white_jungle_itembox_6,
         LocationName.white_jungle_itembox_7,
         LocationName.white_jungle_itembox_8,
-        LocationName.white_jungle_big,
+        LocationName.white_jungle_big_1,
+        LocationName.white_jungle_big_2,
         LocationName.white_jungle_upgrade,
     ]
     white_jungle_region = create_region(multiworld, player, active_locations, LocationName.white_jungle_region,

diff --git a/worlds/sa2b/Rules.py b/worlds/sa2b/Rules.py
@@ -2036,7 +2036,9 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
         add_rule(multiworld.get_location(LocationName.lost_colony_big, player),
                  lambda state: state.has(ItemName.eggman_jet_engine, player))
-        add_rule(multiworld.get_location(LocationName.white_jungle_big, player),
+        add_rule(multiworld.get_location(LocationName.white_jungle_big_1, player),
+                 lambda state: state.has(ItemName.shadow_air_shoes, player))
+        add_rule(multiworld.get_location(LocationName.white_jungle_big_2, player),
                  lambda state: state.has(ItemName.shadow_air_shoes, player))
         add_rule(multiworld.get_location(LocationName.mad_space_big, player),
                  lambda state: state.has(ItemName.rouge_iron_boots, player))