Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-24 04:02:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hot fix

Browse source
This commit is contained in:
John 2015-07-31 21:17:41 +03:00
parent 395130b72f
commit 2687adb691
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/suit/BossCog.py
View file

@ -56,7 +56,7 @@ class BossCog(Avatar.Avatar):
self.healthCondition = 0 self.healthCondition = 0
self.animDoneEvent = 'BossCogAnimDone' self.animDoneEvent = 'BossCogAnimDone'
self.animIvalName = 'BossCogAnimIval' self.animIvalName = 'BossCogAnimIval'
return self.warningSfx = loader.loadSfx('phase_9/audio/sfx/CHQ_GOON_tractor_beam_alarmed.ogg')
def delete(self): def delete(self):
Avatar.Avatar.delete(self) Avatar.Avatar.delete(self)
@ -68,7 +68,6 @@ class BossCog(Avatar.Avatar):
self.doorB.request('Off') self.doorB.request('Off')
self.doorA = None self.doorA = None
self.doorB = None self.doorB = None
return
def setDNAString(self, dnaString): def setDNAString(self, dnaString):
self.dna = SuitDNA.SuitDNA() self.dna = SuitDNA.SuitDNA()
@ -545,7 +544,10 @@ class BossCog(Avatar.Avatar):
self.doAnimate(None, raised=1, happy=0, queueNeutral=0) self.doAnimate(None, raised=1, happy=0, queueNeutral=0)
else: else:
self.doAnimate(None, raised=1, happy=1, queueNeutral=1) 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: if self.twoFaced:
self.happy = 0 self.happy = 0
else: else:

2
toontown/suit/DistributedBossCogAI.py
View file

@ -597,6 +597,8 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI):
delayTime = ToontownGlobals.BossCogAttackTimes.get(attackCode) delayTime = ToontownGlobals.BossCogAttackTimes.get(attackCode)
if delayTime == None: if delayTime == None:
return return
if self.dept == 'm' and attackCode == ToontownGlobals.BossCogAreaAttack:
delayTime += 5.0
self.waitForNextAttack(delayTime) self.waitForNextAttack(delayTime)
return return

3
toontown/suit/DistributedCashbotBossAI.py
View file

@ -145,7 +145,7 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS
def doNextAttack(self, task): def doNextAttack(self, task):
if random.random() <= 0.2: if random.random() <= 0.2:
self.b_setAttackCode(ToontownGlobals.BossCogAreaAttack) self.b_setAttackCode(ToontownGlobals.BossCogAreaAttack)
taskMgr.doMethodLater(4.36, self.__reviveGoons, self.uniqueName('reviveGoons')) taskMgr.doMethodLater(9.36, self.__reviveGoons, self.uniqueName('reviveGoons'))
else: else:
self.__doDirectedAttack() self.__doDirectedAttack()
if self.heldObject == None and not self.waitingForHelmet: if self.heldObject == None and not self.waitingForHelmet:
@ -175,7 +175,6 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS
self.toonsToAttack.append(avId) self.toonsToAttack.append(avId)
def makeTreasure(self, goon): def makeTreasure(self, goon):
return
if self.state != 'BattleThree': if self.state != 'BattleThree':
return return
pos = goon.getPos(self) pos = goon.getPos(self)

2
toontown/suit/DistributedLawbotBoss.py
View file

@ -78,7 +78,6 @@ class DistributedLawbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
self.evidenceHitSfx = None self.evidenceHitSfx = None
self.toonUpSfx = None self.toonUpSfx = None
self.bonusTimer = None self.bonusTimer = None
self.warningSfx = None
self.juryMovesSfx = None self.juryMovesSfx = None
self.baseColStashed = False self.baseColStashed = False
self.battleDifficulty = 0 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.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.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.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.juryMovesSfx = loader.loadSfx('phase_11/audio/sfx/LB_jury_moves.ogg')
self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.ogg') self.toonUpSfx = loader.loadSfx('phase_11/audio/sfx/LB_toonup.ogg')
self.strafeSfx = [] self.strafeSfx = []