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

More fixes

Browse source
This commit is contained in:
Open Toontown 2022-01-16 18:10:51 -05:00
parent 8f1f46cfae
commit 3666947d2b
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
toontown/shtiker/SuitPage.py
View file

@ -468,9 +468,9 @@ class SuitPage(ShtikerPage.ShtikerPage):
quota = str(COG_QUOTAS[1][index % SuitDNA.suitsPerDept]) quota = str(COG_QUOTAS[1][index % SuitDNA.suitsPerDept])
panel.quotaLabel['text'] = TTLocalizer.SuitPageQuota % (count, quota) panel.quotaLabel['text'] = TTLocalizer.SuitPageQuota % (count, quota)
elif status == COG_COMPLETE1: elif status == COG_COMPLETE1:
panel['image_color'] = PANEL_COLORS_COMPLETE1[index / SuitDNA.suitsPerDept] panel['image_color'] = PANEL_COLORS_COMPLETE1[index // SuitDNA.suitsPerDept]
elif status == COG_COMPLETE2: elif status == COG_COMPLETE2:
panel['image_color'] = PANEL_COLORS_COMPLETE2[index / SuitDNA.suitsPerDept] panel['image_color'] = PANEL_COLORS_COMPLETE2[index // SuitDNA.suitsPerDept]
def updateAllCogs(self, status): def updateAllCogs(self, status):
for index in range(0, len(base.localAvatar.cogs)): for index in range(0, len(base.localAvatar.cogs)):

15
toontown/toon/DistributedNPCToon.py
View file

@ -15,6 +15,7 @@ class DistributedNPCToon(DistributedNPCToonBase):
self.curQuestMovie = None self.curQuestMovie = None
self.questChoiceGui = None self.questChoiceGui = None
self.trackChoiceGui = None self.trackChoiceGui = None
self.lerpCameraSeq = None
return return
def delayDelete(self): def delayDelete(self):
@ -86,7 +87,9 @@ class DistributedNPCToon(DistributedNPCToonBase):
self.detectAvatars() self.detectAvatars()
self.initPos() self.initPos()
if isLocalToon: if isLocalToon:
taskMgr.remove(self.uniqueName('lerpCamera')) if self.lerpCameraSeq:
self.lerpCameraSeq.finish()
self.lerpCameraSeq = None
base.localAvatar.posCamera(0, 0) base.localAvatar.posCamera(0, 0)
base.cr.playGame.getPlace().setState('walk') base.cr.playGame.getPlace().setState('walk')
self.sendUpdate('setMovieDone', []) self.sendUpdate('setMovieDone', [])
@ -96,9 +99,15 @@ class DistributedNPCToon(DistributedNPCToonBase):
def setupCamera(self, mode): def setupCamera(self, mode):
camera.wrtReparentTo(render) camera.wrtReparentTo(render)
if mode == NPCToons.QUEST_MOVIE_QUEST_CHOICE or mode == NPCToons.QUEST_MOVIE_TRACK_CHOICE: if mode == NPCToons.QUEST_MOVIE_QUEST_CHOICE or mode == NPCToons.QUEST_MOVIE_TRACK_CHOICE:
camera.lerpPosHpr(5, 9, self.getHeight() - 0.5, 155, -2, 0, 1, other=self, blendType='easeOut', task=self.uniqueName('lerpCamera')) quat = Quat()
quat.setHpr((155, -2, 0))
self.lerpCameraSeq = camera.posQuatInterval(1, Point3(5, 9, self.getHeight() - 0.5), quat, other=self, blendType='easeOut', name=self.uniqueName('lerpCamera'))
self.lerpCameraSeq.start()
else: else:
camera.lerpPosHpr(-5, 9, self.getHeight() - 0.5, -150, -2, 0, 1, other=self, blendType='easeOut', task=self.uniqueName('lerpCamera')) quat = Quat()
quat.setHpr((-150, -2, 0))
self.lerpCameraSeq = camera.posQuatInterval(1, Point3(-5, 9, self.getHeight() - 0.5), quat, other=self, blendType='easeOut', name=self.uniqueName('lerpCamera'))
self.lerpCameraSeq.start()
def setMovie(self, mode, npcId, avId, quests, timestamp): def setMovie(self, mode, npcId, avId, quests, timestamp):
timeStamp = ClockDelta.globalClockDelta.localElapsedTime(timestamp) timeStamp = ClockDelta.globalClockDelta.localElapsedTime(timestamp)