From eea2c7ee08e280aad366ce7efa123471fb815371 Mon Sep 17 00:00:00 2001 From: Zach Date: Sun, 24 May 2015 23:22:53 -0500 Subject: [PATCH] chat balloon anim changed --- toontown/nametag/Nametag3d.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/toontown/nametag/Nametag3d.py b/toontown/nametag/Nametag3d.py index 03dcfffa..f0455447 100755 --- a/toontown/nametag/Nametag3d.py +++ b/toontown/nametag/Nametag3d.py @@ -102,15 +102,8 @@ class Nametag3d(Nametag, Clickable3d): self.contents.node().removeAllChildren() def update(self): - if not self.chatBalloon: - self.removeContents() - Nametag.update(self) - else: - scaleLerp = Sequence(LerpScaleInterval(self.chatBalloon, 0.25, VBase3(0, 0, 0), blendType='easeInOut'), - Wait(0.25), - Func(self.removeContents), - Func(Nametag.update, self)) - scaleLerp.start() + self.removeContents() + Nametag.update(self) def tick(self, task): distance = self.contents.getPos(base.cam).length() @@ -148,9 +141,8 @@ class Nametag3d(Nametag, Clickable3d): foreground=foreground, background=background, reversed=self.chatReversed, button=self.chatButton[self.clickState]) - self.chatBalloon.setScale(0) self.chatBalloon.reparentTo(self.contents) - scaleLerp = Sequence(Wait(0.15), LerpScaleInterval(self.chatBalloon, 0.25, VBase3(1, 1, 1), blendType='easeInOut')) + scaleLerp = Sequence(LerpScaleInterval(self.chatBalloon, 0.2, VBase3(1, 1, 1), VBase3(0, 0, 0), blendType='easeInOut')) scaleLerp.start() def drawNametag(self):