alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Moving Tavern North to mandatory connections

Browse Source
This commit is contained in:
codemann8
2021-09-28 15:09:29 -05:00
parent ecacba55a4
commit a11c23bde9
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
EntranceShuffle.py
View File

@@ -257,9 +257,6 @@ def link_entrances(world, player):
connect_entrance(world, bomb_shop, 'Big Bomb Shop', player)
single_doors.extend(bomb_shop_doors)
# tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player)
# place remaining doors
connect_doors(world, single_doors, door_targets, player)
elif world.shuffle[player] == 'restricted':
@@ -303,9 +300,6 @@ def link_entrances(world, player):
else:
dw_entrances.remove(links_house)
# tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player)
# in restricted, the only mandatory exits are in dark world (lw in inverted)
if not invFlag:
connect_mandatory_exits(world, dw_entrances, caves, dw_must_exits, player)
@@ -406,9 +400,6 @@ def link_entrances(world, player):
lw_entrances.append('Desert Palace Entrance (North)')
old_man_house = list(Old_Man_House)
# tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player)
if world.mode[player] == 'standard':
# must connect front of hyrule castle to do escape
connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player)
@@ -664,9 +655,6 @@ def link_entrances(world, player):
connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player)
world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region)
# tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player)
#place must-exit caves
connect_mandatory_exits(world, entrances, caves, must_exits, player)
@@ -773,9 +761,6 @@ def link_entrances(world, player):
hole_targets = ['Kakariko Well (top)', 'Bat Cave (right)', 'North Fairy Cave', 'Lost Woods Hideout (top)', 'Lumberjack Tree (top)', 'Sewer Drop', 'Skull Back Drop',
'Skull Left Drop', 'Skull Pinball', 'Skull Pot Circle']
# tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player)
if world.mode[player] == 'standard':
# cannot move uncle cave
connect_entrance(world, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player)
@@ -2107,7 +2092,10 @@ mandatory_connections = [('Links House S&Q', 'Links House'),
('Hookshot Cave Middle to Front', 'Hookshot Cave (Front)'),
('Hookshot Cave Middle to Back', 'Hookshot Cave (Back)'),
('Hookshot Cave Back to Middle', 'Hookshot Cave (Middle)'),
('Ganon Drop', 'Bottom of Pyramid')
('Ganon Drop', 'Bottom of Pyramid'),
# Unshuffled Entrances
('Tavern North', 'Tavern')
]
open_mandatory_connections = [('Sanctuary S&Q', 'Sanctuary'),
@@ -2124,7 +2112,6 @@ default_connections = [('Lumberjack House', 'Lumberjack House'),
('Lake Hylia Fortune Teller', 'Lake Hylia Fortune Teller'),
('Light Hype Fairy', 'Swamp Healer Fairy'),
('Desert Fairy', 'Desert Healer Fairy'),
('Tavern North', 'Tavern'),
('Lost Woods Gamble', 'Lost Woods Gamble'),
('Fortune Teller (Light)', 'Fortune Teller (Light)'),
('Snitch Lady (East)', 'Snitch Lady (East)'),