Split overworld model up by screen

This commit is contained in:
codemann8
2023-06-12 14:50:33 -05:00
committed by aerinon
parent 2c3e47d2f6
commit 0b7b82d027
21 changed files with 1678 additions and 816 deletions

View File

@@ -20,13 +20,6 @@ def link_entrances(world, player):
for exitname, regionname in mandatory_connections:
connect_simple(world, exitname, regionname, player)
if not invFlag:
for exitname, regionname in open_mandatory_connections:
connect_simple(world, exitname, regionname, player)
else:
for exitname, regionname in inverted_mandatory_connections:
connect_simple(world, exitname, regionname, player)
connect_custom(world, player)
# if we do not shuffle, set default connections
@@ -1579,7 +1572,7 @@ DW_Single_Cave_Doors = ['Bonk Fairy (Dark)',
'Red Shield Shop',
'Mire Shed',
'East Dark World Hint',
'Dark Desert Hint',
'Mire Hint',
'Spike Cave',
'Palace of Darkness Hint',
'Dark Lake Hylia Ledge Spike Cave',
@@ -1592,7 +1585,7 @@ DW_Single_Cave_Doors = ['Bonk Fairy (Dark)',
'Brewery',
'Dark Lake Hylia Ledge Hint',
'Chest Game',
'Dark Desert Fairy',
'Mire Fairy',
'Dark Lake Hylia Ledge Fairy',
'Fortune Teller (Dark)',
'Hammer Peg Cave']
@@ -1657,8 +1650,8 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Dark Potion Shop',
'Archery Game',
'Mire Shed',
'Dark Desert Hint',
'Dark Desert Fairy',
'Mire Hint',
'Mire Fairy',
'Spike Cave',
'Dark Death Mountain Shop',
'Dark Death Mountain Fairy',
@@ -1723,8 +1716,8 @@ Single_Cave_Targets = ['Blinds Hideout',
'Dark Lumberjack Shop',
'Archery Game',
'Mire Shed',
'Dark Desert Hint',
'Dark Desert Healer Fairy',
'Mire Hint',
'Mire Healer Fairy',
'Spike Cave',
'Dark Death Mountain Shop',
'Dark Death Mountain Healer Fairy',
@@ -1867,7 +1860,7 @@ Inverted_DW_Single_Cave_Doors = ['Bonk Fairy (Dark)',
'Red Shield Shop',
'Mire Shed',
'East Dark World Hint',
'Dark Desert Hint',
'Mire Hint',
'Palace of Darkness Hint',
'Dark Lake Hylia Ledge Spike Cave',
'Dark Death Mountain Shop',
@@ -1879,7 +1872,7 @@ Inverted_DW_Single_Cave_Doors = ['Bonk Fairy (Dark)',
'Brewery',
'Dark Lake Hylia Ledge Hint',
'Chest Game',
'Dark Desert Fairy',
'Mire Fairy',
'Dark Lake Hylia Ledge Fairy',
'Fortune Teller (Dark)',
'Hammer Peg Cave']
@@ -1914,8 +1907,8 @@ Inverted_Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
'Dark Potion Shop',
'Archery Game',
'Mire Shed',
'Dark Desert Hint',
'Dark Desert Fairy',
'Mire Hint',
'Mire Fairy',
'Spike Cave',
'Dark Death Mountain Shop',
'Bumper Cave (Top)',
@@ -2010,8 +2003,8 @@ Inverted_Single_Cave_Targets = ['Blinds Hideout',
'Dark Lumberjack Shop',
'Archery Game',
'Mire Shed',
'Dark Desert Hint',
'Dark Desert Healer Fairy',
'Mire Hint',
'Mire Healer Fairy',
'Spike Cave',
'Dark Death Mountain Shop',
'Dark Death Mountain Healer Fairy',
@@ -2067,9 +2060,7 @@ Inverted_Must_Exit_Invalid_Connections = defaultdict(set, {
# these are connections that cannot be shuffled and always exist.
# They link together separate parts of the world we need to divide into regions
mandatory_connections = [('Links House S&Q', 'Links House'),
# underworld
mandatory_connections = [# underworld
('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'),
('Death Mountain Return Cave E', 'Death Mountain Return Cave (right)'),
@@ -2116,212 +2107,18 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
('Bumper Cave Bottom to Top', 'Bumper Cave (top)'),
('Bumper Cave Top To Bottom', 'Bumper Cave (bottom)'),
('Ganon Drop', 'Bottom of Pyramid'),
# water entry
('Waterfall Fairy Access', 'Zora Waterfall Entryway'),
('Zora Waterfall Water Drop', 'Lake Hylia Water'),
('Light World Water Drop', 'Lake Hylia Water'),
('Potion Shop Water Drop', 'Lake Hylia Water'),
('Northeast Light World Water Drop', 'Lake Hylia Water'),
('Lake Hylia Central Island Water Drop', 'Lake Hylia Water'),
('West Dark World Water Drop', 'Dark Lake Hylia Water'),
('Northeast Dark World Water Drop', 'Dark Lake Hylia Water'),
('Catfish Water Drop', 'Dark Lake Hylia Water'),
('East Dark World Water Drop', 'Dark Lake Hylia Water'),
('South Dark World Water Drop', 'Dark Lake Hylia Water'),
('Southeast Dark World Water Drop', 'Dark Lake Hylia Water'),
('Ice Palace Leave Water Drop', 'Dark Lake Hylia Water'),
# water exit
('Light World Pier', 'Light World'), # there are several piers in-game, only one needs to be modeled
('Potion Shop Pier', 'Potion Shop Area'),
('Hobo Pier', 'Hobo Bridge'),
('Lake Hylia Central Island Pier', 'Lake Hylia Central Island'),
('Lake Hylia Whirlpool', 'Northeast Light World'),
('Northeast Dark World Pier', 'Northeast Dark World'),
('East Dark World Pier', 'East Dark World'),
('Southeast Dark World Pier', 'Southeast Dark World'),
# terrain
('Master Sword Meadow', 'Master Sword Meadow'),
('DM Hammer Bridge (West)', 'East Death Mountain (Top)'),
('DM Hammer Bridge (East)', 'West Death Mountain (Top)'),
('DM Broken Bridge (West)', 'East Death Mountain (Bottom)'),
('DM Broken Bridge (East)', 'West Death Mountain (Bottom)'),
('Fairy Ascension Rocks', 'Fairy Ascension Plateau'),
('Death Mountain Entrance Rock', 'Death Mountain Entrance'),
('Zoras Domain', 'Zoras Domain'),
('Kings Grave Rocks (Outer)', 'Kings Grave Area'),
('Kings Grave Rocks (Inner)', 'Light World'),
('Potion Shop Rock (South)', 'Northeast Light World'),
('Potion Shop Rock (North)', 'Potion Shop Area'),
('Kakariko Southwest Bush (North)', 'Bomb Hut Area'),
('Kakariko Southwest Bush (South)', 'Light World'),
('Kakariko Yard Bush (North)', 'Light World'),
('Kakariko Yard Bush (South)', 'Bush Covered Lawn'),
('Hyrule Castle Courtyard Bush (North)', 'Hyrule Castle Courtyard'),
('Hyrule Castle Courtyard Bush (South)', 'Hyrule Castle Secret Entrance Area'),
('Hyrule Castle Main Gate', 'Hyrule Castle Courtyard'),
('Hyrule Castle Main Gate (North)', 'Light World'),
('Wooden Bridge Bush (North)', 'Light World'),
('Wooden Bridge Bush (South)', 'Potion Shop Area'),
('Bat Cave Ledge Peg', 'Bat Cave Ledge'),
('Bat Cave Ledge Peg (East)', 'Light World'),
('Desert Statue Move', 'Desert Palace Stairs'),
('Desert Ledge Rocks (Outer)', 'Desert Palace Entrance (North) Spot'),
('Desert Ledge Rocks (Inner)', 'Desert Ledge'),
('Skull Woods Forest', 'Skull Woods Forest'),
('East Dark Death Mountain Bushes', 'East Dark Death Mountain (Bushes)'),
('Bumper Cave Entrance Rock', 'Bumper Cave Entrance'),
('Dark Witch Rock (North)', 'Northeast Dark World'),
('Dark Witch Rock (South)', 'Catfish Area'),
('Grassy Lawn Pegs (Top)', 'West Dark World'),
('Grassy Lawn Pegs (Bottom)', 'Dark Grassy Lawn'),
('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'),
('Hammer Bridge Pegs (North)', 'South Dark World'),
('Hammer Bridge Pegs (South)', 'East Dark World'),
('Ice Island To East Pier', 'East Dark World'),
# ledge drops
('Spectacle Rock Drop', 'West Death Mountain (Top)'),
('Death Mountain Drop', 'West Death Mountain (Bottom)'),
('Spiral Cave Ledge Access', 'Spiral Cave Ledge'),
('Fairy Ascension Ledge Access', 'Fairy Ascension Ledge'),
('East Death Mountain Drop', 'East Death Mountain (Bottom)'),
('Spiral Cave Ledge Drop', 'East Death Mountain (Bottom)'),
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
('Fairy Ascension Drop', 'East Death Mountain (Bottom)'),
('Death Mountain Entrance Drop', 'Light World'),
('Death Mountain Return Ledge Drop', 'Light World'),
('Graveyard Ledge Drop', 'Light World'),
('Hyrule Castle Ledge Courtyard Drop', 'Hyrule Castle Courtyard'),
('Hyrule Castle Ledge Drop', 'Light World'),
('Maze Race Ledge Drop', 'Light World'),
('Desert Ledge Drop', 'Light World'),
('Desert Palace Mouth Drop', 'Light World'),
('Checkerboard Ledge Drop', 'Light World'),
('Desert Teleporter Drop', 'Light World'),
('Cave 45 Ledge Drop', 'Light World'),
('Dark Death Mountain Drop (West)', 'West Dark Death Mountain (Bottom)'),
('Dark Death Mountain Drop (East)', 'East Dark Death Mountain (Bottom)'),
('Floating Island Drop', 'Dark Death Mountain (Top)'),
('Turtle Rock Drop', 'Dark Death Mountain (Top)'),
('Bumper Cave Entrance Drop', 'West Dark World'),
('Bumper Cave Ledge Drop', 'West Dark World'),
('Pyramid Drop', 'East Dark World'),
('Village of Outcasts Drop', 'South Dark World'),
('Dark Desert Drop', 'Dark Desert')
('Ganon Drop', 'Bottom of Pyramid')
]
open_mandatory_connections = [('Sanctuary S&Q', 'Sanctuary'),
('Old Man S&Q', 'Old Man House'),
('Other World S&Q', 'East Dark World'),
# flute
('Flute Spot 1', 'West Death Mountain (Bottom)'),
('Flute Spot 2', 'Potion Shop Area'),
('Flute Spot 3', 'Light World'),
('Flute Spot 4', 'Light World'),
('Flute Spot 5', 'Light World'),
('Flute Spot 6', 'Desert Teleporter Ledge'),
('Flute Spot 7', 'Light World'),
('Flute Spot 8', 'Light World'),
('LW Flute', 'Flute Sky'),
('NWLW Flute', 'Flute Sky'),
('ZLW Flute', 'Flute Sky'),
('DM Flute', 'Flute Sky'),
('EDM Flute', 'Flute Sky'),
# portals
('Death Mountain Teleporter', 'West Dark Death Mountain (Bottom)'),
('East Death Mountain Teleporter', 'East Dark Death Mountain (Bottom)'),
('Turtle Rock Teleporter', 'Turtle Rock (Top)'),
('Kakariko Teleporter', 'West Dark World'),
('Castle Gate Teleporter', 'East Dark World'),
('East Hyrule Teleporter', 'East Dark World'),
('South Hyrule Teleporter', 'South Dark World'),
('Desert Teleporter', 'Dark Desert'),
('Lake Hylia Teleporter', 'Dark Lake Hylia Central Island')
]
inverted_mandatory_connections = [('Sanctuary S&Q', 'Dark Sanctuary Hint'),
('Old Man S&Q', 'West Dark Death Mountain (Bottom)'),
('Other World S&Q', 'Hyrule Castle Ledge'),
# flute
('Flute Spot 1', 'West Dark Death Mountain (Bottom)'),
('Flute Spot 2', 'Northeast Dark World'),
('Flute Spot 3', 'West Dark World'),
('Flute Spot 4', 'South Dark World'),
('Flute Spot 5', 'East Dark World'),
('Flute Spot 6', 'Dark Desert Ledge'),
('Flute Spot 7', 'South Dark World'),
('Flute Spot 8', 'Southeast Dark World'),
('DDM Flute', 'Flute Sky'),
('NEDW Flute', 'Flute Sky'),
('WDW Flute', 'Flute Sky'),
('SDW Flute', 'Flute Sky'),
('EDW Flute', 'Flute Sky'),
('DD Flute', 'Flute Sky'),
('DLHL Flute', 'Flute Sky'),
('EDDM Flute', 'Flute Sky'),
('Dark Grassy Lawn Flute', 'Flute Sky'),
('Hammer Peg Area Flute', 'Flute Sky'),
# modified terrain
('Spectacle Rock Approach', 'Spectacle Rock'),
('Spectacle Rock Leave', 'West Death Mountain (Top)'),
('Floating Island Bridge (West)', 'East Death Mountain (Top)'),
('Floating Island Bridge (East)', 'Death Mountain Floating Island'),
('Graveyard Ladder (Top)', 'Light World'),
('Graveyard Ladder (Bottom)', 'Graveyard Ledge'),
('Mimic Cave Ledge Access', 'Mimic Cave Ledge'),
('Mimic Cave Ledge Drop', 'East Death Mountain (Bottom)'),
('Checkerboard Ledge Approach', 'Desert Checkerboard Ledge'),
('Checkerboard Ledge Leave', 'Light World'),
('Cave 45 Approach', 'Cave 45 Ledge'),
('Cave 45 Leave', 'Light World'),
('Lake Hylia Island Pier', 'Lake Hylia Island'),
('Bombos Tablet Ladder (Top)', 'Light World'),
('Bombos Tablet Ladder (Bottom)', 'Bombos Tablet Ledge'),
('Dark Death Mountain Ladder (Top)', 'West Dark Death Mountain (Bottom)'),
('Dark Death Mountain Ladder (Bottom)', 'Dark Death Mountain (Top)'),
('Turtle Rock Tail Drop', 'Turtle Rock (Top)'),
('Ice Palace Approach', 'Dark Lake Hylia Central Island'),
# portals
('Dark Death Mountain Teleporter (West)', 'West Death Mountain (Bottom)'),
('East Dark Death Mountain Teleporter (Bottom)', 'East Death Mountain (Bottom)'),
('East Dark Death Mountain Teleporter (Top)', 'East Death Mountain (Top)'),
('West Dark World Teleporter', 'Light World'),
('Post Aga Teleporter', 'Light World'),
('East Dark World Teleporter', 'Light World'),
('South Dark World Teleporter', 'Light World'),
('Dark Desert Teleporter', 'Light World'),
('Dark Lake Hylia Teleporter', 'Lake Hylia Central Island')
]
# non-shuffled entrance links
default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
('Lost Woods Hideout Drop', 'Lost Woods Hideout (top)'),
('Lost Woods Hideout Stump', 'Lost Woods Hideout (bottom)'),
('Lost Woods Hideout Exit', 'Light World'),
('Lost Woods Hideout Exit', 'Lost Woods East Area'),
('Lumberjack House', 'Lumberjack House'),
('Lumberjack Tree Tree', 'Lumberjack Tree (top)'),
('Lumberjack Tree Cave', 'Lumberjack Tree (bottom)'),
('Lumberjack Tree Exit', 'Light World'),
('Lumberjack Tree Exit', 'Lumberjack Area'),
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave (right)'),
('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'),
('Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Peak)'),
@@ -2354,22 +2151,22 @@ default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
('Fortune Teller (Light)', 'Fortune Teller (Light)'),
('Bonk Rock Cave', 'Bonk Rock Cave'),
('Sanctuary', 'Sanctuary Portal'),
('Sanctuary Exit', 'Light World'),
('Sanctuary Exit', 'Sanctuary Area'),
('Sanctuary Grave', 'Sewer Drop'),
('Graveyard Cave', 'Graveyard Cave'),
('Kings Grave', 'Kings Grave'),
('North Fairy Cave Drop', 'North Fairy Cave'),
('North Fairy Cave', 'North Fairy Cave'),
('North Fairy Cave Exit', 'Light World'),
('North Fairy Cave Exit', 'River Bend Area'),
('Potion Shop', 'Potion Shop'),
('Kakariko Well Drop', 'Kakariko Well (top)'),
('Kakariko Well Cave', 'Kakariko Well (bottom)'),
('Kakariko Well Exit', 'Light World'),
('Kakariko Well Exit', 'Kakariko Village'),
('Blinds Hideout', 'Blinds Hideout'),
('Elder House (West)', 'Elder House'),
('Elder House (East)', 'Elder House'),
('Elder House Exit (West)', 'Light World'),
('Elder House Exit (East)', 'Light World'),
('Elder House Exit (West)', 'Kakariko Village'),
('Elder House Exit (East)', 'Kakariko Village'),
('Snitch Lady (West)', 'Snitch Lady (West)'),
('Snitch Lady (East)', 'Snitch Lady (East)'),
('Bush Covered House', 'Bush Covered House'),
@@ -2381,16 +2178,16 @@ default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
('Tavern (Front)', 'Tavern (Front)'),
('Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance'),
('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance'),
('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance Area'),
('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Courtyard Northeast'),
('Sahasrahlas Hut', 'Sahasrahlas Hut'),
('Blacksmiths Hut', 'Blacksmiths Hut'),
('Bat Cave Drop', 'Bat Cave (right)'),
('Bat Cave Cave', 'Bat Cave (left)'),
('Bat Cave Exit', 'Light World'),
('Bat Cave Exit', 'Blacksmith Area'),
('Two Brothers House (West)', 'Two Brothers House'),
('Two Brothers House Exit (West)', 'Maze Race Ledge'),
('Two Brothers House (East)', 'Two Brothers House'),
('Two Brothers House Exit (East)', 'Light World'),
('Two Brothers House Exit (East)', 'Kakariko Suburb Area'),
('Library', 'Library'),
('Kakariko Gamble Game', 'Kakariko Gamble Game'),
('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
@@ -2416,9 +2213,9 @@ default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
('Hookshot Cave Back Exit', 'Dark Death Mountain Floating Island'),
('Hookshot Cave Back Entrance', 'Hookshot Cave (Back)'),
('Hookshot Cave', 'Hookshot Cave (Front)'),
('Hookshot Cave Front Exit', 'Dark Death Mountain (Top)'),
('Hookshot Cave Front Exit', 'East Dark Death Mountain (Top)'),
('Superbunny Cave (Top)', 'Superbunny Cave (Top)'),
('Superbunny Cave Exit (Top)', 'Dark Death Mountain (Top)'),
('Superbunny Cave Exit (Top)', 'East Dark Death Mountain (Top)'),
('Superbunny Cave (Bottom)', 'Superbunny Cave (Bottom)'),
('Superbunny Cave Exit (Bottom)', 'East Dark Death Mountain (Bottom)'),
('Dark Death Mountain Shop', 'Dark Death Mountain Shop'),
@@ -2438,8 +2235,8 @@ default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
('Dark Lake Hylia Fairy', 'Dark Lake Hylia Healer Fairy'),
('East Dark World Hint', 'East Dark World Hint'),
('Mire Shed', 'Mire Shed'),
('Dark Desert Fairy', 'Dark Desert Healer Fairy'),
('Dark Desert Hint', 'Dark Desert Hint'),
('Mire Fairy', 'Mire Healer Fairy'),
('Mire Hint', 'Mire Hint'),
('Hype Cave', 'Hype Cave'),
('Dark Lake Hylia Shop', 'Dark Lake Hylia Shop'),
('Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Healer Fairy'),
@@ -2448,18 +2245,18 @@ default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
]
open_default_connections = [('Links House', 'Links House'),
('Links House Exit', 'Light World'),
('Links House Exit', 'Links House Area'),
('Big Bomb Shop', 'Big Bomb Shop'),
('Old Man Cave (West)', 'Old Man Cave Ledge'),
('Old Man Cave (East)', 'Old Man Cave (East)'),
('Old Man Cave Exit (West)', 'Light World'),
('Old Man Cave Exit (West)', 'Mountain Pass Entry'),
('Old Man Cave Exit (East)', 'West Death Mountain (Bottom)'),
('Death Mountain Return Cave (West)', 'Death Mountain Return Cave (left)'),
('Death Mountain Return Cave Exit (West)', 'Death Mountain Return Ledge'),
('Death Mountain Return Cave Exit (West)', 'Mountain Pass Ledge'),
('Bumper Cave (Bottom)', 'Bumper Cave (bottom)'),
('Bumper Cave (Top)', 'Bumper Cave (top)'),
('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'),
('Bumper Cave Exit (Bottom)', 'West Dark World'),
('Bumper Cave Exit (Bottom)', 'Bumper Cave Entry'),
('Dark Death Mountain Fairy', 'Dark Death Mountain Healer Fairy'),
('Pyramid Hole', 'Pyramid'),
('Pyramid Entrance', 'Bottom of Pyramid'),
@@ -2467,19 +2264,19 @@ open_default_connections = [('Links House', 'Links House'),
]
inverted_default_connections = [('Links House', 'Big Bomb Shop'),
('Links House Exit', 'South Dark World'),
('Links House Exit', 'Big Bomb Shop Area'),
('Big Bomb Shop', 'Links House'),
('Dark Sanctuary Hint Exit', 'West Dark World'),
('Dark Sanctuary Hint Exit', 'Dark Chapel Area'),
('Old Man Cave (West)', 'Bumper Cave (bottom)'),
('Old Man Cave (East)', 'Death Mountain Return Cave (left)'),
('Old Man Cave Exit (West)', 'West Dark World'),
('Old Man Cave Exit (West)', 'Bumper Cave Entry'),
('Old Man Cave Exit (East)', 'West Dark Death Mountain (Bottom)'),
('Death Mountain Return Cave (West)', 'Bumper Cave (top)'),
('Death Mountain Return Cave Exit (West)', 'West Death Mountain (Bottom)'),
('Bumper Cave (Bottom)', 'Old Man Cave Ledge'),
('Bumper Cave (Top)', 'Dark Death Mountain Healer Fairy'),
('Bumper Cave Exit (Top)', 'Death Mountain Return Ledge'),
('Bumper Cave Exit (Bottom)', 'Light World'),
('Bumper Cave Exit (Top)', 'Mountain Pass Ledge'),
('Bumper Cave Exit (Bottom)', 'Mountain Pass Entry'),
('Dark Death Mountain Fairy', 'Old Man Cave (East)'),
('Inverted Pyramid Hole', 'Pyramid'),
('Inverted Pyramid Entrance', 'Bottom of Pyramid'),
@@ -2497,19 +2294,19 @@ default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle
('Desert Palace Entrance (West)', 'Desert West Portal'),
('Desert Palace Entrance (North)', 'Desert Back Portal'),
('Desert Palace Entrance (East)', 'Desert East Portal'),
('Desert Palace Exit (South)', 'Desert Palace Stairs'),
('Desert Palace Exit (South)', 'Desert Stairs'),
('Desert Palace Exit (West)', 'Desert Ledge'),
('Desert Palace Exit (East)', 'Desert Palace Mouth'),
('Desert Palace Exit (North)', 'Desert Palace Entrance (North) Spot'),
('Desert Palace Exit (East)', 'Desert Mouth'),
('Desert Palace Exit (North)', 'Desert Ledge Keep'),
('Eastern Palace', 'Eastern Portal'),
('Eastern Palace Exit', 'Light World'),
('Eastern Palace Exit', 'Eastern Palace Area'),
('Tower of Hera', 'Hera Portal'),
('Tower of Hera Exit', 'West Death Mountain (Top)'),
('Palace of Darkness', 'Palace of Darkness Portal'),
('Palace of Darkness Exit', 'East Dark World'),
('Palace of Darkness Exit', 'Palace of Darkness Area'),
('Swamp Palace', 'Swamp Portal'), # requires additional patch for flooding moat if moved
('Swamp Palace Exit', 'South Dark World'),
('Swamp Palace Exit', 'Swamp Area'),
('Skull Woods First Section Hole (East)', 'Skull Pinball'),
('Skull Woods First Section Hole (West)', 'Skull Left Drop'),
('Skull Woods First Section Hole (North)', 'Skull Pot Circle'),
@@ -2523,13 +2320,13 @@ default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle
('Skull Woods Final Section', 'Skull 3 Portal'),
('Skull Woods Final Section Exit', 'Skull Woods Forest (West)'),
('Thieves Town', 'Thieves Town Portal'),
('Thieves Town Exit', 'West Dark World'),
('Thieves Town Exit', 'Village of Outcasts'),
('Ice Palace', 'Ice Portal'),
('Ice Palace Exit', 'Dark Lake Hylia Central Island'),
('Ice Palace Exit', 'Ice Palace Area'),
('Misery Mire', 'Mire Portal'),
('Misery Mire Exit', 'Dark Desert'),
('Misery Mire Exit', 'Mire Area'),
('Turtle Rock', 'Turtle Rock Main Portal'),
('Turtle Rock Exit (Front)', 'Dark Death Mountain (Top)'),
('Turtle Rock Exit (Front)', 'Turtle Rock Area'),
('Dark Death Mountain Ledge (West)', 'Turtle Rock Lazy Eyes Portal'),
('Dark Death Mountain Ledge (East)', 'Turtle Rock Chest Portal'),
('Turtle Rock Ledge Exit (West)', 'Dark Death Mountain Ledge'),
@@ -2541,23 +2338,23 @@ default_dungeon_connections = [('Hyrule Castle Entrance (South)', 'Hyrule Castle
open_default_dungeon_connections = [('Agahnims Tower', 'Agahnims Tower Portal'),
('Agahnims Tower Exit', 'Hyrule Castle Ledge'),
('Ganons Tower', 'Ganons Tower Portal'),
('Ganons Tower Exit', 'Dark Death Mountain (Top)')
('Ganons Tower Exit', 'West Dark Death Mountain (Top)')
]
inverted_default_dungeon_connections = [('Agahnims Tower', 'Ganons Tower Portal'),
('Agahnims Tower Exit', 'Dark Death Mountain (Top)'),
('Agahnims Tower Exit', 'West Dark Death Mountain (Top)'),
('Ganons Tower', 'Agahnims Tower Portal'),
('Ganons Tower Exit', 'Hyrule Castle Ledge')
]
indirect_connections = {
'Turtle Rock (Top)': 'Turtle Rock',
'East Dark World': 'Pyramid Fairy',
'Turtle Rock Ledge': 'Turtle Rock',
'Pyramid Area': 'Pyramid Fairy',
'Big Bomb Shop': 'Pyramid Fairy',
'Dark Desert': 'Pyramid Fairy',
'West Dark World': 'Pyramid Fairy',
'South Dark World': 'Pyramid Fairy',
'Light World': 'Pyramid Fairy',
'Mire Area': 'Pyramid Fairy',
#'West Dark World': 'Pyramid Fairy',
'Big Bomb Shop Area': 'Pyramid Fairy',
#'Light World': 'Pyramid Fairy',
'Old Man Cave (East)': 'Old Man S&Q'
}
# format:
@@ -2698,8 +2495,8 @@ door_addresses = {'Links House': (0x00, (0x0104, 0x2c, 0x0506, 0x0a9a, 0x0832, 0
'Dark Potion Shop': (0x6E, (0x010f, 0x56, 0x080e, 0x04f4, 0x0c66, 0x0548, 0x0cd8, 0x0563, 0x0ce3, 0x0a, 0xf6, 0x0000, 0x0000)),
'Archery Game': (0x58, (0x0111, 0x69, 0x069e, 0x0ac4, 0x02ea, 0x0b18, 0x0368, 0x0b33, 0x036f, 0x0a, 0xf6, 0x09AC, 0x0000)),
'Mire Shed': (0x5E, (0x010d, 0x70, 0x0384, 0x0c69, 0x001e, 0x0cb6, 0x0098, 0x0cd6, 0x00a3, 0x07, 0xf9, 0x0000, 0x0000)),
'Dark Desert Hint': (0x61, (0x0114, 0x70, 0x0654, 0x0cc5, 0x02aa, 0x0d16, 0x0328, 0x0d32, 0x032f, 0x09, 0xf7, 0x0000, 0x0000)),
'Dark Desert Fairy': (0x55, (0x0115, 0x70, 0x03a8, 0x0c6a, 0x013a, 0x0cb7, 0x01b8, 0x0cd7, 0x01bf, 0x06, 0xfa, 0x0000, 0x0000)),
'Mire Hint': (0x61, (0x0114, 0x70, 0x0654, 0x0cc5, 0x02aa, 0x0d16, 0x0328, 0x0d32, 0x032f, 0x09, 0xf7, 0x0000, 0x0000)),
'Mire Fairy': (0x55, (0x0115, 0x70, 0x03a8, 0x0c6a, 0x013a, 0x0cb7, 0x01b8, 0x0cd7, 0x01bf, 0x06, 0xfa, 0x0000, 0x0000)),
'Spike Cave': (0x40, (0x0117, 0x43, 0x0ed4, 0x01e4, 0x08aa, 0x0236, 0x0928, 0x0253, 0x092f, 0x0a, 0xf6, 0x0000, 0x0000)),
'Dark Death Mountain Shop': (0x6D, (0x0112, 0x45, 0x0ee0, 0x01e3, 0x0d00, 0x0236, 0x0daa, 0x0252, 0x0d7d, 0x0b, 0xf5, 0x0000, 0x0000)),
'Dark Death Mountain Fairy': (0x6F, (0x0115, 0x43, 0x1400, 0x0294, 0x0600, 0x02e8, 0x0678, 0x0303, 0x0685, 0x0a, 0xf6, 0x0000, 0x0000)),
@@ -2785,7 +2582,7 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Desert Healer Fairy': 0x5E,
'Dark Lake Hylia Healer Fairy': 0x5E,
'Dark Lake Hylia Ledge Healer Fairy': 0x5E,
'Dark Desert Healer Fairy': 0x5E,
'Mire Healer Fairy': 0x5E,
'Dark Death Mountain Healer Fairy': 0x5E,
'Fortune Teller (Light)': 0x65,
'Lake Hylia Fortune Teller': 0x65,
@@ -2840,7 +2637,7 @@ exit_ids = {'Links House Exit': (0x01, 0x00),
'Fortune Teller (Dark)': 0x66,
'Archery Game': 0x59,
'Mire Shed': 0x5F,
'Dark Desert Hint': 0x62,
'Mire Hint': 0x62,
'Spike Cave': 0x41,
'Mimic Cave': 0x4F,
'Kakariko Well (top)': 0x80,
@@ -2976,8 +2773,8 @@ ow_prize_table = {'Links House': (0x8b1, 0xb2d),
'Dark Potion Shop': (0xc80, 0x4c0),
'Archery Game': (0x2f0, 0xaf0),
'Mire Shed': (0x060, 0xc90),
'Dark Desert Hint': (0x2e0, 0xd00),
'Dark Desert Fairy': (0x1c0, 0xc90),
'Mire Hint': (0x2e0, 0xd00),
'Mire Fairy': (0x1c0, 0xc90),
'Spike Cave': (0x860, 0x180),
'Dark Death Mountain Shop': (0xd80, 0x180),
'Dark Death Mountain Fairy': (0x620, 0x2c0),