From 4639129401b130d68b94fdb1f0b69342b5896e66 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 13 Feb 2021 10:52:51 -0600 Subject: [PATCH] Remove OW Shuffle stuff from ER --- EntranceShuffle.py | 282 --------------------------------------------- 1 file changed, 282 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index bc2b1e94..6d82e712 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -17,9 +17,6 @@ def link_entrances(world, player): # setup mandatory connections for exitname, regionname in mandatory_connections: connect_simple(world, exitname, regionname, player) - # TODO: move this to OverworldShuffle.py to be shuffled - for exitname, regionname in default_overworld_connections: - connect_simple(world, exitname, regionname, player) connect_custom(world, player) @@ -3573,285 +3570,6 @@ inverted_default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing' ('Pyramid Exit', 'Light World'), ('Inverted Pyramid Entrance', 'Bottom of Pyramid')] -# non shuffled overworld -default_overworld_connections = [('Lost Woods SW', 'Lost Woods Pass West Area'), - ('Lost Woods SC', 'Lost Woods Pass East Top Area'), - ('Lost Woods SE', 'Kakariko Fortune Area'), - ('Lost Woods EN', 'Lumberjack Area'), - ('Lumberjack WN', 'Lost Woods Area'), - ('Lumberjack SW', 'DM Ascent Area'), - ('DM Ascent NW', 'Lumberjack Area'), - ('DM Ascent SE', 'Kakariko Pond Area'), - ('Lost Woods Pass NW', 'Lost Woods Area'), - ('Lost Woods Pass SW', 'Kakariko Area'), - ('Lost Woods Pass NE', 'Lost Woods Area'), - ('Lost Woods Pass SE', 'Kakariko Area'), - ('Kakariko Fortune NE', 'Lost Woods Area'), - ('Kakariko Fortune EN', 'Kakariko Pond Area'), - ('Kakariko Fortune ES', 'Kakariko Pond Area'), - ('Kakariko Fortune SC', 'Kakariko Area'), - ('Kakariko Pond NE', 'DM Ascent Area'), - ('Kakariko Pond WN', 'Kakariko Fortune Area'), - ('Kakariko Pond WS', 'Kakariko Fortune Area'), - ('Kakariko Pond SW', 'Forgotten Forest Area'), - ('Kakariko Pond SE', 'Forgotten Forest Area'), - ('Kakariko Pond EN', 'Bonk Rock Ledge'), - ('Kakariko Pond ES', 'Sanctuary Area'), - ('Forgotten Forest NW', 'Kakariko Pond Area'), - ('Forgotten Forest NE', 'Kakariko Pond Area'), - ('Forgotten Forest ES', 'Hyrule Castle Area'), - ('Sanctuary WS', 'Kakariko Pond Area'), - ('Sanctuary EC', 'Graveyard Area'), - ('Sanctuary WN', 'Kakariko Pond Area'), - ('Graveyard WC', 'Sanctuary Area'), - ('Graveyard EC', 'Useless Fairy Area'), - ('Useless Fairy WC', 'Graveyard Area'), - ('Useless Fairy SW', 'Wooden Bridge Area'), - ('Useless Fairy SE', 'Wooden Bridge Area'), - ('Useless Fairy EC', 'Potion Shop Area'), - ('Useless Fairy ES', 'Potion Shop Area'), - ('Useless Fairy EN', 'Potion Shop Water'), - ('Useless Fairy SC', 'Wooden Bridge Water'), - ('Potion Shop WC', 'Useless Fairy East Bank'), - ('Potion Shop WS', 'Useless Fairy East Bank'), - ('Potion Shop EC', 'Zora Warning Area'), - ('Potion Shop WN', 'Useless Fairy Water'), - ('Potion Shop EN', 'Zora Warning Water'), - ('Zora Warning WC', 'Potion Shop Northeast'), - ('Zora Warning NE', 'Zora Approach Area'), - ('Zora Warning WN', 'Potion Shop Water'), - ('Zora Approach SE', 'Zora Warning Area'), - ('Kakariko NW', 'Lost Woods Pass West Area'), - ('Kakariko NC', 'Lost Woods Pass East Bottom Area'), - ('Kakariko NE', 'Kakariko Fortune Area'), - ('Kakariko ES', 'Blacksmith Area'), - ('Kakariko SE', 'Kakariko Suburb Area'), - ('Blacksmith WS', 'Kakariko Area'), - ('Hyrule Castle WN', 'Forgotten Forest Area'), - ('Hyrule Castle SW', 'Central Bonk Rock Area'), - ('Hyrule Castle SE', 'Links House Area'), - ('Hyrule Castle ES', 'Sand Dune Area'), - ('Wooden Bridge NW', 'Useless Fairy Area'), - ('Wooden Bridge NE', 'Useless Fairy East Bank'), - ('Wooden Bridge SW', 'Sand Dune Area'), - ('Wooden Bridge NC', 'Useless Fairy Water'), - ('Sand Dune NW', 'Wooden Bridge Area'), - ('Sand Dune WN', 'Hyrule Castle East Entry'), - ('Sand Dune SC', 'Stone Bridge Area'), - ('Eastern Palace SW', 'Tree Line Area'), - ('Eastern Palace SE', 'Eastern Nook Area'), - ('Eastern Nook NE', 'Eastern Palace Area'), - ('Maze Race ES', 'Kakariko Suburb Area'), - ('Kakariko Suburb NE', 'Kakariko Area'), - ('Kakariko Suburb WS', 'Maze Race Area'), - ('Kakariko Suburb ES', 'Flute Boy Pass'), - ('Flute Boy SC', 'Cave 45 Area'), - ('Flute Boy WS', 'Kakariko Suburb Area'), - ('Flute Boy SW', 'Cave 45 Area'), - ('Cave 45 NW', 'Flute Boy Pass'), - ('Cave 45 NC', 'Flute Boy Area'), - ('Cave 45 EC', 'C Whirlpool Outer Area'), - ('C Whirlpool EN', 'Statues Area'), - ('C Whirlpool EC', 'Statues Area'), - ('C Whirlpool ES', 'Statues Area'), - ('C Whirlpool SC', 'Dam Area'), - ('C Whirlpool WC', 'Cave 45 Area'), - ('C Whirlpool NW', 'Central Bonk Rock Area'), - ('Central Bonk Rock NW', 'Hyrule Castle Area'), - ('Central Bonk Rock SW', 'C Whirlpool Outer Area'), - ('Central Bonk Rock EN', 'Links House Area'), - ('Central Bonk Rock EC', 'Links House Area'), - ('Central Bonk Rock ES', 'Links House Area'), - ('Links House NE', 'Hyrule Castle Area'), - ('Links House WN', 'Central Bonk Rock Area'), - ('Links House WC', 'Central Bonk Rock Area'), - ('Links House WS', 'Central Bonk Rock Area'), - ('Links House SC', 'Statues Area'), - ('Links House ES', 'Stone Bridge Area'), - ('Stone Bridge NC', 'Sand Dune Area'), - ('Stone Bridge EN', 'Tree Line Area'), - ('Stone Bridge WS', 'Links House Area'), - ('Stone Bridge SC', 'Lake Hylia Area'), - ('Stone Bridge EC', 'Tree Line Water'), - ('Tree Line WN', 'Stone Bridge Area'), - ('Tree Line NW', 'Eastern Palace Area'), - ('Tree Line SE', 'Lake Hylia Northeast Bank'), - ('Tree Line WC', 'Stone Bridge Water'), - ('Tree Line SC', 'Lake Hylia Water'), - ('Desert ES', 'Purple Chest Area'), - ('Purple Chest WS', 'Desert Area'), - ('Purple Chest EC', 'Dam Area'), - ('Purple Chest ES', 'Dam Area'), - ('Purple Chest WC', 'Bombos Tablet Ledge'), - ('Dam WC', 'Purple Chest Area'), - ('Dam WS', 'Purple Chest Area'), - ('Dam NC', 'C Whirlpool Area'), - ('Dam EC', 'South Pass Area'), - ('Statues NC', 'Links House Area'), - ('Statues WN', 'C Whirlpool Area'), - ('Statues WC', 'C Whirlpool Area'), - ('Statues WS', 'C Whirlpool Area'), - ('Statues SC', 'South Pass Area'), - ('South Pass WC', 'Dam Area'), - ('South Pass NC', 'Statues Area'), - ('South Pass ES', 'Lake Hylia South Shore'), - ('Lake Hylia NW', 'Stone Bridge Area'), - ('Lake Hylia WS', 'South Pass Area'), - ('Lake Hylia ES', 'Octoballoon Area'), - ('Lake Hylia NE', 'Tree Line Area'), - ('Lake Hylia NC', 'Tree Line Water'), - ('Lake Hylia EC', 'Octoballoon Water'), - ('Octoballoon WS', 'Lake Hylia South Shore'), - ('Octoballoon NE', 'Ice Rod Cave Area'), - ('Octoballoon WC', 'Lake Hylia Water'), - ('Octoballoon NW', 'Ice Rod Cave Area'), - ('Ice Rod Cave SE', 'Octoballoon Area'), - ('Ice Rod Cave SW', 'Octoballoon Water Ledge'), - - ('West Death Mountain ES', 'East Death Mountain (Bottom Left)'), - ('West Death Mountain EN', 'East Death Mountain (Top West)'), - ('East Death Mountain WN', 'West Death Mountain (Top)'), - ('East Death Mountain EN', 'Death Mountain TR Pegs'), - ('East Death Mountain WS', 'West Death Mountain (Bottom)'), - ('Death Mountain TR Pegs WN', 'East Death Mountain (Top East)'), - - ('Skull Woods SE', 'Dark Fortune Area'), - ('Skull Woods SC', 'Skull Woods Pass East Top Area'), - ('Skull Woods SW', 'Skull Woods Pass West Area'), - ('Skull Woods WN', 'Dark Lumberjack Area'), - ('Dark Lumberjack WN', 'Skull Woods Forgotten Path (Northeast)'), - ('Dark Lumberjack SW', 'Bumper Cave Area'), - ('Bumper Cave NW', 'Dark Lumberjack Area'), - ('Bumper Cave SE', 'Outcast Pond Area'), - ('Skull Woods Pass NW', 'Skull Woods Forgotten Path (Southwest)'), - ('Skull Woods Pass SW', 'Village of Outcasts Area'), - ('Skull Woods Pass NE', 'Skull Woods Portal Entry'), - ('Skull Woods Pass SE', 'Village of Outcasts Area'), - ('Dark Fortune NE', 'Skull Woods Forest'), - ('Dark Fortune EN', 'Outcast Pond Area'), - ('Dark Fortune ES', 'Outcast Pond Area'), - ('Dark Fortune SC', 'Village of Outcasts Area'), - ('Outcast Pond NE', 'Bumper Cave Area'), - ('Outcast Pond WN', 'Dark Fortune Area'), - ('Outcast Pond WS', 'Dark Fortune Area'), - ('Outcast Pond SW', 'Shield Shop Area'), - ('Outcast Pond SE', 'Shield Shop Area'), - ('Outcast Pond EN', 'Dark Chapel Area'), - ('Outcast Pond ES', 'Dark Chapel Area'), - ('Shield Shop NW', 'Outcast Pond Area'), - ('Shield Shop NE', 'Outcast Pond Area'), - ('Dark Chapel WN', 'Outcast Pond Area'), - ('Dark Chapel WS', 'Outcast Pond Area'), - ('Dark Chapel EC', 'Dark Graveyard Area'), - ('Dark Graveyard WC', 'Dark Chapel Area'), - ('Dark Graveyard ES', 'Qirn Jump Area'), - ('Qirn Jump WC', 'Dark Graveyard Area'), - ('Qirn Jump SW', 'Broken Bridge West'), - ('Qirn Jump SE', 'Broken Bridge Northeast'), - ('Qirn Jump EC', 'Dark Witch Area'), - ('Qirn Jump ES', 'Dark Witch Area'), - ('Qirn Jump EN', 'Dark Witch Water'), - ('Qirn Jump SC', 'Broken Bridge Water'), - ('Dark Witch WC', 'Qirn Jump East Bank'), - ('Dark Witch WS', 'Qirn Jump East Bank'), - ('Dark Witch EC', 'Catfish Approach Area'), - ('Dark Witch WN', 'Qirn Jump Water'), - ('Dark Witch EN', 'Catfish Approach Water'), - ('Catfish Approach WC', 'Dark Witch Northeast'), - ('Catfish Approach NE', 'Catfish Area'), - ('Catfish Approach WN', 'Dark Witch Water'), - ('Catfish SE', 'Catfish Approach Area'), - ('Village of Outcasts NW', 'Skull Woods Pass West Area'), - ('Village of Outcasts NC', 'Skull Woods Pass East Bottom Area'), - ('Village of Outcasts NE', 'Dark Fortune Area'), - ('Village of Outcasts ES', 'Hammer Peg Entry'), - ('Village of Outcasts SE', 'Frog Area'), - ('Hammer Pegs WS', 'Village of Outcasts Area'), - ('Pyramid ES', 'Dark Dune Area'), - ('Pyramid SW', 'Dark Bonk Rock Area'), - ('Pyramid SE', 'Big Bomb Shop Area'), - ('Broken Bridge SW', 'Dark Dune Area'), - ('Broken Bridge NE', 'Qirn Jump East Bank'), - ('Broken Bridge NW', 'Qirn Jump Area'), - ('Broken Bridge NC', 'Qirn Jump Water'), - ('Dark Dune NW', 'Broken Bridge Area'), - ('Dark Dune WN', 'Pyramid Area'), - ('Dark Dune SC', 'Hammer Bridge North Area'), - ('Palace of Darkness SW', 'Dark Tree Line Area'), - ('Palace of Darkness SE', 'Palace of Darkness Nook Area'), - ('Palace of Darkness Nook NE', 'Palace of Darkness Area'), - ('Dig Game ES', 'Archery Game Area'), - ('Dig Game EC', 'Archery Game Area'), - ('Frog NE', 'Village of Outcasts Area'), - ('Frog WC', 'Dig Game Ledge'), - ('Frog WS', 'Dig Game Area'), - ('Frog ES', 'Stumpy Pass'), - ('Stumpy SC', 'Circle of Bushes Area'), - ('Stumpy WS', 'Archery Game Area'), - ('Stumpy SW', 'Circle of Bushes Area'), - ('Circle of Bushes NW', 'Stumpy Pass'), - ('Circle of Bushes NC', 'Stumpy Area'), - ('Circle of Bushes EC', 'Dark C Whirlpool Outer Area'), - ('Dark C Whirlpool EN', 'Hype Cave Area'), - ('Dark C Whirlpool EC', 'Hype Cave Area'), - ('Dark C Whirlpool ES', 'Hype Cave Area'), - ('Dark C Whirlpool SC', 'Swamp Palace Area'), - ('Dark C Whirlpool WC', 'Circle of Bushes Area'), - ('Dark C Whirlpool NW', 'Dark Bonk Rock Area'), - ('Dark Bonk Rock NW', 'Pyramid Pass'), - ('Dark Bonk Rock SW', 'Dark C Whirlpool Outer Area'), - ('Dark Bonk Rock EN', 'Big Bomb Shop Area'), - ('Dark Bonk Rock EC', 'Big Bomb Shop Area'), - ('Dark Bonk Rock ES', 'Big Bomb Shop Area'), - ('Big Bomb Shop NE', 'Pyramid Pass'), - ('Big Bomb Shop WN', 'Dark Bonk Rock Area'), - ('Big Bomb Shop WC', 'Dark Bonk Rock Area'), - ('Big Bomb Shop WS', 'Dark Bonk Rock Area'), - ('Big Bomb Shop SC', 'Hype Cave Area'), - ('Big Bomb Shop ES', 'Hammer Bridge South Area'), - ('Hammer Bridge NC', 'Dark Dune Area'), - ('Hammer Bridge EN', 'Dark Tree Line Area'), - ('Hammer Bridge WS', 'Big Bomb Shop Area'), - ('Hammer Bridge SC', 'Dark Lake Hylia Area'), - ('Hammer Bridge EC', 'Dark Tree Line Water'), - ('Dark Tree Line WN', 'Hammer Bridge North Area'), - ('Dark Tree Line NW', 'Palace of Darkness Area'), - ('Dark Tree Line SE', 'Dark Lake Hylia Northeast Bank'), - ('Dark Tree Line WC', 'Hammer Bridge Water'), - ('Dark Tree Line SC', 'Dark Lake Hylia Water'), - ('Dark Purple Chest EC', 'Swamp Palace Area'), - ('Dark Purple Chest ES', 'Swamp Palace Area'), - ('Swamp Palace WC', 'Dark Purple Chest Area'), - ('Swamp Palace WS', 'Dark Purple Chest Area'), - ('Swamp Palace NC', 'Dark C Whirlpool Area'), - ('Swamp Palace EC', 'Dark South Pass Area'), - ('Hype Cave NC', 'Big Bomb Shop Area'), - ('Hype Cave WN', 'Dark C Whirlpool Area'), - ('Hype Cave WC', 'Dark C Whirlpool Area'), - ('Hype Cave WS', 'Dark C Whirlpool Area'), - ('Hype Cave SC', 'Dark South Pass Area'), - ('Dark South Pass WC', 'Swamp Palace Area'), - ('Dark South Pass NC', 'Hype Cave Area'), - ('Dark South Pass ES', 'Dark Lake Hylia Ledge (West)'), - ('Dark Lake Hylia NW', 'Hammer Bridge South Area'), - ('Dark Lake Hylia NE', 'Dark Tree Line Area'), - ('Dark Lake Hylia WS', 'Dark South Pass Area'), - ('Dark Lake Hylia ES', 'Southeast DW Area'), - ('Dark Lake Hylia NC', 'Dark Tree Line Water'), - ('Dark Lake Hylia EC', 'Southeast DW Water'), - ('Southeast DW WS', 'Dark Lake Hylia Ledge (East)'), - ('Southeast DW NE', 'Dark Shopping Mall Area'), - ('Southeast DW WC', 'Dark Lake Hylia Water'), - ('Southeast DW NW', 'Dark Shopping Mall Area'), - ('Dark Shopping Mall SE', 'Southeast DW Area'), - ('Dark Shopping Mall SW', 'Southeast DW Water Ledge'), - - ('Dark Death Mountain EN', 'Dark Death Mountain (Top East)'), - ('East Dark Death Mountain WN', 'Dark Death Mountain (Top West)'), - ('East Dark Death Mountain EN', 'Turtle Rock Area'), - ('Turtle Rock WN', 'Dark Death Mountain (Top East)') - ] - # non shuffled dungeons default_dungeon_connections = [('Desert Palace Entrance (South)', 'Desert South Portal'), ('Desert Palace Entrance (West)', 'Desert West Portal'),