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

Merge remote-tracking branch 'upstream/DoorDevUnstable' into SynthesisOWRMerge

Browse Source
This commit is contained in:
codemann8
2022-12-22 03:47:30 -06:00
parent 6240061a65 8f9f9e03c1
commit 0324017c2d
5 changed files with 104 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DoorShuffle.py
View File

@@ -2297,7 +2297,7 @@ def find_current_trap_doors(builder):
for region in builder.master_sector.regions:
for ext in region.exits:
d = ext.door
if d and d.blocked and d.trapFlag != 0:
if d and d.blocked and d.trapFlag != 0: # could exclude removing boss doors here
current_doors.append(d)
return current_doors
@@ -2307,7 +2307,9 @@ def change_door_to_trap(d, world, player):
if d.type is DoorType.Interior:
kind = room.kind(d)
new_kind = None
if kind == DoorKind.TrapTriggerable and d.direction in [Direction.South, Direction.East]:
if kind == DoorKind.Trap:
new_kind = DoorKind.Trap
elif kind == DoorKind.TrapTriggerable and d.direction in [Direction.South, Direction.East]:
new_kind = DoorKind.Trap
elif kind == DoorKind.Trap2 and d.direction in [Direction.North, Direction.West]:
new_kind = DoorKind.Trap