Merged in DR v1.4.1.6
This commit is contained in:
codemann8
@@ -2155,20 +2155,20 @@ Exit_Pool_Base = ['Links House Exit',
|
||||
|
||||
# these are connections that cannot be shuffled and always exist.
|
||||
# They link together underworld regions
|
||||
mandatory_connections = [('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
|
||||
mandatory_connections = [
|
||||
('Lost Woods Hideout (top to bottom)', 'Lost Woods Hideout (bottom)'),
|
||||
('Lumberjack Tree (top to bottom)', 'Lumberjack Tree (bottom)'),
|
||||
('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
|
||||
('Kakariko Well (top to back)', 'Kakariko Well (back)'),
|
||||
('Blinds Hideout N', 'Blinds Hideout (Top)'),
|
||||
('Bat Cave Door', 'Bat Cave (left)'),
|
||||
('Sewer Drop', 'Sewers Rat Path'),
|
||||
('Old Man Cave Dropdown', 'Old Man Cave'),
|
||||
('Old Man House Front to Back', 'Old Man House Back'),
|
||||
('Old Man House Back to Front', 'Old Man House'),
|
||||
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave (Bottom)'),
|
||||
('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave (Bottom)'),
|
||||
('Death Mountain Return Cave E', 'Death Mountain Return Cave (right)'),
|
||||
('Death Mountain Return Cave W', 'Death Mountain Return Cave (left)'),
|
||||
('Old Man Cave Dropdown', 'Old Man Cave (West)'),
|
||||
('Old Man Cave W', 'Old Man Cave (West)'),
|
||||
('Old Man Cave E', 'Old Man Cave (East)'),
|
||||
('Spectacle Rock Cave Drop', 'Spectacle Rock Cave Pool'),
|
||||
('Spectacle Rock Cave Peak Drop', 'Spectacle Rock Cave Pool'),
|
||||
('Spectacle Rock Cave West Edge', 'Spectacle Rock Cave (Bottom)'),
|
||||
('Spectacle Rock Cave East Edge', 'Spectacle Rock Cave Pool'),
|
||||
('Old Man House Front to Back', 'Old Man House Back'),
|
||||
('Old Man House Back to Front', 'Old Man House'),
|
||||
('Spiral Cave (top to bottom)', 'Spiral Cave (Bottom)'),
|
||||
('Paradox Shop', 'Paradox Shop'),
|
||||
('Paradox Cave Push Block Reverse', 'Paradox Cave Chest Area'),
|
||||
@@ -2179,89 +2179,102 @@ mandatory_connections = [('Lost Woods Hideout (top to bottom)', 'Lost Woods Hide
|
||||
('Fairy Ascension Cave Climb', 'Fairy Ascension Cave (Top)'),
|
||||
('Fairy Ascension Cave Pots', 'Fairy Ascension Cave (Bottom)'),
|
||||
('Fairy Ascension Cave Drop', 'Fairy Ascension Cave (Drop)'),
|
||||
('Missing Smith', 'Missing Smith'),
|
||||
('Bumper Cave Bottom to Top', 'Bumper Cave (top)'),
|
||||
('Bumper Cave Top To Bottom', 'Bumper Cave (bottom)'),
|
||||
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
|
||||
('Sewer Drop', 'Sewers Rat Path'),
|
||||
('Kakariko Well (top to bottom)', 'Kakariko Well (bottom)'),
|
||||
('Kakariko Well (top to back)', 'Kakariko Well (back)'),
|
||||
('Blinds Hideout N', 'Blinds Hideout (Top)'),
|
||||
('Bat Cave Door', 'Bat Cave (left)'),
|
||||
('Good Bee Cave Front to Back', 'Good Bee Cave (back)'),
|
||||
('Good Bee Cave Back to Front', 'Good Bee Cave'),
|
||||
('Capacity Upgrade East', 'Capacity Fairy Pool'),
|
||||
('Capacity Fairy Pool West', 'Capacity Upgrade'),
|
||||
('Bonk Fairy (Dark) Pool', 'Bonk Fairy Pool'),
|
||||
('Bonk Fairy (Light) Pool', 'Bonk Fairy Pool'),
|
||||
|
||||
('Hookshot Cave Front to Middle', 'Hookshot Cave (Middle)'),
|
||||
('Hookshot Cave Middle to Front', 'Hookshot Cave (Front)'),
|
||||
('Hookshot Cave Middle to Back', 'Hookshot Cave (Back)'),
|
||||
('Hookshot Cave Back to Middle', 'Hookshot Cave (Middle)'),
|
||||
('Hookshot Cave Back to Fairy', 'Hookshot Cave (Fairy Pool)'),
|
||||
('Hookshot Cave Fairy to Back', 'Hookshot Cave (Back)'),
|
||||
('Hookshot Cave Bonk Path', 'Hookshot Cave (Bonk Islands)'),
|
||||
('Hookshot Cave Hook Path', 'Hookshot Cave (Hook Islands)'),
|
||||
('Superbunny Cave Climb', 'Superbunny Cave (Top)'),
|
||||
('Bumper Cave Bottom to Top', 'Bumper Cave (top)'),
|
||||
('Bumper Cave Top To Bottom', 'Bumper Cave (bottom)'),
|
||||
('Missing Smith', 'Missing Smith'),
|
||||
('Ganon Drop', 'Bottom of Pyramid')
|
||||
]
|
||||
|
||||
# non-shuffled entrance links
|
||||
default_connections = [('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
|
||||
('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'),
|
||||
('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
|
||||
('Lost Woods Gamble', 'Lost Woods Gamble'),
|
||||
default_connections = [('Lost Woods Gamble', 'Lost Woods Gamble'),
|
||||
('Fortune Teller (Light)', 'Fortune Teller (Light)'),
|
||||
('Bush Covered House', 'Bush Covered House'),
|
||||
('Long Fairy Cave', 'Long Fairy Cave'), # near East Light World Teleporter
|
||||
('Good Bee Cave', 'Good Bee Cave'),
|
||||
('Kakariko Gamble Game', 'Kakariko Gamble Game'),
|
||||
('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
|
||||
('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'),
|
||||
('Long Fairy Cave', 'Long Fairy Cave'),
|
||||
('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
|
||||
('Good Bee Cave', 'Good Bee Cave'),
|
||||
|
||||
('East Dark World Hint', 'East Dark World Hint'),
|
||||
('Dark Lake Hylia Fairy', 'Dark Lake Hylia Healer Fairy'),
|
||||
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
|
||||
('Dark Sanctuary Hint', 'Dark Sanctuary Hint'),
|
||||
('Fortune Teller (Dark)', 'Fortune Teller (Dark)'),
|
||||
('Dark Sanctuary Hint', 'Dark Sanctuary Hint'),
|
||||
('Archery Game', 'Archery Game'),
|
||||
('Mire Fairy', 'Mire Healer Fairy')
|
||||
('Dark Lake Hylia Fairy', 'Dark Lake Hylia Healer Fairy'),
|
||||
('East Dark World Hint', 'East Dark World Hint'),
|
||||
('Mire Fairy', 'Mire Healer Fairy'),
|
||||
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint')
|
||||
]
|
||||
|
||||
default_takeany_connections = [('Light Hype Fairy', 'Light Hype Fairy'),
|
||||
('Desert Fairy', 'Desert Healer Fairy'),
|
||||
('Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Healer Fairy'),
|
||||
('Dark Death Mountain Fairy', 'Dark Death Mountain Healer Fairy'),
|
||||
('Bonk Fairy (Dark)', 'Bonk Fairy (Dark)'),
|
||||
('Dark Death Mountain Fairy', 'Dark Death Mountain Healer Fairy')
|
||||
('Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Healer Fairy')
|
||||
]
|
||||
|
||||
default_pot_connections = [('Lumberjack House', 'Lumberjack House'),
|
||||
('Hookshot Fairy', 'Hookshot Fairy'),
|
||||
('Snitch Lady (East)', 'Snitch Lady (East)'),
|
||||
('Snitch Lady (West)', 'Snitch Lady (West)'),
|
||||
('Tavern (Front)', 'Tavern (Front)'),
|
||||
('Light World Bomb Hut', 'Light World Bomb Hut'),
|
||||
('Tavern (Front)', 'Tavern (Front)'),
|
||||
('20 Rupee Cave', '20 Rupee Cave'),
|
||||
('50 Rupee Cave', '50 Rupee Cave'),
|
||||
('Hookshot Fairy', 'Hookshot Fairy'),
|
||||
('Palace of Darkness Hint', 'Palace of Darkness Hint'),
|
||||
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'),
|
||||
('Mire Hint', 'Mire Hint')
|
||||
('Mire Hint', 'Mire Hint'),
|
||||
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave')
|
||||
]
|
||||
|
||||
default_connector_connections = [('Old Man Cave (West)', 'Old Man Cave Exit (West)'),
|
||||
('Old Man Cave (East)', 'Old Man Cave Exit (East)'),
|
||||
('Old Man House (Bottom)', 'Old Man House Exit (Bottom)'),
|
||||
('Old Man House (Top)', 'Old Man House Exit (Top)'),
|
||||
default_connector_connections = [('Death Mountain Return Cave (West)', 'Death Mountain Return Cave Exit (West)'),
|
||||
('Death Mountain Return Cave (East)', 'Death Mountain Return Cave Exit (East)'),
|
||||
('Death Mountain Return Cave (West)', 'Death Mountain Return Cave Exit (West)'),
|
||||
('Spectacle Rock Cave Peak', 'Spectacle Rock Cave Exit (Peak)'),
|
||||
('Spectacle Rock Cave (Bottom)', 'Spectacle Rock Cave Exit'),
|
||||
('Spectacle Rock Cave', 'Spectacle Rock Cave Exit (Top)'),
|
||||
('Old Man Cave (East)', 'Old Man Cave Exit (East)'),
|
||||
('Old Man Cave (West)', 'Old Man Cave Exit (West)'),
|
||||
('Old Man House (Bottom)', 'Old Man House Exit (Bottom)'),
|
||||
('Old Man House (Top)', 'Old Man House Exit (Top)'),
|
||||
('Spiral Cave', 'Spiral Cave Exit (Top)'),
|
||||
('Spiral Cave (Bottom)', 'Spiral Cave Exit'),
|
||||
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave Exit (Bottom)'),
|
||||
('Fairy Ascension Cave (Top)', 'Fairy Ascension Cave Exit (Top)'),
|
||||
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave Exit (Bottom)'),
|
||||
('Paradox Cave (Bottom)', 'Paradox Cave Exit (Bottom)'),
|
||||
('Paradox Cave (Middle)', 'Paradox Cave Exit (Middle)'),
|
||||
('Paradox Cave (Top)', 'Paradox Cave Exit (Top)'),
|
||||
('Elder House (East)', 'Elder House Exit (East)'),
|
||||
('Elder House (West)', 'Elder House Exit (West)'),
|
||||
('Two Brothers House (East)', 'Two Brothers House Exit (East)'),
|
||||
('Elder House (East)', 'Elder House Exit (East)'),
|
||||
('Two Brothers House (West)', 'Two Brothers House Exit (West)'),
|
||||
('Bumper Cave (Top)', 'Bumper Cave Exit (Top)'),
|
||||
('Bumper Cave (Bottom)', 'Bumper Cave Exit (Bottom)'),
|
||||
('Two Brothers House (East)', 'Two Brothers House Exit (East)'),
|
||||
('Hookshot Cave Back Entrance', 'Hookshot Cave Back Exit'),
|
||||
('Hookshot Cave', 'Hookshot Cave Front Exit'),
|
||||
('Superbunny Cave (Top)', 'Superbunny Cave Exit (Top)'),
|
||||
('Superbunny Cave (Bottom)', 'Superbunny Cave Exit (Bottom)'),
|
||||
('Hookshot Cave', 'Hookshot Cave Front Exit'),
|
||||
('Hookshot Cave Back Entrance', 'Hookshot Cave Back Exit')
|
||||
('Bumper Cave (Bottom)', 'Bumper Cave Exit (Bottom)'),
|
||||
('Bumper Cave (Top)', 'Bumper Cave Exit (Top)')
|
||||
]
|
||||
|
||||
default_item_connections = [('Links House', 'Links House Exit'),
|
||||
('Mimic Cave', 'Mimic Cave'),
|
||||
default_item_connections = [('Mimic Cave', 'Mimic Cave'),
|
||||
('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Bonk Rock Cave', 'Bonk Rock Cave'),
|
||||
('Graveyard Cave', 'Graveyard Cave'),
|
||||
@@ -2273,6 +2286,7 @@ default_item_connections = [('Links House', 'Links House Exit'),
|
||||
('Sahasrahlas Hut', 'Sahasrahlas Hut'),
|
||||
('Blacksmiths Hut', 'Blacksmiths Hut'),
|
||||
('Library', 'Library'),
|
||||
('Links House', 'Links House Exit'),
|
||||
('Checkerboard Cave', 'Checkerboard Cave'),
|
||||
('Aginahs Cave', 'Aginahs Cave'),
|
||||
('Cave 45', 'Cave 45'),
|
||||
|
||||
Reference in New Issue
Block a user