sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minigame: fix race game run sequence

Browse source
This commit is contained in:
John Cote 2020-01-06 14:29:17 -05:00
parent aca8bd90e6
commit ee6d61671c
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
toontown/minigame/DistributedRaceGame.py
View file

@ -810,7 +810,7 @@ class DistributedRaceGame(DistributedMinigame):
posQuat = Quat() posQuat = Quat()
posQuat.setHpr((posH[3], 0, 0)) posQuat.setHpr((posH[3], 0, 0))
walkSeq = Sequence(Func(avatar.setAnimState, 'walk', 1), walkSeq = Sequence(Func(avatar.setAnimState, 'walk', 1),
avatar.posQuatInterval(time, posH[:3], posQuat, other=self.raceBoard), avatar.posQuatInterval(time, (posH[0], posH[1], posH[2]), posQuat, other=self.raceBoard),
Func(stopWalk)) Func(stopWalk))
walkSeq.start() walkSeq.start()
@ -821,22 +821,22 @@ class DistributedRaceGame(DistributedMinigame):
pos2 = self.posHprArray[lane][currentPlace + 2 * step] pos2 = self.posHprArray[lane][currentPlace + 2 * step]
pos3 = self.posHprArray[lane][place] pos3 = self.posHprArray[lane][place]
def startRun(task): def stopRun(raceBoard = self.raceBoard, pos3 = pos3):
task.avatar.setAnimState('run', 1) avatar.setAnimState('neutral', 1)
return Task.done avatar.setPosHpr(raceBoard, pos3[0], pos3[1], pos3[2], pos3[3], 0, 0)
startRunTask = Task(startRun, 'startRun-' + str(lane)) pos1Quat = Quat()
startRunTask.avatar = avatar pos1Quat.setHpr((pos1[3], 0, 0))
pos2Quat = Quat()
def stopRun(task, raceBoard = self.raceBoard, pos3 = pos3): pos2Quat.setHpr((pos2[3], 0, 0))
task.avatar.setAnimState('neutral', 1) pos3Quat = Quat()
task.avatar.setPosHpr(raceBoard, pos3[0], pos3[1], pos3[2], pos3[3], 0, 0) pos3Quat.setHpr((pos3[3], 0, 0))
return Task.done runSeq = Sequence(Func(avatar.setAnimState, 'run', 1),
avatar.posQuatInterval(time / 3.0, (pos1[0], pos1[1], pos1[2]), pos1Quat, other=self.raceBoard),
stopRunTask = Task(stopRun, 'stopRun-' + str(lane)) avatar.posQuatInterval(time / 3.0, (pos2[0], pos2[1], pos2[2]), pos2Quat, other=self.raceBoard),
stopRunTask.avatar = avatar avatar.posQuatInterval(time / 3.0, (pos3[0], pos3[1], pos3[2]), pos3Quat, other=self.raceBoard),
runTask = Task.sequence(startRunTask, avatar.lerpPosHpr(pos1[0], pos1[1], pos1[2], pos1[3], 0, 0, time / 3.0, other=self.raceBoard), avatar.lerpPosHpr(pos2[0], pos2[1], pos2[2], pos2[3], 0, 0, time / 3.0, other=self.raceBoard), avatar.lerpPosHpr(pos3[0], pos3[1], pos3[2], pos3[3], 0, 0, time / 3.0, other=self.raceBoard), stopRunTask) Func(stopRun))
taskMgr.add(runTask, 'runAvatar-' + str(lane)) runSeq.start()
def setAvatarChoice(self, choice): def setAvatarChoice(self, choice):
self.notify.error('setAvatarChoice should not be called on the client') self.notify.error('setAvatarChoice should not be called on the client')