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

racing: more race pad stuff

Browse source
This commit is contained in:
John Cote 2020-01-02 20:45:36 -05:00
parent 06ca87a01e
commit 53a854a134
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
toontown/racing/DistributedRacePadAI.py
View file

@ -31,6 +31,7 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
def delete(self): def delete(self):
taskMgr.remove(self.uniqueName('changeTrack')) taskMgr.remove(self.uniqueName('changeTrack'))
taskMgr.remove(self.uniqueName('countdownTask')) taskMgr.remove(self.uniqueName('countdownTask'))
taskMgr.remove(self.uniqueName('enterRaceTask'))
DistributedKartPadAI.delete(self) DistributedKartPadAI.delete(self)
def request(self, state): def request(self, state):
@ -75,6 +76,13 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
def exitWaitCountdown(self): def exitWaitCountdown(self):
taskMgr.remove(self.uniqueName('countdownTask')) taskMgr.remove(self.uniqueName('countdownTask'))
def enterAllAboard(self):
taskMgr.doMethodLater(KartGlobals.ENTER_RACE_TIME, self.enterRace, self.uniqueName('enterRaceTask'))
def exitAllAboard(self):
self.avIds = []
taskMgr.remove(self.uniqueName('enterRaceTask'))
def changeTrack(self, task): def changeTrack(self, task):
trackInfo = RaceGlobals.getNextRaceInfo(self.trackInfo[0], self.genre, self.index) trackInfo = RaceGlobals.getNextRaceInfo(self.trackInfo[0], self.genre, self.index)
trackId, raceType = trackInfo[0], trackInfo[1] trackId, raceType = trackInfo[0], trackInfo[1]
@ -85,6 +93,25 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
self.laps = trackInfo[2] self.laps = trackInfo[2]
return task.again return task.again
def considerAllAboard(self, task=None):
for startingBlock in self.startingBlocks:
if startingBlock.currentMovie:
if not self.state == 'WaitBoarding':
self.request('WaitBoarding')
return
if self.trackInfo[1] in (RaceGlobals.ToonBattle, RaceGlobals.Circuit) and len(self.avIds) < 2:
for startingBlock in self.startingBlocks:
if startingBlock.avId != 0:
startingBlock.normalExit()
self.request('WaitEmpty')
return
self.request('AllAboard')
if task:
return task.done
def addAvBlock(self, avId, startingBlock, paid): def addAvBlock(self, avId, startingBlock, paid):
av = self.air.doId2do.get(avId) av = self.air.doId2do.get(avId)
if not av: if not av:
@ -115,4 +142,4 @@ class DistributedRacePadAI(DistributedKartPadAI, FSM):
if len(self.avIds) == 0 and not self.state == 'WaitEmpty': if len(self.avIds) == 0 and not self.state == 'WaitEmpty':
self.request('WaitEmpty') self.request('WaitEmpty')
if self.state == 'WaitBoarding': if self.state == 'WaitBoarding':
self.considerAllAboard(0) self.considerAllAboard()