From b75336c8d6e8bfd85b847dd7ae6b0f7e5be388a7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 27 May 2015 17:15:20 +0300 Subject: [PATCH] Proper Cog Boss tasks (+ add AnyBoss task) --- toontown/ai/CogPageManagerAI.py | 2 +- toontown/battle/BattleExperienceAI.py | 12 +- toontown/battle/DistributedBattleBaseAI.py | 5 +- toontown/battle/RewardPanel.py | 12 +- toontown/quest/QuestPoster.py | 81 +--------- toontown/quest/Quests.py | 177 ++++++--------------- toontown/suit/DistributedBossbotBossAI.py | 5 +- toontown/suit/DistributedCashbotBossAI.py | 5 +- toontown/suit/DistributedLawbotBossAI.py | 5 +- toontown/suit/DistributedSellbotBossAI.py | 5 +- toontown/toonbase/TTLocalizerEnglish.py | 2 + toontown/toonbase/ToontownBattleGlobals.py | 11 +- 12 files changed, 75 insertions(+), 247 deletions(-) diff --git a/toontown/ai/CogPageManagerAI.py b/toontown/ai/CogPageManagerAI.py index 53595636..4de0e2e5 100755 --- a/toontown/ai/CogPageManagerAI.py +++ b/toontown/ai/CogPageManagerAI.py @@ -17,7 +17,7 @@ class CogPageManagerAI: cogCounts = toon.cogCounts cogs = toon.cogs for cog in killedCogs: - if cog['isSkelecog'] or cog['isVP'] or cog['isCFO'] or cog['isCJ'] or cog['isCEO']: + if cog['isSkelecog'] or cog['isBoss'] > 0: continue if toon.getDoId() in cog['activeToons']: deptIndex = SuitDNA.suitDepts.index(cog['track']) diff --git a/toontown/battle/BattleExperienceAI.py b/toontown/battle/BattleExperienceAI.py index e3045bf5..c1de01af 100755 --- a/toontown/battle/BattleExperienceAI.py +++ b/toontown/battle/BattleExperienceAI.py @@ -85,7 +85,7 @@ def getBattleExperience(numToons, activeToons, toonExp, toonSkillPtsGained, toon for deathRecord in suitsKilled: level = deathRecord['level'] type = deathRecord['type'] - if deathRecord['isVP'] or deathRecord['isCFO'] or deathRecord['isCJ'] or deathRecord['isCEO']: + if deathRecord['isBoss'] > 0: level = 0 typeNum = SuitDNA.suitDepts.index(deathRecord['track']) else: @@ -101,14 +101,8 @@ def getBattleExperience(numToons, activeToons, toonExp, toonSkillPtsGained, toon flags |= ToontownBattleGlobals.DLF_SKELECOG if deathRecord['isForeman']: flags |= ToontownBattleGlobals.DLF_FOREMAN - if deathRecord['isVP']: - flags |= ToontownBattleGlobals.DLF_VP - if deathRecord['isCFO']: - flags |= ToontownBattleGlobals.DLF_CFO - if deathRecord['isCJ']: - flags |= ToontownBattleGlobals.DLF_CJ - if deathRecord['isCEO']: - flags |= ToontownBattleGlobals.DLF_CEO + if deathRecord['isBoss'] > 0: + flags |= ToontownBattleGlobals.DLF_BOSS if deathRecord['isSupervisor']: flags |= ToontownBattleGlobals.DLF_SUPERVISOR if deathRecord['isVirtual']: diff --git a/toontown/battle/DistributedBattleBaseAI.py b/toontown/battle/DistributedBattleBaseAI.py index 61a661d6..6ff74cb0 100755 --- a/toontown/battle/DistributedBattleBaseAI.py +++ b/toontown/battle/DistributedBattleBaseAI.py @@ -1562,10 +1562,7 @@ class DistributedBattleBaseAI(DistributedObjectAI.DistributedObjectAI, BattleBas 'track': suit.dna.dept, 'isSkelecog': suit.getSkelecog(), 'isForeman': suit.isForeman(), - 'isVP': 0, - 'isCFO': 0, - 'isCJ': 0, - 'isCEO': 0, + 'isBoss': 0, 'isSupervisor': suit.isSupervisor(), 'isVirtual': suit.isVirtual(), 'hasRevives': suit.getMaxSkeleRevives(), diff --git a/toontown/battle/RewardPanel.py b/toontown/battle/RewardPanel.py index c95be6a5..5c826917 100755 --- a/toontown/battle/RewardPanel.py +++ b/toontown/battle/RewardPanel.py @@ -569,14 +569,11 @@ class RewardPanel(DirectFrame): isSkelecog = flags & ToontownBattleGlobals.DLF_SKELECOG isForeman = flags & ToontownBattleGlobals.DLF_FOREMAN - isVP = flags & ToontownBattleGlobals.DLF_VP - isCFO = flags & ToontownBattleGlobals.DLF_CFO - isCJ = flags & ToontownBattleGlobals.DLF_CJ - isCEO = flags & ToontownBattleGlobals.DLF_CEO + isBoss = flags & ToontownBattleGlobals.DLF_BOSS isSupervisor = flags & ToontownBattleGlobals.DLF_SUPERVISOR isVirtual = flags & ToontownBattleGlobals.DLF_VIRTUAL hasRevives = flags & ToontownBattleGlobals.DLF_REVIVES - if isVP or isCFO or isCJ or isCEO: + if isBoss > 0: cogType = None cogTrack = SuitDNA.suitDepts[cogIndex] else: @@ -587,10 +584,7 @@ class RewardPanel(DirectFrame): 'track': cogTrack, 'isSkelecog': isSkelecog, 'isForeman': isForeman, - 'isVP': isVP, - 'isCFO': isCFO, - 'isCJ': isCJ, - 'isCEO': isCEO, + 'isBoss': isBoss, 'isSupervisor': isSupervisor, 'isVirtual': isVirtual, 'hasRevives': hasRevives, diff --git a/toontown/quest/QuestPoster.py b/toontown/quest/QuestPoster.py index 69ec5301..07f2c23a 100755 --- a/toontown/quest/QuestPoster.py +++ b/toontown/quest/QuestPoster.py @@ -659,89 +659,16 @@ class QuestPoster(DirectFrame): rIconGeom = None lIconGeomScale = rIconGeomScale rIconGeomScale = 1 - elif quest.getType() == Quests.VPQuest: + elif isinstance(quest, Quests.TexturedQuest): self.teleportButton.hide() - frameBgColor = 'blue' - bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') - lIconGeom = bookModel.find('**/BossHead3Icon') - bookModel.removeNode() + frame = quest.getFrame() + frameBgColor = frame[1] + lIconGeom = frame[0] lIconGeomScale = 0.13 if not fComplete: infoText = quest.getLocationName() if infoText == '': infoText = TTLocalizer.QuestPosterAnywhere - elif quest.getType() == Quests.VPNewbieQuest: - self.teleportButton.hide() - frameBgColor = 'blue' - bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') - rIconGeom = bookModel.find('**/BossHead3Icon') - bookModel.removeNode() - rIconGeomScale = 0.13 - if not fComplete: - headlineString = TTLocalizer.QuestsNewbieQuestHeadline - captions = [quest.getCaption()] - captions.append(map(string.capwords, quest.getObjectiveStrings())) - auxText = TTLocalizer.QuestsCogNewbieQuestAux - lPos.setX(-0.18) - self.laffMeter = self.createLaffMeter(quest.getNewbieLevel()) - self.laffMeter.setScale(0.04) - lIconGeom = None - infoText = quest.getLocationName() - if infoText == '': - infoText = TTLocalizer.QuestPosterAnywhere - else: - lIconGeom = rIconGeom - rIconGeom = None - lIconGeomScale = rIconGeomScale - rIconGeomScale = 1 - elif quest.getType() == Quests.CFOQuest: - self.teleportButton.hide() - frameBgColor = 'blue' - bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') - lIconGeom = bookModel.find('**/CashBotBossHeadIcon') - bookModel.removeNode() - lIconGeomScale = 0.13 - if not fComplete: - infoText = quest.getLocationName() - if infoText == '': - infoText = TTLocalizer.QuestPosterAnywhere - elif quest.getType() == Quests.CJQuest or quest.getType() == Quests.CEOQuest: - self.teleportButton.hide() - cj = quest.getType() == Quests.CJQuest - frameBgColor = 'blue' if cj else 'brown' - cardMaker = CardMaker('boss-cm') - cardMaker.setFrame(-0.5, 0.5, -0.5, 0.5) - lIconGeom = NodePath(cardMaker.generate()) - lIconGeom.setTexture(loader.loadTexture('phase_3.5/maps/' + 'cj_icon.jpg' if cj else 'ceo_icon.jpg')) - lIconGeomScale = 0.13 - if not fComplete: - infoText = quest.getLocationName() - if infoText == '': - infoText = TTLocalizer.QuestPosterAnywhere - elif quest.getType() == Quests.CFONewbieQuest: - self.teleportButton.hide() - frameBgColor = 'blue' - bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui') - rIconGeom = bookModel.find('**/CashBotBossHeadIcon') - bookModel.removeNode() - rIconGeomScale = 0.13 - if not fComplete: - headlineString = TTLocalizer.QuestsNewbieQuestHeadline - captions = [quest.getCaption()] - captions.append(map(string.capwords, quest.getObjectiveStrings())) - auxText = TTLocalizer.QuestsCogNewbieQuestAux - lPos.setX(-0.18) - self.laffMeter = self.createLaffMeter(quest.getNewbieLevel()) - self.laffMeter.setScale(0.04) - lIconGeom = None - infoText = quest.getLocationName() - if infoText == '': - infoText = TTLocalizer.QuestPosterAnywhere - else: - lIconGeom = rIconGeom - rIconGeom = None - lIconGeomScale = rIconGeomScale - rIconGeomScale = 1 elif quest.getType() == Quests.RescueQuest: self.teleportButton.hide() frameBgColor = 'blue' diff --git a/toontown/quest/Quests.py b/toontown/quest/Quests.py index cd140a00..dfb2e288 100755 --- a/toontown/quest/Quests.py +++ b/toontown/quest/Quests.py @@ -228,21 +228,12 @@ class Quest: def checkNumForemen(self, num): self.check(num > 0, 'invalid number of foremen: %s' % num) - def checkNumVPs(self, num): - self.check(num > 0, 'invalid number of VPs: %s' % num) + def checkNumBosses(self, num): + self.check(num > 0, 'invalid number of bosses: %s' % num) def checkNumSupervisors(self, num): self.check(num > 0, 'invalid number of supervisors: %s' % num) - def checkNumCFOs(self, num): - self.check(num > 0, 'invalid number of CFOs: %s' % num) - - def checkNumCJs(self, num): - self.check(num > 0, 'invalid number of CJs: %s' % num) - - def checkNumCEOs(self, num): - self.check(num > 0, 'invalid number of CEOs: %s' % num) - def checkNumBuildings(self, num): self.check(1, 'invalid num buildings: %s' % num) @@ -828,46 +819,46 @@ class ForemanNewbieQuest(ForemanQuest, NewbieQuest): else: return 0 +BOSS_NAMES = { + Anywhere: [TTLocalizer.ACogBoss, TTLocalizer.CogBosses, 'phase_3.5/maps/boss_icon.jpg', 'blue'], + ToontownGlobals.SellbotHQ: [TTLocalizer.ACogVP, TTLocalizer.CogVPs, 'phase_3.5/maps/vp_icon.jpg', 'red'], + ToontownGlobals.CashbotHQ: [TTLocalizer.ACogCFO, TTLocalizer.CogCFOs, 'phase_3.5/maps/cfo_icon.jpg', 'green'], + ToontownGlobals.LawbotHQ: [TTLocalizer.ACogCJ, TTLocalizer.CogCJs, 'phase_3.5/maps/cj_icon.jpg', 'blue'], + ToontownGlobals.BossbotHQ: [TTLocalizer.ACogCEO, TTLocalizer.CogCEOs, 'phase_3.5/maps/ceo_icon.jpg', 'brown'] +} -class VPQuest(CogQuest): +class TexturedQuest: + def getModelFromTexture(self, texture): + cardMaker = CardMaker('cm-%s' % time.time()) + cardMaker.setFrame(-0.5, 0.5, -0.5, 0.5) + node = NodePath(cardMaker.generate()) + + node.setTexture(loader.loadTexture(texture)) + return node + + def getFrame(self): + print 'getFrame from TexturedQuest not implemented!' + return [None, None] + +class BossQuest(CogQuest, TexturedQuest): def __init__(self, id, quest): CogQuest.__init__(self, id, quest) - self.checkNumVPs(self.quest[1]) + self.checkNumBosses(self.quest[1]) + def getFrame(self): + boss = BOSS_NAMES[self.quest[0]] + + return [self.getModelFromTexture(boss[2]), boss[3]] + def getCogType(self): return Any def getCogNameString(self): - numCogs = self.getNumCogs() - if numCogs == 1: - return TTLocalizer.ACogVP - else: - return TTLocalizer.CogVPs + return BOSS_NAMES[self.quest[0]][self.getNumCogs() > 1] def doesCogCount(self, avId, cogDict, zoneId, avList): - return 0 - - def doesVPCount(self, avId, cogDict, zoneId, avList): - return self.isLocationMatch(zoneId) - - -class VPNewbieQuest(VPQuest, NewbieQuest): - def __init__(self, id, quest): - VPQuest.__init__(self, id, quest) - self.checkNewbieLevel(self.quest[2]) - - def getNewbieLevel(self): - return self.quest[2] - - def getString(self): - return NewbieQuest.getString(self) - - def doesVPCount(self, avId, cogDict, zoneId, avList): - if VPQuest.doesVPCount(self, avId, cogDict, zoneId, avList): - return self.getNumNewbies(avId, avList) - else: - return 0 - + print cogDict + return cogDict['isBoss'] > 0 and self.isLocationMatch(zoneId) class SupervisorQuest(CogQuest): def __init__(self, id, quest): @@ -887,7 +878,6 @@ class SupervisorQuest(CogQuest): def doesCogCount(self, avId, cogDict, zoneId, avList): return bool(CogQuest.doesCogCount(self, avId, cogDict, zoneId, avList) and cogDict['isSupervisor']) - class SupervisorNewbieQuest(SupervisorQuest, NewbieQuest): def __init__(self, id, quest): SupervisorQuest.__init__(self, id, quest) @@ -905,69 +895,9 @@ class SupervisorNewbieQuest(SupervisorQuest, NewbieQuest): else: return 0 -class CFOQuest(CogQuest): +class RescueQuest(BossQuest): def __init__(self, id, quest): - CogQuest.__init__(self, id, quest) - self.checkNumCFOs(self.quest[1]) - - def getCogType(self): - return Any - - def getCogNameString(self): - return TTLocalizer.ACogCFO if self.getNumCogs() == 1 else TTLocalizer.CogCFOs - - def doesCFOCount(self, avId, cogDict, zoneId, avList): - return self.isLocationMatch(zoneId) - -class CJQuest(CogQuest): - def __init__(self, id, quest): - CogQuest.__init__(self, id, quest) - self.checkNumCJs(self.quest[1]) - - def getCogType(self): - return Any - - def getCogNameString(self): - return TTLocalizer.ACogCJ if self.getNumCogs() == 1 else TTLocalizer.CogCJs - - def doesCJCount(self, avId, cogDict, zoneId, avList): - return self.isLocationMatch(zoneId) - -class CEOQuest(CogQuest): - def __init__(self, id, quest): - CogQuest.__init__(self, id, quest) - self.checkNumCEOs(self.quest[1]) - - def getCogType(self): - return Any - - def getCogNameString(self): - return TTLocalizer.ACogCEO if self.getNumCogs() == 1 else TTLocalizer.CogCEOs - - def doesCEOCount(self, avId, cogDict, zoneId, avList): - return self.isLocationMatch(zoneId) - -class CFONewbieQuest(CFOQuest, NewbieQuest): - def __init__(self, id, quest): - CFOQuest.__init__(self, id, quest) - self.checkNewbieLevel(self.quest[2]) - - def getNewbieLevel(self): - return self.quest[2] - - def getString(self): - return NewbieQuest.getString(self) - - def doesCFOCount(self, avId, cogDict, zoneId, avList): - if CFOQuest.doesCFOCount(self, avId, cogDict, zoneId, avList): - return self.getNumNewbies(avId, avList) - else: - return 0 - - -class RescueQuest(VPQuest): - def __init__(self, id, quest): - VPQuest.__init__(self, id, quest) + BossQuest.__init__(self, id, quest) def getNumToons(self): return self.getNumCogs() @@ -1006,7 +936,6 @@ class RescueQuest(VPQuest): def getHeadlineString(self): return TTLocalizer.QuestsRescueQuestHeadline - class RescueNewbieQuest(RescueQuest, NewbieQuest): def __init__(self, id, quest): RescueQuest.__init__(self, id, quest) @@ -1018,13 +947,12 @@ class RescueNewbieQuest(RescueQuest, NewbieQuest): def getString(self): return NewbieQuest.getString(self, newStr=TTLocalizer.QuestsRescueNewNewbieQuestObjective, oldStr=TTLocalizer.QuestsRescueOldNewbieQuestObjective) - def doesVPCount(self, avId, cogDict, zoneId, avList): - if RescueQuest.doesVPCount(self, avId, cogDict, zoneId, avList): + def doesCogCount(self, avId, cogDict, zoneId, avList): + if RescueQuest.doesCogCount(self, avId, cogDict, zoneId, avList): return self.getNumNewbies(avId, avList) else: return 0 - class BuildingQuest(CogQuest): trackCodes = ['c', 'l', @@ -3302,8 +3230,8 @@ QuestDict = { 8185: (DL_TIER + 2, OBSOLETE, (SkelecogLevelQuest, ToontownGlobals.SellbotHQ, 16, 6), Any, ToonHQ, Any, NA, DefaultDialog), 8186: (DL_TIER + 2, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 12), Any, ToonHQ, Any, NA, DefaultDialog), 8187: (DL_TIER + 2, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 16), Any, ToonHQ, Any, NA, DefaultDialog), - 8188: (DL_TIER + 2, Start, (VPQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 8189: (DL_TIER + 2, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 8188: (DL_TIER + 2, Start, (BossQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + #8189: (DL_TIER + 2, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), 8190: (DL_TIER + 2, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 30, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), 8191: (DL_TIER + 2, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 30, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), 8192: (DL_TIER + 2, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 30, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), @@ -3311,8 +3239,8 @@ QuestDict = { 8194: (DL_TIER + 2, OBSOLETE, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 3, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), 8195: (DL_TIER + 2, OBSOLETE, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 3, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), 8196: (DL_TIER + 2, OBSOLETE, (ForemanNewbieQuest, ToontownGlobals.SellbotFactoryInt, 3, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), - 8197: (DL_TIER + 2, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), - 8198: (DL_TIER + 2, OBSOLETE, (RescueNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), + #8197: (DL_TIER + 2, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), + #8198: (DL_TIER + 2, OBSOLETE, (RescueNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog), 8201: (DL_TIER + 2, Start, (CogQuest, ToontownGlobals.CashbotHQ, 160, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8202: (DL_TIER + 2, Start, (CogQuest, ToontownGlobals.CashbotHQ, 180, Any), Any, ToonHQ, Any, NA, DefaultDialog), 8203: (DL_TIER + 2, Start, (CogQuest, ToontownGlobals.CashbotHQ, 200, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3331,7 +3259,7 @@ QuestDict = { 8216: (DL_TIER + 2, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntA, 16), Any, ToonHQ, Any, NA, DefaultDialog), 8217: (DL_TIER + 2, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntB, 14), Any, ToonHQ, Any, NA, DefaultDialog), 8218: (DL_TIER + 2, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntC, 12), Any, ToonHQ, Any, NA, DefaultDialog), - 8219: (DL_TIER + 2, Start, (CFOQuest, ToontownGlobals.CashbotHQ, 2), Any, ToonHQ, 621, NA, DefaultDialog), + 8219: (DL_TIER + 2, Start, (BossQuest, ToontownGlobals.CashbotHQ, 2), Any, ToonHQ, 621, NA, DefaultDialog), 8220: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 25, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 8221: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 20, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), 8224: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 15, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3420,8 +3348,8 @@ QuestDict = { 9185: (DL_TIER + 3, OBSOLETE, (SkelecogLevelQuest, ToontownGlobals.SellbotHQ, 32, 6), Any, ToonHQ, Any, NA, DefaultDialog), 9186: (DL_TIER + 3, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 25), Any, ToonHQ, Any, NA, DefaultDialog), 9187: (DL_TIER + 3, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 35), Any, ToonHQ, Any, NA, DefaultDialog), - 9188: (DL_TIER + 3, Start, (VPQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog), - 9189: (DL_TIER + 3, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog), + 9188: (DL_TIER + 3, Start, (BossQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog), + #9189: (DL_TIER + 3, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog), 9190: (DL_TIER + 3, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 35, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9191: (DL_TIER + 3, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 35, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9192: (DL_TIER + 3, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 35, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), @@ -3429,8 +3357,8 @@ QuestDict = { 9194: (DL_TIER + 3, OBSOLETE, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 4, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9195: (DL_TIER + 3, OBSOLETE, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 4, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9196: (DL_TIER + 3, OBSOLETE, (ForemanNewbieQuest, ToontownGlobals.SellbotFactoryInt, 4, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), - 9197: (DL_TIER + 3, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), - 9198: (DL_TIER + 3, OBSOLETE, (RescueNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), + #9197: (DL_TIER + 3, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), + #9198: (DL_TIER + 3, OBSOLETE, (RescueNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9201: (DL_TIER + 3, Start, (CogQuest, ToontownGlobals.CashbotHQ, 350, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9202: (DL_TIER + 3, Start, (CogQuest, ToontownGlobals.CashbotHQ, 400, Any), Any, ToonHQ, Any, NA, DefaultDialog), 9203: (DL_TIER + 3, Start, (CogQuest, ToontownGlobals.CashbotHQ, 450, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3449,7 +3377,7 @@ QuestDict = { 9216: (DL_TIER + 3, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntA, 35), Any, ToonHQ, Any, NA, DefaultDialog), 9217: (DL_TIER + 3, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntB, 30), Any, ToonHQ, Any, NA, DefaultDialog), 9218: (DL_TIER + 3, Start, (SupervisorQuest, ToontownGlobals.CashbotMintIntC, 25), Any, ToonHQ, Any, NA, DefaultDialog), - 9219: (DL_TIER + 3, Start, (CFOQuest, ToontownGlobals.CashbotHQ, 3), Any, ToonHQ, 622, NA, DefaultDialog), + 9219: (DL_TIER + 3, Start, (BossQuest, ToontownGlobals.CashbotHQ, 3), Any, ToonHQ, 622, NA, DefaultDialog), 9220: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.CashbotMintIntA, 35, Any, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9221: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.CashbotMintIntB, 30, Any, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), 9222: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.CashbotMintIntC, 25, Any, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), @@ -3487,20 +3415,21 @@ QuestDict = { 10120: (ELDER_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 60, Any), Any, ToonHQ, Any, NA, DefaultDialog), 10121: (ELDER_TIER, OBSOLETE, (FactoryQuest, ToontownGlobals.SellbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), 10122: (ELDER_TIER, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), - 10123: (ELDER_TIER, Start, (VPQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 10124: (ELDER_TIER, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 10123: (ELDER_TIER, Start, (BossQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + #10124: (ELDER_TIER, OBSOLETE, (RescueQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), 10130: (ELDER_TIER, OBSOLETE, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 40, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), 10131: (ELDER_TIER, OBSOLETE, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 3, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), - 10132: (ELDER_TIER, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), + #10132: (ELDER_TIER, OBSOLETE, (VPNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), 10140: (ELDER_TIER, Start, (CogQuest, ToontownGlobals.CashbotHQ, 60, Any), Any, ToonHQ, Any, NA, DefaultDialog), 10141: (ELDER_TIER, Start, (MintQuest, ToontownGlobals.CashbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), 10142: (ELDER_TIER, Start, (SupervisorQuest, ToontownGlobals.CashbotHQ, 10), Any, ToonHQ, Any, NA, DefaultDialog), - 10143: (ELDER_TIER, Start, (CFOQuest, ToontownGlobals.CashbotHQ, 2), Any, ToonHQ, 623, NA, DefaultDialog), + 10143: (ELDER_TIER, Start, (BossQuest, ToontownGlobals.CashbotHQ, 2), Any, ToonHQ, 623, NA, DefaultDialog), 10145: (ELDER_TIER, Start, (CogNewbieQuest, ToontownGlobals.CashbotHQ, 40, Any, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), 10146: (ELDER_TIER, Start, (MintNewbieQuest, ToontownGlobals.CashbotHQ, 3, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog), 10147: (ELDER_TIER, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotHQ, 3, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog), - 10148: (ELDER_TIER, Start, (CJQuest, ToontownGlobals.LawbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), - 10149: (ELDER_TIER, Start, (CEOQuest, ToontownGlobals.BossbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 10148: (ELDER_TIER, Start, (BossQuest, ToontownGlobals.LawbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 10149: (ELDER_TIER, Start, (BossQuest, ToontownGlobals.BossbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog), + 10150: (ELDER_TIER, Start, (BossQuest, Anywhere, 3), Any, ToonHQ, Any, NA, DefaultDialog), 10200: (ELDER_TIER, Start, (CogQuest, Anywhere, 100, Any), Any, ToonHQ, NA, 10201, DefaultDialog), 10201: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog), 10202: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 1, 0), Any, ToonHQ, NA, 10203, DefaultDialog), diff --git a/toontown/suit/DistributedBossbotBossAI.py b/toontown/suit/DistributedBossbotBossAI.py index 67f19205..0485f95e 100755 --- a/toontown/suit/DistributedBossbotBossAI.py +++ b/toontown/suit/DistributedBossbotBossAI.py @@ -575,10 +575,7 @@ class DistributedBossbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS 'track': self.dna.dept, 'isSkelecog': 0, 'isForeman': 0, - 'isVP': 0, - 'isCFO': 0, - 'isCJ': 0, - 'isCEO': 1, + 'isBoss': 1, 'isSupervisor': 0, 'isVirtual': 0, 'activeToons': self.involvedToons[:]}) diff --git a/toontown/suit/DistributedCashbotBossAI.py b/toontown/suit/DistributedCashbotBossAI.py index 1e97e3fc..ce54c9f7 100755 --- a/toontown/suit/DistributedCashbotBossAI.py +++ b/toontown/suit/DistributedCashbotBossAI.py @@ -473,10 +473,7 @@ class DistributedCashbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS 'track': self.dna.dept, 'isSkelecog': 0, 'isForeman': 0, - 'isVP': 0, - 'isCFO': 1, - 'isCJ': 0, - 'isCEO': 0, + 'isBoss': 1, 'isSupervisor': 0, 'isVirtual': 0, 'activeToons': self.involvedToons[:]}) diff --git a/toontown/suit/DistributedLawbotBossAI.py b/toontown/suit/DistributedLawbotBossAI.py index 8d24e3c9..16bf5cb8 100755 --- a/toontown/suit/DistributedLawbotBossAI.py +++ b/toontown/suit/DistributedLawbotBossAI.py @@ -633,10 +633,7 @@ class DistributedLawbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FSM 'track': self.dna.dept, 'isSkelecog': 0, 'isForeman': 0, - 'isVP': 0, - 'isCFO': 0, - 'isCJ': 1, - 'isCEO': 0, + 'isBoss': 1, 'isSupervisor': 0, 'isVirtual': 0, 'activeToons': self.involvedToons[:]}) diff --git a/toontown/suit/DistributedSellbotBossAI.py b/toontown/suit/DistributedSellbotBossAI.py index ab8553cd..a8423301 100755 --- a/toontown/suit/DistributedSellbotBossAI.py +++ b/toontown/suit/DistributedSellbotBossAI.py @@ -333,10 +333,7 @@ class DistributedSellbotBossAI(DistributedBossCogAI.DistributedBossCogAI, FSM.FS 'track': self.dna.dept, 'isSkelecog': 0, 'isForeman': 0, - 'isVP': 1, - 'isCFO': 0, - 'isCJ': 0, - 'isCEO': 0, + 'isBoss': 1, 'isSupervisor': 0, 'isVirtual': 0, 'activeToons': self.involvedToons[:]}) diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 203d3d2e..22256488 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -184,6 +184,8 @@ CogCJs = "Cog C.J.'s" ACogCJ = ACog + ' C.J.' CogCEOs = "Cog C.E.O.'s" ACogCEO = ACog + ' C.E.O.' +CogBosses = 'Cog Bosses' +ACogBoss = ACog + ' Boss' TheFish = 'the Fish' AFish = 'a fish' Level = 'Level' diff --git a/toontown/toonbase/ToontownBattleGlobals.py b/toontown/toonbase/ToontownBattleGlobals.py index 5726a039..c70e3007 100755 --- a/toontown/toonbase/ToontownBattleGlobals.py +++ b/toontown/toonbase/ToontownBattleGlobals.py @@ -443,13 +443,10 @@ CarryLimits = (((10, MaxProps = ((15, 40), (30, 60), (75, 80)) DLF_SKELECOG = 1 DLF_FOREMAN = 2 -DLF_VP = 4 -DLF_CFO = 8 -DLF_CJ = 16 -DLF_CEO = 32 -DLF_SUPERVISOR = 64 -DLF_VIRTUAL = 128 -DLF_REVIVES = 256 +DLF_BOSS = 4 +DLF_SUPERVISOR = 8 +DLF_VIRTUAL = 16 +DLF_REVIVES = 32 pieNames = ['tart', 'fruitpie-slice', 'creampie-slice',