diff options
| -rw-r--r-- | src/editorui/paths.py | 4 | ||||
| -rw-r--r-- | src/exporter.py | 6 | ||||
| -rw-r--r-- | src/mapdata.py | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/editorui/paths.py b/src/editorui/paths.py index e402eb8..a40ab2b 100644 --- a/src/editorui/paths.py +++ b/src/editorui/paths.py @@ -410,8 +410,8 @@ class KPEditorPath(QtGui.QGraphicsLineItem): Layout = QtGui.QGridLayout() # Make an exclusive button group for our animations. - AnimationList = ["Walk", "WalkSand", "WalkSnow", "WalkIce", - "Jump", "JumpSand", "JumpSnow", "SpinJump", + AnimationList = ["Walk", "WalkSand", "WalkSnow", "WalkWater", + "Jump", "JumpSand", "JumpSnow", "JumpWater", "Ladder", "LadderLeft", "LadderRight", "Fall", "Swim", "Run", "Pipe", "Door"] diff --git a/src/exporter.py b/src/exporter.py index ed377c3..e6ba38a 100644 --- a/src/exporter.py +++ b/src/exporter.py @@ -268,12 +268,12 @@ class KPMapExporter: requiredFixUps.append((len(data) - 8, texture)) for anim in doodad.animations: - rLoop, rCurve, rFrames, rType, rStart, rEnd = anim + rLoop, rCurve, rFrames, rType, rStart, rEnd, rDelay, rDelayOffset = anim loopid = self.ANIM_LOOPS.index(rLoop) curveid = self.ANIM_CURVES.index(rCurve) typeid = self.ANIM_TYPES.index(rType) - data += struct.pack('>iiiiiiii', loopid, curveid, rFrames, typeid, rStart, rEnd, 0, 0) + data += struct.pack('>iiiiiiiiii', loopid, curveid, rFrames, typeid, rStart, rEnd, rDelay, rDelayOffset, 0, 0) elif isinstance(eLayer, self.PathLayerExporter): data += u32.pack(2) @@ -343,7 +343,7 @@ class KPMapExporter: if node.isStop(): if node.level: level1, level2 = node.level - data += struct.pack('>ibbbb', 2, level1, level2, 0, 0) + data += struct.pack('>ibbibb', 2, level1, level2, 0, 0, 0) elif node.mapChange: data += u32.pack(3) diff --git a/src/mapdata.py b/src/mapdata.py index b4b5e4b..bbf0b6c 100644 --- a/src/mapdata.py +++ b/src/mapdata.py @@ -423,7 +423,7 @@ class KPDoodadLayer(KPLayer): @mapfile.dumpable('node') class KPNode(object): __dump_attribs__ = ( - 'position', 'actions', 'level', 'mapChange', + 'position', 'actions', 'level', 'hasSecret', 'mapChange', 'transition', 'mapID', 'foreignID') def _dump(self, mapObj, dest): @@ -439,6 +439,7 @@ class KPNode(object): self.actions = [] self.exits = [] self.level = None + self.hasSecret = False self.mapChange = None self.transition = 0 self.mapID = None |