Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-10-31 08:47:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

teleport transition and npc transition update

Browse source
This commit is contained in:
Zach 2015-04-30 01:27:17 -05:00
parent 31e5ed5f7e
commit 0f06855621
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/toon/DistributedNPCToon.py
View file

@ -115,7 +115,7 @@ 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:
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()

15
toontown/toon/Toon.py
View file

@ -6,7 +6,7 @@ from direct.task.Task import Task
from pandac.PandaModules import * from pandac.PandaModules import *
import random import random
import types import types
import math
import AccessoryGlobals import AccessoryGlobals
import Motion import Motion
import TTEmote import TTEmote
@ -1789,6 +1789,19 @@ class Toon(Avatar.Avatar, ToonHead):
self.holeClipPath = self.attachNewNode(holeClip) self.holeClipPath = self.attachNewNode(holeClip)
self.getGeomNode().setClipPlane(self.holeClipPath) self.getGeomNode().setClipPlane(self.holeClipPath)
self.nametag3d.setClipPlane(self.holeClipPath) self.nametag3d.setClipPlane(self.holeClipPath)
avHeight = max(self.getHeight(), 3)
def lerpCam(task):
degrees = task.time * 52.941
radians = degrees * (math.pi / 180.0)
x = -12 * math.sin(radians)
y = -12 * math.cos(radians)
z = base.localAvatar.getHeight()
camera.setPos(x, y, z)
camera.setH(-degrees)
if task.time > 3.4:
return Task.done
return Task.cont
taskMgr.add(lerpCam, 'lerpCam')
self.track.start(ts) self.track.start(ts)
self.setActiveShadow(0) self.setActiveShadow(0)