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
This commit is contained in:
aerinon
2022-03-29 14:32:24 -06:00
parent 69bae0f338 c560e0d275
commit 730847fa07
7 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DoorShuffle.py
View File

@@ -1887,7 +1887,7 @@ def smooth_door_pairs(world, player):
if type_b == DoorKind.SmallKey:
remove_pair(door, world, player)
else:
if valid_pair:
if valid_pair and not std_forbidden(door, world, player):
bd_candidates[door.entrance.parent_region.dungeon].append(door)
elif type_a in [DoorKind.Bombable, DoorKind.Dashable] or type_b in [DoorKind.Bombable, DoorKind.Dashable]:
if type_a in [DoorKind.Bombable, DoorKind.Dashable]:
@@ -1896,7 +1896,8 @@ def smooth_door_pairs(world, player):
else:
room_b.change(partner.doorListPos, DoorKind.Normal)
remove_pair(partner, world, player)
elif valid_pair and type_a != DoorKind.SmallKey and type_b != DoorKind.SmallKey:
elif (valid_pair and type_a != DoorKind.SmallKey and type_b != DoorKind.SmallKey
and not std_forbidden(door, world, player)):
bd_candidates[door.entrance.parent_region.dungeon].append(door)
shuffle_bombable_dashable(bd_candidates, world, player)
world.paired_doors[player] = [x for x in world.paired_doors[player] if x.pair or x.original]
@@ -1935,6 +1936,11 @@ def stateful_door(door, kind):
return False
def std_forbidden(door, world, player):
return (world.mode[player] == 'standard' and door.entrance.parent_region.dungeon.name == 'Hyrule Castle' and
'Hyrule Castle Throne Room N' in [door.name, door.dest.name])
def custom_door_kind(custom_key, kind, bd_candidates, counts, world, player):
if custom_key in world.custom_door_types[player]:
for door_a, door_b in world.custom_door_types[player][custom_key]: