Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kickass transition

Browse source
This commit is contained in:
Zach 2015-04-29 22:45:13 -05:00
parent adc3d6d24f
commit fd52a8a820
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
toontown/toon/DistributedNPCToon.py
View file

@ -1,6 +1,6 @@
from direct.interval.IntervalGlobal import * from direct.interval.IntervalGlobal import *
from pandac.PandaModules import * from pandac.PandaModules import *
import time
from DistributedNPCToonBase import * from DistributedNPCToonBase import *
from toontown.chat.ChatGlobals import * from toontown.chat.ChatGlobals import *
from toontown.hood import ZoneUtil from toontown.hood import ZoneUtil
@ -69,12 +69,20 @@ class DistributedNPCToon(DistributedNPCToonBase):
if isLocalToon: if isLocalToon:
self.showNametag2d() self.showNametag2d()
taskMgr.remove(self.uniqueName('lerpCamera')) taskMgr.remove(self.uniqueName('lerpCamera'))
base.localAvatar.posCamera(0, 0) self.neutralizeCamera()
base.cr.playGame.getPlace().setState('walk')
self.sendUpdate('setMovieDone', []) self.sendUpdate('setMovieDone', [])
self.nametag3d.clearDepthTest() self.nametag3d.clearDepthTest()
self.nametag3d.clearBin() self.nametag3d.clearBin()
def neutralizeCamera(self):
avHeight = max(base.localAvatar.getHeight(), 3.0)
scaleFactor = avHeight * 0.3333333333
camera.wrtReparentTo(base.localAvatar)
camera.posQuatInterval(1, (0, -9 * scaleFactor, avHeight), (0, 0, 0), other=base.localAvatar, blendType='easeOut').start()
def walk():
base.cr.playGame.getPlace().setState('walk')
Sequence(Wait(1), Func(walk)).start()
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:
@ -86,11 +94,13 @@ class DistributedNPCToon(DistributedNPCToonBase):
isLocalToon = avId == base.localAvatar.doId isLocalToon = avId == base.localAvatar.doId
if mode == NPCToons.QUEST_MOVIE_CLEAR: if mode == NPCToons.QUEST_MOVIE_CLEAR:
self.cleanupMovie() self.cleanupMovie()
if isLocalToon:
self.neutralizeCamera()
return return
if mode == NPCToons.QUEST_MOVIE_TIMEOUT: if mode == NPCToons.QUEST_MOVIE_TIMEOUT:
self.cleanupMovie() self.cleanupMovie()
if isLocalToon: if isLocalToon:
self.freeAvatar() self.neutralizeCamera()
self.setPageNumber(0, -1) self.setPageNumber(0, -1)
self.clearChat() self.clearChat()
self.startLookAround() self.startLookAround()
@ -105,16 +115,14 @@ class DistributedNPCToon(DistributedNPCToonBase):
rejectString = Quests.fillInQuestNames(rejectString, avName=av.name) rejectString = Quests.fillInQuestNames(rejectString, avName=av.name)
self.setChatAbsolute(rejectString, CFSpeech | CFTimeout) self.setChatAbsolute(rejectString, CFSpeech | CFTimeout)
if isLocalToon: if isLocalToon:
base.localAvatar.posCamera(0, 0) self.neutralizeCamera()
base.cr.playGame.getPlace().setState('walk')
return return
if mode == NPCToons.QUEST_MOVIE_TIER_NOT_DONE: if mode == NPCToons.QUEST_MOVIE_TIER_NOT_DONE:
rejectString = Quests.chooseQuestDialogTierNotDone() rejectString = Quests.chooseQuestDialogTierNotDone()
rejectString = Quests.fillInQuestNames(rejectString, avName=av.name) rejectString = Quests.fillInQuestNames(rejectString, avName=av.name)
self.setChatAbsolute(rejectString, CFSpeech | CFTimeout) self.setChatAbsolute(rejectString, CFSpeech | CFTimeout)
if isLocalToon: if isLocalToon:
base.localAvatar.posCamera(0, 0) self.neutralizeCamera()
base.cr.playGame.getPlace().setState('walk')
return return
self.setupAvatars(av) self.setupAvatars(av)
fullString = '' fullString = ''