alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Initial check-in for OWG logic

Browse Source 
Includes renames and reorganizations
This commit is contained in:
codemann8
2021-05-16 04:41:43 -05:00
parent 9110ac4e9c
commit 2a394cc880
6 changed files with 487 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
OverworldShuffle.py
View File

@@ -245,7 +245,7 @@ def connect_two_way(world, edgename1, edgename2, player):
else:
x.dest = y
y.dest = x
if world.owShuffle[player] != 'vanilla':
world.spoiler.set_overworld(edgename2, edgename1, 'both', player)
@@ -289,7 +289,7 @@ test_connections = [
temporary_mandatory_connections = [
# Special OW Areas
('Lost Woods NW', 'Master Sword Meadow SC'),
('Zora Approach NE', 'Zoras Domain SW'),
('Zora Waterfall NE', 'Zoras Domain SW'),
('Stone Bridge WC', 'Hobo EC'),
]
@@ -305,8 +305,8 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
# Whirlpool Connections
('C Whirlpool', 'River Bend Water'),
('River Bend Whirlpool', 'C Whirlpool Area'),
('Lake Hylia Whirlpool', 'Zora Approach Area'),
('River Bend Whirlpool', 'C Whirlpool Water'),
('Lake Hylia Whirlpool', 'Zora Waterfall Water'),
('Zora Whirlpool', 'Lake Hylia Water'),
('Kakariko Pond Whirlpool', 'Octoballoon Water'),
('Octoballoon Whirlpool', 'Kakariko Pond Area'),
@@ -317,8 +317,10 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('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'),
('Zora Approach Water Drop', 'Zora Approach Area'),
('Bonk Rock Ledge Drop', 'Sanctuary Area'),
('Kings Grave Outer Rocks', 'Kings Grave Area'),
('Kings Grave Inner Rocks', 'Graveyard Area'),
@@ -331,7 +333,7 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Potion Shop Northeast Water Drop', 'Potion Shop Water'),
('Potion Shop Rock (South)', 'Potion Shop Northeast'),
('Potion Shop Rock (North)', 'Potion Shop Area'),
('Zora Warning Water Drop', 'Zora Warning Water'),
('Zora Approach Water Drop', 'Zora Approach Water'),
('Bat Cave Ledge Peg', 'Bat Cave Ledge'),
('Hyrule Castle Main Gate (South)', 'Hyrule Castle Courtyard'),
('Hyrule Castle Main Gate (North)', 'Hyrule Castle Area'),
@@ -340,10 +342,15 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Hyrule Castle Inner East Rock', 'Hyrule Castle East Entry'),
('Hyrule Castle Outer East Rock', 'Hyrule Castle Area'),
('Wooden Bridge Water Drop', 'Wooden Bridge Water'),
('Maze Race Game', 'Maze Race Prize'),
('Maze Race Ledge Drop', 'Maze Race Area'),
('Cave 45 Ledge Drop', 'Cave 45 Area'),
('Cave 45 Ledge Drop', 'Flute Boy Approach Area'),
('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'),
@@ -378,7 +385,9 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Fairy Ascension Plateau Drop', 'East Death Mountain (Bottom)'),
('Fairy Ascension Rocks', 'Fairy Ascension Plateau'),
('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'),
('DM Broken Bridge (East)', 'East Death Mountain (Bottom Left)'),
('DM Broken Bridge (East)', 'East Death Mountain (West Lip)'),
('TR Pegs Ledge Entry', 'Death Mountain TR Pegs Ledge'),
('TR Pegs Ledge Drop', 'Death Mountain TR Pegs'),
('Skull Woods Bush Rock (West)', 'Skull Woods Forest'),
('Skull Woods Bush Rock (East)', 'Skull Woods Portal Entry'),
@@ -414,28 +423,87 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Dig Game Ledge Drop', 'Dig Game Area'),
('Frog Ledge Drop', 'Archery Game Area'),
('Archery Game Rock', 'Frog Area'),
('Circle of Bushes Bush (North)', 'Circle of Bushes Area'),
('Circle of Bushes Bush (South)', 'Circle of Bushes Stumpy Entry'),
('Stumpy Approach Bush (North)', 'Stumpy Approach Area'),
('Stumpy Approach Bush (South)', 'Stumpy Approach Bush Entry'),
('Dark C Whirlpool Water Entry', 'Dark C Whirlpool Water'),
('Dark C Whirlpool Landing', 'Dark C Whirlpool Area'),
('Dark C Whirlpool Rock (Bottom)', 'Dark C Whirlpool Outer Area'),
('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'),
('Ice Lake Southeast Water Drop', 'Ice Lake Water'),
('Ice Lake Moat Water Drop', 'Ice Lake Water'),
('Ice Lake Northeast Pier', 'Ice Lake Northeast Bank'),
('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)', 'Dark Death Mountain (West Bottom)'),
('Dark Death Mountain Drop (East)', 'Dark Death Mountain (East Bottom)'),
('Floating Island Drop', 'Dark Death Mountain (Top East)'),
('Dark Death Mountain Drop (West)', 'West Dark Death Mountain (Bottom)'),
('GT Approach Entry', 'GT Approach'),
('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'),
# OWG Connections
('Sand Dunes Ledge Drop', 'Sand Dunes Area'),
('Stone Bridge East Ledge Drop', 'Stone Bridge Area'),
('Tree Line Ledge Drop', 'Tree Line Area'),
('Eastern Palace Ledge Drop', 'Eastern Palace Area'),
('Links House Cliff Ledge Drop', 'Links House Area'),
('Central Bonk Rocks Cliff Ledge Drop', 'Central Bonk Rocks Area'),
('Stone Bridge Cliff Ledge Drop', 'Stone Bridge Area'),
('Lake Hylia Area Cliff Ledge Drop', 'Lake Hylia Area'),
('C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'),
('C Whirlpool Outer Cliff Ledge Drop', 'C Whirlpool Outer Area'),
('South Teleporter Cliff Ledge Drop', 'Dark C Whirlpool Area'),
('Statues Cliff Ledge Drop', 'Statues Area'),
('Lake Hylia Island FAWT Ledge Drop', 'Lake Hylia Island'),
('Stone Bridge EC Cliff Water Drop', 'Stone Bridge Water'), #fake flipper
('Tree Line WC Cliff Water Drop', 'Tree Line Water'), #fake flipper
('Desert Boss Cliff Ledge Drop', 'Desert Palace Entrance (North) Spot'),
('Checkerboard Cliff Ledge Drop', 'Desert Checkerboard Ledge'),
('Suburb Cliff Ledge Drop', 'Kakariko Suburb Area'),
('Cave 45 Cliff Ledge Drop', 'Cave 45 Ledge'),
('Desert Pass Cliff Ledge Drop', 'Desert Pass Area'),
('Desert Pass Southeast Cliff Ledge Drop', 'Desert Pass Southeast'),
('Desert C Whirlpool Cliff Ledge Drop', 'C Whirlpool Outer Area'),
('Dam Cliff Ledge Drop', 'Dam Area'),
('Dark Dunes Ledge Drop', 'Dark Dunes Area'),
('Hammer Bridge North Ledge Drop', 'Hammer Bridge North Area'),
('Dark Tree Line Ledge Drop', 'Dark Tree Line Area'),
('Palace of Darkness Ledge Drop', 'Palace of Darkness Area'),
('Mire Cliff Ledge Drop', 'Misery Mire Area'),
('Archery Game Cliff Ledge Drop', 'Archery Game Area'),
('Stumpy Approach Cliff Ledge Drop', 'Stumpy Approach Area'),
('Swamp Nook Cliff Ledge Drop', 'Swamp Nook Area'),
('Mire C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'),
('Swamp Cliff Ledge Drop', 'Swamp Area'),
('Bomb Shop Cliff Ledge Drop', 'Big Bomb Shop Area'),
('Dark Bonk Rocks Cliff Ledge Drop', 'Dark Bonk Rocks Area'),
('Hammer Bridge South Cliff Ledge Drop', 'Hammer Bridge South Area'),
('Ice Lake Area Cliff Ledge Drop', 'Ice Lake Area'),
('Ice Lake Northeast Pier Bomb Jump', 'Ice Lake Northeast Bank'),
('Dark C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'),
('Dark C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'),
#('Dark South Teleporter Cliff Ledge Drop', 'C Whirlpool Area'), #inverted only, add glove requirement
('Hype Cliff Ledge Drop', 'Hype Cave Area'),
('Ice Palace Island FAWT Ledge Drop', 'Ice Lake Moat'),
('Hammer Bridge EC Cliff Water Drop', 'Hammer Bridge Water'), #fake flipper
('Dark Tree Line WC Cliff Water Drop', 'Dark Tree Line Water'), #fake flipper
# Portal Connections
('Kakariko Teleporter (Hammer)', 'Skull Woods Pass East Top Area'),
('Kakariko Teleporter (Rock)', 'Skull Woods Pass East Top Area'),
@@ -443,11 +511,11 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Top of Pyramid (Inner)', 'Pyramid Area'),
('East Hyrule Teleporter', 'Palace of Darkness Nook Area'),
('South Hyrule Teleporter', 'Dark C Whirlpool Area'),
('Desert Teleporter', 'Misery Mire Area'),
('Desert Teleporter', 'Misery Mire Teleporter Ledge'),
('Lake Hylia Teleporter', 'Ice Palace Area'),
('West Death Mountain Teleporter', 'Dark Death Mountain (West Bottom)'),
('East Death Mountain Teleporter', 'Dark Death Mountain (East Bottom)'),
('Turtle Rock Teleporter', 'Turtle Rock Ledge'),
('West Death Mountain Teleporter', 'West Dark Death Mountain (Bottom)'),
('East Death Mountain Teleporter', 'East Dark Death Mountain (Bottom)'),
('TR Pegs Teleporter', 'Turtle Rock Ledge'),
# Mirror Connections
('Lost Woods Mirror Spot', 'Lost Woods Area'),
@@ -472,8 +540,8 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('River Bend East Mirror Spot', 'River Bend East Bank'),
('Potion Shop Mirror Spot', 'Potion Shop Area'),
('Potion Shop Northeast Mirror Spot', 'Potion Shop Northeast'),
('Zora Warning Mirror Spot', 'Zora Warning Area'),
('Zora Approach Mirror Spot', 'Zora Approach Area'),
('Zora Waterfall Mirror Spot', 'Zora Waterfall Area'),
('Kakariko Mirror Spot', 'Kakariko Area'),
('Kakariko Grass Mirror Spot', 'Kakariko Area'),
('Blacksmith Mirror Spot', 'Blacksmith Area'),
@@ -509,7 +577,8 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Checkerboard Mirror Spot', 'Desert Checkerboard Ledge'),
('DP Stairs Mirror Spot', 'Desert Palace Stairs'),
('DP Entrance (North) Mirror Spot', 'Desert Palace Entrance (North) Spot'),
('Bombos Tablet Mirror Spot', 'Desert Pass Ledge'),
('Bombos Tablet Ledge Mirror Spot', 'Bombos Tablet Ledge'),
('Desert Pass Ledge Mirror Spot', 'Desert Pass Ledge'),
('Desert Pass Mirror Spot', 'Desert Pass Area'),
('Dam Mirror Spot', 'Dam Area'),
('Statues Mirror Spot', 'Statues Area'),
@@ -520,6 +589,7 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('South Shore East Mirror Spot', 'Lake Hylia South Shore'),
('Lake Hylia Island Mirror Spot', 'Lake Hylia Island'),
('Lake Hylia Central Island Mirror Spot', 'Lake Hylia Central Island'),
('Lake Hylia Water Mirror Spot', 'Lake Hylia Water'),
('Octoballoon Mirror Spot', 'Octoballoon Area'),
('Ice Cave Mirror Spot', 'Ice Cave Area'),
('Spectacle Rock Mirror Spot', 'Spectacle Rock Ledge'),
@@ -530,8 +600,8 @@ mandatory_connections = [('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Mimic Cave Mirror Spot', 'Mimic Cave Ledge'),
('Isolated Ledge Mirror Spot', 'Fairy Ascension Ledge'),
('Fairy Ascension Mirror Spot', 'Fairy Ascension Plateau'),
('Death Mountain Bridge Mirror Spot', 'East Death Mountain (Bottom Left)'),
('Floating Island Mirror Spot', 'Death Mountain Floating Island (Light World)'),
('Death Mountain Bridge Mirror Spot', 'East Death Mountain (West Lip)'),
('Floating Island Mirror Spot', 'Death Mountain Floating Island'),
('TR Pegs Area Mirror Spot', 'Death Mountain TR Pegs')
]
@@ -561,7 +631,7 @@ parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW',
'Death Mountain TR Pegs WN': 'Turtle Rock WN',
'Mountain Entry NW': 'Bumper Cave NW',
'Mountain Entry SE': 'Bumper Cave SE',
'Zora Approach SE': 'Catfish SE',
'Zora Waterfall SE': 'Catfish SE',
'Lost Woods Pass NW': 'Skull Woods Pass NW',
'Lost Woods Pass NE': 'Skull Woods Pass NE',
'Lost Woods Pass SW': 'Skull Woods Pass SW',
@@ -594,9 +664,9 @@ parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW',
'Potion Shop WS': 'Dark Witch WS',
'Potion Shop EN': 'Dark Witch EN',
'Potion Shop EC': 'Dark Witch EC',
'Zora Warning NE': 'Catfish Approach NE',
'Zora Warning WN': 'Catfish Approach WN',
'Zora Warning WC': 'Catfish Approach WC',
'Zora Approach NE': 'Catfish Approach NE',
'Zora Approach WN': 'Catfish Approach WN',
'Zora Approach WC': 'Catfish Approach WC',
'Kakariko NW': 'Village of Outcasts NW',
'Kakariko NC': 'Village of Outcasts NC',
'Kakariko NE': 'Village of Outcasts NE',
@@ -646,9 +716,9 @@ parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW',
'Tree Line WN': 'Dark Tree Line WN',
'Tree Line WC': 'Dark Tree Line WC',
'Eastern Nook NE': 'Palace of Darkness Nook NE',
'Cave 45 NW': 'Circle of Bushes NW',
'Cave 45 NC': 'Circle of Bushes NC',
'Cave 45 EC': 'Circle of Bushes EC',
'Flute Boy Approach NW': 'Stumpy Approach NW',
'Flute Boy Approach NC': 'Stumpy Approach NC',
'Flute Boy Approach EC': 'Stumpy Approach EC',
'C Whirlpool NW': 'Dark C Whirlpool NW',
'C Whirlpool SC': 'Dark C Whirlpool SC',
'C Whirlpool WC': 'Dark C Whirlpool WC',
@@ -708,9 +778,9 @@ default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'),
('River Bend EN', 'Potion Shop WN'),
('River Bend EC', 'Potion Shop WC'),
('River Bend ES', 'Potion Shop WS'),
('Potion Shop EN', 'Zora Warning WN'),
('Potion Shop EC', 'Zora Warning WC'),
('Zora Warning NE', 'Zora Approach SE'),
('Potion Shop EN', 'Zora Approach WN'),
('Potion Shop EC', 'Zora Approach WC'),
('Zora Approach NE', 'Zora Waterfall SE'),
('Kakariko SE', 'Kakariko Suburb NE'),
('Kakariko ES', 'Blacksmith WS'),
('Hyrule Castle SW', 'Central Bonk Rocks NW'),
@@ -722,9 +792,9 @@ default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'),
('Eastern Palace SE', 'Eastern Nook NE'),
('Maze Race ES', 'Kakariko Suburb WS'),
('Kakariko Suburb ES', 'Flute Boy WS'),
('Flute Boy SW', 'Cave 45 NW'),
('Flute Boy SC', 'Cave 45 NC'),
('Cave 45 EC', 'C Whirlpool WC'),
('Flute Boy SW', 'Flute Boy Approach NW'),
('Flute Boy SC', 'Flute Boy Approach NC'),
('Flute Boy Approach EC', 'C Whirlpool WC'),
('C Whirlpool NW', 'Central Bonk Rocks SW'),
('C Whirlpool SC', 'Dam NC'),
('C Whirlpool EN', 'Statues WN'),
@@ -793,9 +863,9 @@ default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'),
('Dig Game EC', 'Frog WC'),
('Dig Game ES', 'Frog WS'),
('Frog ES', 'Stumpy WS'),
('Stumpy SW', 'Circle of Bushes NW'),
('Stumpy SC', 'Circle of Bushes NC'),
('Circle of Bushes EC', 'Dark C Whirlpool WC'),
('Stumpy SW', 'Stumpy Approach NW'),
('Stumpy SC', 'Stumpy Approach NC'),
('Stumpy Approach EC', 'Dark C Whirlpool WC'),
('Dark C Whirlpool NW', 'Dark Bonk Rocks SW'),
('Dark C Whirlpool SC', 'Swamp NC'),
('Dark C Whirlpool EN', 'Hype Cave WN'),