From 7f36036cedaf606be6669ae9619bb88acb684092 Mon Sep 17 00:00:00 2001 From: StructuralMike <66819228+StructuralMike@users.noreply.github.com> Date: Tue, 9 Mar 2021 13:08:56 +0100 Subject: [PATCH] Removed unneccesery PoD Arena crystal --- DoorShuffle.py | 2 -- Doors.py | 3 --- Dungeons.py | 2 +- Regions.py | 4 +--- Rules.py | 9 +++++---- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/DoorShuffle.py b/DoorShuffle.py index 27ceaf99..cfba665d 100644 --- a/DoorShuffle.py +++ b/DoorShuffle.py @@ -2024,8 +2024,6 @@ logical_connections = [ ('PoD Arena Landing to Main Barrier - Blue', 'PoD Arena Main'), ('PoD Arena Landing to Right Barrier - Blue', 'PoD Arena Right'), ('PoD Arena Landing to North Barrier - Orange', 'PoD Arena North'), - ('PoD Arena Landing to Ranged Crystal', 'PoD Arena Landing - Ranged Crystal'), - ('PoD Arena Landing Ranged Crystal Exit', 'PoD Arena Landing'), ('PoD Arena Right to Landing Barrier - Blue', 'PoD Arena Landing'), ('PoD Map Balcony Drop Down', 'PoD Sexy Statue'), diff --git a/Doors.py b/Doors.py index a798e0f9..d045b3d5 100644 --- a/Doors.py +++ b/Doors.py @@ -388,8 +388,6 @@ def create_doors(world, player): create_door(player, 'PoD Arena Landing to Main Barrier - Blue', Lgcl), create_door(player, 'PoD Arena Landing to Right Barrier - Blue', Lgcl), create_door(player, 'PoD Arena Landing to North Barrier - Orange', Lgcl), - create_door(player, 'PoD Arena Landing to Ranged Crystal', Lgcl), - create_door(player, 'PoD Arena Landing Ranged Crystal Exit', Lgcl), create_door(player, 'PoD Arena Right to Landing Barrier - Blue', Lgcl), create_door(player, 'PoD Arena Ledge ES', Nrml).dir(Ea, 0x2a, Bot, High).pos(2), create_door(player, 'PoD Sexy Statue W', Nrml).dir(We, 0x2b, Mid, High).pos(3), @@ -1247,7 +1245,6 @@ def create_doors(world, player): world.get_door('PoD Arena Landing to Main Barrier - Blue', player).barrier(CrystalBarrier.Blue) world.get_door('PoD Arena Landing to Right Barrier - Blue', player).barrier(CrystalBarrier.Blue) world.get_door('PoD Arena Landing to North Barrier - Orange', player).barrier(CrystalBarrier.Orange) - world.get_door('PoD Arena Landing Ranged Crystal Exit', player).c_switch() world.get_door('PoD Arena Right to Landing Barrier - Blue', player).barrier(CrystalBarrier.Blue) world.get_door('PoD Sexy Statue W', player).c_switch() diff --git a/Dungeons.py b/Dungeons.py index 6f0b1bfe..2e333572 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -212,7 +212,7 @@ tower_regions = [ pod_regions = [ 'PoD Lobby', 'PoD Left Cage', 'PoD Middle Cage', 'PoD Shooter Room', 'PoD Pit Room', 'PoD Pit Room Blocked', 'PoD Arena Main', 'PoD Arena Main - Ranged Crystal', 'PoD Arena North', 'PoD Arena Bridge', 'PoD Arena Bridge - Ranged Crystal', - 'PoD Arena Landing', 'PoD Arena Landing - Ranged Crystal', 'PoD Arena Right', 'PoD Arena Ledge', 'PoD Sexy Statue', + 'PoD Arena Landing', 'PoD Arena Right', 'PoD Arena Ledge', 'PoD Sexy Statue', 'PoD Map Balcony', 'PoD Map Balcony - Ranged Crystal', 'PoD Conveyor', 'PoD Mimics 1', 'PoD Jelly Hall', 'PoD Warp Hint', 'PoD Warp Room', 'PoD Stalfos Basement', 'PoD Basement Ledge', 'PoD Big Key Landing', 'PoD Falling Bridge', 'PoD Falling Bridge Ledge', 'PoD Dark Maze', 'PoD Big Chest Balcony', 'PoD Compass Room', 'PoD Dark Basement', diff --git a/Regions.py b/Regions.py index 8c13fb94..fc403261 100644 --- a/Regions.py +++ b/Regions.py @@ -393,8 +393,7 @@ def create_dungeon_regions(world, player): create_dungeon_region(player, 'PoD Arena North', 'Palace of Darkness', None, ['PoD Arena Main NW', 'PoD Arena Main NE', 'PoD Arena North Drop Down', 'PoD Arena North to Landing Barrier - Orange']), create_dungeon_region(player, 'PoD Arena Bridge', 'Palace of Darkness', ['Palace of Darkness - The Arena - Bridge'], ['PoD Arena Bridge SE', 'PoD Arena Bridge Drop Down', 'PoD Arena Bridge to Ranged Crystal']), create_dungeon_region(player, 'PoD Arena Bridge - Ranged Crystal', 'Palace of Darkness', None, ['PoD Arena Bridge Ranged Crystal Exit']), - create_dungeon_region(player, 'PoD Arena Landing', 'Palace of Darkness', None, ['PoD Arena Landing to Main Barrier - Blue', 'PoD Arena Landing to Right Barrier - Blue', 'PoD Arena Landing to North Barrier - Orange', 'PoD Arena Landing to Ranged Crystal', 'PoD Arena Landing Bonk Path']), - create_dungeon_region(player, 'PoD Arena Landing - Ranged Crystal', 'Palace of Darkness', None, ['PoD Arena Landing Ranged Crystal Exit']), + create_dungeon_region(player, 'PoD Arena Landing', 'Palace of Darkness', None, ['PoD Arena Landing to Main Barrier - Blue', 'PoD Arena Landing to Right Barrier - Blue', 'PoD Arena Landing to North Barrier - Orange', 'PoD Arena Landing Bonk Path']), create_dungeon_region(player, 'PoD Arena Right', 'Palace of Darkness', None, ['PoD Arena Crystals E', 'PoD Arena Right to Landing Barrier - Blue']), create_dungeon_region(player, 'PoD Arena Ledge', 'Palace of Darkness', ['Palace of Darkness - The Arena - Ledge'], ['PoD Arena Ledge ES']), @@ -821,7 +820,6 @@ def create_dungeon_regions(world, player): world.get_region('Hera Startile Wide', player).crystal_switch = True world.get_region('PoD Arena Main - Ranged Crystal', player).crystal_switch = True world.get_region('PoD Arena Bridge - Ranged Crystal', player).crystal_switch = True - world.get_region('PoD Arena Landing - Ranged Crystal', player).crystal_switch = True world.get_region('PoD Map Balcony - Ranged Crystal', player).crystal_switch = True world.get_region('PoD Sexy Statue', player).crystal_switch = True world.get_region('PoD Bow Statue Left', player).crystal_switch = True diff --git a/Rules.py b/Rules.py index e6760689..85013efc 100644 --- a/Rules.py +++ b/Rules.py @@ -360,7 +360,6 @@ def global_rules(world, player): set_rule(world.get_entrance('PoD Arena Main to Ranged Crystal', player), lambda state: True) # Can always throw pots here set_rule(world.get_entrance('PoD Arena Bridge to Ranged Crystal', player), lambda state: state.can_shoot_arrows(player) or state.has('Red Boomerang', player) or state.has('Fire Rod', player) or state.has('Ice Rod', player) or state.has('Cane of Somaria', player)) - set_rule(world.get_entrance('PoD Arena Landing to Ranged Crystal', player), lambda state: state.has('Red Boomerang', player)) set_rule(world.get_entrance('PoD Arena Main to North Ranged Barrier - Orange', player), lambda state: state.can_use_bombs(player) or state.has('Cane of Somaria', player)) set_rule(world.get_entrance('PoD Arena North to Landing Barrier - Orange', player), lambda state: state.can_reach_orange(world.get_region('PoD Arena North', player), player)) set_rule(world.get_entrance('PoD Arena Landing to North Barrier - Orange', player), lambda state: state.can_reach_orange(world.get_region('PoD Arena Landing', player), player)) @@ -1661,11 +1660,13 @@ bunny_impassible_doors = { 'Hera Down Stairs to Front Barrier - Blue', 'Hera Tile Room EN', 'Hera Tridorm SE', 'Hera Beetles WS', 'Hera 4F Down Stairs', 'Tower Gold Knights SW', 'Tower Dark Maze EN', 'Tower Dark Pits ES', 'Tower Dark Archers WN', 'Tower Red Spears WN', 'Tower Red Guards EN', 'Tower Red Guards SW', 'Tower Circle of Pots NW', 'Tower Altar NW', - 'PoD Left Cage SW', 'PoD Middle Cage SE', 'PoD Pit Room Bomb Hole', 'PoD Stalfos Basement Warp', - 'PoD Arena Main to Ranged Crystal', 'PoD Arena Bridge to Ranged Crystal', 'PoD Arena Landing to Ranged Crystal', + 'PoD Left Cage SW', 'PoD Middle Cage SE', 'PoD Pit Room Bomb Hole', 'PoD Stalfos Basement Warp', + 'PoD Arena Main to Landing Barrier - Blue', 'PoD Arena Landing to Right Barrier - Blue', + 'PoD Arena Right to Landing Barrier - Blue', 'PoD Arena Main to Landing Barrier - Blue', + 'PoD Arena Main to North Ranged Barrier - Orange', 'PoD Arena Landing Bonk Path', 'PoD Sexy Statue NW', 'PoD Map Balcony Drop Down', 'PoD Mimics 1 NW', 'PoD Falling Bridge Path N', 'PoD Falling Bridge Path S', - 'PoD Mimics 2 NW', 'PoD Bow Statue Down Ladder', 'PoD Dark Pegs Landing to Right', 'PoD Dark Pegs Landing to Ranged Crystal', + 'PoD Mimics 2 NW', 'PoD Bow Statue Down Ladder', 'PoD Dark Pegs Landing to Right', 'PoD Dark Pegs Left to Middle Barrier - Blue', 'PoD Dark Pegs Left to Ranged Crystal', 'PoD Turtle Party ES', 'PoD Turtle Party NW', 'PoD Callback Warp', 'Swamp Lobby Moat', 'Swamp Entrance Moat', 'Swamp Trench 1 Approach Swim Depart', 'Swamp Trench 1 Approach Key', 'Swamp Trench 1 Key Approach',