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

Made CFO back to the way it was.

Browse source
This commit is contained in:
Loudrob 2015-03-06 06:25:05 -05:00
parent 7e6e89f7e8
commit c76dcab057
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/general.prc
View file

@ -101,8 +101,8 @@ want-lawbot-headquarters #t
want-bossbot-headquarters #t want-bossbot-headquarters #t
# Cashbot boss: # Cashbot boss:
want-resistance-toonup #f want-resistance-toonup #t
want-resistance-restock #f want-resistance-restock #t
want-resistance-dance #f want-resistance-dance #f
# Cog battles: # Cog battles:

24
toontown/suit/DistributedCashbotBossAI.py
View file

@ -4,7 +4,7 @@ from toontown.toonbase import ToontownGlobals
from toontown.coghq import DistributedCashbotBossCraneAI from toontown.coghq import DistributedCashbotBossCraneAI
from toontown.coghq import DistributedCashbotBossSafeAI from toontown.coghq import DistributedCashbotBossSafeAI
from toontown.suit import DistributedCashbotBossGoonAI from toontown.suit import DistributedCashbotBossGoonAI
#from toontown.coghq import DistributedCashbotBossTreasureAI from toontown.coghq import DistributedCashbotBossTreasureAI
from toontown.battle import BattleExperienceAI from toontown.battle import BattleExperienceAI
from toontown.chat import ResistanceChat from toontown.chat import ResistanceChat
from direct.fsm import FSM from direct.fsm import FSM
@ -198,9 +198,8 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS
treasure.b_setPosition(pos[0], pos[1], 0) treasure.b_setPosition(pos[0], pos[1], 0)
treasure.b_setFinalPosition(fpos[0], fpos[1], 0) treasure.b_setFinalPosition(fpos[0], fpos[1], 0)
else: else:
#treasure = DistributedCashbotBossTreasureAI.DistributedCashbotBossTreasureAI(self.air, self, goon, style, fpos[0], fpos[1], 0) treasure = DistributedCashbotBossTreasureAI.DistributedCashbotBossTreasureAI(self.air, self, goon, style, fpos[0], fpos[1], 0)
#treasure.generateWithRequired(self.zoneId) treasure.generateWithRequired(self.zoneId)
pass
treasure.healAmount = healAmount treasure.healAmount = healAmount
self.treasures[treasure.doId] = treasure self.treasures[treasure.doId] = treasure
@ -541,3 +540,20 @@ def skipCFO():
boss.exitIntroduction() boss.exitIntroduction()
boss.b_setState('PrepareBattleThree') boss.b_setState('PrepareBattleThree')
return 'Skipping the first round...' return 'Skipping the first round...'
@magicWord(category=CATEGORY_ADMINISTRATOR)
def killCFO():
"""
Kills the CFO.
"""
invoker = spellbook.getInvoker()
boss = None
for do in simbase.air.doId2do.values():
if isinstance(do, DistributedCashbotBossAI):
if invoker.doId in do.involvedToons:
boss = do
break
if not boss:
return "You aren't in a CFO"
boss.b_setState('Victory')
return 'Killed CFO.'