diff --git a/OWEdges.py b/OWEdges.py index d3e1f8ac..9db72771 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1734,7 +1734,7 @@ OWExitTypes = { 'Qirn Jump Whirlpool', 'Bomber Corner Whirlpool' ], - 'Mirror': ['Bombos Tablet Ledge Mirror Spot' + 'Mirror': ['Mirror To Bombos Tablet Ledge' ] } diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 55b52a88..4582d863 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -1489,7 +1489,7 @@ ow_connections = { ('East Dark World Teleporter', 'Eastern Nook Area') ]), 0x30: ([ - ('Bombos Tablet Ledge Mirror Spot', 'Bombos Tablet Ledge'), # OWG + ('Mirror To Bombos Tablet Ledge', 'Bombos Tablet Ledge'), # OWG ('Desert Teleporter', 'Misery Mire Teleporter Ledge'), ('Desert Boss Cliff Ledge Drop', 'Desert Palace Entrance (North) Spot'), # OWG ('Mire Cliff Ledge Drop', 'Misery Mire Area'), # OWG diff --git a/Regions.py b/Regions.py index 9bc2f5e4..261b0113 100644 --- a/Regions.py +++ b/Regions.py @@ -207,7 +207,7 @@ def create_regions(world, player): create_dw_region(player, 'Palace of Darkness Nook Area', None, ['East Dark World Hint', 'East Dark World Teleporter', 'Palace of Darkness Nook NE']), create_dw_region(player, 'Misery Mire Area', None, ['Mire Shed', 'Misery Mire', 'Dark Desert Fairy', 'Dark Desert Hint']), create_dw_region(player, 'Misery Mire Teleporter Ledge', None, ['Misery Mire Teleporter Ledge Drop', 'Misery Mire Teleporter']), - create_dw_region(player, 'Mire Northeast Cliffs', None, ['Mire Cliff Ledge Drop', 'Dark Checkerboard Cliff Ledge Drop', 'Archery Game Cliff Ledge Drop', 'Stumpy Approach Cliff Ledge Drop', 'Mire C Whirlpool Cliff Ledge Drop', 'Swamp Nook Cliff Ledge Drop', 'Swamp Cliff Ledge Drop', 'Bombos Tablet Ledge Mirror Spot']), + create_dw_region(player, 'Mire Northeast Cliffs', None, ['Mire Cliff Ledge Drop', 'Dark Checkerboard Cliff Ledge Drop', 'Archery Game Cliff Ledge Drop', 'Stumpy Approach Cliff Ledge Drop', 'Mire C Whirlpool Cliff Ledge Drop', 'Swamp Nook Cliff Ledge Drop', 'Swamp Cliff Ledge Drop', 'Mirror To Bombos Tablet Ledge']), create_dw_region(player, 'Stumpy Approach Area', None, ['Stumpy Approach Bush (South)', 'Stumpy Approach NW', 'Stumpy Approach EC']), create_dw_region(player, 'Stumpy Approach Bush Entry', None, ['Stumpy Approach Bush (North)', 'Stumpy Approach NC']), create_dw_region(player, 'Dark C Whirlpool Area', None, ['Dark C Whirlpool Rock (Bottom)', 'Dark C Whirlpool Pegs (Right)', 'Dark C Whirlpool Water Entry', 'Dark C Whirlpool EN', 'Dark C Whirlpool ES', 'Dark C Whirlpool SC']), diff --git a/Rules.py b/Rules.py index c3ac5308..69b7fed2 100644 --- a/Rules.py +++ b/Rules.py @@ -1027,7 +1027,7 @@ def ow_inverted_rules(world, player): set_rule(world.get_entrance('East Dark World Teleporter', player), lambda state: state.has('Hammer', player) and state.can_lift_rocks(player) and state.has_Pearl(player)) if not world.is_tile_swapped(0x30, player): - set_rule(world.get_entrance('Bombos Tablet Ledge Mirror Spot', player), lambda state: state.has_Mirror(player)) + set_rule(world.get_entrance('Mirror To Bombos Tablet Ledge', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Desert Teleporter', player), lambda state: state.can_lift_heavy_rocks(player)) else: set_rule(world.get_entrance('Misery Mire Teleporter', player), lambda state: state.can_lift_heavy_rocks(player)) diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 8085b17b..1be0c5a4 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -1973,7 +1973,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Turtle Rock Drop', 'Dark Death Mountain (Top)'), ('Floating Island Drop', 'Dark Death Mountain (Top)'), ('East Death Mountain Teleporter', 'Dark Death Mountain (East Bottom)'), - ('Bombos Tablet Mirror Spot', 'Bombos Tablet Ledge'), + ('Mirror To Bombos Tablet Ledge', 'Bombos Tablet Ledge'), ('Ganon Drop', 'Bottom of Pyramid'), ('Pyramid Drop', 'East Dark World'), ('Maze Race Ledge Drop', 'Light World'),