Merge branch 'master' of gitlab.com:toontown-unlimited/src

This commit is contained in:
Zach 2015-03-06 06:09:15 -06:00
commit 0007b149c1
3 changed files with 34 additions and 6 deletions

View file

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

View file

@ -16935,6 +16935,7 @@ WHITELIST = [
'groupies',
'grouping',
'groupleader',
'groupmanager',
'groups',
'grousing',
'grouting',
@ -20270,6 +20271,7 @@ WHITELIST = [
'joyful',
'joyous',
'joys',
'jp187187',
'jpeg',
'jpn',
'jps',
@ -21741,6 +21743,7 @@ WHITELIST = [
'louder',
'loudest',
'loudly',
'loudrob',
'louie',
"louie's",
'louies',
@ -27411,6 +27414,7 @@ WHITELIST = [
'rabbit',
"rabbit's",
'rabbits',
'rabbitstew',
'raccoon',
"raccoon's",
'raccoons',
@ -29923,6 +29927,7 @@ WHITELIST = [
'sidewinders',
'siding',
'sidings',
'siefer',
'siege',
'sieges',
'sienna',
@ -32214,6 +32219,7 @@ WHITELIST = [
"swabbin'",
'swabby',
'swag',
'swagalicious',
'swain',
'swam',
'swamies',
@ -33164,6 +33170,8 @@ WHITELIST = [
'toonter',
'toontorial',
'toontown',
'toontownunlimited',
'toontownunlimited.net',
'toontrooper',
'toontroopers',
'toonup',
@ -33723,6 +33731,8 @@ WHITELIST = [
'tti',
'tto',
'ttr',
'ttu',
'ttunlimited',
'ttyl',
'tub',
'tuba',
@ -35596,6 +35606,7 @@ WHITELIST = [
'wildzapper',
'wildzilla',
'wildzoom',
'wilee',
'will',
'willa',
"willa's",
@ -36358,6 +36369,7 @@ WHITELIST = [
'zabutons',
'zac',
'zach',
'zachgates7',
'zack',
"zack's",
'zamboni',

View file

@ -4,7 +4,7 @@ from toontown.toonbase import ToontownGlobals
from toontown.coghq import DistributedCashbotBossCraneAI
from toontown.coghq import DistributedCashbotBossSafeAI
from toontown.suit import DistributedCashbotBossGoonAI
#from toontown.coghq import DistributedCashbotBossTreasureAI
from toontown.coghq import DistributedCashbotBossTreasureAI
from toontown.battle import BattleExperienceAI
from toontown.chat import ResistanceChat
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_setFinalPosition(fpos[0], fpos[1], 0)
else:
#treasure = DistributedCashbotBossTreasureAI.DistributedCashbotBossTreasureAI(self.air, self, goon, style, fpos[0], fpos[1], 0)
#treasure.generateWithRequired(self.zoneId)
pass
treasure = DistributedCashbotBossTreasureAI.DistributedCashbotBossTreasureAI(self.air, self, goon, style, fpos[0], fpos[1], 0)
treasure.generateWithRequired(self.zoneId)
treasure.healAmount = healAmount
self.treasures[treasure.doId] = treasure
@ -541,3 +540,20 @@ def skipCFO():
boss.exitIntroduction()
boss.b_setState('PrepareBattleThree')
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.'