diff --git a/direct/src/level/DistributedLevel.py b/direct/src/level/DistributedLevel.py index 2714afec68..4e238575ab 100755 --- a/direct/src/level/DistributedLevel.py +++ b/direct/src/level/DistributedLevel.py @@ -770,6 +770,9 @@ class DistributedLevel(DistributedObject.DistributedObject, def setOuch(self, penalty, anim = None): if anim == "Squish": toonbase.tcr.playGame.getPlace().fsm.request('squished') + elif anim == "Fall": + toonbase.tcr.playGame.getPlace().fsm.request('fallDown') + av = toonbase.localToon av.stunToon() av.playDialogueForString("!") diff --git a/direct/src/level/PathEntity.py b/direct/src/level/PathEntity.py index d6af79afa0..0b45a13569 100755 --- a/direct/src/level/PathEntity.py +++ b/direct/src/level/PathEntity.py @@ -16,7 +16,7 @@ class PathEntity(BasicEntities.NodePathEntity): self.pathIndex = pathIndex self.path = GoonPathData.Paths[self.pathIndex] - def makePathTrack(self, node, velocity, name, turnTime=1): + def makePathTrack(self, node, velocity, name, turnTime=1, lookAroundNode=None): track = Sequence(name = name) assert (len(self.path) > 1) @@ -32,7 +32,7 @@ class PathEntity(BasicEntities.NodePathEntity): # Note: this will only look right for paths that are defined in a # counterclockwise order. Otherwise the goon will always turn the # "long" way to look at the next point - node.setPos(startPoint[0],startPoint[1],startPoint[2]) + node.setPos(startPoint[0], startPoint[1],startPoint[2]) node.headsUp(endPoint[0], endPoint[1], endPoint[2]) theta = node.getH() % 360