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

No longer shuffle Sanctuary/Sewer Drop into Pyramid slot, Sanctuary should be in Light World.

This commit is contained in:
LLCoolDave 2017-08-01 17:24:20 +02:00
parent 0e1dc9c4e1
commit cbf7f36a73
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
EntranceShuffle.py
View File

@ -716,14 +716,12 @@ def scramble_holes(world):
('Bat Cave Exit', 'Bat Cave (right)'), ('Bat Cave Exit', 'Bat Cave (right)'),
('North Fairy Cave Exit', 'North Fairy Cave'), ('North Fairy Cave Exit', 'North Fairy Cave'),
('Thieves Forest Hideout Exit', 'Thieves Forest Hideout (top)'), ('Thieves Forest Hideout Exit', 'Thieves Forest Hideout (top)'),
('Lumberjack Tree Exit', 'Lumberjack Tree (top)'), ('Lumberjack Tree Exit', 'Lumberjack Tree (top)')]
('Sanctuary Exit', 'Sewer Drop')]
if not world.shuffle_ganon: if not world.shuffle_ganon:
connect_two_way(world, 'Pyramid Entrance', 'Pyramid Exit') connect_two_way(world, 'Pyramid Entrance', 'Pyramid Exit')
connect_entrance(world, 'Pyramid Hole', 'Pyramid') connect_entrance(world, 'Pyramid Hole', 'Pyramid')
else: else:
hole_entrances.append(('Pyramid Entrance', 'Pyramid Hole'))
hole_targets.append(('Pyramid Exit', 'Pyramid')) hole_targets.append(('Pyramid Exit', 'Pyramid'))
if world.mode == 'standard': if world.mode == 'standard':
@ -734,6 +732,14 @@ def scramble_holes(world):
hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop')) hole_entrances.append(('Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Drop'))
hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance')) hole_targets.append(('Hyrule Castle Secret Entrance Exit', 'Hyrule Castle Secret Entrance'))
# do not shuffle sanctuary into pyramid hole
if world.shuffle_ganon:
random.shuffle(hole_targets)
exit, target = hole_targets.pop()
connect_two_way(world, 'Pyramid Entrance', exit)
connect_entrance(world, 'Pyramid Hole', target)
hole_targets.append(('Sanctuary Exit', 'Sewer Drop'))
random.shuffle(hole_targets) random.shuffle(hole_targets)
for entrance, drop in hole_entrances: for entrance, drop in hole_entrances:
exit, target = hole_targets.pop() exit, target = hole_targets.pop()