diff --git a/OverworldShuffle.py b/OverworldShuffle.py index a3151d9d..735d49b2 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -411,6 +411,8 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'), ('Dig Game Ledge Drop', 'Dig Game Area'), ('Frog Ledge Drop', 'Archery Game Area'), ('Archery Game Rock', 'Frog Area'), + ('Circle of Bushes Bush (North)', 'Circle of Bushes Area'), + ('Circle of Bushes Bush (South)', 'Circle of Bushes Stumpy Entry'), ('Dark C Whirlpool Rock (Bottom)', 'Dark C Whirlpool Outer Area'), ('Dark C Whirlpool Rock (Top)', 'Dark C Whirlpool Area'), ('Hammer Bridge Pegs (North)', 'Hammer Bridge South Area'), diff --git a/Regions.py b/Regions.py index afb19aef..bd7dc908 100644 --- a/Regions.py +++ b/Regions.py @@ -243,7 +243,8 @@ def create_regions(world, player): create_dw_region(player, 'Archery Game Area', None, ['Archery Game', 'Archery Game Rock', 'Kakariko Suburb South Mirror Spot', 'Frog WC', 'Frog WS', 'Frog ES']), create_dw_region(player, 'Stumpy Area', ['Stumpy'], ['Flute Boy Mirror Spot', 'Stumpy SC']), create_dw_region(player, 'Stumpy Pass', None, ['Flute Boy Pass Mirror Spot', 'Stumpy WS', 'Stumpy SW']), - create_dw_region(player, 'Circle of Bushes Area', None, ['Cave 45 Mirror Spot', 'Circle of Bushes NW', 'Circle of Bushes NC', 'Circle of Bushes EC']), + create_dw_region(player, 'Circle of Bushes Area', None, ['Circle of Bushes Bush (South)', 'Cave 45 Mirror Spot', 'Circle of Bushes NW', 'Circle of Bushes EC']), + create_dw_region(player, 'Circle of Bushes Stumpy Entry', None, ['Circle of Bushes Bush (North)', 'Flute Boy Entry Mirror Spot', 'Circle of Bushes NC']), create_dw_region(player, 'Dark C Whirlpool Area', None, ['Dark C Whirlpool Rock (Bottom)', 'C Whirlpool Mirror Spot', 'Dark C Whirlpool EN', 'Dark C Whirlpool EC', 'Dark C Whirlpool ES', 'Dark C Whirlpool SC']), create_dw_region(player, 'Dark C Whirlpool Outer Area', None, ['Dark C Whirlpool Rock (Top)', 'C Whirlpool Outer Mirror Spot', 'Dark C Whirlpool WC', 'Dark C Whirlpool NW']), create_dw_region(player, 'Dark Bonk Rocks Area', None, ['Bonk Fairy (Dark)', 'Central Bonk Rocks Mirror Spot', 'Dark Bonk Rocks NW', 'Dark Bonk Rocks SW', 'Dark Bonk Rocks EN', 'Dark Bonk Rocks EC', 'Dark Bonk Rocks ES']), diff --git a/Rules.py b/Rules.py index 6a0a472a..53666aa2 100644 --- a/Rules.py +++ b/Rules.py @@ -517,6 +517,8 @@ def default_rules(world, player): set_rule(world.get_entrance('Dark C Whirlpool Rock (Top)', player), lambda state: state.has_Pearl(player) and state.can_lift_rocks(player)) set_rule(world.get_entrance('Hammer Bridge Pegs (North)', player), lambda state: state.has('Hammer', player) and state.has_Pearl(player)) set_rule(world.get_entrance('Hammer Bridge Pegs (South)', player), lambda state: state.has_Pearl(player) and state.has('Hammer', player)) + set_rule(world.get_entrance('Circle of Bushes Bush (North)', player), lambda state: state.has_Pearl(player)) + set_rule(world.get_entrance('Circle of Bushes Bush (South)', player), lambda state: state.has_Pearl(player)) set_rule(world.get_entrance('Flute Away', player), lambda state: state.can_flute(player)) @@ -614,6 +616,7 @@ def default_rules(world, player): set_rule(world.get_entrance('Flute Boy Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Flute Boy Pass Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Cave 45 Mirror Spot', player), lambda state: state.has_Mirror(player)) + set_rule(world.get_entrance('Flute Boy Entry Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('C Whirlpool Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('C Whirlpool Outer Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Central Bonk Rocks Mirror Spot', player), lambda state: state.has_Mirror(player))