From 5ac01f4f35ee46466701612371f11d1a792a4571 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 7 Dec 2022 22:16:55 -0600 Subject: [PATCH] Merged Inverted/Open ER code and data --- EntranceShuffle.py | 6 ++---- source/overworld/EntranceShuffle2.py | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 553eac31..039b2b43 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -2520,8 +2520,7 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert South ('Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Eye Bridge Portal') ] -open_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle South Portal'), - ('Agahnims Tower', 'Agahnims Tower Portal'), +open_default_dungeon_connections = [('Agahnims Tower', 'Agahnims Tower Portal'), ('Agahnims Tower Exit', 'Hyrule Castle Ledge'), ('Ice Palace Exit', 'Dark Lake Hylia Central Island'), ('Turtle Rock Exit (Front)', 'Dark Death Mountain (Top)'), @@ -2529,8 +2528,7 @@ open_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule C ('Ganons Tower Exit', 'Dark Death Mountain (Top)') ] -inverted_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle South Portal'), - ('Agahnims Tower', 'Ganons Tower Portal'), +inverted_default_dungeon_connections = [('Agahnims Tower', 'Ganons Tower Portal'), ('Agahnims Tower Exit', 'Dark Death Mountain'), ('Ice Palace Exit', 'Dark Lake Hylia'), ('Turtle Rock Exit (Front)', 'Dark Death Mountain'), diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 403b5488..8ac2ee24 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -2299,8 +2299,7 @@ default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert South ('Turtle Rock Isolated Ledge Entrance', 'Turtle Rock Eye Bridge Portal') ] -open_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle South Portal'), - ('Agahnims Tower', 'Agahnims Tower Portal'), +open_default_dungeon_connections = [('Agahnims Tower', 'Agahnims Tower Portal'), ('Agahnims Tower Exit', 'Hyrule Castle Ledge'), ('Ice Palace Exit', 'Dark Lake Hylia Central Island'), ('Turtle Rock Exit (Front)', 'Dark Death Mountain (Top)'), @@ -2308,8 +2307,7 @@ open_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule C ('Ganons Tower Exit', 'Dark Death Mountain (Top)') ] -inverted_default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle South Portal'), - ('Agahnims Tower', 'Ganons Tower Portal'), +inverted_default_dungeon_connections = [('Agahnims Tower', 'Ganons Tower Portal'), ('Agahnims Tower Exit', 'Dark Death Mountain'), ('Ice Palace Exit', 'Dark Lake Hylia'), ('Turtle Rock Exit (Front)', 'Dark Death Mountain'),