From 7b953dcb0ec19e7aaf480ada9067a061edd65d4f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 9 Jul 2015 13:51:51 +0300 Subject: [PATCH] Bossbot Boss talks a lot more now --- toontown/coghq/DistributedGolfSpot.py | 2 +- toontown/suit/DistributedBossbotBoss.py | 4 ++-- toontown/suit/DistributedBossbotBossAI.py | 15 ++++++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/toontown/coghq/DistributedGolfSpot.py b/toontown/coghq/DistributedGolfSpot.py index 65d59a00..46f983b7 100755 --- a/toontown/coghq/DistributedGolfSpot.py +++ b/toontown/coghq/DistributedGolfSpot.py @@ -715,7 +715,7 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM): throwerId)) if flyBallCode == ToontownGlobals.PieCodeBossCog and self.avId == localAvatar.doId and self.lastHitSequenceNum != self.__flyBallSequenceNum: self.lastHitSequenceNum = self.__flyBallSequenceNum - self.boss.d_ballHitBoss(2) + self.boss.d_ballHitBoss(10) elif flyBallCode == ToontownGlobals.PieCodeToon and self.avId == localAvatar.doId and self.lastHitSequenceNum != self.__flyBallSequenceNum: self.lastHitSequenceNum = self.__flyBallSequenceNum avatarDoId = entry.getIntoNodePath().getNetTag('avatarDoId') diff --git a/toontown/suit/DistributedBossbotBoss.py b/toontown/suit/DistributedBossbotBoss.py index b401ca93..0fb4c400 100755 --- a/toontown/suit/DistributedBossbotBoss.py +++ b/toontown/suit/DistributedBossbotBoss.py @@ -944,7 +944,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): return self.doMethodLater(0.01, detachGearRoot, 'detach-%s' % gearRoot.getName()) - seq = Sequence(ParallelEndTogether(self.pelvis.hprInterval(1, VBase3(toToonH, 0, 0)), neutral1Anim), extraAnim, Parallel(Sequence(Wait(0.19), gearTrack, Func(detachGearRootLater), self.pelvis.hprInterval(0.2, VBase3(0, 0, 0))), Sequence(throwAnim, neutral2Anim))) + seq = Sequence(ParallelEndTogether(self.pelvis.hprInterval(1, VBase3(toToonH, 0, 0)), neutral1Anim), extraAnim, Parallel(Sequence(Wait(0.19), gearTrack, Func(detachGearRootLater), self.pelvis.hprInterval(0.2, VBase3(0, 0, 0))), Sequence(Func(self.setChatAbsolute, random.choice(TTLocalizer.DirectedAttackBossTaunts[self.dna.dept]) % {'toon': toon.getName()}, CFSpeech | CFTimeout), throwAnim, neutral2Anim))) self.doAnimate(seq, now=1, raised=1) def setBattleDifficulty(self, diff): @@ -1358,7 +1358,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): def detachGearRootLater(gearRoot = gearRoot): self.doMethodLater(0.01, detachGearRoot, 'detach-%s' % gearRoot.getName()) - seq = Sequence(ParallelEndTogether(self.pelvis.hprInterval(1, VBase3(toToonH, 0, 0)), neutral1Anim), extraAnim, Parallel(Sequence(Wait(0.19), gearTrack, Func(detachGearRootLater), self.pelvis.hprInterval(0.2, VBase3(0, 0, 0))), Sequence(throwAnim, neutral2Anim), Sequence(Wait(0.85), SoundInterval(self.swingClubSfx, node=self, duration=0.45, cutOff=300, listenerNode=base.localAvatar)))) + seq = Sequence(ParallelEndTogether(self.pelvis.hprInterval(1, VBase3(toToonH, 0, 0)), neutral1Anim), extraAnim, Parallel(Sequence(Wait(0.19), gearTrack, Func(detachGearRootLater), self.pelvis.hprInterval(0.2, VBase3(0, 0, 0))), Sequence(Func(self.setChatAbsolute, random.choice(TTLocalizer.DirectedAttackBossTaunts[self.dna.dept]) % {'toon': toon.getName()}, CFSpeech | CFTimeout), throwAnim, neutral2Anim), Sequence(Wait(0.85), SoundInterval(self.swingClubSfx, node=self, duration=0.45, cutOff=300, listenerNode=base.localAvatar)))) self.doAnimate(seq, now=1, raised=1) def doGolfAreaAttack(self): diff --git a/toontown/suit/DistributedBossbotBossAI.py b/toontown/suit/DistributedBossbotBossAI.py index 73b0e37a..ae453cec 100755 --- a/toontown/suit/DistributedBossbotBossAI.py +++ b/toontown/suit/DistributedBossbotBossAI.py @@ -934,7 +934,7 @@ def skipCEOBanquet(): @magicWord(category=CATEGORY_ADMINISTRATOR) def skipCEO(): """ - Skips to the final round of the CEO. + Skips to the third round of the CEO. """ boss = getCEO(spellbook.getInvoker()) if not boss: @@ -944,6 +944,19 @@ def skipCEO(): boss.exitIntroduction() boss.b_setState('PrepareBattleThree') +@magicWord(category=CATEGORY_ADMINISTRATOR) +def skipCEOFinal(): + """ + Skips to the final round of the CEO. + """ + boss = getCEO(spellbook.getInvoker()) + if not boss: + return "You aren't in a CEO!" + if boss.state in ('PrepareBattleFour', 'BattleFour'): + return "You can't skip this round." + boss.exitIntroduction() + boss.b_setState('PrepareBattleFour') + @magicWord(category=CATEGORY_ADMINISTRATOR) def killCEO(): """