From c6d0df5f4fff8b922104bfe4d48868529ad82b1b Mon Sep 17 00:00:00 2001 From: codemann8 Date: Mon, 26 Dec 2022 05:21:59 -0600 Subject: [PATCH] Modeling Fairy Ascension Mirror Spot more correctly --- EntranceShuffle.py | 1 + Regions.py | 5 +++-- Rules.py | 3 ++- source/overworld/EntranceShuffle2.py | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 8a6a1454..ebd4c283 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -2160,6 +2160,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Desert Ledge Rocks (Inner)', 'Desert Ledge'), ('Skull Woods Forest', 'Skull Woods Forest'), + ('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'), ('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'), ('Dark Witch Rock (North)', 'Northeast Dark World'), ('Dark Witch Rock (South)', 'Catfish Area'), diff --git a/Regions.py b/Regions.py index 84a36844..53d056ca 100644 --- a/Regions.py +++ b/Regions.py @@ -81,8 +81,9 @@ def create_regions(world, player): create_dw_region(player, 'Dark Death Mountain Floating Island', None, ['Hookshot Cave Back Entrance', 'Floating Island Drop', 'Dark Floating Island Mirror Spot'], 'a dark island'), create_dw_region(player, 'Dark Death Mountain Ledge', None, ['Dark Death Mountain Ledge (West)', 'Dark Death Mountain Ledge (East)', 'Mimic Cave Mirror Spot', 'Spiral Cave Mirror Spot'], 'a dark ledge'), create_dw_region(player, 'Dark Death Mountain Isolated Ledge', None, ['Turtle Rock Isolated Ledge Entrance', 'Isolated Ledge Mirror Spot'], 'a dark vista'), - create_dw_region(player, 'East Dark Death Mountain (Bottom)', None, ['Superbunny Cave (Bottom)', 'Dark Death Mountain Shop', - 'East Dark Death Mountain Teleporter (Bottom)', 'EDDM Flute', 'Fairy Ascension Mirror Spot']), + create_dw_region(player, 'East Dark Death Mountain (Bottom)', None, ['East Dark Death Mountain Bushes', 'Superbunny Cave (Bottom)', 'Dark Death Mountain Shop', + 'East Dark Death Mountain Teleporter (Bottom)', 'EDDM Flute']), + create_dw_region(player, 'East Dark Death Mountain (Bushes)', None, ['Fairy Ascension Mirror Spot']), create_dw_region(player, 'Turtle Rock (Top)', None, ['Turtle Rock Drop', 'East Dark Death Mountain Teleporter (Top)']), create_dw_region(player, 'West Dark World', ['Frog'], ['Dark Lumberjack Shop', 'Fortune Teller (Dark)', 'Dark Sanctuary Hint', 'Chest Game', 'Thieves Town', 'C-Shaped House', 'Brewery', 'Red Shield Shop', 'Skull Woods Forest', 'Bumper Cave Entrance Rock', diff --git a/Rules.py b/Rules.py index 77a0fb65..69c4e21c 100644 --- a/Rules.py +++ b/Rules.py @@ -860,7 +860,7 @@ def ow_inverted_rules(world, player): set_rule(world.get_entrance('Spiral Cave Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Mimic Cave Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Isolated Ledge Mirror Spot', player), lambda state: state.has_Mirror(player)) - set_rule(world.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has_Mirror(player) and state.has_Pearl(player)) # need to lift flowers + set_rule(world.get_entrance('Fairy Ascension Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Bumper Cave Ledge Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Bumper Cave Entrance Mirror Spot', player), lambda state: state.has_Mirror(player)) set_rule(world.get_entrance('Graveyard Ledge Mirror Spot', player), lambda state: state.has_Mirror(player)) @@ -995,6 +995,7 @@ def ow_bunny_rules(world, player): add_bunny_rule(world.get_entrance('Desert Ledge Rocks (Outer)', player), player) add_bunny_rule(world.get_entrance('Desert Ledge Rocks (Inner)', player), player) + add_bunny_rule(world.get_entrance('East Dark Death Mountain Bushes', player), player) add_bunny_rule(world.get_entrance('Bumper Cave Entrance Rock', player), player) add_bunny_rule(world.get_entrance('Dark Witch Rock (North)', player), player) add_bunny_rule(world.get_entrance('Dark Witch Rock (South)', player), player) diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 801abc51..d13b4416 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -1949,6 +1949,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Desert Ledge Rocks (Inner)', 'Desert Ledge'), ('Skull Woods Forest', 'Skull Woods Forest'), + ('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'), ('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'), ('Dark Witch Rock (North)', 'Northeast Dark World'), ('Dark Witch Rock (South)', 'Catfish Area'),