diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 2e5162e4..3a44b677 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -2169,6 +2169,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('West Dark World Gap', 'West Dark World'), ('Broken Bridge Pass (Top)', 'East Dark World'), ('Broken Bridge Pass (Bottom)', 'Northeast Dark World'), + ('Dark Graveyard Bush (South)', 'Dark Graveyard North'), + ('Dark Graveyard Bush (North)', 'West Dark World'), ('Peg Area Rocks (Left)', 'Hammer Peg Area'), ('Peg Area Rocks (Right)', 'West Dark World'), ('Village of Outcasts Heavy Rock', 'West Dark World'), diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 099d5a9c..3793f272 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -48,7 +48,7 @@ mirror_connections = { 'East Dark Death Mountain (Bushes)': ['Fairy Ascension Plateau'], 'East Dark Death Mountain (Bottom)': ['East Death Mountain (Bottom)'], - 'West Dark World': ['Graveyard Ledge', 'Kings Grave Area'], + 'Dark Graveyard North': ['Graveyard Ledge', 'Kings Grave Area'], 'Bumper Cave Ledge': ['Death Mountain Return Ledge'], 'Bumper Cave Entrance': ['Death Mountain Entrance'], diff --git a/Regions.py b/Regions.py index 7b0e2535..7546e012 100644 --- a/Regions.py +++ b/Regions.py @@ -85,7 +85,8 @@ def create_regions(world, player): 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', 'West Dark World Water Drop', 'Grassy Lawn Pegs (Bottom)', 'Peg Area Rocks (Left)', 'Village of Outcasts Drop', - 'West Dark World Teleporter', 'WDW Flute']), + 'West Dark World Teleporter', 'WDW Flute', 'Dark Graveyard Bush (South)']), + create_dw_region(player, 'Dark Graveyard North', None, ['Dark Graveyard Bush (North)']), create_dw_region(player, 'Skull Woods Forest', None, ['Skull Woods First Section Hole (East)', 'Skull Woods First Section Hole (West)', 'Skull Woods First Section Hole (North)', 'Skull Woods First Section Door', 'Skull Woods Second Section Door (East)']), create_dw_region(player, 'Skull Woods Forest (West)', None, ['Skull Woods Second Section Hole', 'Skull Woods Second Section Door (West)', 'Skull Woods Final Section'], 'a deep, dark forest'), diff --git a/Rules.py b/Rules.py index fc608ec2..80392396 100644 --- a/Rules.py +++ b/Rules.py @@ -965,6 +965,8 @@ def ow_bunny_rules(world, 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 Graveyard Bush (South)', player), player) + add_bunny_rule(world.get_entrance('Dark Graveyard Bush (North)', 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) add_bunny_rule(world.get_entrance('Grassy Lawn Pegs (Bottom)', player), player) diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 61f0a80d..6afc7b9e 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -1962,6 +1962,8 @@ mandatory_connections = [('Links House S&Q', 'Links House'), ('Grassy Lawn Pegs (Top)', 'West Dark World'), ('Grassy Lawn Pegs (Bottom)', 'Dark Grassy Lawn'), ('West Dark World Gap', 'West Dark World'), + ('Dark Graveyard Bush (South)', 'Dark Graveyard North'), + ('Dark Graveyard Bush (North)', 'West Dark World'), ('Broken Bridge Pass (Top)', 'East Dark World'), ('Broken Bridge Pass (Bottom)', 'Northeast Dark World'), ('Peg Area Rocks (Left)', 'Hammer Peg Area'),