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

minigame: fix some race game crashes

Browse source
This commit is contained in:
John Cote 2020-01-06 13:42:57 -05:00
parent ec12097b06
commit aa69c9e4a3
1 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
toontown/minigame/DistributedRaceGame.py
View file

@ -1,6 +1,7 @@
from pandac.PandaModules import * from pandac.PandaModules import *
from toontown.toonbase.ToonBaseGlobal import * from toontown.toonbase.ToonBaseGlobal import *
from direct.distributed.ClockDelta import * from direct.distributed.ClockDelta import *
from direct.interval.IntervalGlobal import *
from .DistributedMinigame import * from .DistributedMinigame import *
from direct.gui.DirectGui import * from direct.gui.DirectGui import *
from pandac.PandaModules import * from pandac.PandaModules import *
@ -498,6 +499,7 @@ class DistributedRaceGame(DistributedMinigame):
self.positionInPlace(diceInstance, i, dicePosition) self.positionInPlace(diceInstance, i, dicePosition)
diceInstance.setP(-90) diceInstance.setP(-90)
diceInstance.setZ(0.05) diceInstance.setZ(0.05)
diceInstance.setDepthOffset(1)
return Task.done return Task.done
@ -533,7 +535,7 @@ class DistributedRaceGame(DistributedMinigame):
self.notify.debug('in enterMoveAvatars:') self.notify.debug('in enterMoveAvatars:')
tasks = [] tasks = []
self.avatarPositionsCopy = self.avatarPositions.copy() self.avatarPositionsCopy = self.avatarPositions.copy()
for i in range(0, len(choiceList) / self.numPlayers): for i in range(0, len(choiceList) // self.numPlayers):
startIndex = i * self.numPlayers startIndex = i * self.numPlayers
endIndex = startIndex + self.numPlayers endIndex = startIndex + self.numPlayers
self.choiceList = choiceList[startIndex:endIndex] self.choiceList = choiceList[startIndex:endIndex]
@ -702,10 +704,11 @@ class DistributedRaceGame(DistributedMinigame):
camera_lookat_idx = min(RaceGameGlobals.NumberToWin - 6, localToonPosition) camera_lookat_idx = min(RaceGameGlobals.NumberToWin - 6, localToonPosition)
posLookAt = self.posHprArray[self.localAvLane][camera_lookat_idx] posLookAt = self.posHprArray[self.localAvLane][camera_lookat_idx]
camera.lookAt(posLookAt[0], posLookAt[1], posLookAt[2]) camera.lookAt(posLookAt[0], posLookAt[1], posLookAt[2])
CamHpr = camera.getHpr() CamQuat = Quat()
CamQuat.setHpr(camera.getHpr())
camera.setPos(savedCamPos) camera.setPos(savedCamPos)
camera.setHpr(savedCamHpr) camera.setHpr(savedCamHpr)
camera.lerpPosHpr(CamPos[0], CamPos[1], CamPos[2], CamHpr[0], CamHpr[1], CamHpr[2], 0.75) camera.posQuatInterval(0.75, CamPos, CamQuat).start()
def getWalkDuration(self, squares_walked): def getWalkDuration(self, squares_walked):
walkDuration = abs(squares_walked / 1.2) walkDuration = abs(squares_walked / 1.2)
@ -795,29 +798,23 @@ class DistributedRaceGame(DistributedMinigame):
place = min(place, len(self.posHprArray[lane]) - 1) place = min(place, len(self.posHprArray[lane]) - 1)
posH = self.posHprArray[lane][place] posH = self.posHprArray[lane][place]
def startWalk(task): def stopWalk(raceBoard = self.raceBoard, posH = posH):
task.avatar.setAnimState('walk', 1) avatar.setAnimState('neutral', 1)
return Task.done
startWalkTask = Task(startWalk, 'startWalk-' + str(lane))
startWalkTask.avatar = avatar
def stopWalk(task, raceBoard = self.raceBoard, posH = posH):
task.avatar.setAnimState('neutral', 1)
if raceBoard.isEmpty(): if raceBoard.isEmpty():
task.avatar.setPosHpr(0, 0, 0, 0, 0, 0) avatar.setPosHpr(0, 0, 0, 0, 0, 0)
else: else:
task.avatar.setPosHpr(raceBoard, posH[0], posH[1], posH[2], posH[3], 0, 0) avatar.setPosHpr(raceBoard, posH[0], posH[1], posH[2], posH[3], 0, 0)
return Task.done
stopWalkTask = Task(stopWalk, 'stopWalk-' + str(lane)) posQuat = Quat()
stopWalkTask.avatar = avatar posQuat.setHpr((posH[3], 0, 0))
walkTask = Task.sequence(startWalkTask, avatar.lerpPosHpr(posH[0], posH[1], posH[2], posH[3], 0, 0, time, other=self.raceBoard), stopWalkTask) walkSeq = Sequence(Func(avatar.setAnimState, 'walk', 1),
taskMgr.add(walkTask, 'walkAvatar-' + str(lane)) avatar.posQuatInterval(time, posH[:3], posQuat, other=self.raceBoard),
Func(stopWalk))
walkSeq.start()
def runInPlace(self, avatar, lane, currentPlace, newPlace, time): def runInPlace(self, avatar, lane, currentPlace, newPlace, time):
place = min(newPlace, len(self.posHprArray[lane]) - 1) place = min(newPlace, len(self.posHprArray[lane]) - 1)
step = (place - currentPlace) / 3 step = (place - currentPlace) // 3
pos1 = self.posHprArray[lane][currentPlace + step] pos1 = self.posHprArray[lane][currentPlace + step]
pos2 = self.posHprArray[lane][currentPlace + 2 * step] pos2 = self.posHprArray[lane][currentPlace + 2 * step]
pos3 = self.posHprArray[lane][place] pos3 = self.posHprArray[lane][place]
@ -856,6 +853,7 @@ class DistributedRaceGame(DistributedMinigame):
posHpr = self.posHprArray[row][pos] posHpr = self.posHprArray[row][pos]
marker.setPosHpr(self.raceBoard, posHpr[0], posHpr[1], posHpr[2], posHpr[3] + 180, 0, 0.025) marker.setPosHpr(self.raceBoard, posHpr[0], posHpr[1], posHpr[2], posHpr[3] + 180, 0, 0.025)
marker.setScale(0.7) marker.setScale(0.7)
marker.setDepthOffset(1)
self.chanceMarkers.append(marker) self.chanceMarkers.append(marker)
row += 1 row += 1