From 67c5f4b7286bde2eef80a0f86c18b6a15a92c009 Mon Sep 17 00:00:00 2001 From: Loudrob Date: Sat, 28 Mar 2015 18:06:45 -0400 Subject: [PATCH] Made this line less cancerous... --- .../cogdominium/DistributedCogdoInterior.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/toontown/cogdominium/DistributedCogdoInterior.py b/toontown/cogdominium/DistributedCogdoInterior.py index 0fabdb02..be9fd2b8 100644 --- a/toontown/cogdominium/DistributedCogdoInterior.py +++ b/toontown/cogdominium/DistributedCogdoInterior.py @@ -811,7 +811,23 @@ class DistributedCogdoInterior(DistributedObject.DistributedObject): else: speech = TTLocalizer.CogdoExecutiveSuiteToonThankYou % self.SOSToonName - track.append(Sequence(Func(camera.wrtReparentTo, localAvatar), Func(camera.setPos, 0, -9, 9), Func(camera.lookAt, Point3(5, 15, 0)), Parallel(self.cage.posInterval(0.75, self.cagePos[1], blendType='easeOut'), SoundInterval(self.cageLowerSfx, duration=0.5)), Parallel(self.cageDoor.hprInterval(0.5, VBase3(0, 90, 0), blendType='easeOut'), Sequence(SoundInterval(self.cageDoorSfx), duration=0)), Wait(0.25), Func(self.shopOwnerNpc.wrtReparentTo, render), Func(self.shopOwnerNpc.setScale, 1), Func(self.shopOwnerNpc.loop, 'walk'), Func(self.shopOwnerNpc.headsUp, Point3(0, 10, 0)), ParallelEndTogether(self.shopOwnerNpc.posInterval(1.5, Point3(0, 10, 0)), self.shopOwnerNpc.hprInterval(0.5, VBase3(180, 0, 0), blendType='easeInOut')), Func(self.shopOwnerNpc.setChatAbsolute, TTLocalizer.CagedToonYippee, CFSpeech), ActorInterval(self.shopOwnerNpc, 'jump'), Func(self.shopOwnerNpc.loop, 'neutral'), Func(self.shopOwnerNpc.headsUp, localAvatar), Func(self.shopOwnerNpc.setLocalPageChat, speech, 0), Func(camera.lookAt, self.shopOwnerNpc, Point3(0, 0, 2)))) + track.append(Sequence(Func(camera.wrtReparentTo, localAvatar), + Func(camera.setPos, 0, -9, 9), + Func(camera.lookAt, Point3(5, 15, 0)), + Parallel(self.cage.posInterval(0.75, self.cagePos[1], blendType='easeOut'), + SoundInterval(self.cageLowerSfx, duration=0.5)), + Parallel(self.cageDoor.hprInterval(0.5, VBase3(0, 90, 0), blendType='easeOut'), + Sequence(SoundInterval(self.cageDoorSfx), duration=0)), + Wait(0.25), + Func(self.shopOwnerNpc.wrtReparentTo, render), + Func(self.shopOwnerNpc.setScale, 1), + Func(self.shopOwnerNpc.loop, 'walk'), + Func(self.shopOwnerNpc.headsUp, Point3(0, 10, 0)), + ParallelEndTogether(self.shopOwnerNpc.posInterval(1.5, Point3(0, 10, 0)), self.shopOwnerNpc.hprInterval(0.5, VBase3(180, 0, 0), blendType='easeInOut')), + Func(self.shopOwnerNpc.setChatAbsolute, TTLocalizer.CagedToonYippee, CFSpeech), ActorInterval(self.shopOwnerNpc, 'jump'), + Func(self.shopOwnerNpc.loop, 'neutral'), Func(self.shopOwnerNpc.headsUp, localAvatar), + Func(self.shopOwnerNpc.setLocalPageChat, speech, 0), + Func(camera.lookAt, self.shopOwnerNpc, Point3(0, 0, 2)))) self.activeIntervals[trackName] = track self.accept('doneChatPage', self.__outroPenthouseChatDone) return track