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

Bossbot Boss talks a lot more now

Browse source
This commit is contained in:
John 2015-07-09 13:51:51 +03:00
parent d1e778b089
commit 7b953dcb0e
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/coghq/DistributedGolfSpot.py
View file

@ -715,7 +715,7 @@ class DistributedGolfSpot(DistributedObject.DistributedObject, FSM.FSM):
throwerId)) throwerId))
if flyBallCode == ToontownGlobals.PieCodeBossCog and self.avId == localAvatar.doId and self.lastHitSequenceNum != self.__flyBallSequenceNum: if flyBallCode == ToontownGlobals.PieCodeBossCog and self.avId == localAvatar.doId and self.lastHitSequenceNum != self.__flyBallSequenceNum:
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: elif flyBallCode == ToontownGlobals.PieCodeToon and self.avId == localAvatar.doId and self.lastHitSequenceNum != self.__flyBallSequenceNum:
self.lastHitSequenceNum = self.__flyBallSequenceNum self.lastHitSequenceNum = self.__flyBallSequenceNum
avatarDoId = entry.getIntoNodePath().getNetTag('avatarDoId') avatarDoId = entry.getIntoNodePath().getNetTag('avatarDoId')

4
toontown/suit/DistributedBossbotBoss.py
View file

@ -944,7 +944,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
return return
self.doMethodLater(0.01, detachGearRoot, 'detach-%s' % gearRoot.getName()) 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) self.doAnimate(seq, now=1, raised=1)
def setBattleDifficulty(self, diff): def setBattleDifficulty(self, diff):
@ -1358,7 +1358,7 @@ class DistributedBossbotBoss(DistributedBossCog.DistributedBossCog, FSM.FSM):
def detachGearRootLater(gearRoot = gearRoot): def detachGearRootLater(gearRoot = gearRoot):
self.doMethodLater(0.01, detachGearRoot, 'detach-%s' % gearRoot.getName()) 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) self.doAnimate(seq, now=1, raised=1)
def doGolfAreaAttack(self): def doGolfAreaAttack(self):

15
toontown/suit/DistributedBossbotBossAI.py
View file

@ -934,7 +934,7 @@ def skipCEOBanquet():
@magicWord(category=CATEGORY_ADMINISTRATOR) @magicWord(category=CATEGORY_ADMINISTRATOR)
def skipCEO(): def skipCEO():
""" """
Skips to the final round of the CEO. Skips to the third round of the CEO.
""" """
boss = getCEO(spellbook.getInvoker()) boss = getCEO(spellbook.getInvoker())
if not boss: if not boss:
@ -944,6 +944,19 @@ def skipCEO():
boss.exitIntroduction() boss.exitIntroduction()
boss.b_setState('PrepareBattleThree') 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) @magicWord(category=CATEGORY_ADMINISTRATOR)
def killCEO(): def killCEO():
""" """