From 30b7ff3b20ff8a5fc1978a196831540f387abdf9 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 31 Jul 2015 20:18:56 +0300 Subject: [PATCH] The CFO can now jump to revive all goons --- toontown/suit/DistributedCashbotBossAI.py | 17 +++++++++++++---- toontown/toonbase/TTLocalizerEnglish.py | 7 +++++++ toontown/toonbase/ToontownGlobals.py | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/toontown/suit/DistributedCashbotBossAI.py b/toontown/suit/DistributedCashbotBossAI.py index 482cb4d8..0261352c 100755 --- a/toontown/suit/DistributedCashbotBossAI.py +++ b/toontown/suit/DistributedCashbotBossAI.py @@ -143,10 +143,18 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS return def doNextAttack(self, task): - self.__doDirectedAttack() - if self.heldObject == None and not self.waitingForHelmet: - self.waitForNextHelmet() - return + if random.random() <= 0.2: + self.b_setAttackCode(ToontownGlobals.BossCogAreaAttack) + taskMgr.doMethodLater(4.36, self.__reviveGoons, self.uniqueName('reviveGoons')) + else: + self.__doDirectedAttack() + if self.heldObject == None and not self.waitingForHelmet: + self.waitForNextHelmet() + + def __reviveGoons(self, task): + for goon in self.goons: + if goon.state == 'Stunned': + goon.request('Recovery') def __doDirectedAttack(self): if self.toonsToAttack: @@ -285,6 +293,7 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS def stopGoons(self): taskName = self.uniqueName('NextGoon') taskMgr.remove(taskName) + taskMgr.remove(self.uniqueName('reviveGoons')) def doNextGoon(self, task): if self.attackCode != ToontownGlobals.BossCogDizzy: diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index ff424dfc..9f13a32a 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -8590,6 +8590,13 @@ JumpBossTaunts = { ], 'l': [ "You're all in contempt of court!" + ], + 'm': [ + 'STOP!', + 'What are you doing? Wake up!', + "I can't believe it!", + "You're all asleep on the job!", + 'Wake up!' ] } CEOSpeech = [ diff --git a/toontown/toonbase/ToontownGlobals.py b/toontown/toonbase/ToontownGlobals.py index e381c298..df8ba443 100755 --- a/toontown/toonbase/ToontownGlobals.py +++ b/toontown/toonbase/ToontownGlobals.py @@ -577,7 +577,7 @@ BossCogOvertimeAttack = 20 BossCogAttackTimes = {BossCogElectricFence: 0, BossCogSwatLeft: 5.5, BossCogSwatRight: 5.5, - BossCogAreaAttack: 4.21, + BossCogAreaAttack: 4.5, BossCogFrontAttack: 2.65, BossCogRecoverDizzyAttack: 5.1, BossCogDirectedAttack: 4.84,