Account for Pyramid Cave Omothrow for Skeleton Dog

PoryGoneDev · Dec 29, 2024 · 0f3e3c7 · 0f3e3c7
1 parent 38ddfcb
commit 0f3e3c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/worlds/sa2b/Regions.py b/worlds/sa2b/Regions.py
@@ -2902,7 +2902,7 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
                         lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
 
                 connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
-                        lambda state: (state.has(ItemName.sonic_light_shoes, player) and
+                        lambda state: (state.has(ItemName.sonic_bounce_bracelet, player) and
                                        state.has(ItemName.sonic_flame_ring, player)))
 
                 connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
@@ -2917,8 +2917,7 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
                         lambda state: (state.has(ItemName.knuckles_shovel_claws, player)))
 
                 connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
-                        lambda state: (state.has(ItemName.sonic_light_shoes, player) and
-                                       state.has(ItemName.sonic_flame_ring, player)))
+                        lambda state: (state.has(ItemName.sonic_flame_ring, player)))
 
                 connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.eggman_jet_engine, player)))
@@ -2928,7 +2927,8 @@ def connect_regions(multiworld: MultiWorld, world: World, player: int, gates: ty
             if world.options.logic_difficulty.value == 2:
                 connect(multiworld, player, names, LocationName.wild_canyon_region, LocationName.animal_dragon)
 
-                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog)
+                connect(multiworld, player, names, LocationName.pyramid_cave_region, LocationName.animal_skeleton_dog,
+                        lambda state: (state.has(ItemName.sonic_flame_ring, player)))
 
                 connect(multiworld, player, names, LocationName.iron_gate_region, LocationName.animal_dragon,
                         lambda state: (state.has(ItemName.eggman_jet_engine, player)))

diff --git a/worlds/sa2b/Rules.py b/worlds/sa2b/Rules.py
@@ -1316,6 +1316,7 @@ def set_mission_upgrade_rules_standard(multiworld: MultiWorld, world: World, pla
         add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
                  lambda state: state.has(ItemName.sonic_light_shoes, player) and
                                state.has(ItemName.sonic_bounce_bracelet, player) and
+                               state.has(ItemName.sonic_flame_ring, player) and
                                state.has(ItemName.sonic_mystic_melody, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
@@ -2916,8 +2917,7 @@ def set_mission_upgrade_rules_hard(multiworld: MultiWorld, world: World, player:
                                state.has(ItemName.knuckles_hammer_gloves, player))
 
         add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
-                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
-                               state.has(ItemName.sonic_mystic_melody, player))
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
                  lambda state: state.has(ItemName.tails_booster, player) and
@@ -3994,8 +3994,7 @@ def set_mission_upgrade_rules_expert(multiworld: MultiWorld, world: World, playe
                                (state.has(ItemName.knuckles_hammer_gloves, player)) and state.has(ItemName.sonic_flame_ring, player))
 
         add_rule(multiworld.get_location(LocationName.pyramid_cave_animal_19, player),
-                 lambda state: state.has(ItemName.sonic_bounce_bracelet, player) and
-                               state.has(ItemName.sonic_mystic_melody, player))
+                 lambda state: state.has(ItemName.sonic_flame_ring, player))
 
         add_rule(multiworld.get_location(LocationName.cannon_core_animal_19, player),
                  lambda state: state.has(ItemName.eggman_large_cannon, player) and