mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
Renamed some locations for clarity. Updated location hints. Still uncertain what to do with silver arrows hint.
This commit is contained in:
LLCoolDave
@@ -86,8 +86,8 @@ def link_entrances(world):
|
||||
|
||||
# at this point only Light World death mountain entrances remain
|
||||
# place old man, has limited options
|
||||
remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', 'Death Mountain Climb (Bottom)', 'Death Mountain Climb (Middle)', 'Death Mountain Climb (Top)',
|
||||
'Death Mountain Fairy Drop Cave (Bottom)', 'Death Mountain Fairy Drop Cave (Top)', 'Spiral Cave', 'Spiral Cave (Bottom)']
|
||||
remaining_entrances = ['Old Man Cave (West)', 'Old Man House (Bottom)', 'Death Mountain Return Cave (West)', '7 Chest Cave (Bottom)', '7 Chest Cave (Middle)', '7 Chest Cave (Top)',
|
||||
'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave', 'Spiral Cave (Bottom)']
|
||||
random.shuffle(old_man_entrances)
|
||||
old_man_exit = old_man_entrances.pop()
|
||||
remaining_entrances.extend(old_man_entrances)
|
||||
@@ -968,7 +968,7 @@ Two_Door_Caves_Directional = [('Bumper Cave (Bottom)', 'Bumper Cave (Top)'),
|
||||
|
||||
Two_Door_Caves = [('Elder House (East)', 'Elder House (West)'),
|
||||
('Two Brothers House (East)', 'Two Brothers House (West)'),
|
||||
('Dark Death Mountain Climb (Bottom)', 'Dark Death Mountain Climb (Top)')]
|
||||
('Dark Death Mountain Ascend (Bottom)', 'Dark Death Mountain Ascend (Top)')]
|
||||
|
||||
Old_Man_Entrances = ['Old Man Cave (East)',
|
||||
'Old Man House (Top)',
|
||||
@@ -980,14 +980,14 @@ Old_Man_Entrances = ['Old Man Cave (East)',
|
||||
Cave_Exits = [('Elder House Exit (East)', 'Elder House Exit (West)'),
|
||||
('Two Brothers House Exit (East)', 'Two Brothers House Exit (West)'),
|
||||
('Death Mountain Return Cave Exit (West)', 'Death Mountain Return Cave Exit (East)'),
|
||||
('Death Mountain Fairy Drop Cave Exit (Bottom)', 'Death Mountain Fairy Drop Cave Exit (Top)'),
|
||||
('Fairy Ascension Cave Exit (Bottom)', 'Fairy Ascension Cave Exit (Top)'),
|
||||
('Spiral Cave Exit (Top)', 'Spiral Cave Exit'),
|
||||
('Bumper Cave Exit (Top)', 'Bumper Cave Exit (Bottom)'),
|
||||
('Dark Death Mountain Climb Exit (Bottom)', 'Dark Death Mountain Climb Exit (Top)'),
|
||||
('Dark Death Mountain Ascend Exit (Bottom)', 'Dark Death Mountain Ascend Exit (Top)'),
|
||||
('Hookshot Cave Exit (South)', 'Hookshot Cave Exit (North)')]
|
||||
|
||||
Cave_Three_Exits = [('Spectacle Rock Cave Exit (Peak)', 'Spectacle Rock Cave Exit (Top)', 'Spectacle Rock Cave Exit'),
|
||||
('Death Mountain Climb Exit (Top)', 'Death Mountain Climb Exit (Middle)', 'Death Mountain Climb Exit (Bottom)')]
|
||||
('7 Chest Cave Exit (Top)', '7 Chest Cave Exit (Middle)', '7 Chest Cave Exit (Bottom)')]
|
||||
|
||||
LW_Entrances = ['Elder House (East)',
|
||||
'Elder House (West)',
|
||||
@@ -996,17 +996,17 @@ LW_Entrances = ['Elder House (East)',
|
||||
'Old Man Cave (West)',
|
||||
'Old Man House (Bottom)',
|
||||
'Death Mountain Return Cave (West)',
|
||||
'Death Mountain Climb (Bottom)',
|
||||
'Death Mountain Climb (Middle)',
|
||||
'Death Mountain Climb (Top)',
|
||||
'Death Mountain Fairy Drop Cave (Bottom)',
|
||||
'Death Mountain Fairy Drop Cave (Top)',
|
||||
'7 Chest Cave (Bottom)',
|
||||
'7 Chest Cave (Middle)',
|
||||
'7 Chest Cave (Top)',
|
||||
'Fairy Ascension Cave (Bottom)',
|
||||
'Fairy Ascension Cave (Top)',
|
||||
'Spiral Cave',
|
||||
'Spiral Cave (Bottom)']
|
||||
|
||||
DW_Entrances = ['Bumper Cave (Bottom)',
|
||||
'Dark Death Mountain Climb (Top)',
|
||||
'Dark Death Mountain Climb (Bottom)',
|
||||
'Dark Death Mountain Ascend (Top)',
|
||||
'Dark Death Mountain Ascend (Bottom)',
|
||||
'Hookshot Cave']
|
||||
|
||||
Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
|
||||
@@ -1031,8 +1031,8 @@ Blacksmith_Single_Cave_Doors = ['Thiefs Hut',
|
||||
'Kakariko Shop',
|
||||
'Cave South of Haunted Grove',
|
||||
'Graveyard Cave',
|
||||
'Desert Cave',
|
||||
'Lake Hylia Cave',
|
||||
'Checkerboard Cave',
|
||||
'Mini Moldorm Cave',
|
||||
'Long Fairy Cave',
|
||||
'Good Bee Cave',
|
||||
'20 Rupee Cave',
|
||||
@@ -1101,8 +1101,8 @@ Single_Cave_Targets = ['Thiefs Hut',
|
||||
'Kakariko Shop',
|
||||
'Cave South of Haunted Grove',
|
||||
'Graveyard Cave',
|
||||
'Desert Cave',
|
||||
'Lake Hylia Cave',
|
||||
'Checkerboard Cave',
|
||||
'Mini Moldorm Cave',
|
||||
'Long Fairy Cave',
|
||||
'Good Bee Cave',
|
||||
'20 Rupee Cave',
|
||||
@@ -1218,15 +1218,15 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
|
||||
('South Hyrule Teleporter', 'South Dark World'),
|
||||
('Kakariko Teleporter', 'West Dark World'),
|
||||
('Death Mountain Teleporter', 'Dark Death Mountain (West Bottom)'),
|
||||
('Death Mountain Climb Push Block Reverse', 'Death Mountain Climb Cave Chest Area'),
|
||||
('Death Mountain Climb Push Block', 'Death Mountain Climb Cave Front'),
|
||||
('Death Mountain Climb Bomb Jump', 'Death Mountain Climb Cave'),
|
||||
('Death Mountain Climb Drop', 'Death Mountain Climb Cave Chest Area'),
|
||||
('Death Mountain Fairy Drop Area Rocks', 'Death Mountain Fairy Drop Area'),
|
||||
('Death Mountain Fairy Drop Area Mirror Spot', 'Death Mountain Fairy Drop Area'),
|
||||
('Death Mountain Fairy Drop Area Drop', 'East Death Mountain (Bottom)'),
|
||||
('Death Mountain Fairy Drop Ledge Drop', 'Death Mountain Fairy Drop Area'),
|
||||
('Death Mountain Fairy Drop Ledge', 'Death Mountain Fairy Drop Ledge'),
|
||||
('7 Chest Cave Push Block Reverse', '7 Chest Cave Cave Chest Area'),
|
||||
('7 Chest Cave Push Block', '7 Chest Cave Cave Front'),
|
||||
('7 Chest Cave Bomb Jump', '7 Chest Cave Cave'),
|
||||
('7 Chest Cave Drop', '7 Chest Cave Cave Chest Area'),
|
||||
('Fairy Ascension Rocks', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Mirror Spot', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Drop', 'East Death Mountain (Bottom)'),
|
||||
('Fairy Ascension Ledge Drop', 'Fairy Ascension Plateau'),
|
||||
('Fairy Ascension Ledge', 'Fairy Ascension Ledge'),
|
||||
('Spectacle Rock Mirror Spot', 'Spectacle Rock'),
|
||||
('Dark Death Mountain Drop (East)', 'Dark Death Mountain (East Bottom)'),
|
||||
('Dark Death Mountain Drop (West)', 'Dark Death Mountain (West Bottom)'),
|
||||
@@ -1238,7 +1238,7 @@ mandatory_connections = [('Links House', 'Links House'), # unshuffled. For now
|
||||
('Turtle Rock Drop', 'Dark Death Mountain (Top)'),
|
||||
('Floating Island Drop', 'Dark Death Mountain (Top)'),
|
||||
('East Death Mountain Teleporter', 'Dark Death Mountain (East Bottom)'),
|
||||
('Isolated Ledge Mirror Spot', 'Death Mountain Fairy Drop Ledge'),
|
||||
('Isolated Ledge Mirror Spot', 'Fairy Ascension Ledge'),
|
||||
('Spiral Cave Mirror Spot', 'Spiral Cave Ledge'),
|
||||
|
||||
('Palace of Darkness Pay Kiki', 'Palace of Darkness Kiki Door'),
|
||||
@@ -1353,8 +1353,8 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Lumberjack Tree Exit', 'Light World'),
|
||||
('Cave South of Haunted Grove', 'Cave South of Haunted Grove'),
|
||||
('Graveyard Cave', 'Graveyard Cave'),
|
||||
('Desert Cave', 'Desert Cave'),
|
||||
('Lake Hylia Cave', 'Lake Hylia 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'),
|
||||
@@ -1391,17 +1391,17 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Spectacle Rock Cave Exit', 'Death Mountain'),
|
||||
('Spectacle Rock Cave Exit (Top)', 'Death Mountain'),
|
||||
('Spectacle Rock Cave Exit (Peak)', 'Death Mountain'),
|
||||
('Death Mountain Climb (Bottom)', 'Death Mountain Climb Cave Front'),
|
||||
('Death Mountain Climb (Middle)', 'Death Mountain Climb Cave'),
|
||||
('Death Mountain Climb (Top)', 'Death Mountain Climb Cave'),
|
||||
('Death Mountain Climb Exit (Bottom)', 'East Death Mountain (Bottom)'),
|
||||
('Death Mountain Climb Exit (Middle)', 'East Death Mountain (Bottom)'),
|
||||
('Death Mountain Climb Exit (Top)', 'East Death Mountain (Top)'),
|
||||
('7 Chest Cave (Bottom)', '7 Chest Cave Cave Front'),
|
||||
('7 Chest Cave (Middle)', '7 Chest Cave Cave'),
|
||||
('7 Chest Cave (Top)', '7 Chest Cave Cave'),
|
||||
('7 Chest Cave Exit (Bottom)', 'East Death Mountain (Bottom)'),
|
||||
('7 Chest Cave Exit (Middle)', 'East Death Mountain (Bottom)'),
|
||||
('7 Chest Cave Exit (Top)', 'East Death Mountain (Top)'),
|
||||
('Hookshot Fairy', 'Hookshot Fairy'),
|
||||
('Death Mountain Fairy Drop Cave (Bottom)', 'Death Mountain Fairy Drop Cave'),
|
||||
('Death Mountain Fairy Drop Cave (Top)', 'Death Mountain Fairy Drop Cave'),
|
||||
('Death Mountain Fairy Drop Cave Exit (Bottom)', 'Death Mountain Fairy Drop Area'),
|
||||
('Death Mountain Fairy Drop Cave Exit (Top)', 'Death Mountain Fairy Drop Ledge'),
|
||||
('Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave'),
|
||||
('Fairy Ascension Cave (Top)', 'Fairy Ascension Cave'),
|
||||
('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)'),
|
||||
@@ -1438,12 +1438,12 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
|
||||
('Dark Desert Fairy', 'Healer Fairy'),
|
||||
('Spike Cave', 'Spike Cave'),
|
||||
('Hookshot Cave', 'Hookshot Cave'),
|
||||
('Dark Death Mountain Climb (Top)', 'Dark Death Mountain Climb'),
|
||||
('Dark Death Mountain Ascend (Top)', 'Dark Death Mountain Ascend'),
|
||||
('Cave Shop (Dark Death Mountain)', 'Cave Shop'),
|
||||
('Dark Death Mountain Fairy', 'Healer Fairy'),
|
||||
('Dark Death Mountain Climb (Bottom)', 'Dark Death Mountain Climb'),
|
||||
('Dark Death Mountain Climb Exit (Top)', 'Dark Death Mountain (Top)'),
|
||||
('Dark Death Mountain Climb Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
|
||||
('Dark Death Mountain Ascend (Bottom)', 'Dark Death Mountain Ascend'),
|
||||
('Dark Death Mountain Ascend Exit (Top)', 'Dark Death Mountain (Top)'),
|
||||
('Dark Death Mountain Ascend Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
|
||||
('Hookshot Cave Exit (South)', 'Dark Death Mountain (Top)'),
|
||||
('Hookshot Cave Exit (North)', 'Death Mountain Floating Island'),
|
||||
('Hookshot Cave Back Entrance', 'Hookshot Cave'),
|
||||
@@ -1553,17 +1553,17 @@ door_addresses = {'Desert Palace Entrance (South)': (0xDBB7B, 0x15B02),
|
||||
'Spectacle Rock Cave Peak': (0xDBB95, 0x15B36),
|
||||
'Spectacle Rock Cave': (0xDBB94, 0x15B34),
|
||||
'Spectacle Rock Cave (Bottom)': (0xDBB93, 0x15B32),
|
||||
'Death Mountain Climb (Bottom)': (0xDBB90, 0x15B2C),
|
||||
'Death Mountain Climb (Middle)': (0xDBB91, 0x15B2E),
|
||||
'Death Mountain Climb (Top)': (0xDBB92, 0x15B30),
|
||||
'Death Mountain Fairy Drop Cave (Bottom)': (0xDBB8C, 0x15B24),
|
||||
'Death Mountain Fairy Drop Cave (Top)': (0xDBB8D, 0x15B26),
|
||||
'7 Chest Cave (Bottom)': (0xDBB90, 0x15B2C),
|
||||
'7 Chest Cave (Middle)': (0xDBB91, 0x15B2E),
|
||||
'7 Chest Cave (Top)': (0xDBB92, 0x15B30),
|
||||
'Fairy Ascension Cave (Bottom)': (0xDBB8C, 0x15B24),
|
||||
'Fairy Ascension Cave (Top)': (0xDBB8D, 0x15B26),
|
||||
'Spiral Cave': (0xDBB8F, 0x15B2A),
|
||||
'Spiral Cave (Bottom)': (0xDBB8E, 0x15B28),
|
||||
'Bumper Cave (Bottom)': (0xDBB88, 0x15B1C),
|
||||
'Bumper Cave (Top)': (0xDBB89, 0x15B1E),
|
||||
'Dark Death Mountain Climb (Top)': (0xDBB86, 0x15B18),
|
||||
'Dark Death Mountain Climb (Bottom)': (0xDBB85, 0x15B16),
|
||||
'Dark Death Mountain Ascend (Top)': (0xDBB86, 0x15B18),
|
||||
'Dark Death Mountain Ascend (Bottom)': (0xDBB85, 0x15B16),
|
||||
'Hookshot Cave': (0xDBBAC, 0x15B64),
|
||||
'Hookshot Cave Back Entrance': (0xDBBAD, 0x15B66)}
|
||||
|
||||
@@ -1610,17 +1610,17 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x84),
|
||||
'Spectacle Rock Cave Exit': (0x21, 0xF9),
|
||||
'Spectacle Rock Cave Exit (Top)': (0x22, 0xFA),
|
||||
'Spectacle Rock Cave Exit (Peak)': (0x23, 0xEA),
|
||||
'Death Mountain Climb Exit (Bottom)': (0x1E, 0xFF),
|
||||
'Death Mountain Climb Exit (Middle)': (0x1F, 0xEF),
|
||||
'Death Mountain Climb Exit (Top)': (0x20, 0xDF),
|
||||
'Death Mountain Fairy Drop Cave Exit (Bottom)': (0x1A, 0xFD),
|
||||
'Death Mountain Fairy Drop Cave Exit (Top)': (0x1B, 0xED),
|
||||
'7 Chest Cave Exit (Bottom)': (0x1E, 0xFF),
|
||||
'7 Chest Cave Exit (Middle)': (0x1F, 0xEF),
|
||||
'7 Chest Cave Exit (Top)': (0x20, 0xDF),
|
||||
'Fairy Ascension Cave Exit (Bottom)': (0x1A, 0xFD),
|
||||
'Fairy Ascension Cave Exit (Top)': (0x1B, 0xED),
|
||||
'Spiral Cave Exit': (0x1C, 0xFE),
|
||||
'Spiral Cave Exit (Top)': (0x1D, 0xEE),
|
||||
'Bumper Cave Exit (Top)': (0x17, 0xEB),
|
||||
'Bumper Cave Exit (Bottom)': (0x16, 0xFB),
|
||||
'Dark Death Mountain Climb Exit (Top)': (0x14, 0xE8),
|
||||
'Dark Death Mountain Climb Exit (Bottom)': (0x13, 0xF8),
|
||||
'Dark Death Mountain Ascend Exit (Top)': (0x14, 0xE8),
|
||||
'Dark Death Mountain Ascend Exit (Bottom)': (0x13, 0xF8),
|
||||
'Hookshot Cave Exit (South)': (0x3A, 0x3C),
|
||||
'Hookshot Cave Exit (North)': (0x3B, 0x2C)}
|
||||
|
||||
@@ -1660,8 +1660,8 @@ single_doors = {'Skull Woods First Section Hole (East)': (0xDB84D, 0xDB84E),
|
||||
'Lumberjack Tree Tree': 0xDB85B,
|
||||
'Cave South of Haunted Grove': 0xDBBC3,
|
||||
'Graveyard Cave': 0xDBBC4,
|
||||
'Desert Cave': 0xDBBF0,
|
||||
'Lake Hylia Cave': 0xDBBEF,
|
||||
'Checkerboard Cave': 0xDBBF0,
|
||||
'Mini Moldorm Cave': 0xDBBEF,
|
||||
'Long Fairy Cave': 0xDBBC7,
|
||||
'Good Bee Cave': 0xDBBDD,
|
||||
'20 Rupee Cave': 0xDBBED,
|
||||
@@ -1731,8 +1731,8 @@ cave_codes = {'Waterfall of Wishing': 0x5C,
|
||||
'Kakariko Shop': 0x46,
|
||||
'Cave South of Haunted Grove': 0x51,
|
||||
'Graveyard Cave': 0x52,
|
||||
'Desert Cave': 0x72,
|
||||
'Lake Hylia Cave': 0x6C,
|
||||
'Checkerboard Cave': 0x72,
|
||||
'Mini Moldorm Cave': 0x6C,
|
||||
'Long Fairy Cave': 0x55,
|
||||
'Good Bee Cave': 0x56,
|
||||
'20 Rupee Cave': 0x6F,
|
||||
|
||||
Reference in New Issue
Block a user