Various region/rule reorganization to match DR

This commit is contained in:
codemann8
2023-06-13 18:36:16 -05:00
parent f19b19ea00
commit a842939e92
13 changed files with 753 additions and 765 deletions

View File

@@ -51,8 +51,8 @@ def create_owedges(world, player):
create_owedge(player, 'East Death Mountain WS', 0x05, We, Ld, 0x03, 0x0d).coordInfo(0x0340, 0x1660),
create_owedge(player, 'East Death Mountain EN', 0x05, Ea, Ld, 0x02, 0x06).coordInfo(0x0078, 0x0180),
create_owedge(player, 'Death Mountain TR Pegs WN', 0x07, We, Ld, 0x02) .coordInfo(0x0078, 0x00e0),
create_owedge(player, 'Mountain Entry NW', 0x0a, No, Ld, 0x01) .coordInfo(0x04cc, 0x180a),
create_owedge(player, 'Mountain Entry SE', 0x0a, So, Ld, 0x04) .coordInfo(0x0518, 0x1012),
create_owedge(player, 'Mountain Pass NW', 0x0a, No, Ld, 0x01) .coordInfo(0x04cc, 0x180a),
create_owedge(player, 'Mountain Pass SE', 0x0a, So, Ld, 0x04) .coordInfo(0x0518, 0x1012),
create_owedge(player, 'Zora Waterfall NE', 0x0f, No, Ld, 0x02) .coordInfo(0x0f80, 0x009a).special_entrance(0x82),
create_owedge(player, 'Zora Waterfall SE', 0x0f, So, Ld, 0x05) .coordInfo(0x0f80, 0x1020),
create_owedge(player, 'Lost Woods Pass NW', 0x10, No, Ld, 0x03) .coordInfo(0x0058, 0x1800),
@@ -402,7 +402,7 @@ OWEdgeGroups = {
(Op, LW, Vt, Ld, PL, 1): (
[
['Lumberjack SW'],
['Mountain Entry SE'],
['Mountain Pass SE'],
['Lost Woods SE'],
['Zora Waterfall SE'],
['Kakariko Fortune SC'],
@@ -420,7 +420,7 @@ OWEdgeGroups = {
['Ice Cave SE']
],
[
['Mountain Entry NW'],
['Mountain Pass NW'],
['Kakariko Pond NE'],
['Kakariko Fortune NE'],
['Zora Approach NE'],
@@ -764,7 +764,7 @@ OWEdgeGroupsTerrain = {
(Op, LW, Vt, None, PL, 1): (
[
['Lumberjack SW'],
['Mountain Entry SE'],
['Mountain Pass SE'],
['Lost Woods SE'],
['Zora Waterfall SE'],
['Kakariko Fortune SC'],
@@ -780,7 +780,7 @@ OWEdgeGroupsTerrain = {
['Statues SC']
],
[
['Mountain Entry NW'],
['Mountain Pass NW'],
['Kakariko Pond NE'],
['Kakariko Fortune NE'],
['Zora Approach NE'],
@@ -1037,12 +1037,12 @@ OWTileRegions = bidict({
'East Death Mountain (Bottom)': 0x05,
'Death Mountain Floating Island': 0x05,
'Death Mountain TR Pegs': 0x07,
'Death Mountain TR Pegs Area': 0x07,
'Death Mountain TR Pegs Ledge': 0x07,
'Mountain Entry Area': 0x0a,
'Mountain Entry Entrance': 0x0a,
'Mountain Entry Ledge': 0x0a,
'Mountain Pass Area': 0x0a,
'Mountain Pass Entry': 0x0a,
'Mountain Pass Ledge': 0x0a,
'Zora Waterfall Area': 0x0f,
'Zora Waterfall Water': 0x0f,
@@ -1076,9 +1076,9 @@ OWTileRegions = bidict({
'Zora Approach Ledge': 0x17,
'Zora Approach Water': 0x17,
'Kakariko Area': 0x18,
'Kakariko Village': 0x18,
'Kakariko Southwest': 0x18,
'Kakariko Grass Yard': 0x18,
'Kakariko Bush Yard': 0x18,
'Forgotten Forest Area': 0x1a,
@@ -1097,7 +1097,7 @@ OWTileRegions = bidict({
'Eastern Palace Area': 0x1e,
'Blacksmith Area': 0x22,
'Bat Cave Ledge': 0x22,
'Blacksmith Ledge': 0x22,
'Sand Dunes Area': 0x25,
@@ -1125,11 +1125,11 @@ OWTileRegions = bidict({
'Desert Area': 0x30,
'Desert Ledge': 0x30,
'Desert Palace Entrance (North) Spot': 0x30,
'Desert Ledge Keep': 0x30,
'Desert Checkerboard Ledge': 0x30,
'Desert Palace Stairs': 0x30,
'Desert Palace Mouth': 0x30,
'Desert Palace Teleporter Ledge': 0x30,
'Desert Stairs': 0x30,
'Desert Mouth': 0x30,
'Desert Teleporter Ledge': 0x30,
'Bombos Tablet Ledge': 0x30,
'Flute Boy Approach Area': 0x32,
@@ -1144,9 +1144,9 @@ OWTileRegions = bidict({
'Statues Area': 0x34,
'Statues Water': 0x34,
'Lake Hylia Area': 0x35,
'Lake Hylia South Shore': 0x35,
'Lake Hylia Northwest Bank': 0x35,
'Lake Hylia Northeast Bank': 0x35,
'Lake Hylia South Shore': 0x35,
'Lake Hylia Central Island': 0x35,
'Lake Hylia Island': 0x35,
'Lake Hylia Water': 0x35,
@@ -1176,7 +1176,7 @@ OWTileRegions = bidict({
'Dark Lumberjack Area': 0x42,
'West Dark Death Mountain (Top)': 0x43,
'GT Approach': 0x43,
'GT Stairs': 0x43,
'West Dark Death Mountain (Bottom)': 0x43,
'East Dark Death Mountain (Top)': 0x45,
@@ -1191,7 +1191,7 @@ OWTileRegions = bidict({
'Turtle Rock Ledge': 0x47,
'Bumper Cave Area': 0x4a,
'Bumper Cave Entrance': 0x4a,
'Bumper Cave Entry': 0x4a,
'Bumper Cave Ledge': 0x4a,
'Catfish Area': 0x4f,
@@ -1222,8 +1222,8 @@ OWTileRegions = bidict({
'Catfish Approach Ledge': 0x57,
'Catfish Approach Water': 0x57,
'Village of Outcasts Area': 0x58,
'Dark Grassy Lawn': 0x58,
'Village of Outcasts': 0x58,
'Village of Outcasts Bush Yard': 0x58,
'Shield Shop Area': 0x5a,
'Shield Shop Fence': 0x5a,
@@ -1267,10 +1267,10 @@ OWTileRegions = bidict({
'Dark Tree Line Area': 0x6e,
'Dark Tree Line Water': 0x6e,
'Palace of Darkness Nook Area': 0x6f,
'Darkness Nook Area': 0x6f,
'Misery Mire Area': 0x70,
'Misery Mire Teleporter Ledge': 0x70,
'Mire Area': 0x70,
'Mire Teleporter Ledge': 0x70,
'Stumpy Approach Area': 0x72,
'Stumpy Approach Bush Entry': 0x72,
@@ -1283,12 +1283,12 @@ OWTileRegions = bidict({
'Hype Cave Area': 0x74,
'Hype Cave Water': 0x74,
'Ice Lake Area': 0x75,
'Ice Lake Northwest Bank': 0x75,
'Ice Lake Northeast Bank': 0x75,
'Ice Lake Ledge (West)': 0x75,
'Ice Lake Ledge (East)': 0x75,
'Ice Lake Southwest Ledge': 0x75,
'Ice Lake Southeast Ledge': 0x75,
'Ice Lake Water': 0x75,
'Ice Lake Moat': 0x75,
'Ice Lake Iceberg': 0x75,
'Ice Palace Area': 0x75,
'Shopping Mall Area': 0x77,
@@ -1321,8 +1321,8 @@ parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW',
'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',
'Mountain Pass NW': 'Bumper Cave NW',
'Mountain Pass 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',
@@ -1448,18 +1448,19 @@ parallel_links = bidict({'Lost Woods SW': 'Skull Woods SW',
OWExitTypes = {
'OWEdge': [],
'Ledge': ['West Death Mountain Drop',
'Spectacle Rock Drop',
'East Death Mountain Spiral Ledge Drop',
'East Death Mountain Fairy Ledge Drop',
'East Death Mountain Mimic Ledge Drop',
'Spectacle Rock Ledge Drop',
'EDM To Spiral Ledge Drop',
'EDM To Fairy Ledge Drop',
'EDM To Mimic Ledge Drop',
'EDM Ledge Drop',
'Spiral Ledge Drop',
'Mimic Ledge Drop',
'Spiral Mimic Ledge Drop',
'Fairy Ascension Ledge Drop',
'Fairy Ascension Plateau Ledge Drop',
'TR Pegs Ledge Drop',
'Mountain Entry Entrance Ledge Drop',
'Mountain Entry Ledge Drop',
'Mountain Pass Entry Ledge Drop',
'Mountain Pass Ledge Drop',
'Zora Waterfall Water Drop',
'Bonk Rock Ledge Drop',
'Graveyard Ledge Drop',
@@ -1472,15 +1473,15 @@ OWExitTypes = {
'Hyrule Castle Ledge Courtyard Drop',
'Wooden Bridge Water Drop',
'Wooden Bridge Northeast Water Drop',
'Sand Dunes Ledge Drop',
'Stone Bridge East Ledge Drop',
'Tree Line Ledge Drop',
'Eastern Palace Ledge Drop',
'Sand Dunes Cliff Ledge Drop',
'Stone Bridge East Cliff Ledge Drop',
'Tree Line Cliff Ledge Drop',
'Eastern Palace Cliff Ledge Drop',
'Maze Race Ledge Drop',
'Central Bonk Rocks Cliff Ledge Drop',
'Links House Cliff Ledge Drop',
'Stone Bridge Cliff Ledge Drop',
'Lake Hylia Area Cliff Ledge Drop',
'Lake Hylia Northwest Cliff Ledge Drop',
'Lake Hylia Island FAWT Ledge Drop',
'Stone Bridge EC Cliff Water Drop',
'Tree Line WC Cliff Water Drop',
@@ -1492,7 +1493,6 @@ OWExitTypes = {
'Checkerboard Ledge Drop',
'Desert Mouth Drop',
'Desert Teleporter Drop',
'Desert Boss Cliff Ledge Drop',
'Checkerboard Cliff Ledge Drop',
'Suburb Cliff Ledge Drop',
'Cave 45 Cliff Ledge Drop',
@@ -1505,29 +1505,29 @@ OWExitTypes = {
'Lake Hylia Island Water Drop',
'Desert Pass Ledge Drop',
'Octoballoon Waterfall Water Drop',
'Dark Death Mountain Drop (West)',
'Dark Death Mountain Drop (East)',
'West Dark Death Mountain Drop',
'East Dark Death Mountain Drop',
'Floating Island Drop',
'Turtle Rock Tail Ledge Drop',
'Turtle Rock Ledge Drop',
'Bumper Cave Ledge Drop',
'Bumper Cave Entrance Drop',
'Bumper Cave Entry Drop',
'Qirn Jump Water Drop',
'Dark Witch Water Drop',
'Dark Witch Northeast Water Drop',
'Catfish Approach Bottom Ledge Drop',
'Catfish Approach Water Drop',
'Catfish Approach Ledge Drop',
'Shield Shop Fence (Outer) Ledge Drop',
'Shield Shop Fence (Inner) Ledge Drop',
'Shield Shop Fence Drop (Outer)',
'Shield Shop Fence Drop (Inner)',
'Pyramid Exit Ledge Drop',
'Broken Bridge Water Drop',
'Broken Bridge Northeast Water Drop',
'Broken Bridge West Water Drop',
'Dark Dunes Ledge Drop',
'Hammer Bridge North Ledge Drop',
'Dark Tree Line Ledge Drop',
'Palace of Darkness Ledge Drop',
'Dark Dunes Cliff Ledge Drop',
'Hammer Bridge North Cliff Ledge Drop',
'Dark Tree Line Cliff Ledge Drop',
'Palace of Darkness Cliff Ledge Drop',
'Dig Game To Ledge Drop',
'Dig Game Ledge Drop',
'Frog Ledge Drop',
@@ -1535,8 +1535,8 @@ OWExitTypes = {
'Dark Bonk Rocks Cliff Ledge Drop',
'Bomb Shop Cliff Ledge Drop',
'Hammer Bridge South Cliff Ledge Drop',
'Ice Lake Moat Bomb Jump',
'Ice Lake Area Cliff Ledge Drop',
'Ice Lake Iceberg Bomb Jump',
'Ice Lake Northwest Cliff Ledge Drop',
'Ice Palace Island FAWT Ledge Drop',
'Hammer Bridge EC Cliff Water Drop',
'Dark Tree Line WC Cliff Water Drop',
@@ -1544,7 +1544,7 @@ OWExitTypes = {
'Dark C Whirlpool Cliff Ledge Drop',
'Dark C Whirlpool Portal Cliff Ledge Drop',
'Hype Cliff Ledge Drop',
'Misery Mire Teleporter Ledge Drop',
'Mire Teleporter Ledge Drop',
'Mire Cliff Ledge Drop',
'Dark Checkerboard Cliff Ledge Drop',
'Archery Game Cliff Ledge Drop',
@@ -1565,30 +1565,30 @@ OWExitTypes = {
'DM Hammer Bridge (West)',
'DM Hammer Bridge (East)',
'Floating Island Bridge (East)',
'Fairy Ascension Rocks (North)',
'Fairy Ascension Rocks (Inner)',
'DM Broken Bridge (West)',
'DM Broken Bridge (East)',
'Spiral Mimic Bridge (West)',
'Spiral Mimic Bridge (East)',
'Spiral Ledge Approach',
'Mimic Ledge Approach',
'Fairy Ascension Rocks (South)',
'Fairy Ascension Rocks (Outer)',
'Floating Island Bridge (West)',
'TR Pegs Ledge Entry',
'TR Pegs Ledge Leave',
'Mountain Entry Entrance Rock (West)',
'Mountain Entry Entrance Rock (East)',
'Mountain Pass Rock (Outer)',
'Mountain Pass Rock (Inner)',
'Zora Waterfall Water Entry',
'Zora Waterfall Water Approach',
'Zora Waterfall Approach',
'Zora Waterfall Landing',
'Lost Woods Pass Hammer (North)',
'Lost Woods Pass Hammer (South)',
'Lost Woods Pass Rock (North)',
'Lost Woods Pass Rock (South)',
'Kings Grave Outer Rocks',
'Kings Grave Rocks (Outer)',
'Graveyard Ladder (Bottom)',
'Graveyard Ladder (Top)',
'Kings Grave Inner Rocks',
'Kings Grave Rocks (Inner)',
'River Bend Water Drop',
'River Bend West Pier',
'River Bend East Water Drop',
@@ -1602,33 +1602,33 @@ OWExitTypes = {
'Kakariko Southwest Bush (South)',
'Kakariko Yard Bush (North)',
'Hyrule Castle Main Gate (South)',
'Hyrule Castle Inner East Rock',
'Hyrule Castle East Rock (Inner)',
'Hyrule Castle Southwest Bush (North)',
'Hyrule Castle Southwest Bush (South)',
'Hyrule Castle Courtyard Bush (South)',
'Hyrule Castle Main Gate (North)',
'Hyrule Castle Courtyard Bush (North)',
'Hyrule Castle Outer East Rock',
'Hyrule Castle East Rock (Outer)',
'Wooden Bridge Bush (South)',
'Wooden Bridge Bush (North)',
'Bat Cave Ledge Peg',
'Bat Cave Ledge Peg (East)',
'Blacksmith Ledge Peg (West)',
'Blacksmith Ledge Peg (East)',
'Maze Race Game',
'Stone Bridge Northbound',
'Stone Bridge Southbound',
'Desert Palace Statue Move',
'Stone Bridge (Northbound)',
'Stone Bridge (Southbound)',
'Desert Statue Move',
'Checkerboard Ledge Approach',
'Desert Ledge Outer Rocks',
'Desert Ledge Inner Rocks',
'Desert Ledge Rocks (Outer)',
'Desert Ledge Rocks (Inner)',
'Checkerboard Ledge Leave',
'Flute Boy Bush (South)',
'Cave 45 Inverted Approach',
'Cave 45 Approach',
'Flute Boy Bush (North)',
'Cave 45 Inverted Leave',
'Cave 45 Leave',
'C Whirlpool Rock (Bottom)',
'C Whirlpool Rock (Top)',
'C Whirlpool Pegs (Right)',
'C Whirlpool Pegs (Left)',
'C Whirlpool Pegs (Outer)',
'C Whirlpool Pegs (Inner)',
'C Whirlpool Water Entry',
'C Whirlpool Landing',
'Statues Water Entry',
@@ -1649,14 +1649,15 @@ OWExitTypes = {
'Middle Aged Man',
'Octoballoon Water Drop',
'Octoballoon Pier',
'Skull Woods Bush Rock (East)',
'Skull Woods Bush Rock (West)',
'Skull Woods Rock (East)',
'Skull Woods Rock (West)',
'Skull Woods Forgotten Bush (West)',
'Skull Woods Forgotten Bush (East)',
'GT Entry Approach',
'GT Entry Leave',
'GT Approach',
'GT Leave',
'East Dark Death Mountain Bushes',
'Bumper Cave Entrance Rock',
'Bumper Cave Rock (Outer)',
'Bumper Cave Rock (Inner)',
'Skull Woods Pass Bush Row (West)',
'Skull Woods Pass Bush Row (East)',
'Skull Woods Pass Bush (North)',
@@ -1671,8 +1672,8 @@ OWExitTypes = {
'Dark Witch Rock (North)',
'Catfish Approach Rocks (West)',
'Catfish Approach Rocks (East)',
'Village of Outcasts Pegs',
'Grassy Lawn Pegs',
'Bush Yard Pegs (Outer)',
'Bush Yard Pegs (Inner)',
'Pyramid Crack',
'Broken Bridge Hammer Rock (South)',
'Broken Bridge Hammer Rock (North)',
@@ -1690,8 +1691,8 @@ OWExitTypes = {
'Stumpy Approach Bush (North)',
'Dark C Whirlpool Rock (Bottom)',
'Dark C Whirlpool Rock (Top)',
'Dark C Whirlpool Pegs (Right)',
'Dark C Whirlpool Pegs (Left)',
'Dark C Whirlpool Pegs (Outer)',
'Dark C Whirlpool Pegs (Inner)',
'Dark C Whirlpool Water Entry',
'Dark C Whirlpool Landing',
'Hype Cave Water Entry',
@@ -1699,7 +1700,7 @@ OWExitTypes = {
'Ice Lake Northeast Water Drop',
'Ice Lake Northeast Pier',
'Ice Lake Northeast Pier Hop',
'Ice Lake Moat Water Entry',
'Ice Lake Iceberg Water Entry',
'Bomber Corner Water Drop',
'Bomber Corner Pier'
],
@@ -1714,14 +1715,14 @@ OWExitTypes = {
'South Hyrule Teleporter',
'Lake Hylia Teleporter',
'Dark Death Mountain Teleporter (West)',
'Dark Death Mountain Teleporter (East)',
'East Dark Death Mountain Teleporter',
'Turtle Rock Teleporter',
'West Dark World Teleporter',
'Post Aga Inverted Teleporter',
'Post Aga Teleporter',
'East Dark World Teleporter',
'Misery Mire Teleporter',
'Mire Teleporter',
'South Dark World Teleporter',
'Ice Palace Teleporter'
'Ice Lake Teleporter'
],
'Whirlpool': ['Zora Whirlpool',
'Kakariko Pond Whirlpool',