Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CFO jump

Browse source
This commit is contained in:
John 2015-08-29 16:08:11 +03:00
parent 0607c19a1c
commit 5d56463f51
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toontown/suit/BossCog.py
View file

@ -461,7 +461,8 @@ class BossCog(Avatar.Avatar):
self.doAnimate(None, raised=1, happy=1, queueNeutral=1) self.doAnimate(None, raised=1, happy=1, queueNeutral=1)
ival = Sequence() ival = Sequence()
if self.dna.dept == 'm': 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)))) 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

1
toontown/suit/DistributedBossCogAI.py
View file

@ -600,7 +600,6 @@ class DistributedBossCogAI(DistributedAvatarAI.DistributedAvatarAI):
if self.dept == 'm' and attackCode == ToontownGlobals.BossCogAreaAttack: if self.dept == 'm' and attackCode == ToontownGlobals.BossCogAreaAttack:
delayTime += 5.0 delayTime += 5.0
self.waitForNextAttack(delayTime) self.waitForNextAttack(delayTime)
return
def d_setAttackCode(self, attackCode, avId = 0): def d_setAttackCode(self, attackCode, avId = 0):
self.sendUpdate('setAttackCode', [attackCode, avId]) self.sendUpdate('setAttackCode', [attackCode, avId])

2
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(9.36, self.__reviveGoons, self.uniqueName('reviveGoons')) taskMgr.doMethodLater(7.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: