remove speed from sir Zeta and change connection rules

Ehseezed · Aug 29, 2024 · 8a3604e · 8a3604e
1 parent 8c15ad2
commit 8a3604e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/worlds/am2r/locations.py b/worlds/am2r/locations.py
@@ -173,7 +173,7 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int]):
         LocationData("The Tower", "The Tower: Anakin", 108680131, 341, lambda state: state.has("Space Jump", player)),  # Xander
         LocationData("The Tower", "The Tower: Xander", 108680132, 342, lambda state: state.has("Space Jump", player)),
 
-        LocationData("EMP", "EMP: Sir Zeta Commander of the Alpha Squadron", 108680133, 343, lambda state: logic.AM2R_can_bomb(state) and state.has("Speed Booster", player)),  # Lucina
+        LocationData("Pipe Hell BL", "EMP: Sir Zeta Commander of the Alpha Squadron", 108680133, 343, logic.AM2R_can_bomb),  # Lucina
 
         LocationData("Pipe Hell R", "Alpha Squadron: Timmy", 108680134, 346),  # Lucina
         LocationData("Pipe Hell R", "Alpha Squadron: Tommy", 108680135, 345),  # Lucina

diff --git a/worlds/am2r/regions.py b/worlds/am2r/regions.py
@@ -160,8 +160,8 @@ def create_regions_and_locations(world: MultiWorld, player: int):
     connect(world, player, "Serris", "Ice Beam", lambda state: state.has("Gravity Suit", player)),
 
     # Pipe Hell Fuckery
-    connect(world, player, "EMP", "Pipe Hell BL"),
-    connect(world, player, "Pipe Hell BL", "EMP"),
+    connect(world, player, "EMP", "Pipe Hell BL", lambda state: state.has("Speed Booster", player)),
+    connect(world, player, "Pipe Hell BL", "EMP", lambda state: state.has("Speed Booster", player)),
 
     connect(world, player, "Pipe Hell BL", "Pipe Hell BR"),
     connect(world, player, "Pipe Hell BR", "Pipe Hell BL"),