diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 62256bd6..5359610c 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -2937,8 +2937,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'), ('Fairy Ascension Plateau Drop', 'East Death Mountain (Bottom)'), ('Fairy Ascension Rocks', 'Fairy Ascension Plateau'), - ('Broken Bridge (West)', 'East Death Mountain (Bottom)'), - ('Broken Bridge (East)', 'East Death Mountain (Bottom Left)'), + ('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'), + ('DM Broken Bridge (East)', 'East Death Mountain (Bottom Left)'), ('Skull Woods Bush Rock (West)', 'Skull Woods Forest'), ('Skull Woods Bush Rock (East)', 'Skull Woods Portal Entry'), diff --git a/Regions.py b/Regions.py index f2450d90..2bee78e6 100644 --- a/Regions.py +++ b/Regions.py @@ -164,8 +164,8 @@ def create_regions(world, player): create_lw_region(player, 'Mimic Cave Ledge', None, ['Mimic Cave']), create_lw_region(player, 'Fairy Ascension Ledge', None, ['Fairy Ascension Ledge Drop', 'Fairy Ascension Cave (Top)']), create_lw_region(player, 'Fairy Ascension Plateau', None, ['Fairy Ascension Plateau Drop', 'Fairy Ascension Cave (Bottom)']), - create_lw_region(player, 'East Death Mountain (Bottom Left)', None, ['Broken Bridge (West)', 'East Death Mountain WS']), - create_lw_region(player, 'East Death Mountain (Bottom)', None, ['Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Hookshot Fairy', 'Spiral Cave (Bottom)', 'Fairy Ascension Rocks', 'East Death Mountain Teleporter']), + create_lw_region(player, 'East Death Mountain (Bottom Left)', None, ['DM Broken Bridge (West)', 'East Death Mountain WS']), + create_lw_region(player, 'East Death Mountain (Bottom)', None, ['DM Broken Bridge (East)', 'Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Hookshot Fairy', 'Spiral Cave (Bottom)', 'Fairy Ascension Rocks', 'East Death Mountain Teleporter']), create_lw_region(player, 'Death Mountain Floating Island (Light World)', ['Floating Island']), create_lw_region(player, 'Death Mountain TR Pegs', None, ['Death Mountain TR Pegs WN', 'Turtle Rock Teleporter']), create_cave_region(player, 'Old Man Cave', 'a connector', ['Old Man'], ['Old Man Cave Exit (East)']), diff --git a/Rules.py b/Rules.py index 2ff1a714..51eaed91 100644 --- a/Rules.py +++ b/Rules.py @@ -487,8 +487,8 @@ def default_rules(world, player): set_rule(world.get_entrance('Purple Chest Rocks (South)', player), lambda state: state.can_lift_rocks(player)) set_rule(world.get_entrance('DM Hammer Bridge (West)', player), lambda state: state.has('Hammer', player)) set_rule(world.get_entrance('DM Hammer Bridge (East)', player), lambda state: state.has('Hammer', player)) - set_rule(world.get_entrance('Broken Bridge (West)', player), lambda state: state.has('Hookshot', player)) - set_rule(world.get_entrance('Broken Bridge (East)', player), lambda state: state.has('Hookshot', player)) + set_rule(world.get_entrance('DM Broken Bridge (West)', player), lambda state: state.has('Hookshot', player)) + set_rule(world.get_entrance('DM Broken Bridge (East)', player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('Fairy Ascension Rocks', player), lambda state: state.can_lift_heavy_rocks(player)) set_rule(world.get_entrance('Skull Woods Bush Rock (West)', player), lambda state: state.has_Pearl(player) and state.can_lift_rocks(player)) set_rule(world.get_entrance('Skull Woods Bush Rock (East)', player), lambda state: state.has_Pearl(player) and state.can_lift_rocks(player))