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

Merge branch 'DoorDev' into DoorShuffleStandardModeDev

Browse Source
This commit is contained in:
tolmar
2019-09-14 22:15:55 -07:00
parent fcd810b4f3 e739bf94bb
commit b4028f429a
9 changed files with 333 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BaseClasses.py
View File

@@ -837,6 +837,7 @@ class Door(object):
self.doorIndex = doorIndex
self.layer = layer # 0 for normal floor, 1 for the inset layer
self.toggle = toggle
self.trap = 0x0
self.quadrant = 2
self.shiftX = 78
self.shiftY = 78
@@ -859,8 +860,9 @@ class Door(object):
def getTarget(self, toggle):
if self.type == DoorType.Normal:
layer = 4 * (self.layer ^ 1 if toggle else self.layer)
return [self.roomIndex, layer + self.doorIndex]
bitmask = 4 * (self.layer ^ 1 if toggle else self.layer)
bitmask += 0x08 * int(self.trap)
return [self.roomIndex, bitmask + self.doorIndex]
if self.type == DoorType.SpiralStairs:
bitmask = int(self.layer) << 2
bitmask += 0x10 * int(self.zeroHzCam)