From b342896ff73dd72abfaea903060beca1c0d4f7e8 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 19 May 2021 04:59:33 -0500 Subject: [PATCH] Moved static OW data to OWEdges --- OWEdges.py | 137 +++++++++++++++++++++++++++++++++++++++++++ OverworldShuffle.py | 139 +------------------------------------------- 2 files changed, 138 insertions(+), 138 deletions(-) diff --git a/OWEdges.py b/OWEdges.py index eb175d08..065d7261 100644 --- a/OWEdges.py +++ b/OWEdges.py @@ -1,6 +1,7 @@ from BaseClasses import OWEdge, Direction, Terrain, WorldType, PolSlot from enum import Enum, unique +from Utils import bidict @unique class OpenStd(Enum): @@ -655,3 +656,139 @@ OWEdgeGroups = { ] ) } + +parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW', + 'Lost Woods SC': 'Skull Woods SC', + 'Lost Woods SE': 'Skull Woods SE', + 'Lost Woods EN': 'Skull Woods EN', + 'Lumberjack SW': 'Dark Lumberjack SW', + 'Lumberjack WN': 'Dark Lumberjack WN', + 'West Death Mountain EN': 'West Dark Death Mountain EN', + 'West Death Mountain ES': 'West Dark Death Mountain ES', + 'East Death Mountain WN': 'East Dark Death Mountain WN', + 'East Death Mountain WS': 'East Dark Death Mountain WS', + 'East Death Mountain EN': 'East Dark Death Mountain EN', + 'Death Mountain TR Pegs WN': 'Turtle Rock WN', + 'Mountain Entry NW': 'Bumper Cave NW', + 'Mountain Entry SE': 'Bumper Cave 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', + 'Lost Woods Pass SE': 'Skull Woods Pass SE', + 'Kakariko Fortune NE': 'Dark Fortune NE', + 'Kakariko Fortune SC': 'Dark Fortune SC', + 'Kakariko Fortune EN': 'Dark Fortune EN', + 'Kakariko Fortune ES': 'Dark Fortune ES', + 'Kakariko Pond NE': 'Outcast Pond NE', + 'Kakariko Pond SW': 'Outcast Pond SW', + 'Kakariko Pond SE': 'Outcast Pond SE', + 'Kakariko Pond WN': 'Outcast Pond WN', + 'Kakariko Pond WS': 'Outcast Pond WS', + 'Kakariko Pond EN': 'Outcast Pond EN', + 'Kakariko Pond ES': 'Outcast Pond ES', + 'Sanctuary WN': 'Dark Chapel WN', + 'Sanctuary WS': 'Dark Chapel WS', + 'Sanctuary EC': 'Dark Chapel EC', + 'Graveyard WC': 'Dark Graveyard WC', + 'Graveyard EC': 'Dark Graveyard ES', + 'River Bend SW': 'Qirn Jump SW', + 'River Bend SC': 'Qirn Jump SC', + 'River Bend SE': 'Qirn Jump SE', + 'River Bend WC': 'Qirn Jump WC', + 'River Bend EN': 'Qirn Jump EN', + 'River Bend EC': 'Qirn Jump EC', + 'River Bend ES': 'Qirn Jump ES', + 'Potion Shop WN': 'Dark Witch WN', + 'Potion Shop WC': 'Dark Witch WC', + 'Potion Shop WS': 'Dark Witch WS', + 'Potion Shop EN': 'Dark Witch EN', + 'Potion Shop EC': 'Dark Witch EC', + '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', + 'Kakariko SE': 'Village of Outcasts SE', + 'Kakariko ES': 'Village of Outcasts ES', + 'Forgotten Forest NW': 'Shield Shop NW', + 'Forgotten Forest NE': 'Shield Shop NE', + 'Hyrule Castle SW': 'Pyramid SW', + 'Hyrule Castle SE': 'Pyramid SE', + 'Hyrule Castle ES': 'Pyramid ES', + 'Wooden Bridge NW': 'Broken Bridge NW', + 'Wooden Bridge NC': 'Broken Bridge NC', + 'Wooden Bridge NE': 'Broken Bridge NE', + 'Wooden Bridge SW': 'Broken Bridge SW', + 'Eastern Palace SW': 'Palace of Darkness SW', + 'Eastern Palace SE': 'Palace of Darkness SE', + 'Blacksmith WS': 'Hammer Pegs WS', + 'Sand Dunes NW': 'Dark Dunes NW', + 'Sand Dunes SC': 'Dark Dunes SC', + 'Sand Dunes WN': 'Dark Dunes WN', + 'Maze Race ES': 'Dig Game ES', + 'Kakariko Suburb NE': 'Frog NE', + 'Kakariko Suburb WS': 'Frog WS', + 'Kakariko Suburb ES': 'Frog ES', + 'Flute Boy SW': 'Stumpy SW', + 'Flute Boy SC': 'Stumpy SC', + 'Flute Boy WS': 'Stumpy WS', + 'Central Bonk Rocks NW': 'Dark Bonk Rocks NW', + 'Central Bonk Rocks SW': 'Dark Bonk Rocks SW', + 'Central Bonk Rocks EN': 'Dark Bonk Rocks EN', + 'Central Bonk Rocks EC': 'Dark Bonk Rocks EC', + 'Central Bonk Rocks ES': 'Dark Bonk Rocks ES', + 'Links House NE': 'Big Bomb Shop NE', + 'Links House SC': 'Big Bomb Shop SC', + 'Links House WN': 'Big Bomb Shop WN', + 'Links House WC': 'Big Bomb Shop WC', + 'Links House WS': 'Big Bomb Shop WS', + 'Links House ES': 'Big Bomb Shop ES', + 'Stone Bridge NC': 'Hammer Bridge NC', + 'Stone Bridge SC': 'Hammer Bridge SC', + 'Stone Bridge WS': 'Hammer Bridge WS', + 'Stone Bridge EN': 'Hammer Bridge EN', + 'Stone Bridge EC': 'Hammer Bridge EC', + 'Tree Line NW': 'Dark Tree Line NW', + 'Tree Line SC': 'Dark Tree Line SC', + 'Tree Line SE': 'Dark Tree Line SE', + 'Tree Line WN': 'Dark Tree Line WN', + 'Tree Line WC': 'Dark Tree Line WC', + 'Eastern Nook NE': 'Palace of Darkness Nook NE', + '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', + 'C Whirlpool EN': 'Dark C Whirlpool EN', + 'C Whirlpool EC': 'Dark C Whirlpool EC', + 'C Whirlpool ES': 'Dark C Whirlpool ES', + 'Statues NC': 'Hype Cave NC', + 'Statues SC': 'Hype Cave SC', + 'Statues WN': 'Hype Cave WN', + 'Statues WC': 'Hype Cave WC', + 'Statues WS': 'Hype Cave WS', + 'Lake Hylia NW': 'Ice Lake NW', + 'Lake Hylia NC': 'Ice Lake NC', + 'Lake Hylia NE': 'Ice Lake NE', + 'Lake Hylia WS': 'Ice Lake WS', + 'Lake Hylia EC': 'Ice Lake EC', + 'Lake Hylia ES': 'Ice Lake ES', + 'Ice Cave SW': 'Shopping Mall SW', + 'Ice Cave SE': 'Shopping Mall SE', + 'Desert Pass EC': 'Swamp Nook EC', + 'Desert Pass ES': 'Swamp Nook ES', + 'Dam NC': 'Swamp NC', + 'Dam WC': 'Swamp WC', + 'Dam WS': 'Swamp WS', + 'Dam EC': 'Swamp EC', + 'South Pass WC': 'Dark South Pass WC', + 'South Pass NC': 'Dark South Pass NC', + 'South Pass ES': 'Dark South Pass ES', + 'Octoballoon NW': 'Bomber Corner NW', + 'Octoballoon NE': 'Bomber Corner NE', + 'Octoballoon WC': 'Bomber Corner WC', + 'Octoballoon WS': 'Bomber Corner WS' + }) \ No newline at end of file diff --git a/OverworldShuffle.py b/OverworldShuffle.py index d2dd0d37..f89b614d 100644 --- a/OverworldShuffle.py +++ b/OverworldShuffle.py @@ -1,7 +1,6 @@ import random from BaseClasses import OWEdge, WorldType, Direction, Terrain -from Utils import bidict -from OWEdges import OWEdgeGroups, IsParallel +from OWEdges import OWEdgeGroups, parallel_links, IsParallel __version__ = '0.1.3.0u' @@ -617,142 +616,6 @@ parallelsimilar_connections = [('Maze Race ES', 'Kakariko Suburb WS'), ('Dig Game ES', 'Frog WS') ] -parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW', - 'Lost Woods SC': 'Skull Woods SC', - 'Lost Woods SE': 'Skull Woods SE', - 'Lost Woods EN': 'Skull Woods EN', - 'Lumberjack SW': 'Dark Lumberjack SW', - 'Lumberjack WN': 'Dark Lumberjack WN', - 'West Death Mountain EN': 'West Dark Death Mountain EN', - 'West Death Mountain ES': 'West Dark Death Mountain ES', - 'East Death Mountain WN': 'East Dark Death Mountain WN', - 'East Death Mountain WS': 'East Dark Death Mountain WS', - 'East Death Mountain EN': 'East Dark Death Mountain EN', - 'Death Mountain TR Pegs WN': 'Turtle Rock WN', - 'Mountain Entry NW': 'Bumper Cave NW', - 'Mountain Entry SE': 'Bumper Cave 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', - 'Lost Woods Pass SE': 'Skull Woods Pass SE', - 'Kakariko Fortune NE': 'Dark Fortune NE', - 'Kakariko Fortune SC': 'Dark Fortune SC', - 'Kakariko Fortune EN': 'Dark Fortune EN', - 'Kakariko Fortune ES': 'Dark Fortune ES', - 'Kakariko Pond NE': 'Outcast Pond NE', - 'Kakariko Pond SW': 'Outcast Pond SW', - 'Kakariko Pond SE': 'Outcast Pond SE', - 'Kakariko Pond WN': 'Outcast Pond WN', - 'Kakariko Pond WS': 'Outcast Pond WS', - 'Kakariko Pond EN': 'Outcast Pond EN', - 'Kakariko Pond ES': 'Outcast Pond ES', - 'Sanctuary WN': 'Dark Chapel WN', - 'Sanctuary WS': 'Dark Chapel WS', - 'Sanctuary EC': 'Dark Chapel EC', - 'Graveyard WC': 'Dark Graveyard WC', - 'Graveyard EC': 'Dark Graveyard ES', - 'River Bend SW': 'Qirn Jump SW', - 'River Bend SC': 'Qirn Jump SC', - 'River Bend SE': 'Qirn Jump SE', - 'River Bend WC': 'Qirn Jump WC', - 'River Bend EN': 'Qirn Jump EN', - 'River Bend EC': 'Qirn Jump EC', - 'River Bend ES': 'Qirn Jump ES', - 'Potion Shop WN': 'Dark Witch WN', - 'Potion Shop WC': 'Dark Witch WC', - 'Potion Shop WS': 'Dark Witch WS', - 'Potion Shop EN': 'Dark Witch EN', - 'Potion Shop EC': 'Dark Witch EC', - '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', - 'Kakariko SE': 'Village of Outcasts SE', - 'Kakariko ES': 'Village of Outcasts ES', - 'Forgotten Forest NW': 'Shield Shop NW', - 'Forgotten Forest NE': 'Shield Shop NE', - 'Hyrule Castle SW': 'Pyramid SW', - 'Hyrule Castle SE': 'Pyramid SE', - 'Hyrule Castle ES': 'Pyramid ES', - 'Wooden Bridge NW': 'Broken Bridge NW', - 'Wooden Bridge NC': 'Broken Bridge NC', - 'Wooden Bridge NE': 'Broken Bridge NE', - 'Wooden Bridge SW': 'Broken Bridge SW', - 'Eastern Palace SW': 'Palace of Darkness SW', - 'Eastern Palace SE': 'Palace of Darkness SE', - 'Blacksmith WS': 'Hammer Pegs WS', - 'Sand Dunes NW': 'Dark Dunes NW', - 'Sand Dunes SC': 'Dark Dunes SC', - 'Sand Dunes WN': 'Dark Dunes WN', - 'Maze Race ES': 'Dig Game ES', - 'Kakariko Suburb NE': 'Frog NE', - 'Kakariko Suburb WS': 'Frog WS', - 'Kakariko Suburb ES': 'Frog ES', - 'Flute Boy SW': 'Stumpy SW', - 'Flute Boy SC': 'Stumpy SC', - 'Flute Boy WS': 'Stumpy WS', - 'Central Bonk Rocks NW': 'Dark Bonk Rocks NW', - 'Central Bonk Rocks SW': 'Dark Bonk Rocks SW', - 'Central Bonk Rocks EN': 'Dark Bonk Rocks EN', - 'Central Bonk Rocks EC': 'Dark Bonk Rocks EC', - 'Central Bonk Rocks ES': 'Dark Bonk Rocks ES', - 'Links House NE': 'Big Bomb Shop NE', - 'Links House SC': 'Big Bomb Shop SC', - 'Links House WN': 'Big Bomb Shop WN', - 'Links House WC': 'Big Bomb Shop WC', - 'Links House WS': 'Big Bomb Shop WS', - 'Links House ES': 'Big Bomb Shop ES', - 'Stone Bridge NC': 'Hammer Bridge NC', - 'Stone Bridge SC': 'Hammer Bridge SC', - 'Stone Bridge WS': 'Hammer Bridge WS', - 'Stone Bridge EN': 'Hammer Bridge EN', - 'Stone Bridge EC': 'Hammer Bridge EC', - 'Tree Line NW': 'Dark Tree Line NW', - 'Tree Line SC': 'Dark Tree Line SC', - 'Tree Line SE': 'Dark Tree Line SE', - 'Tree Line WN': 'Dark Tree Line WN', - 'Tree Line WC': 'Dark Tree Line WC', - 'Eastern Nook NE': 'Palace of Darkness Nook NE', - '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', - 'C Whirlpool EN': 'Dark C Whirlpool EN', - 'C Whirlpool EC': 'Dark C Whirlpool EC', - 'C Whirlpool ES': 'Dark C Whirlpool ES', - 'Statues NC': 'Hype Cave NC', - 'Statues SC': 'Hype Cave SC', - 'Statues WN': 'Hype Cave WN', - 'Statues WC': 'Hype Cave WC', - 'Statues WS': 'Hype Cave WS', - 'Lake Hylia NW': 'Ice Lake NW', - 'Lake Hylia NC': 'Ice Lake NC', - 'Lake Hylia NE': 'Ice Lake NE', - 'Lake Hylia WS': 'Ice Lake WS', - 'Lake Hylia EC': 'Ice Lake EC', - 'Lake Hylia ES': 'Ice Lake ES', - 'Ice Cave SW': 'Shopping Mall SW', - 'Ice Cave SE': 'Shopping Mall SE', - 'Desert Pass EC': 'Swamp Nook EC', - 'Desert Pass ES': 'Swamp Nook ES', - 'Dam NC': 'Swamp NC', - 'Dam WC': 'Swamp WC', - 'Dam WS': 'Swamp WS', - 'Dam EC': 'Swamp EC', - 'South Pass WC': 'Dark South Pass WC', - 'South Pass NC': 'Dark South Pass NC', - 'South Pass ES': 'Dark South Pass ES', - 'Octoballoon NW': 'Bomber Corner NW', - 'Octoballoon NE': 'Bomber Corner NE', - 'Octoballoon WC': 'Bomber Corner WC', - 'Octoballoon WS': 'Bomber Corner WS' - }) - # non shuffled overworld default_connections = [('Lost Woods SW', 'Lost Woods Pass NW'), ('Lost Woods SC', 'Lost Woods Pass NE'),