From 5d56463f517c56ba1e86e531770c12cccd996008 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 29 Aug 2015 16:08:11 +0300 Subject: [PATCH] Fix CFO jump --- toontown/suit/BossCog.py | 3 ++- toontown/suit/DistributedBossCogAI.py | 1 - toontown/suit/DistributedCashbotBossAI.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/toontown/suit/BossCog.py b/toontown/suit/BossCog.py index 3c96a4f0..e247384a 100755 --- a/toontown/suit/BossCog.py +++ b/toontown/suit/BossCog.py @@ -461,7 +461,8 @@ class BossCog(Avatar.Avatar): self.doAnimate(None, raised=1, happy=1, queueNeutral=1) ival = Sequence() if self.dna.dept == 'm': - ival.append(Parallel(SoundInterval(self.warningSfx, node=self), Wait(5.0))) + ival.append(Func(self.loop, 'Ff_neutral')) + ival.append(Parallel(SoundInterval(self.warningSfx, node=self, volume=2.0), Wait(3.0))) ival.append(Parallel(ActorInterval(self, 'Fb_jump'), Sequence(Func(self.setChatAbsolute, random.choice(TTLocalizer.JumpBossTaunts[self.dna.dept]), CFSpeech | CFTimeout), SoundInterval(self.swishSfx, duration=1.1, node=self), SoundInterval(self.boomSfx, duration=1.9)), Sequence(Wait(1.21), Func(self.announceAreaAttack)))) if self.twoFaced: self.happy = 0 diff --git a/toontown/suit/DistributedBossCogAI.py b/toontown/suit/DistributedBossCogAI.py index a1c445d7..c790e670 100755 --- a/toontown/suit/DistributedBossCogAI.py +++ b/toontown/suit/DistributedBossCogAI.py @@ -600,7 +600,6 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI): if self.dept == 'm' and attackCode == ToontownGlobals.BossCogAreaAttack: delayTime += 5.0 self.waitForNextAttack(delayTime) - return def d_setAttackCode(self, attackCode, avId = 0): self.sendUpdate('setAttackCode', [attackCode, avId]) diff --git a/toontown/suit/DistributedCashbotBossAI.py b/toontown/suit/DistributedCashbotBossAI.py index 4dd14e16..77e8535a 100755 --- a/toontown/suit/DistributedCashbotBossAI.py +++ b/toontown/suit/DistributedCashbotBossAI.py @@ -145,7 +145,7 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS def doNextAttack(self, task): if random.random() <= 0.2: self.b_setAttackCode(ToontownGlobals.BossCogAreaAttack) - taskMgr.doMethodLater(9.36, self.__reviveGoons, self.uniqueName('reviveGoons')) + taskMgr.doMethodLater(7.36, self.__reviveGoons, self.uniqueName('reviveGoons')) else: self.__doDirectedAttack() if self.heldObject == None and not self.waitingForHelmet: