Skip to content

Commit

Permalink
Fix Screw Attack
Browse files Browse the repository at this point in the history
Create region Screw Attack, connect it to World, put Screw Attack in Screw Attack so you can Screw Attack while you Screw Attack (we heard you like Screw Attack)
  • Loading branch information
ANXvariable committed Oct 30, 2023
1 parent 4ef9652 commit ce94fb2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion worlds/am2r/locations.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int]):
LocationData("Underwater Distro Connection", "Distribution Center: Spikey Tunnel Shinespark", 8680076, lambda state: state.has("Gravity Suit", player) and state.has("Speed Booster", player)), # grav + speed
LocationData("Underwater Distro Connection", "Distribution Center: After Spikey Tunnel", 8680078, lambda state: state.has("Power Bomb", player) and state.has("Speed Booster", player) and state.has("Gravity Suit", player) and state.has("Space Jump", player)), # speed + grav + space + pb

LocationData("Pipe Hell R", "Distribution Center: Screw Attack", 8680080),
LocationData("Screw Attack", "Distribution Center: Screw Attack", 8680080),
LocationData("Pipe Hell Outside", "Distribution Center: Outside after Gravity", 8680081, lambda state: state.has("Power Bomb", player) and state.has("Space Jump", player) and state.has("Gravity Suit", player)), # pb + space + grav
LocationData("Pipe Hell R", "Distribution Center: Before Underwater Pipe", 8680082, lambda state: state.has("Power Bomb", player) and state.has("Speed Booster", player)), # pb + speed

Expand Down
4 changes: 4 additions & 0 deletions worlds/am2r/regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ def create_regions_and_locations(world: MultiWorld, player: int):
create_region(world, player, locations_per_region, "Fast Travel"),
create_region(world, player, locations_per_region, "Gravity"),
create_region(world, player, locations_per_region, "EMP"),
create_region(world, player, locations_per_region, "Screw Attack"),
create_region(world, player, locations_per_region, "GFS Thoth"),
create_region(world, player, locations_per_region, "Genesis"),
create_region(world, player, locations_per_region, "Deep Caves"),
Expand Down Expand Up @@ -188,6 +189,9 @@ def create_regions_and_locations(world: MultiWorld, player: int):
connect(world, player, "Pipe Hell Outside", "Pipe Hell R", logic.AM2R_can_bomb),
connect(world, player, "Pipe Hell R", "Pipe Hell Outside", lambda state: state.can_reach("Pipe Hell Outside", "Region", player)),

connect(world, player, "Screw Attack", "Pipe Hell R", lambda state: state.has("Screw Attack", player) and logic.AM2R_can_schmove(state)),
connect(world, player, "Pipe Hell R", "Screw Attack", logic.AM2R_can_spider),

connect(world, player, "Underwater Distribution Center", "Underwater Distro Connection", lambda state: state.has("Ice Beam", player) or (state.has("Gravity Suit", player) and state.has("Speed Booster", player))),
connect(world, player, "Underwater Distro Connection", "Underwater Distribution Center", lambda state: state.has("Ice Beam", player) or (state.has("Gravity Suit", player) and state.has("Speed Booster", player))),

Expand Down

0 comments on commit ce94fb2

Please sign in to comment.