Separated default connections to grouped lists
This commit is contained in:
codemann8
@@ -29,7 +29,7 @@ def link_entrances(world, player):
|
||||
|
||||
# if we do not shuffle, set default connections
|
||||
if world.shuffle[player] in ['vanilla', 'dungeonssimple', 'dungeonsfull']:
|
||||
for exitname, regionname in default_connections:
|
||||
for exitname, regionname in default_connections + default_connector_connections + default_drop_connections + default_item_connections + default_shop_connections:
|
||||
connect_simple(world, exitname, regionname, player)
|
||||
if world.shuffle[player] == 'vanilla':
|
||||
for exitname, regionname in default_dungeon_connections:
|
||||
@@ -2662,7 +2662,7 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
|
||||
('Hookshot Cave Middle to Back', 'Hookshot Cave (Back)'),
|
||||
('Hookshot Cave Back to Middle', 'Hookshot Cave (Middle)'),
|
||||
('Ganon Drop', 'Bottom of Pyramid')
|
||||
]
|
||||
]
|
||||
|
||||
open_mandatory_connections = [('Sanctuary S&Q', 'Sanctuary'),
|
||||
('Other World S&Q', 'Pyramid Area')]
|
||||
@@ -2672,40 +2672,13 @@ inverted_mandatory_connections = [('Sanctuary S&Q', 'Dark Sanctuary Hint'),
|
||||
('Dark Sanctuary Hint Exit', 'Dark Chapel Area')]
|
||||
|
||||
# non-shuffled entrance links
|
||||
default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
("Blinds Hideout", "Blinds Hideout"),
|
||||
('Dam', 'Dam'),
|
||||
('Lumberjack House', 'Lumberjack House'),
|
||||
('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 Courtyard Northeast'),
|
||||
default_connections = [('Lumberjack House', 'Lumberjack House'),
|
||||
('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
|
||||
('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'),
|
||||
('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
|
||||
('Light Hype Fairy', 'Swamp Healer Fairy'),
|
||||
('Desert Fairy', 'Desert Healer Fairy'),
|
||||
('Kings Grave', 'Kings Grave'),
|
||||
('Tavern North', 'Tavern'),
|
||||
('Chicken House', 'Chicken House'),
|
||||
('Aginahs Cave', 'Aginahs Cave'),
|
||||
('Sahasrahlas Hut', 'Sahasrahlas Hut'),
|
||||
('Cave Shop (Lake Hylia)', 'Cave Shop (Lake Hylia)'),
|
||||
('Capacity Upgrade', 'Capacity Upgrade'),
|
||||
('Kakariko Well Drop', 'Kakariko Well (top)'),
|
||||
('Kakariko Well Cave', 'Kakariko Well (bottom)'),
|
||||
('Kakariko Well Exit', 'Kakariko Area'),
|
||||
('Blacksmiths Hut', 'Blacksmiths Hut'),
|
||||
('Bat Cave Drop', 'Bat Cave (right)'),
|
||||
('Bat Cave Cave', 'Bat Cave (left)'),
|
||||
('Bat Cave Exit', 'Blacksmith Area'),
|
||||
('Sick Kids House', 'Sick Kids House'),
|
||||
('Elder House (East)', 'Elder House'),
|
||||
('Elder House (West)', 'Elder House'),
|
||||
('Elder House Exit (East)', 'Kakariko Area'),
|
||||
('Elder House Exit (West)', 'Kakariko Area'),
|
||||
('North Fairy Cave Drop', 'North Fairy Cave'),
|
||||
('North Fairy Cave', 'North Fairy Cave'),
|
||||
('North Fairy Cave Exit', 'River Bend Area'),
|
||||
('Lost Woods Gamble', 'Lost Woods Gamble'),
|
||||
('Fortune Teller (Light)', 'Fortune Teller (Light)'),
|
||||
('Snitch Lady (East)', 'Snitch Lady (East)'),
|
||||
@@ -2713,117 +2686,149 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Bush Covered House', 'Bush Covered House'),
|
||||
('Tavern (Front)', 'Tavern (Front)'),
|
||||
('Light World Bomb Hut', 'Light World Bomb Hut'),
|
||||
('Kakariko Shop', 'Kakariko Shop'),
|
||||
('Lost Woods Hideout Drop', 'Lost Woods Hideout (top)'),
|
||||
('Lost Woods Hideout Stump', 'Lost Woods Hideout (bottom)'),
|
||||
('Lost Woods Hideout Exit', 'Lost Woods East Area'),
|
||||
('Lumberjack Tree Tree', 'Lumberjack Tree (top)'),
|
||||
('Lumberjack Tree Cave', 'Lumberjack Tree (bottom)'),
|
||||
('Lumberjack Tree Exit', 'Lumberjack Area'),
|
||||
('Cave 45', 'Cave 45'),
|
||||
('Graveyard Cave', 'Graveyard Cave'),
|
||||
('Checkerboard Cave', 'Checkerboard Cave'),
|
||||
('Mini Moldorm Cave', 'Mini Moldorm Cave'),
|
||||
('Long Fairy Cave', 'Long Fairy Cave'), # near East Light World Teleporter
|
||||
('Good Bee Cave', 'Good Bee Cave'),
|
||||
('20 Rupee Cave', '20 Rupee Cave'),
|
||||
('50 Rupee Cave', '50 Rupee Cave'),
|
||||
('Ice Rod Cave', 'Ice Rod Cave'),
|
||||
('Bonk Rock Cave', 'Bonk Rock Cave'),
|
||||
('Library', 'Library'),
|
||||
('Kakariko Gamble Game', 'Kakariko Gamble Game'),
|
||||
('Potion Shop', 'Potion Shop'),
|
||||
('Two Brothers House (East)', 'Two Brothers House'),
|
||||
('Two Brothers House (West)', 'Two Brothers House'),
|
||||
('Two Brothers House Exit (East)', 'Kakariko Suburb Area'),
|
||||
('Two Brothers House Exit (West)', 'Maze Race Ledge'),
|
||||
|
||||
('Sanctuary', 'Sanctuary Portal'),
|
||||
('Sanctuary Grave', 'Sewer Drop'),
|
||||
('Sanctuary Exit', 'Sanctuary Area'),
|
||||
|
||||
('Old Man Cave (West)', 'Old Man Cave Ledge'),
|
||||
('Old Man Cave (East)', 'Old Man Cave'),
|
||||
('Old Man Cave Exit (West)', 'Mountain Entry Entrance'),
|
||||
('Old Man Cave Exit (East)', 'West Death Mountain (Bottom)'),
|
||||
('Old Man House (Bottom)', 'Old Man House'),
|
||||
('Old Man House Exit (Bottom)', 'West Death Mountain (Bottom)'),
|
||||
('Old Man House (Top)', 'Old Man House Back'),
|
||||
('Old Man House Exit (Top)', 'West Death Mountain (Bottom)'),
|
||||
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave'),
|
||||
('Death Mountain Return Cave (West)', 'Death Mountain Return Cave'),
|
||||
('Death Mountain Return Cave Exit (West)', 'Mountain Entry Ledge'),
|
||||
('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Peak)'),
|
||||
('Spectacle Rock Cave (Bottom)', 'Spectacle Rock Cave (Bottom)'),
|
||||
('Spectacle Rock Cave', 'Spectacle Rock Cave (Top)'),
|
||||
('Spectacle Rock Cave Exit', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Exit (Top)', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Exit (Peak)', 'West Death Mountain (Bottom)'),
|
||||
('Paradox Cave (Bottom)', 'Paradox Cave Front'),
|
||||
('Paradox Cave (Middle)', 'Paradox Cave'),
|
||||
('Paradox Cave (Top)', 'Paradox Cave'),
|
||||
('Paradox Cave Exit (Bottom)', 'East Death Mountain (Bottom)'),
|
||||
('Paradox Cave Exit (Middle)', 'East Death Mountain (Bottom)'),
|
||||
('Paradox Cave Exit (Top)', 'East Death Mountain (Top East)'),
|
||||
('Hookshot Fairy', 'Hookshot Fairy'),
|
||||
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Bottom)'),
|
||||
('Fairy Ascension Cave (Top)', 'Fairy Ascension Cave (Top)'),
|
||||
('Fairy Ascension Cave Exit (Bottom)', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Ledge'),
|
||||
('Spiral Cave', 'Spiral Cave (Top)'),
|
||||
('Spiral Cave (Bottom)', 'Spiral Cave (Bottom)'),
|
||||
('Spiral Cave Exit', 'East Death Mountain (Bottom)'),
|
||||
('Spiral Cave Exit (Top)', 'Spiral Cave Ledge'),
|
||||
|
||||
('Pyramid Fairy', 'Pyramid Fairy'),
|
||||
|
||||
('East Dark World Hint', 'East Dark World Hint'),
|
||||
('Palace of Darkness Hint', 'Palace of Darkness Hint'),
|
||||
('Dark Lake Hylia Shop', 'Dark Lake Hylia Shop'),
|
||||
('Dark Lake Hylia Fairy', 'Dark Lake Hylia Healer Fairy'),
|
||||
('Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Healer Fairy'),
|
||||
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'),
|
||||
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
|
||||
('Hype Cave', 'Hype Cave'),
|
||||
('Bonk Fairy (Dark)', 'Bonk Fairy (Dark)'),
|
||||
('Brewery', 'Brewery'),
|
||||
('C-Shaped House', 'C-Shaped House'),
|
||||
('Chest Game', 'Chest Game'),
|
||||
('Dark World Hammer Peg Cave', 'Dark World Hammer Peg Cave'),
|
||||
('Bumper Cave (Bottom)', 'Bumper Cave'),
|
||||
('Bumper Cave (Top)', 'Bumper Cave'),
|
||||
('Red Shield Shop', 'Red Shield Shop'),
|
||||
('Dark Sanctuary Hint', 'Dark Sanctuary Hint'),
|
||||
('Fortune Teller (Dark)', 'Fortune Teller (Dark)'),
|
||||
('Dark World Shop', 'Village of Outcasts Shop'),
|
||||
('Dark World Lumberjack Shop', 'Dark World Lumberjack Shop'),
|
||||
('Dark World Potion Shop', 'Dark World Potion Shop'),
|
||||
('Archery Game', 'Archery Game'),
|
||||
('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'),
|
||||
('Bumper Cave Exit (Bottom)', 'Bumper Cave Entrance'),
|
||||
('Mire Shed', 'Mire Shed'),
|
||||
('Dark Desert Hint', 'Dark Desert Hint'),
|
||||
('Dark Desert Fairy', 'Dark Desert Healer Fairy'),
|
||||
('Spike Cave', 'Spike Cave'),
|
||||
('Hookshot Cave', 'Hookshot Cave (Front)'),
|
||||
('Superbunny Cave (Top)', 'Superbunny Cave (Top)'),
|
||||
('Cave Shop (Dark Death Mountain)', 'Cave Shop (Dark Death Mountain)'),
|
||||
('Dark Death Mountain Fairy', 'Dark Death Mountain Healer Fairy'),
|
||||
('Superbunny Cave (Bottom)', 'Superbunny Cave (Bottom)'),
|
||||
('Superbunny Cave Exit (Top)', 'East Dark Death Mountain (Top)'),
|
||||
('Superbunny Cave Exit (Bottom)', 'East Dark Death Mountain (Bottom)'),
|
||||
('Hookshot Cave Front Exit', 'East Dark Death Mountain (Top)'),
|
||||
('Hookshot Cave Back Exit', 'Dark Death Mountain Floating Island'),
|
||||
('Hookshot Cave Back Entrance', 'Hookshot Cave (Back)'),
|
||||
('Mimic Cave', 'Mimic Cave'),
|
||||
|
||||
('Pyramid Exit', 'Pyramid Exit Ledge'),
|
||||
('Pyramid Hole', 'Pyramid'),
|
||||
('Pyramid Entrance', 'Bottom of Pyramid'),
|
||||
('Inverted Pyramid Hole', 'Pyramid'),
|
||||
('Inverted Pyramid Entrance', 'Bottom of Pyramid')
|
||||
]
|
||||
|
||||
default_connector_connections = [('Old Man Cave (West)', 'Old Man Cave Ledge'),
|
||||
('Old Man Cave (East)', 'Old Man Cave'),
|
||||
('Old Man Cave Exit (West)', 'Mountain Entry Entrance'),
|
||||
('Old Man Cave Exit (East)', 'West Death Mountain (Bottom)'),
|
||||
('Old Man House (Bottom)', 'Old Man House'),
|
||||
('Old Man House Exit (Bottom)', 'West Death Mountain (Bottom)'),
|
||||
('Old Man House (Top)', 'Old Man House Back'),
|
||||
('Old Man House Exit (Top)', 'West Death Mountain (Bottom)'),
|
||||
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave'),
|
||||
('Death Mountain Return Cave (West)', 'Death Mountain Return Cave'),
|
||||
('Death Mountain Return Cave Exit (West)', 'Mountain Entry Ledge'),
|
||||
('Death Mountain Return Cave Exit (East)', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Peak', 'Spectacle Rock Cave (Peak)'),
|
||||
('Spectacle Rock Cave (Bottom)', 'Spectacle Rock Cave (Bottom)'),
|
||||
('Spectacle Rock Cave', 'Spectacle Rock Cave (Top)'),
|
||||
('Spectacle Rock Cave Exit', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Exit (Top)', 'West Death Mountain (Bottom)'),
|
||||
('Spectacle Rock Cave Exit (Peak)', 'West Death Mountain (Bottom)'),
|
||||
('Spiral Cave', 'Spiral Cave (Top)'),
|
||||
('Spiral Cave (Bottom)', 'Spiral Cave (Bottom)'),
|
||||
('Spiral Cave Exit', 'East Death Mountain (Bottom)'),
|
||||
('Spiral Cave Exit (Top)', 'Spiral Cave Ledge'),
|
||||
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Bottom)'),
|
||||
('Fairy Ascension Cave (Top)', 'Fairy Ascension Cave (Top)'),
|
||||
('Fairy Ascension Cave Exit (Bottom)', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Cave Exit (Top)', 'Fairy Ascension Ledge'),
|
||||
('Paradox Cave (Bottom)', 'Paradox Cave Front'),
|
||||
('Paradox Cave (Middle)', 'Paradox Cave'),
|
||||
('Paradox Cave (Top)', 'Paradox Cave'),
|
||||
('Paradox Cave Exit (Bottom)', 'East Death Mountain (Bottom)'),
|
||||
('Paradox Cave Exit (Middle)', 'East Death Mountain (Bottom)'),
|
||||
('Paradox Cave Exit (Top)', 'East Death Mountain (Top East)'),
|
||||
('Elder House (East)', 'Elder House'),
|
||||
('Elder House (West)', 'Elder House'),
|
||||
('Elder House Exit (East)', 'Kakariko Area'),
|
||||
('Elder House Exit (West)', 'Kakariko Area'),
|
||||
('Two Brothers House (East)', 'Two Brothers House'),
|
||||
('Two Brothers House (West)', 'Two Brothers House'),
|
||||
('Two Brothers House Exit (East)', 'Kakariko Suburb Area'),
|
||||
('Two Brothers House Exit (West)', 'Maze Race Ledge'),
|
||||
('Bumper Cave (Bottom)', 'Bumper Cave'),
|
||||
('Bumper Cave (Top)', 'Bumper Cave'),
|
||||
('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'),
|
||||
('Bumper Cave Exit (Bottom)', 'Bumper Cave Entrance'),
|
||||
('Superbunny Cave (Top)', 'Superbunny Cave (Top)'),
|
||||
('Superbunny Cave (Bottom)', 'Superbunny Cave (Bottom)'),
|
||||
('Superbunny Cave Exit (Top)', 'East Dark Death Mountain (Top)'),
|
||||
('Superbunny Cave Exit (Bottom)', 'East Dark Death Mountain (Bottom)'),
|
||||
('Hookshot Cave', 'Hookshot Cave (Front)'),
|
||||
('Hookshot Cave Back Entrance', 'Hookshot Cave (Back)'),
|
||||
('Hookshot Cave Front Exit', 'East Dark Death Mountain (Top)'),
|
||||
('Hookshot Cave Back Exit', 'Dark Death Mountain Floating Island')
|
||||
]
|
||||
|
||||
default_item_connections = [('Mimic Cave', 'Mimic Cave'),
|
||||
('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Bonk Rock Cave', 'Bonk Rock Cave'),
|
||||
('Graveyard Cave', 'Graveyard Cave'),
|
||||
('Kings Grave', 'Kings Grave'),
|
||||
('Potion Shop', 'Potion Shop'),
|
||||
('Blinds Hideout', 'Blinds Hideout'),
|
||||
('Chicken House', 'Chicken House'),
|
||||
('Sick Kids House', 'Sick Kids House'),
|
||||
('Sahasrahlas Hut', 'Sahasrahlas Hut'),
|
||||
('Blacksmiths Hut', 'Blacksmiths Hut'),
|
||||
('Library', 'Library'),
|
||||
('Checkerboard Cave', 'Checkerboard Cave'),
|
||||
('Aginahs Cave', 'Aginahs Cave'),
|
||||
('Cave 45', 'Cave 45'),
|
||||
('Mini Moldorm Cave', 'Mini Moldorm Cave'),
|
||||
('Ice Rod Cave', 'Ice Rod Cave'),
|
||||
('Dam', 'Dam'),
|
||||
('Spike Cave', 'Spike Cave'),
|
||||
('Chest Game', 'Chest Game'),
|
||||
('C-Shaped House', 'C-Shaped House'),
|
||||
('Brewery', 'Brewery'),
|
||||
('Pyramid Fairy', 'Pyramid Fairy'),
|
||||
('Dark World Hammer Peg Cave', 'Dark World Hammer Peg Cave'),
|
||||
('Mire Shed', 'Mire Shed'),
|
||||
('Hype Cave', 'Hype Cave')
|
||||
]
|
||||
|
||||
default_shop_connections = [('Kakariko Shop', 'Kakariko Shop'),
|
||||
('Cave Shop (Lake Hylia)', 'Cave Shop (Lake Hylia)'),
|
||||
('Capacity Upgrade', 'Capacity Upgrade'),
|
||||
('Dark World Lumberjack Shop', 'Dark World Lumberjack Shop'),
|
||||
('Cave Shop (Dark Death Mountain)', 'Cave Shop (Dark Death Mountain)'),
|
||||
('Dark World Potion Shop', 'Dark World Potion Shop'),
|
||||
('Dark World Shop', 'Village of Outcasts Shop'),
|
||||
('Red Shield Shop', 'Red Shield Shop'),
|
||||
('Dark Lake Hylia Shop', 'Dark Lake Hylia Shop')
|
||||
]
|
||||
|
||||
default_drop_connections = [('Lost Woods Hideout Drop', 'Lost Woods Hideout (top)'),
|
||||
('Lost Woods Hideout Stump', 'Lost Woods Hideout (bottom)'),
|
||||
('Lost Woods Hideout Exit', 'Lost Woods East Area'),
|
||||
('Lumberjack Tree Tree', 'Lumberjack Tree (top)'),
|
||||
('Lumberjack Tree Cave', 'Lumberjack Tree (bottom)'),
|
||||
('Lumberjack Tree Exit', 'Lumberjack Area'),
|
||||
('Sanctuary', 'Sanctuary Portal'),
|
||||
('Sanctuary Grave', 'Sewer Drop'),
|
||||
('Sanctuary Exit', 'Sanctuary Area'),
|
||||
('North Fairy Cave Drop', 'North Fairy Cave'),
|
||||
('North Fairy Cave', 'North Fairy Cave'),
|
||||
('North Fairy Cave Exit', 'River Bend Area'),
|
||||
('Kakariko Well Drop', 'Kakariko Well (top)'),
|
||||
('Kakariko Well Cave', 'Kakariko Well (bottom)'),
|
||||
('Kakariko Well Exit', 'Kakariko Area'),
|
||||
('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 Courtyard Northeast'),
|
||||
('Bat Cave Drop', 'Bat Cave (right)'),
|
||||
('Bat Cave Cave', 'Bat Cave (left)'),
|
||||
('Bat Cave Exit', 'Blacksmith Area'),
|
||||
('Pyramid Hole', 'Pyramid'),
|
||||
('Pyramid Entrance', 'Bottom of Pyramid'),
|
||||
('Inverted Pyramid Hole', 'Pyramid'),
|
||||
('Inverted Pyramid Entrance', 'Bottom of Pyramid'),
|
||||
('Pyramid Exit', 'Pyramid Exit Ledge')
|
||||
]
|
||||
|
||||
swapped_connections = {
|
||||
0x03: [
|
||||
('Old Man Cave (East)', 'Death Mountain Return Cave Exit (West)'),
|
||||
@@ -2844,7 +2849,7 @@ swapped_connections = {
|
||||
open_default_connections = [('Links House', 'Links House'),
|
||||
('Links House Exit', 'Links House Area'),
|
||||
('Big Bomb Shop', 'Big Bomb Shop')
|
||||
]
|
||||
]
|
||||
|
||||
inverted_default_connections = [('Links House', 'Big Bomb Shop'),
|
||||
('Links House Exit', 'Big Bomb Shop Area'),
|
||||
|
||||
Reference in New Issue
Block a user