diff --git a/toontown/suit/BossCog.py b/toontown/suit/BossCog.py index f20276ad..a6007a71 100755 --- a/toontown/suit/BossCog.py +++ b/toontown/suit/BossCog.py @@ -56,7 +56,7 @@ class BossCog(Avatar.Avatar): self.healthCondition = 0 self.animDoneEvent = 'BossCogAnimDone' self.animIvalName = 'BossCogAnimIval' - return + self.warningSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg') def delete(self): Avatar.Avatar.delete(self) @@ -68,7 +68,6 @@ class BossCog(Avatar.Avatar): self.doorB.request('Off') self.doorA = None self.doorB = None - return def setDNAString(self, dnaString): self.dna = SuitDNA.SuitDNA() @@ -545,7 +544,10 @@ class BossCog(Avatar.Avatar): self.doAnimate(None, raised=1, happy=0, queueNeutral=0) else: self.doAnimate(None, raised=1, happy=1, queueNeutral=1) - ival = 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))) + ival = Sequence() + if self.dna.dept == 'm': + ival.append(Parallel(SoundInterval(self.warningSfx, node=self), Wait(5.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 else: diff --git a/toontown/suit/DistributedBossCogAI.py b/toontown/suit/DistributedBossCogAI.py index a70ddd34..7d82d1f3 100755 --- a/toontown/suit/DistributedBossCogAI.py +++ b/toontown/suit/DistributedBossCogAI.py @@ -597,6 +597,8 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI): delayTime = ToontownGlobals.BossCogAttackTimes.get(attackCode) if delayTime == None: return + if self.dept == 'm' and attackCode == ToontownGlobals.BossCogAreaAttack: + delayTime += 5.0 self.waitForNextAttack(delayTime) return diff --git a/toontown/suit/DistributedCashbotBossAI.py b/toontown/suit/DistributedCashbotBossAI.py index 0261352c..4dd14e16 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(4.36, self.__reviveGoons, self.uniqueName('reviveGoons')) + taskMgr.doMethodLater(9.36, self.__reviveGoons, self.uniqueName('reviveGoons')) else: self.__doDirectedAttack() if self.heldObject == None and not self.waitingForHelmet: @@ -175,7 +175,6 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS self.toonsToAttack.append(avId) def makeTreasure(self, goon): - return if self.state != 'BattleThree': return pos = goon.getPos(self) diff --git a/toontown/suit/DistributedLawbotBoss.py b/toontown/suit/DistributedLawbotBoss.py index 580f6cb4..2ee4b9da 100755 --- a/toontown/suit/DistributedLawbotBoss.py +++ b/toontown/suit/DistributedLawbotBoss.py @@ -78,7 +78,6 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): self.evidenceHitSfx = None self.toonUpSfx = None self.bonusTimer = None - self.warningSfx = None self.juryMovesSfx = None self.baseColStashed = False self.battleDifficulty = 0 @@ -98,7 +97,6 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM): self.piesRestockSfx = loader.loadSfx('phase_5/audio/sfx/LB_receive_evidence.ogg') self.rampSlideSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_VP_ramp_slide.ogg') self.evidenceHitSfx = loader.loadSfx('phase_11/audio/sfx/LB_evidence_hit.ogg') - self.warningSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg') self.juryMovesSfx = loader.loadSfx('phase_11/audio/sfx/LB_jury_moves.ogg') self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.ogg') self.strafeSfx = []