monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dedupe

This commit is contained in:
Kevin Cathcart 2018-02-06 19:13:10 -05:00
parent e090692c15
commit 165feee1cd
2 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
EntranceShuffle.py
View File

@ -1379,15 +1379,15 @@ Bomb_Shop_Single_Cave_Doors = ['Waterfall of Wishing',
Single_Cave_Doors = ['Pyramid Fairy'] Single_Cave_Doors = ['Pyramid Fairy']
Single_Cave_Targets = ['Blinds Hideout', Single_Cave_Targets = ['Blinds Hideout',
'Bonk Fairy', 'Bonk Fairy (Light)',
'Healer Fairy', 'Lake Hylia Healer Fairy',
'Healer Fairy', 'Swamp Healer Fairy',
'Healer Fairy', 'Desert Healer Fairy',
'Kings Grave', 'Kings Grave',
'Chicken House', 'Chicken House',
'Aginahs Cave', 'Aginahs Cave',
'Sahasrahlas Hut', 'Sahasrahlas Hut',
'Cave Shop', 'Cave Shop (Lake Hylia)',
'Sick Kids House', 'Sick Kids House',
'Lost Woods Gamble', 'Lost Woods Gamble',
'Fortune Teller (Light)', 'Fortune Teller (Light)',
@ -1415,12 +1415,12 @@ Single_Cave_Targets = ['Blinds Hideout',
'Pyramid Fairy', 'Pyramid Fairy',
'East Dark World Hint', 'East Dark World Hint',
'Palace of Darkness Hint', 'Palace of Darkness Hint',
'Healer Fairy', 'Dark Lake Hylia Healer Fairy',
'Healer Fairy', 'Dark Lake Hylia Ledge Healer Fairy',
'Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave',
'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint',
'Hype Cave', 'Hype Cave',
'Bonk Fairy', 'Bonk Fairy (Dark)',
'Brewery', 'Brewery',
'C-Shaped House', 'C-Shaped House',
'Chest Game', 'Chest Game',
@ -1428,20 +1428,20 @@ Single_Cave_Targets = ['Blinds Hideout',
'Red Shield Shop', 'Red Shield Shop',
'Dark Sanctuary Hint', 'Dark Sanctuary Hint',
'Fortune Teller (Dark)', 'Fortune Teller (Dark)',
'Dark World Shop', 'Village of Outcasts Shop',
'Dark World Shop', 'Dark Lake Hylia Shop',
'Dark World Shop', 'Dark World Lumberjack Shop',
'Archery Game', 'Archery Game',
'Mire Shed', 'Mire Shed',
'Dark Desert Hint', 'Dark Desert Hint',
'Healer Fairy', 'Dark Desert Healer Fairy',
'Spike Cave', 'Spike Cave',
'Cave Shop', 'Cave Shop (Dark Death Mountain)',
'Healer Fairy', 'Dark Death Mountain Healer Fairy',
'Mimic Cave', 'Mimic Cave',
'Dark World Shop', 'Dark World Potion Shop',
'Lumberjack House', 'Lumberjack House',
'Fortune Teller (Light)', 'Lake Hylia Fortune Teller',
'Kakariko Gamble Game', 'Kakariko Gamble Game',
'Dam'] 'Dam']
@ -1623,17 +1623,17 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
("Hyrule Castle Secret Entrance Drop", "Hyrule Castle Secret Entrance"), ("Hyrule Castle Secret Entrance Drop", "Hyrule Castle Secret Entrance"),
("Hyrule Castle Secret Entrance Stairs", "Hyrule Castle Secret Entrance"), ("Hyrule Castle Secret Entrance Stairs", "Hyrule Castle Secret Entrance"),
("Hyrule Castle Secret Entrance Exit", "Light World"), ("Hyrule Castle Secret Entrance Exit", "Light World"),
('Bonk Fairy (Light)', 'Bonk Fairy'), ('Bonk Fairy (Light)', 'Bonk Fairy (Light)'),
('Lake Hylia Fairy', 'Healer Fairy'), ('Lake Hylia Fairy', 'Lake Hylia Healer Fairy'),
('Lake Hylia Fortune Teller', 'Fortune Teller (Light)'), ('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
('Swamp Fairy', 'Healer Fairy'), ('Swamp Fairy', 'Swamp Healer Fairy'),
('Desert Fairy', 'Healer Fairy'), ('Desert Fairy', 'Desert Healer Fairy'),
('Kings Grave', 'Kings Grave'), ('Kings Grave', 'Kings Grave'),
('Tavern North', 'Tavern'), ('Tavern North', 'Tavern'),
('Chicken House', 'Chicken House'), ('Chicken House', 'Chicken House'),
('Aginahs Cave', 'Aginahs Cave'), ('Aginahs Cave', 'Aginahs Cave'),
('Sahasrahlas Hut', 'Sahasrahlas Hut'), ('Sahasrahlas Hut', 'Sahasrahlas Hut'),
('Cave Shop (Lake Hylia)', 'Cave Shop'), ('Cave Shop (Lake Hylia)', 'Cave Shop (Lake Hylia)'),
('Capacity Upgrade', 'Capacity Upgrade'), ('Capacity Upgrade', 'Capacity Upgrade'),
('Kakariko Well Drop', 'Kakariko Well (top)'), ('Kakariko Well Drop', 'Kakariko Well (top)'),
('Kakariko Well Cave', 'Kakariko Well (bottom)'), ('Kakariko Well Cave', 'Kakariko Well (bottom)'),
@ -1724,13 +1724,13 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('East Dark World Hint', 'East Dark World Hint'), ('East Dark World Hint', 'East Dark World Hint'),
('Palace of Darkness Hint', 'Palace of Darkness Hint'), ('Palace of Darkness Hint', 'Palace of Darkness Hint'),
('Big Bomb Shop', 'Big Bomb Shop'), ('Big Bomb Shop', 'Big Bomb Shop'),
('Dark Lake Hylia Shop', 'Dark World Shop'), ('Dark Lake Hylia Shop', 'Dark Lake Hylia Shop'),
('Dark Lake Hylia Fairy', 'Healer Fairy'), ('Dark Lake Hylia Fairy', 'Dark Lake Hylia Healer Fairy'),
('Dark Lake Hylia Ledge Fairy', 'Healer Fairy'), ('Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Healer Fairy'),
('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'), ('Dark Lake Hylia Ledge Spike Cave', 'Dark Lake Hylia Ledge Spike Cave'),
('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'), ('Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Hint'),
('Hype Cave', 'Hype Cave'), ('Hype Cave', 'Hype Cave'),
('Bonk Fairy (Dark)', 'Bonk Fairy'), ('Bonk Fairy (Dark)', 'Bonk Fairy (Dark)'),
('Brewery', 'Brewery'), ('Brewery', 'Brewery'),
('C-Shaped House', 'C-Shaped House'), ('C-Shaped House', 'C-Shaped House'),
('Chest Game', 'Chest Game'), ('Chest Game', 'Chest Game'),
@ -1740,20 +1740,20 @@ default_connections = [('Waterfall of Wishing', 'Waterfall of Wishing'),
('Red Shield Shop', 'Red Shield Shop'), ('Red Shield Shop', 'Red Shield Shop'),
('Dark Sanctuary Hint', 'Dark Sanctuary Hint'), ('Dark Sanctuary Hint', 'Dark Sanctuary Hint'),
('Fortune Teller (Dark)', 'Fortune Teller (Dark)'), ('Fortune Teller (Dark)', 'Fortune Teller (Dark)'),
('Dark World Shop', 'Dark World Shop'), ('Dark World Shop', 'Village of Outcasts Shop'),
('Dark World Lumberjack Shop', 'Dark World Shop'), ('Dark World Lumberjack Shop', 'Dark World Lumberjack Shop'),
('Dark World Potion Shop', 'Dark World Shop'), ('Dark World Potion Shop', 'Dark World Potion Shop'),
('Archery Game', 'Archery Game'), ('Archery Game', 'Archery Game'),
('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'), ('Bumper Cave Exit (Top)', 'Bumper Cave Ledge'),
('Bumper Cave Exit (Bottom)', 'West Dark World'), ('Bumper Cave Exit (Bottom)', 'West Dark World'),
('Mire Shed', 'Mire Shed'), ('Mire Shed', 'Mire Shed'),
('Dark Desert Hint', 'Dark Desert Hint'), ('Dark Desert Hint', 'Dark Desert Hint'),
('Dark Desert Fairy', 'Healer Fairy'), ('Dark Desert Fairy', 'Dark Desert Healer Fairy'),
('Spike Cave', 'Spike Cave'), ('Spike Cave', 'Spike Cave'),
('Hookshot Cave', 'Hookshot Cave'), ('Hookshot Cave', 'Hookshot Cave'),
('Superbunny Cave (Top)', 'Superbunny Cave'), ('Superbunny Cave (Top)', 'Superbunny Cave'),
('Cave Shop (Dark Death Mountain)', 'Cave Shop'), ('Cave Shop (Dark Death Mountain)', 'Cave Shop (Dark Death Mountain)'),
('Dark Death Mountain Fairy', 'Healer Fairy'), ('Dark Death Mountain Fairy', 'Dark Death Mountain Healer Fairy'),
('Superbunny Cave (Bottom)', 'Superbunny Cave'), ('Superbunny Cave (Bottom)', 'Superbunny Cave'),
('Superbunny Cave Exit (Top)', 'Dark Death Mountain (Top)'), ('Superbunny Cave Exit (Top)', 'Dark Death Mountain (Top)'),
('Superbunny Cave Exit (Bottom)', 'Dark Death Mountain (East Bottom)'), ('Superbunny Cave Exit (Bottom)', 'Dark Death Mountain (East Bottom)'),
@ -2041,15 +2041,24 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x0A),
'Dam': 0x4E, 'Dam': 0x4E,
'Blinds Hideout': 0x61, 'Blinds Hideout': 0x61,
'Lumberjack House': 0x6B, 'Lumberjack House': 0x6B,
'Bonk Fairy': 0x71, 'Bonk Fairy (Light)': 0x71,
'Healer Fairy': 0x5E, 'Bonk Fairy (Dark)': 0x71,
'Lake Hylia Healer Fairy': 0x5E,
'Swamp Healer Fairy': 0x5E,
'Desert Healer Fairy': 0x5E,
'Dark Lake Hylia Healer Fairy': 0x5E,
'Dark Lake Hylia Ledge Healer Fairy': 0x5E,
'Dark Desert Healer Fairy': 0x5E,
'Dark Death Mountain Healer Fairy': 0x5E,
'Fortune Teller (Light)': 0x65, 'Fortune Teller (Light)': 0x65,
'Lake Hylia Fortune Teller': 0x65,
'Kings Grave': 0x5B, 'Kings Grave': 0x5B,
'Tavern': 0x43, 'Tavern': 0x43,
'Chicken House': 0x4B, 'Chicken House': 0x4B,
'Aginahs Cave': 0x4D, 'Aginahs Cave': 0x4D,
'Sahasrahlas Hut': 0x45, 'Sahasrahlas Hut': 0x45,
'Cave Shop': 0x58, 'Cave Shop (Lake Hylia)': 0x58,
'Cave Shop (Dark Death Mountain)': 0x58,
'Capacity Upgrade': 0x5D, 'Capacity Upgrade': 0x5D,
'Blacksmiths Hut': 0x64, 'Blacksmiths Hut': 0x64,
'Sick Kids House': 0x40, 'Sick Kids House': 0x40,
@ -2078,7 +2087,10 @@ exit_ids = {'Desert Palace Exit (South)': (0x09, 0x0A),
'East Dark World Hint': 0x69, 'East Dark World Hint': 0x69,
'Palace of Darkness Hint': 0x68, 'Palace of Darkness Hint': 0x68,
'Big Bomb Shop': 0x53, 'Big Bomb Shop': 0x53,
'Dark World Shop': 0x60, 'Village of Outcasts Shop': 0x60,
'Dark Lake Hylia Shop': 0x60,
'Dark World Lumberjack Shop': 0x60,
'Dark World Potion Shop': 0x60,
'Dark Lake Hylia Ledge Spike Cave': 0x70, 'Dark Lake Hylia Ledge Spike Cave': 0x70,
'Dark Lake Hylia Ledge Hint': 0x6A, 'Dark Lake Hylia Ledge Hint': 0x6A,
'Hype Cave': 0x3D, 'Hype Cave': 0x3D,

20
Regions.py
View File

@ -38,9 +38,17 @@ def create_regions(world):
create_cave_region('Light World Bomb Hut'), create_cave_region('Light World Bomb Hut'),
create_cave_region('Kakariko Shop'), create_cave_region('Kakariko Shop'),
create_cave_region('Fortune Teller (Light)'), create_cave_region('Fortune Teller (Light)'),
create_cave_region('Lake Hylia Fortune Teller'),
create_cave_region('Lumberjack House'), create_cave_region('Lumberjack House'),
create_cave_region('Bonk Fairy'), # near links house both worlds create_cave_region('Bonk Fairy (Light)'),
create_cave_region('Healer Fairy'), # 8 entrances? create_cave_region('Bonk Fairy (Dark)'),
create_cave_region('Lake Hylia Healer Fairy'),
create_cave_region('Swamp Healer Fairy'),
create_cave_region('Desert Healer Fairy'),
create_cave_region('Dark Lake Hylia Healer Fairy'),
create_cave_region('Dark Lake Hylia Ledge Healer Fairy'),
create_cave_region('Dark Desert Healer Fairy'),
create_cave_region('Dark Death Mountain Healer Fairy'),
create_cave_region('Chicken House', ['Chicken House']), create_cave_region('Chicken House', ['Chicken House']),
create_cave_region('Aginahs Cave', ['Aginah\'s Cave']), create_cave_region('Aginahs Cave', ['Aginah\'s Cave']),
create_cave_region('Sahasrahlas Hut', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']), create_cave_region('Sahasrahlas Hut', ['Sahasrahla\'s Hut - Left', 'Sahasrahla\'s Hut - Middle', 'Sahasrahla\'s Hut - Right', 'Sahasrahla']),
@ -68,7 +76,8 @@ def create_regions(world):
create_cave_region('Ice Rod Cave', ['Ice Rod Cave']), create_cave_region('Ice Rod Cave', ['Ice Rod Cave']),
create_cave_region('Good Bee Cave'), create_cave_region('Good Bee Cave'),
create_cave_region('20 Rupee Cave'), create_cave_region('20 Rupee Cave'),
create_cave_region('Cave Shop'), # two connectors in vanilla create_cave_region('Cave Shop (Lake Hylia)'),
create_cave_region('Cave Shop (Dark Death Mountain)'),
create_cave_region('Bonk Rock Cave', ['Bonk Rock Cave']), create_cave_region('Bonk Rock Cave', ['Bonk Rock Cave']),
create_cave_region('Library', ['Library']), create_cave_region('Library', ['Library']),
create_cave_region('Kakariko Gamble Game'), create_cave_region('Kakariko Gamble Game'),
@ -157,7 +166,10 @@ def create_regions(world):
'Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)', 'Dark World Shop', 'Dark World Lumberjack Shop']), 'Bat Cave Drop Ledge Mirror Spot', 'Dark World Hammer Peg Cave', 'Red Shield Shop', 'Dark Sanctuary Hint', 'Fortune Teller (Dark)', 'Dark World Shop', 'Dark World Lumberjack Shop']),
create_dw_region('Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']), create_dw_region('Bumper Cave Entrance', None, ['Bumper Cave (Bottom)', 'Bumper Cave Entrance Mirror Spot', 'Bumper Cave Entrance Drop']),
create_cave_region('Fortune Teller (Dark)'), create_cave_region('Fortune Teller (Dark)'),
create_cave_region('Dark World Shop'), create_cave_region('Village of Outcasts Shop'),
create_cave_region('Dark Lake Hylia Shop'),
create_cave_region('Dark World Lumberjack Shop'),
create_cave_region('Dark World Potion Shop'),
create_cave_region('Dark World Hammer Peg Cave', ['Peg Cave']), create_cave_region('Dark World Hammer Peg Cave', ['Peg Cave']),
create_cave_region('Pyramid Fairy', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']), create_cave_region('Pyramid Fairy', ['Pyramid Fairy - Left', 'Pyramid Fairy - Right']),
create_cave_region('Brewery', ['Brewery']), create_cave_region('Brewery', ['Brewery']),