Reordered OW connections
This commit is contained in:
codemann8
@@ -256,7 +256,6 @@ def connect_two_way(world, edgename1, edgename2, player):
|
||||
world.spoiler.set_overworld(edgename2, edgename1, 'both', player)
|
||||
|
||||
def remove_reserved(world, groupedlist, connected_edges, player):
|
||||
#TODO:
|
||||
new_grouping = {}
|
||||
for group in groupedlist.keys():
|
||||
new_grouping[group] = ([], [])
|
||||
@@ -313,86 +312,6 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
# Intra-tile OW Connections
|
||||
('Lost Woods Bush (West)', 'Lost Woods East Area'),
|
||||
('Lost Woods Bush (East)', 'Lost Woods West Area'),
|
||||
('Death Mountain Entrance Rock', 'Death Mountain Entrance'),
|
||||
('Death Mountain Entrance Drop', 'Mountain Entry Area'),
|
||||
('Death Mountain Return Drop', 'Mountain Entry Area'),
|
||||
('Zora Waterfall Landing', 'Zora Waterfall Area'),
|
||||
('Zora Waterfall Water Drop', 'Zora Waterfall Water'),
|
||||
('Zora Waterfall Water Entry', 'Zora Waterfall Water'),
|
||||
('Waterfall of Wishing Cave Entry', 'Waterfall of Wishing Cave'),
|
||||
('Bonk Rock Ledge Drop', 'Sanctuary Area'),
|
||||
('Kings Grave Outer Rocks', 'Kings Grave Area'),
|
||||
('Kings Grave Inner Rocks', 'Graveyard Area'),
|
||||
('Graveyard Ledge Drop', 'Graveyard Area'),
|
||||
('Graveyard Ladder (Top)', 'Graveyard Area'),
|
||||
('Graveyard Ladder (Bottom)', 'Graveyard Ledge'),
|
||||
('River Bend Water Drop', 'River Bend Water'),
|
||||
('River Bend East Water Drop', 'River Bend Water'),
|
||||
('River Bend West Pier', 'River Bend Area'),
|
||||
('River Bend East Pier', 'River Bend East Bank'),
|
||||
('Potion Shop Water Drop', 'Potion Shop Water'),
|
||||
('Potion Shop Northeast Water Drop', 'Potion Shop Water'),
|
||||
('Potion Shop Rock (South)', 'Potion Shop Northeast'),
|
||||
('Potion Shop Rock (North)', 'Potion Shop Area'),
|
||||
('Zora Approach Water Drop', 'Zora Approach Water'),
|
||||
('Kakariko Yard Bush (South)', 'Kakariko Grass Yard'),
|
||||
('Kakariko Yard Bush (North)', 'Kakariko Area'),
|
||||
('Kakariko Southwest Bush (North)', 'Kakariko Southwest'),
|
||||
('Kakariko Southwest Bush (South)', 'Kakariko Area'),
|
||||
('Bat Cave Ledge Peg', 'Bat Cave Ledge'),
|
||||
('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Courtyard Northeast'),
|
||||
('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Main Gate (North)', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Drop', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Courtyard Drop', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Inner East Rock', 'Hyrule Castle East Entry'),
|
||||
('Hyrule Castle Outer East Rock', 'Hyrule Castle Area'),
|
||||
('Wooden Bridge Bush (South)', 'Wooden Bridge Northeast'),
|
||||
('Wooden Bridge Bush (North)', 'Wooden Bridge Area'),
|
||||
('Wooden Bridge Water Drop', 'Wooden Bridge Water'),
|
||||
('Wooden Bridge Northeast Water Drop', 'Wooden Bridge Water'),
|
||||
('Maze Race Game', 'Maze Race Prize'),
|
||||
('Maze Race Ledge Drop', 'Maze Race Area'),
|
||||
('Flute Boy Bush (North)', 'Flute Boy Approach Area'),
|
||||
('Flute Boy Bush (South)', 'Flute Boy Bush Entry'),
|
||||
('Cave 45 Ledge Drop', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Inverted Leave', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Inverted Approach', 'Cave 45 Ledge'),
|
||||
('C Whirlpool Water Entry', 'C Whirlpool Water'),
|
||||
('C Whirlpool Landing', 'C Whirlpool Area'),
|
||||
('C Whirlpool Rock (Bottom)', 'C Whirlpool Outer Area'),
|
||||
('C Whirlpool Rock (Top)', 'C Whirlpool Area'),
|
||||
('Statues Water Entry', 'Statues Water'),
|
||||
('Statues Landing', 'Statues Area'),
|
||||
('Desert Palace Statue Move', 'Desert Palace Stairs'),
|
||||
('Desert Ledge Drop', 'Desert Area'),
|
||||
('Desert Ledge Outer Rocks', 'Desert Palace Entrance (North) Spot'),
|
||||
('Desert Ledge Inner Rocks', 'Desert Ledge'),
|
||||
('Checkerboard Ledge Drop', 'Desert Area'),
|
||||
('Checkerboard Ledge Approach', 'Desert Checkerboard Ledge'),
|
||||
('Checkerboard Ledge Leave', 'Desert Area'),
|
||||
('Desert Mouth Drop', 'Desert Area'),
|
||||
('Desert Teleporter Drop', 'Desert Area'),
|
||||
('Bombos Tablet Drop', 'Desert Area'),
|
||||
('Desert Pass Ledge Drop', 'Desert Pass Area'),
|
||||
('Desert Pass Ladder (North)', 'Desert Pass Area'),
|
||||
('Desert Pass Ladder (South)', 'Desert Pass Ledge'),
|
||||
('Desert Pass Rocks (North)', 'Desert Pass Southeast'),
|
||||
('Desert Pass Rocks (South)', 'Desert Pass Area'),
|
||||
('Lake Hylia Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia South Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Northeast Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Central Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Island Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
|
||||
('Lake Hylia Island Pier', 'Lake Hylia Island'),
|
||||
('Lake Hylia West Pier', 'Lake Hylia Area'),
|
||||
('Lake Hylia East Pier', 'Lake Hylia Northeast Bank'),
|
||||
('Octoballoon Water Drop', 'Octoballoon Water'),
|
||||
('Octoballoon Waterfall Water Drop', 'Octoballoon Water'),
|
||||
('Octoballoon Pier', 'Octoballoon Area'),
|
||||
|
||||
('West Death Mountain Drop', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Drop', 'West Death Mountain (Top)'),
|
||||
('Spectacle Rock Leave', 'West Death Mountain (Top)'),
|
||||
@@ -405,20 +324,108 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
('East Death Mountain Fairy Ledge Drop', 'Fairy Ascension Ledge'),
|
||||
('East Death Mountain Mimic Ledge Drop', 'Mimic Cave Ledge'),
|
||||
('Spiral Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Mimic Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Plateau Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Rocks (North)', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Rocks (South)', 'Fairy Ascension Plateau'),
|
||||
('Mimic Ledge Drop', 'East Death Mountain (Bottom)'),
|
||||
('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'),
|
||||
('DM Broken Bridge (East)', 'East Death Mountain (Bottom Left)'),
|
||||
('TR Pegs Ledge Entry', 'Death Mountain TR Pegs Ledge'),
|
||||
('TR Pegs Ledge Drop', 'Death Mountain TR Pegs'),
|
||||
|
||||
('Death Mountain Entrance Rock', 'Death Mountain Entrance'),
|
||||
('Death Mountain Entrance Drop', 'Mountain Entry Area'),
|
||||
('Death Mountain Return Drop', 'Mountain Entry Area'),
|
||||
('Zora Waterfall Landing', 'Zora Waterfall Area'),
|
||||
('Zora Waterfall Water Drop', 'Zora Waterfall Water'),
|
||||
('Zora Waterfall Water Entry', 'Zora Waterfall Water'),
|
||||
('Waterfall of Wishing Cave Entry', 'Waterfall of Wishing Cave'),
|
||||
('Bonk Rock Ledge Drop', 'Sanctuary Area'),
|
||||
('Graveyard Ledge Drop', 'Graveyard Area'),
|
||||
('Graveyard Ladder (Top)', 'Graveyard Area'),
|
||||
('Graveyard Ladder (Bottom)', 'Graveyard Ledge'),
|
||||
('Kings Grave Outer Rocks', 'Kings Grave Area'),
|
||||
('Kings Grave Inner Rocks', 'Graveyard Area'),
|
||||
('River Bend Water Drop', 'River Bend Water'),
|
||||
('River Bend East Water Drop', 'River Bend Water'),
|
||||
('River Bend West Pier', 'River Bend Area'),
|
||||
('River Bend East Pier', 'River Bend East Bank'),
|
||||
('Potion Shop Water Drop', 'Potion Shop Water'),
|
||||
('Potion Shop Northeast Water Drop', 'Potion Shop Water'),
|
||||
('Potion Shop Rock (South)', 'Potion Shop Northeast'),
|
||||
('Potion Shop Rock (North)', 'Potion Shop Area'),
|
||||
('Zora Approach Water Drop', 'Zora Approach Water'),
|
||||
('Kakariko Southwest Bush (North)', 'Kakariko Southwest'),
|
||||
('Kakariko Southwest Bush (South)', 'Kakariko Area'),
|
||||
('Kakariko Yard Bush (South)', 'Kakariko Grass Yard'),
|
||||
('Kakariko Yard Bush (North)', 'Kakariko Area'),
|
||||
('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Courtyard Northeast'),
|
||||
('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Main Gate (North)', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Drop', 'Hyrule Castle Area'),
|
||||
('Hyrule Castle Ledge Courtyard Drop', 'Hyrule Castle Courtyard'),
|
||||
('Hyrule Castle Inner East Rock', 'Hyrule Castle East Entry'),
|
||||
('Hyrule Castle Outer East Rock', 'Hyrule Castle Area'),
|
||||
('Wooden Bridge Bush (South)', 'Wooden Bridge Northeast'),
|
||||
('Wooden Bridge Bush (North)', 'Wooden Bridge Area'),
|
||||
('Wooden Bridge Water Drop', 'Wooden Bridge Water'),
|
||||
('Wooden Bridge Northeast Water Drop', 'Wooden Bridge Water'),
|
||||
('Bat Cave Ledge Peg', 'Bat Cave Ledge'),
|
||||
('Maze Race Game', 'Maze Race Prize'),
|
||||
('Maze Race Ledge Drop', 'Maze Race Area'),
|
||||
('Desert Palace Statue Move', 'Desert Palace Stairs'),
|
||||
('Desert Ledge Drop', 'Desert Area'),
|
||||
('Desert Ledge Outer Rocks', 'Desert Palace Entrance (North) Spot'),
|
||||
('Desert Ledge Inner Rocks', 'Desert Ledge'),
|
||||
('Checkerboard Ledge Drop', 'Desert Area'),
|
||||
('Checkerboard Ledge Approach', 'Desert Checkerboard Ledge'),
|
||||
('Checkerboard Ledge Leave', 'Desert Area'),
|
||||
('Desert Mouth Drop', 'Desert Area'),
|
||||
('Desert Teleporter Drop', 'Desert Area'),
|
||||
('Bombos Tablet Drop', 'Desert Area'),
|
||||
('Flute Boy Bush (North)', 'Flute Boy Approach Area'),
|
||||
('Flute Boy Bush (South)', 'Flute Boy Bush Entry'),
|
||||
('Cave 45 Ledge Drop', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Inverted Leave', 'Flute Boy Approach Area'),
|
||||
('Cave 45 Inverted Approach', 'Cave 45 Ledge'),
|
||||
('C Whirlpool Water Entry', 'C Whirlpool Water'),
|
||||
('C Whirlpool Landing', 'C Whirlpool Area'),
|
||||
('C Whirlpool Rock (Bottom)', 'C Whirlpool Outer Area'),
|
||||
('C Whirlpool Rock (Top)', 'C Whirlpool Area'),
|
||||
('Statues Water Entry', 'Statues Water'),
|
||||
('Statues Landing', 'Statues Area'),
|
||||
('Lake Hylia Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia South Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Northeast Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Central Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Island Water Drop', 'Lake Hylia Water'),
|
||||
('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
|
||||
('Lake Hylia Island Pier', 'Lake Hylia Island'),
|
||||
('Lake Hylia West Pier', 'Lake Hylia Area'),
|
||||
('Lake Hylia East Pier', 'Lake Hylia Northeast Bank'),
|
||||
('Desert Pass Ledge Drop', 'Desert Pass Area'),
|
||||
('Desert Pass Ladder (North)', 'Desert Pass Area'),
|
||||
('Desert Pass Ladder (South)', 'Desert Pass Ledge'),
|
||||
('Desert Pass Rocks (North)', 'Desert Pass Southeast'),
|
||||
('Desert Pass Rocks (South)', 'Desert Pass Area'),
|
||||
('Octoballoon Water Drop', 'Octoballoon Water'),
|
||||
('Octoballoon Waterfall Water Drop', 'Octoballoon Water'),
|
||||
('Octoballoon Pier', 'Octoballoon Area'),
|
||||
|
||||
('Skull Woods Bush Rock (West)', 'Skull Woods Forest'),
|
||||
('Skull Woods Bush Rock (East)', 'Skull Woods Portal Entry'),
|
||||
('Skull Woods Forgotten Bush (West)', 'Skull Woods Forgotten Path (Northeast)'),
|
||||
('Skull Woods Forgotten Bush (East)', 'Skull Woods Forgotten Path (Southwest)'),
|
||||
('Dark Death Mountain Drop (West)', 'West Dark Death Mountain (Bottom)'),
|
||||
('Dark Death Mountain Ladder (North)', 'West Dark Death Mountain (Bottom)'),
|
||||
('Dark Death Mountain Ladder (South)', 'West Dark Death Mountain (Top)'),
|
||||
('GT Entry Approach', 'GT Approach'),
|
||||
('GT Entry Leave', 'West Dark Death Mountain (Top)'),
|
||||
('Floating Island Drop', 'East Dark Death Mountain (Top)'),
|
||||
('Dark Death Mountain Drop (East)', 'East Dark Death Mountain (Bottom)'),
|
||||
('Turtle Rock Ledge Drop', 'Turtle Rock Area'),
|
||||
('Turtle Rock Tail Ledge Drop', 'Turtle Rock Ledge'),
|
||||
('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'),
|
||||
('Bumper Cave Ledge Drop', 'Bumper Cave Area'),
|
||||
('Bumper Cave Entrance Drop', 'Bumper Cave Area'),
|
||||
@@ -438,8 +445,6 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
('Grassy Lawn Pegs', 'Village of Outcasts Area'),
|
||||
('Shield Shop Fence (Outer) Ledge Drop', 'Shield Shop Fence'),
|
||||
('Shield Shop Fence (Inner) Ledge Drop', 'Shield Shop Area'),
|
||||
('Peg Area Rocks (West)', 'Hammer Peg Area'),
|
||||
('Peg Area Rocks (East)', 'Hammer Peg Entry'),
|
||||
('Pyramid Exit Ledge Drop', 'Pyramid Area'),
|
||||
('Broken Bridge Hammer Rock (South)', 'Broken Bridge Northeast'),
|
||||
('Broken Bridge Hammer Rock (North)', 'Broken Bridge Area'),
|
||||
@@ -447,10 +452,17 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
('Broken Bridge Water Drop', 'Broken Bridge Water'),
|
||||
('Broken Bridge Northeast Water Drop', 'Broken Bridge Water'),
|
||||
('Broken Bridge West Water Drop', 'Broken Bridge Water'),
|
||||
('Peg Area Rocks (West)', 'Hammer Peg Area'),
|
||||
('Peg Area Rocks (East)', 'Hammer Peg Entry'),
|
||||
('Dig Game To Ledge Drop', 'Dig Game Ledge'),
|
||||
('Dig Game Ledge Drop', 'Dig Game Area'),
|
||||
('Frog Ledge Drop', 'Archery Game Area'),
|
||||
('Archery Game Rock', 'Frog Area'),
|
||||
('Hammer Bridge Pegs (North)', 'Hammer Bridge South Area'),
|
||||
('Hammer Bridge Pegs (South)', 'Hammer Bridge North Area'),
|
||||
('Hammer Bridge Water Drop', 'Hammer Bridge Water'),
|
||||
('Hammer Bridge Pier', 'Hammer Bridge North Area'),
|
||||
('Misery Mire Teleporter Ledge Drop', 'Misery Mire Area'),
|
||||
('Stumpy Approach Bush (North)', 'Stumpy Approach Area'),
|
||||
('Stumpy Approach Bush (South)', 'Stumpy Approach Bush Entry'),
|
||||
('Dark C Whirlpool Water Entry', 'Dark C Whirlpool Water'),
|
||||
@@ -459,11 +471,6 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
('Dark C Whirlpool Rock (Top)', 'Dark C Whirlpool Area'),
|
||||
('Hype Cave Water Entry', 'Hype Cave Water'),
|
||||
('Hype Cave Landing', 'Hype Cave Area'),
|
||||
('Hammer Bridge Pegs (North)', 'Hammer Bridge South Area'),
|
||||
('Hammer Bridge Pegs (South)', 'Hammer Bridge North Area'),
|
||||
('Hammer Bridge Water Drop', 'Hammer Bridge Water'),
|
||||
('Hammer Bridge Pier', 'Hammer Bridge North Area'),
|
||||
('Misery Mire Teleporter Ledge Drop', 'Misery Mire Area'),
|
||||
('Ice Lake Water Drop', 'Ice Lake Water'),
|
||||
('Ice Lake Northeast Water Drop', 'Ice Lake Water'),
|
||||
('Ice Lake Southwest Water Drop', 'Ice Lake Water'),
|
||||
@@ -475,16 +482,6 @@ mandatory_connections = [ # Whirlpool Connections
|
||||
('Bomber Corner Water Drop', 'Bomber Corner Water'),
|
||||
('Bomber Corner Waterfall Water Drop', 'Bomber Corner Water'),
|
||||
('Bomber Corner Pier', 'Bomber Corner Area'),
|
||||
|
||||
('Dark Death Mountain Drop (West)', 'West Dark Death Mountain (Bottom)'),
|
||||
('Dark Death Mountain Ladder (North)', 'West Dark Death Mountain (Bottom)'),
|
||||
('Dark Death Mountain Ladder (South)', 'West Dark Death Mountain (Top)'),
|
||||
('GT Entry Approach', 'GT Approach'),
|
||||
('GT Entry Leave', 'West Dark Death Mountain (Top)'),
|
||||
('Dark Death Mountain Drop (East)', 'East Dark Death Mountain (Bottom)'),
|
||||
('Floating Island Drop', 'East Dark Death Mountain (Top)'),
|
||||
('Turtle Rock Ledge Drop', 'Turtle Rock Area'),
|
||||
('Turtle Rock Tail Ledge Drop', 'Turtle Rock Ledge'),
|
||||
|
||||
# OWG Connections
|
||||
('Sand Dunes Ledge Drop', 'Sand Dunes Area'),
|
||||
|
||||
Reference in New Issue
Block a user