diff --git a/OverworldShuffle.py b/OverworldShuffle.py index 0b1bcda5..39aa2c0b 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -359,6 +359,8 @@ mandatory_connections = [('Flute Away', 'Flute Sky'), ('Kakariko Southwest Bush (South)', 'Kakariko Area'), #pearl ('Kakariko Yard Bush (South)', 'Kakariko Grass Yard'), #pearl ('Kakariko Yard Bush (North)', 'Kakariko Area'), #pearl + ('Hyrule Castle Southwest Bush (North)', 'Hyrule Castle Southwest'), #pearl + ('Hyrule Castle Southwest Bush (South)', 'Hyrule Castle Area'), #pearl ('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'), #pearl ('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Courtyard Northeast'), #pearl ('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'), #aga+mirror diff --git a/Regions.py b/Regions.py index b085108b..f0315796 100644 --- a/Regions.py +++ b/Regions.py @@ -58,7 +58,8 @@ def create_regions(world, player): create_lw_region(player, 'Kakariko Southwest', None, ['Kakariko Southwest Bush (South)', 'Light World Bomb Hut', 'Village of Outcasts Southwest Mirror Spot']), create_lw_region(player, 'Kakariko Grass Yard', None, ['Kakariko Yard Bush (North)', 'Bush Covered House', 'Hammer House Mirror Spot']), create_lw_region(player, 'Forgotten Forest Area', None, ['Shield Shop Mirror Spot', 'Forgotten Forest NW', 'Forgotten Forest NE', 'Forgotten Forest ES']), - create_lw_region(player, 'Hyrule Castle Area', None, ['Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Main Gate (South)', 'Hyrule Castle Inner East Rock', 'Top of Pyramid', 'Pyramid Mirror Spot', 'Pyramid Pass Mirror Spot', 'Hyrule Castle WN', 'Hyrule Castle SW', 'Hyrule Castle SE']), + create_lw_region(player, 'Hyrule Castle Area', None, ['Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Main Gate (South)', 'Hyrule Castle Inner East Rock', 'Hyrule Castle Southwest Bush (North)', 'Top of Pyramid', 'Pyramid Mirror Spot', 'Pyramid Pass Mirror Spot', 'Hyrule Castle WN', 'Hyrule Castle SE']), + create_lw_region(player, 'Hyrule Castle Southwest', None, ['Hyrule Castle Southwest Bush (South)', 'Hyrule Castle SW']), create_lw_region(player, 'Hyrule Castle Courtyard', None, ['Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Main Gate (North)', 'Hyrule Castle Entrance (South)', 'Pyramid Courtyard Mirror Spot', 'Top of Pyramid (Inner)']), create_lw_region(player, 'Hyrule Castle Courtyard Northeast', None, ['Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Secret Entrance Stairs', 'Pyramid Uncle Mirror Spot']), create_lw_region(player, 'Hyrule Castle Ledge', None, ['Hyrule Castle Ledge Drop', 'Hyrule Castle Ledge Courtyard Drop', 'Inverted Pyramid Entrance', 'Hyrule Castle Entrance (West)', 'Agahnims Tower', 'Hyrule Castle Entrance (East)', 'Inverted Pyramid Hole', 'Pyramid From Ledge Mirror Spot']), diff --git a/Rules.py b/Rules.py index 0939a3d3..3c03f045 100644 --- a/Rules.py +++ b/Rules.py @@ -1271,6 +1271,8 @@ def ow_bunny_rules(world, player): add_bunny_rule(world.get_entrance('Kakariko Southwest Bush (South)', player), player) add_bunny_rule(world.get_entrance('Kakariko Yard Bush (North)', player), player) add_bunny_rule(world.get_entrance('Kakariko Yard Bush (South)', player), player) + add_bunny_rule(world.get_entrance('Hyrule Castle Southwest Bush (North)', player), player) + add_bunny_rule(world.get_entrance('Hyrule Castle Southwest Bush (South)', player), player) add_bunny_rule(world.get_entrance('Hyrule Castle Courtyard Bush (North)', player), player) add_bunny_rule(world.get_entrance('Hyrule Castle Courtyard Bush (South)', player), player) add_bunny_rule(world.get_entrance('Hyrule Castle Inner East Rock', player), player)