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

Merge branch 'DoorDevVolatile' into Customizer

Browse Source 
# Conflicts:
#	DoorShuffle.py
#	ItemList.py
#	Main.py
This commit is contained in:
aerinon
2022-05-24 10:09:36 -06:00
parent 7dd5cc0e36 62ec084a98
commit 8fd010985f
17 changed files with 525 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DoorShuffle.py
View File

@@ -1967,8 +1967,10 @@ ohko_forbidden = {
def filter_dashable_candidates(candidates, world):
forbidden_set = dashable_forbidden if world.timer in ['ohko', 'timed-ohko'] else ohko_forbidden
return [x for x in candidates if x not in forbidden_set and x.dest not in forbidden_set]
forbidden_set = dashable_forbidden
if world.timer in ['ohko', 'timed-ohko']:
forbidden_set = ohko_forbidden.union(dashable_forbidden)
return [x for x in candidates if x.name not in forbidden_set and x.dest.name not in forbidden_set]
def shuffle_bombable_dashable(bd_candidates, world, player):