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

Aga Tower shouldn't choose inverted links house if not shuffled

Browse Source
This commit is contained in:
aerinon
2021-07-23 08:39:31 -07:00
parent 8c1e746556
commit 46bfcb4dde
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
EntranceShuffle.py
View File

@@ -1446,7 +1446,7 @@ def link_inverted_entrances(world, player):
# shuffle aga door first. if it's on hc ledge, then one other hc ledge door has to be must_exit # shuffle aga door first. if it's on hc ledge, then one other hc ledge door has to be must_exit
all_entrances_aga = lw_entrances + dw_entrances all_entrances_aga = lw_entrances + dw_entrances
aga_doors = [i for i in all_entrances_aga] aga_doors = [i for i in all_entrances_aga if world.shufflelinks[player] or i != 'Inverted Links House']
random.shuffle(aga_doors) random.shuffle(aga_doors)
aga_door = aga_doors.pop() aga_door = aga_doors.pop()
@@ -1589,7 +1589,8 @@ def link_inverted_entrances(world, player):
hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower'] hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)', 'Inverted Ganons Tower']
# shuffle aga door. if it's on hc ledge, then one other hc ledge door has to be must_exit # shuffle aga door. if it's on hc ledge, then one other hc ledge door has to be must_exit
aga_door = random.choice(entrances) aga_choices = [x for x in entrances if world.shufflelinks[player] or x != 'Inverted Links House']
aga_door = random.choice(aga_choices)
if aga_door in hc_ledge_entrances: if aga_door in hc_ledge_entrances:
hc_ledge_entrances.remove(aga_door) hc_ledge_entrances.remove(aga_door)