From 6b7e2d86f1f78f7a94fa5c989c94bff0228ad6dc Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Thu, 8 Feb 2018 21:56:57 -0500 Subject: [PATCH] Regionized Northeast Dark World --- EntranceShuffle.py | 2 ++ Regions.py | 5 +++-- Rules.py | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 84f42115..56e3dfcf 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -1511,6 +1511,8 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now ('Bat Cave Drop Ledge Mirror Spot', 'Bat Cave Drop Ledge'), ('East Dark World River Pier', 'East Dark World'), ('West Dark World Gap', 'West Dark World'), + ('East Dark World Broken Bridge Pass', 'East Dark World'), + ('Northeast Dark World Broken Bridge Pass', 'Northeast Dark World'), ('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'), ('Bumper Cave Entrance Drop', 'West Dark World'), ('Bumper Cave Entrance Mirror Spot', 'Death Mountain Entrance'), diff --git a/Regions.py b/Regions.py index 61ee095c..ca2b420b 100644 --- a/Regions.py +++ b/Regions.py @@ -137,8 +137,9 @@ def create_regions(world): create_dungeon_region('Tower of Hera (Basement)', ['Tower of Hera - Big Key Chest']), create_dungeon_region('Tower of Hera (Top)', ['Tower of Hera - Compass Chest', 'Tower of Hera - Big Chest', 'Tower of Hera - Moldorm', 'Tower of Hera - Prize']), - create_dw_region('East Dark World', ['Pyramid', 'Catfish'], ['Pyramid Fairy', 'South Dark World Bridge', 'West Dark World Gap', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter', - 'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Dark World Potion Shop', 'Pyramid Hole']), + create_dw_region('East Dark World', ['Pyramid'], ['Pyramid Fairy', 'South Dark World Bridge', 'Palace of Darkness', 'Dark Lake Hylia Drop (East)', 'Dark Lake Hylia Teleporter', + 'Hyrule Castle Ledge Mirror Spot', 'Dark Lake Hylia Fairy', 'Palace of Darkness Hint', 'East Dark World Hint', 'Pyramid Hole', 'Northeast Dark World Broken Bridge Pass']), + create_dw_region('Northeast Dark World', ['Catfish'], ['West Dark World Gap', 'Dark World Potion Shop', 'East Dark World Broken Bridge Pass']), create_cave_region('Palace of Darkness Hint'), create_cave_region('East Dark World Hint'), create_dw_region('South Dark World', ['Stumpy', 'Digging Game', 'Bombos Tablet'], ['Dark Lake Hylia Drop (South)', 'Hype Cave', 'Swamp Palace', 'Village of Outcasts Heavy Rock', diff --git a/Rules.py b/Rules.py index 1b8d2685..6067288d 100644 --- a/Rules.py +++ b/Rules.py @@ -137,10 +137,11 @@ def global_rules(world): set_rule(world.get_entrance('East Death Mountain (Top)'), lambda state: state.has('Hammer')) set_rule(world.get_location('Catfish'), lambda state: state.can_lift_rocks()) - set_rule(world.get_entrance('Dark World Potion Shop'), lambda state: state.has_Pearl() and (state.can_lift_rocks() or state.has('Hammer') or state.has('Flippers'))) + set_rule(world.get_entrance('Northeast Dark World Broken Bridge Pass'), lambda state: state.has_Pearl() and (state.can_lift_rocks() or state.has('Hammer') or state.has('Flippers'))) + set_rule(world.get_entrance('East Dark World Broken Bridge Pass'), lambda state: state.has_Pearl() and (state.can_lift_rocks() or state.has('Hammer'))) set_rule(world.get_entrance('South Dark World Bridge'), lambda state: state.has('Hammer') and state.has_Pearl()) set_rule(world.get_entrance('Bonk Fairy (Dark)'), lambda state: state.has_Pearl() and state.has_Boots()) - set_rule(world.get_entrance('West Dark World Gap'), lambda state: state.has_Pearl() and state.has('Hookshot') and (state.has('Flippers') or state.has('Hammer') or state.can_lift_rocks())) + set_rule(world.get_entrance('West Dark World Gap'), lambda state: state.has_Pearl() and state.has('Hookshot')) set_rule(world.get_entrance('Palace of Darkness'), lambda state: state.has_Pearl()) # kiki needs pearl set_rule(world.get_entrance('Hyrule Castle Ledge Mirror Spot'), lambda state: state.has_Mirror()) set_rule(world.get_entrance('Hyrule Castle Main Gate'), lambda state: state.has_Mirror())