From fa8cda0e40c0795421f2e3915db2ac056bdce2b9 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 4 Jul 2015 15:22:04 +0300 Subject: [PATCH] VP Cutscene --- toontown/suit/DistributedSellbotBoss.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/toontown/suit/DistributedSellbotBoss.py b/toontown/suit/DistributedSellbotBoss.py index b6d4b600..93b896d7 100755 --- a/toontown/suit/DistributedSellbotBoss.py +++ b/toontown/suit/DistributedSellbotBoss.py @@ -261,7 +261,6 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): def makeIntroductionMovie(self, delayDeletes): track = Parallel() camera.reparentTo(render) - camera.setPosHpr(0, 25, 30, 0, 0, 0) localAvatar.setCameraFov(ToontownGlobals.CogHQCameraFov) dooberTrack = Parallel() if self.doobers: @@ -318,11 +317,11 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): (9, IndirectInterval(dooberTrack, 0, 9)), (10, Sequence( Func(self.clearChat), - Func(camera.setPosHpr, -23.1, 15.7, 17.2, -160, -2.4, 0))), + camera.posHprInterval(5, (-0.3, -105.1, 5.4), (0, 0, 0), blendType='easeInOut'))), (12, Func(self.setChatAbsolute, doobersAway, CFSpeech)), (16, Parallel( Func(self.clearChat), - Func(camera.setPosHpr, -25, -99, 10, -14, 10, 0), + camera.posHprInterval(4, (-25, -99, 10), (-14, 10, 0), blendType='easeInOut'), IndirectInterval(dooberTrack, 14), IndirectInterval(toonTrack, 30))), (18, Func(self.setChatAbsolute, welcomeToons, CFSpeech)), @@ -343,26 +342,28 @@ class DistributedSellbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): ActorInterval(self.cagedToon, 'wave'), Func(self.cagedToon.loop, 'neutral'))), (31, Sequence( - Func(camera.setPosHpr, -20, -35, 10, -88, 25, 0), + camera.posHprInterval(1, (-20, -35, 10), (-88, 25, 0), blendType='easeOut'), Func(self.setChatAbsolute, discoverToons, CFSpeech), Func(self.cagedToon.nametag3d.setScale, 1), Func(self.cagedToon.clearChat), ActorInterval(self, 'turn2Fb'))), - (34, Sequence( + (35, Sequence( Func(self.clearChat), self.loseCogSuits(self.toonsA, self.battleANode, (0, 18, 5, -180, 0, 0)), self.loseCogSuits(self.toonsB, self.battleBNode, (0, 18, 5, -180, 0, 0)))), - (37, Sequence( + (38, Sequence( self.toonNormalEyes(self.involvedToons), - Func(camera.setPosHpr, -23.4, -145.6, 44.0, -10.0, -12.5, 0), + camera.posHprInterval(1, (-23.4, -145.6, 44.0), (-10.0, -12.5, 0), blendType='easeInOut'), Func(self.loop, 'Fb_neutral'), Func(self.rampA.request, 'retract'), Func(self.rampB.request, 'retract'), Parallel(self.backupToonsToBattlePosition(self.toonsA, self.battleANode), self.backupToonsToBattlePosition(self.toonsB, self.battleBNode), Sequence( - Wait(2), - Func(self.setChatAbsolute, attackToons, CFSpeech)))))) + Wait(3), + camera.posHprInterval(1, (-25, -35, 20.5), (-90, 0, 0), blendType='easeOut'), + Func(self.setChatAbsolute, attackToons, CFSpeech), + Wait(3)))))) track.append(dialogTrack) return Sequence(Func(self.stickToonsToFloor), track, Func(self.unstickToons), name=self.uniqueName('Introduction'))