Newbie Quests holocausted

This commit is contained in:
John 2015-07-07 19:15:35 +03:00
parent 3ca278f940
commit e4d46fa992
11 changed files with 54 additions and 706 deletions

View file

@ -435,7 +435,7 @@ class QuestManagerAI:
return (recoveredItems, unrecoveredItems)
def toonKilledBuilding(self, av, type, difficulty, floors, zoneId, activeToons, cogdo):
def toonKilledBuilding(self, av, type, difficulty, floors, zoneId, cogdo):
# Get the avatars current quests.
avQuests = av.getQuests()
questList = []
@ -447,14 +447,14 @@ class QuestManagerAI:
questClass = Quests.getQuest(questDesc[QuestIdIndex])
if isinstance(questClass, Quests.BuildingQuest) and questClass.getCompletionStatus(av, questDesc) == Quests.INCOMPLETE:
if questClass.isLocationMatch(zoneId) and questClass.doesBuildingTypeCount(type):
if questClass.isCogdo() == cogdo and questClass.doesBuildingCount(av, activeToons):
if questClass.isCogdo() == cogdo:
if floors >= questClass.getNumFloors():
questDesc[QuestProgressIndex] += 1
questList.append(questDesc)
av.b_setQuests(questList)
def toonDefeatedFactory(self, av, factoryId, activeVictors):
def toonDefeatedFactory(self, av, factoryId):
# Get the avatars current quests.
avQuests = av.getQuests()
questList = []
@ -464,13 +464,13 @@ class QuestManagerAI:
questDesc = avQuests[i : i + 5]
questClass = Quests.getQuest(questDesc[QuestIdIndex])
if isinstance(questClass, Quests.FactoryQuest):
if questClass.doesFactoryCount(av, factoryId, activeVictors):
if questClass.doesFactoryCount(av, factoryId):
questDesc[QuestProgressIndex] += 1
questList.append(questDesc)
av.b_setQuests(questList)
def toonDefeatedMint(self, av, mintId, activeVictors):
def toonDefeatedMint(self, av, mintId):
# Get the avatars current quests.
avQuests = av.getQuests()
questList = []
@ -480,23 +480,20 @@ class QuestManagerAI:
questDesc = avQuests[i : i + 5]
questClass = Quests.getQuest(questDesc[QuestIdIndex])
if isinstance(questClass, Quests.MintQuest):
if questClass.doesMintCount(av, mintId, activeVictors):
if questClass.doesMintCount(av, mintId):
questDesc[QuestProgressIndex] += 1
questList.append(questDesc)
av.b_setQuests(questList)
def toonDefeatedStage(self, av, stageId, activeVictors):
def toonDefeatedStage(self, av, stageId):
pass
def toonKilledCogs(self, av, suitsKilled, zoneId, activeToonList):
def toonKilledCogs(self, av, suitsKilled, zoneId):
# Get the avatar's current quests.
avQuests = av.getQuests()
questList = []
# Make a list of the activeToonDoIds
activeToonDoIds = [toon.doId for toon in activeToonList if not None]
# Iterate through the avatar's current quests.
for i in xrange(0, len(avQuests), 5):
questDesc = avQuests[i : i + 5]
@ -506,7 +503,7 @@ class QuestManagerAI:
if isinstance(questClass, Quests.CogQuest):
# Check if the cog counts...
for suit in suitsKilled:
if questClass.doesCogCount(av.doId, suit, zoneId, activeToonDoIds):
if questClass.doesCogCount(av.doId, suit, zoneId):
# Looks like the cog counts!
if questClass.getCompletionStatus(av, questDesc) != Quests.COMPLETE:
questDesc[QuestProgressIndex] += 1

View file

@ -181,11 +181,11 @@ def assignRewards(activeToons, toonSkillPtsGained, suitsKilled, zoneId, helpfulT
if simbase.air.config.GetBool('battle-passing-no-credit', True):
if helpfulToons and toon.doId in helpfulToons:
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId, activeToonList)
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId)
simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
else:
BattleExperienceAINotify.debug('toon=%d unhelpful not getting killed cog quest credit' % toon.doId)
else:
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId, activeToonList)
simbase.air.questManager.toonKilledCogs(toon, suitsKilled, zoneId)
simbase.air.cogPageManager.toonKilledCogs(toon, suitsKilled, zoneId)
return

View file

@ -544,10 +544,6 @@ class RewardPanel(DirectFrame):
avId = toon.getDoId()
tickDelay = 0.2
intervalList = []
toonShortList = []
for t in toonList:
if t is not None:
toonShortList.append(t)
cogList = []
for i in xrange(0, len(deathList), 4):
@ -610,7 +606,7 @@ class RewardPanel(DirectFrame):
earned = itemList.count(questItem)
else:
for cogDict in cogList:
num = quest.doesCogCount(avId, cogDict, zoneId, toonShortList)
num = quest.doesCogCount(avId, cogDict, zoneId)
if num:
if base.config.GetBool('battle-passing-no-credit', True):

View file

@ -291,7 +291,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI):
toon = self.getToon(t)
self.air.writeServerEvent('buildingDefeated', t, '%s|%s|%s|%s' % (self.track, self.numFloors, self.zoneId, victorList))
if toon is not None:
self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, self.numFloors, self.zoneId, activeToons, 0)
self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, self.numFloors, self.zoneId, 0)
for i in xrange(0, 4):
victor = victorList[i]
if (victor is None) or (victor not in self.air.doId2do):
@ -328,7 +328,7 @@ class DistributedBuildingAI(DistributedObjectAI.DistributedObjectAI):
self.air.writeServerEvent('buildingDefeated', t, '%s|%s|%s|%s' % (self.track, self.numFloors, self.zoneId, victorList))
if toon != None:
self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, 5, self.zoneId, activeToons, 1)
self.air.questManager.toonKilledBuilding(toon, self.track, self.difficulty, 5, self.zoneId, 1)
continue
victorList.extend([None, None, None, None])

View file

@ -86,7 +86,7 @@ class DistributedFactoryAI(DistributedLevelAI.DistributedLevelAI, FactoryBase.Fa
for avId in activeVictorIds:
self.air.writeServerEvent('factoryDefeated', avId, description)
for toon in activeVictors:
simbase.air.questManager.toonDefeatedFactory(toon, self.factoryId, activeVictors)
simbase.air.questManager.toonDefeatedFactory(toon, self.factoryId)
def b_setDefeated(self):
self.d_setDefeated()

View file

@ -96,7 +96,7 @@ class DistributedLawOfficeFloorAI(DistributedLevelAI.DistributedLevelAI, LawOffi
for avId in activeVictorIds:
self.air.writeServerEvent('DAOffice Defeated', avId, description)
for toon in activeVictors:
simbase.air.questManager.toonDefeatedFactory(toon, self.lawOfficeId, activeVictors)
simbase.air.questManager.toonDefeatedFactory(toon, self.lawOfficeId)
def b_setDefeated(self):
self.d_setDefeated()

View file

@ -108,7 +108,7 @@ class DistributedMintRoomAI(DistributedLevelAI.DistributedLevelAI, MintRoomBase.
self.air.writeServerEvent('mintDefeated', avId, description)
for toon in activeVictors:
simbase.air.questManager.toonDefeatedMint(toon, self.mintId, activeVictors)
simbase.air.questManager.toonDefeatedMint(toon, self.mintId)
def b_setDefeated(self):
self.d_setDefeated()

View file

@ -111,7 +111,7 @@ class DistributedStageRoomAI(DistributedLevelAI.DistributedLevelAI, StageRoomBas
for avId in activeVictorIds:
self.air.writeServerEvent('stageDefeated', avId, description)
for toon in activeVictors:
simbase.air.questManager.toonDefeatedStage(toon, self.stageId, activeVictors)
simbase.air.questManager.toonDefeatedStage(toon, self.stageId)
def b_setDefeated(self):
self.d_setDefeated()

View file

@ -482,47 +482,6 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName()
if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.BuildingNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
track = quest.getBuildingTrack()
numFloors = quest.getNumFloors()
if track == 'c':
rIconGeom = loader.loadModel('phase_4/models/modules/suit_landmark_corp')
elif track == 'l':
rIconGeom = loader.loadModel('phase_4/models/modules/suit_landmark_legal')
elif track == 'm':
rIconGeom = loader.loadModel('phase_4/models/modules/suit_landmark_money')
elif track == 's':
rIconGeom = loader.loadModel('phase_4/models/modules/suit_landmark_sales')
else:
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = bookModel.find('**/COG_building')
bookModel.removeNode()
if rIconGeom and track != Quests.Any:
self.loadElevator(rIconGeom, numFloors)
rIconGeom.setH(180)
self.fitGeometry(rIconGeom, fFlip=0)
rIconGeomScale = IMAGE_SCALE_SMALL
else:
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.FactoryQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
@ -534,30 +493,6 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName()
if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.FactoryNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = bookModel.find('**/factoryIcon2')
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.MintQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
@ -569,30 +504,6 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName()
if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.MintNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = bookModel.find('**/CashBotMint')
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.CogPartQuest:
self.teleportButton.hide()
frameBgColor = 'green'
@ -604,30 +515,6 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName()
if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.CogPartNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'green'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = bookModel.find('**/CogArmIcon2')
bookModel.removeNode()
rIconGeomScale = 0.13
if not fComplete:
headlineString = TTLocalizer.QuestsNewbieQuestHeadline
captions = [quest.getCaption()]
captions.append(map(string.capwords, quest.getObjectiveStrings()))
auxText = TTLocalizer.QuestsCogPartQuestAux
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.ForemanQuest or quest.getType() == Quests.SupervisorQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
@ -639,30 +526,6 @@ class QuestPoster(DirectFrame):
infoText = quest.getLocationName()
if infoText == '':
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.ForemanNewbieQuest or quest.getType() == Quests.SupervisorNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'blue'
bookModel = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = bookModel.find('**/skelecog5')
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'
@ -677,14 +540,6 @@ class QuestPoster(DirectFrame):
lIconGeomScale = 0.45
gui.removeNode()
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.FriendNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'brown'
gui = loader.loadModel('phase_3.5/models/gui/friendslist_gui')
lIconGeom = gui.find('**/FriendsBox_Closed')
lIconGeomScale = 0.45
gui.removeNode()
infoText = TTLocalizer.QuestPosterAnywhere
elif quest.getType() == Quests.TrolleyQuest:
self.teleportButton.hide()
frameBgColor = 'lightBlue'
@ -709,27 +564,6 @@ class QuestPoster(DirectFrame):
lIconGeomScale = 0.12
bookModel.removeNode()
infoText = TTLocalizer.QuestPosterOnPhone
elif quest.getType() == Quests.MinigameNewbieQuest:
self.teleportButton.hide()
frameBgColor = 'lightBlue'
gui = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = gui.find('**/trolley')
rIconGeomScale = 0.13
gui.removeNode()
infoText = TTLocalizer.QuestPosterPlayground
if not fComplete:
captions = [TTLocalizer.QuestsMinigameNewbieQuestCaption % quest.getNewbieLevel()]
captions.append(map(string.capwords, quest.getObjectiveStrings()))
auxText = TTLocalizer.QuestsMinigameNewbieQuestAux
lPos.setX(-0.18)
self.laffMeter = self.createLaffMeter(quest.getNewbieLevel())
self.laffMeter.setScale(0.04)
lIconGeom = None
else:
lIconGeom = rIconGeom
rIconGeom = None
lIconGeomScale = rIconGeomScale
rIconGeomScale = 1
else:
self.teleportButton.hide()
frameBgColor = 'blue'
@ -756,29 +590,6 @@ class QuestPoster(DirectFrame):
lIconGeom = cogIcons.find('**/cog')
lIconGeomScale = IMAGE_SCALE_SMALL
cogIcons.removeNode()
elif quest.getType() == Quests.CogNewbieQuest:
if quest.getCogType() != Quests.Any:
rIconGeom = self.createSuitHead(quest.getCogType())
rIconGeomScale = IMAGE_SCALE_SMALL
else:
cogIcons = loader.loadModel('phase_3/models/gui/cog_icons')
rIconGeom = cogIcons.find('**/cog')
rIconGeomScale = IMAGE_SCALE_SMALL
cogIcons.removeNode()
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
else:
lIconGeom = rIconGeom
rIconGeom = None
lIconGeomScale = rIconGeomScale
rIconGeomScale = 1
elif quest.getType() == Quests.SkelecogTrackQuest:
dept = quest.getCogTrack()
cogIcons = loader.loadModel('phase_3/models/gui/cog_icons')
@ -798,25 +609,6 @@ class QuestPoster(DirectFrame):
lIconGeom = cogIcons.find('**/skelecog5')
lIconGeomScale = IMAGE_SCALE_SMALL
cogIcons.removeNode()
elif quest.getType() == Quests.SkelecogNewbieQuest:
cogIcons = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
rIconGeom = cogIcons.find('**/skelecog5')
rIconGeomScale = IMAGE_SCALE_SMALL
cogIcons.removeNode()
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
else:
lIconGeom = rIconGeom
rIconGeom = None
lIconGeomScale = rIconGeomScale
rIconGeomScale = 1
elif quest.getType() == Quests.SkeleReviveQuest:
cogIcons = loader.loadModel('phase_3.5/models/gui/stickerbook_gui')
lIconGeom = cogIcons.find('**/skelecog5')

View file

@ -80,9 +80,6 @@ TROLLEY_QUEST_ID = 110
FIRST_COG_QUEST_ID = 145
FRIEND_QUEST_ID = 150
PHONE_QUEST_ID = 175
NEWBIE_HP = 25
SELLBOT_HQ_NEWBIE_HP = 50
CASHBOT_HQ_NEWBIE_HP = 85
from toontown.toonbase.ToontownGlobals import FT_FullSuit, FT_Leg, FT_Arm, FT_Torso
QuestRandGen = random.Random()
@ -203,9 +200,6 @@ class Quest:
def checkNumCogs(self, num):
self.check(1, 'invalid number of cogs: %s' % num)
def checkNewbieLevel(self, level):
self.check(1, 'invalid newbie level: %s' % level)
def checkCogType(self, type):
types = [Any] + SuitBattleGlobals.SuitAttributes.keys()
self.check(type in types, 'invalid cog type: %s' % type)
@ -349,16 +343,16 @@ class Quest:
def __repr__(self):
return 'Quest type: %s id: %s params: %s' % (self.__class__.__name__, self.id, self.quest[0:])
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
return 0
def doesFactoryCount(self, avId, location, avList):
def doesFactoryCount(self, avId, location):
return 0
def doesMintCount(self, avId, location, avList):
def doesMintCount(self, avId, location):
return 0
def doesCogPartCount(self, avId, location, avList):
def doesCogPartCount(self, avId, location):
return 0
def getCompletionStatus(self, av, questDesc, npc = None):
@ -414,42 +408,6 @@ class LocationBasedQuest(Quest):
return (TTLocalizer.QuestsLocationString + TTLocalizer.Period) % {'string': self.getString(),
'location': self.getLocationName()}
class NewbieQuest:
def getNewbieLevel(self):
notify.error('Pure virtual - please override me')
def getString(self, newStr = TTLocalizer.QuestsCogNewNewbieQuestObjective, oldStr = TTLocalizer.QuestsCogOldNewbieQuestObjective):
laff = self.getNewbieLevel()
if laff <= NEWBIE_HP:
return newStr % self.getObjectiveStrings()[0]
else:
return oldStr % {'laffPoints': laff,
'objective': self.getObjectiveStrings()[0]}
def getCaption(self):
laff = self.getNewbieLevel()
if laff <= NEWBIE_HP:
return TTLocalizer.QuestsCogNewNewbieQuestCaption % laff
else:
return TTLocalizer.QuestsCogOldNewbieQuestCaption % laff
def getNumNewbies(self, avId, avList):
newbieHp = self.getNewbieLevel()
num = 0
for av in avList:
if process == 'client':
avatar = base.cr.doId2do.get(av)
else:
avatar = simbase.air.doId2do.get(av)
if avatar is None:
continue
if avatar.getDoId() != avId and avatar.getMaxHp() <= newbieHp:
num += 1
return num
class CogQuest(LocationBasedQuest):
def __init__(self, id, quest):
LocationBasedQuest.__init__(self, id, quest)
@ -522,32 +480,11 @@ class CogQuest(LocationBasedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsCogQuestHeadline
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
questCogType = self.getCogType()
return (questCogType is Any or questCogType is cogDict['type']) and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
class CogNewbieQuest(CogQuest, NewbieQuest):
def __init__(self, id, quest):
CogQuest.__init__(self, id, quest)
if self.__class__ == CogNewbieQuest:
self.checkNumCogs(self.quest[1])
self.checkCogType(self.quest[2])
self.checkNewbieLevel(self.quest[3])
def getNewbieLevel(self):
return self.quest[3]
def getString(self):
return NewbieQuest.getString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
if CogQuest.doesCogCount(self, avId, cogDict, zoneId, avList):
return self.getNumNewbies(avId, avList)
else:
return 0
class CogTrackQuest(CogQuest):
trackCodes = ['c',
'l',
@ -611,7 +548,7 @@ class CogTrackQuest(CogQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsCogTrackQuestHeadline
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
questCogTrack = self.getCogTrack()
return questCogTrack == cogDict['track'] and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
@ -671,7 +608,7 @@ class CogLevelQuest(CogQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsCogLevelQuestHeadline
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
questCogLevel = self.getCogLevel()
return questCogLevel <= cogDict['level'] and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
@ -684,7 +621,7 @@ class SkelecogQBase:
else:
return TTLocalizer.SkeletonP
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
return cogDict['isSkelecog'] and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
@ -699,27 +636,8 @@ class SkelecogQuest(CogQuest, SkelecogQBase):
def getCogNameString(self):
return SkelecogQBase.getCogNameString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId, avList)
class SkelecogNewbieQuest(SkelecogQuest, NewbieQuest):
def __init__(self, id, quest):
SkelecogQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
if SkelecogQuest.doesCogCount(self, avId, cogDict, zoneId, avList):
return self.getNumNewbies(avId, avList)
else:
return 0
def doesCogCount(self, avId, cogDict, zoneId):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId)
class SkelecogTrackQuest(CogTrackQuest, SkelecogQBase):
trackNamesS = [TTLocalizer.BossbotSkelS,
@ -739,8 +657,8 @@ class SkelecogTrackQuest(CogTrackQuest, SkelecogQBase):
def getCogNameString(self):
return SkelecogQBase.getCogNameString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId, avList) and self.getCogTrack() == cogDict['track']
def doesCogCount(self, avId, cogDict, zoneId):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId) and self.getCogTrack() == cogDict['track']
class SkelecogLevelQuest(CogLevelQuest, SkelecogQBase):
@ -755,8 +673,8 @@ class SkelecogLevelQuest(CogLevelQuest, SkelecogQBase):
def getCogNameString(self):
return SkelecogQBase.getCogNameString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId, avList) and self.getCogLevel() <= cogDict['level']
def doesCogCount(self, avId, cogDict, zoneId):
return SkelecogQBase.doesCogCount(self, avId, cogDict, zoneId) and self.getCogLevel() <= cogDict['level']
class SkeleReviveQBase:
@ -767,7 +685,7 @@ class SkeleReviveQBase:
else:
return TTLocalizer.v2CogP
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
return cogDict['hasRevives'] and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
@ -782,8 +700,8 @@ class SkeleReviveQuest(CogQuest, SkeleReviveQBase):
def getCogNameString(self):
return SkeleReviveQBase.getCogNameString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
return SkeleReviveQBase.doesCogCount(self, avId, cogDict, zoneId, avList)
def doesCogCount(self, avId, cogDict, zoneId):
return SkeleReviveQBase.doesCogCount(self, avId, cogDict, zoneId)
class ForemanQuest(CogQuest):
@ -801,26 +719,8 @@ class ForemanQuest(CogQuest):
else:
return TTLocalizer.ForemanP
def doesCogCount(self, avId, cogDict, zoneId, avList):
return bool(CogQuest.doesCogCount(self, avId, cogDict, zoneId, avList) and cogDict['isForeman'])
class ForemanNewbieQuest(ForemanQuest, NewbieQuest):
def __init__(self, id, quest):
ForemanQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
if ForemanQuest.doesCogCount(self, avId, cogDict, zoneId, avList):
return self.getNumNewbies(avId, avList)
else:
return 0
def doesCogCount(self, avId, cogDict, zoneId):
return bool(CogQuest.doesCogCount(self, avId, cogDict, zoneId) and cogDict['isForeman'])
BOSS_NAMES = {
Anywhere: [TTLocalizer.ACogBoss, TTLocalizer.CogBosses, 'phase_3.5/maps/boss_icon.jpg', 'blue'],
@ -862,7 +762,7 @@ class BossQuest(CogQuest, TexturedQuest):
def getCogNameString(self):
return BOSS_NAMES[self.quest[0]][self.getNumCogs() > 1]
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
return cogDict['isBoss'] > 0 and self.isLocationMatch(zoneId)
class SupervisorQuest(CogQuest):
@ -880,25 +780,8 @@ class SupervisorQuest(CogQuest):
else:
return TTLocalizer.SupervisorP
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)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self)
def doesCogCount(self, avId, cogDict, zoneId, avList):
if SupervisorQuest.doesCogCount(self, avId, cogDict, zoneId, avList):
return self.getNumNewbies(avId, avList)
else:
return 0
def doesCogCount(self, avId, cogDict, zoneId):
return bool(CogQuest.doesCogCount(self, avId, cogDict, zoneId) and cogDict['isSupervisor'])
class RescueQuest(LocationBasedQuest):
def __init__(self, id, quest):
@ -1076,37 +959,15 @@ class BuildingQuest(CogQuest, TexturedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsBuildingQuestHeadline
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
return 0
def doesBuildingCount(self, avId, avList):
return 1
def doesBuildingTypeCount(self, type):
buildingTrack = self.getBuildingTrack()
if buildingTrack == Any or buildingTrack == type:
return True
return False
class BuildingNewbieQuest(BuildingQuest, NewbieQuest):
def __init__(self, id, quest):
BuildingQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[5])
def getNewbieLevel(self):
return self.quest[5]
def getString(self):
return NewbieQuest.getString(self)
def getHeadlineString(self):
return TTLocalizer.QuestsNewbieQuestHeadline
def doesBuildingCount(self, avId, avList):
return self.getNumNewbies(avId, avList)
class FactoryQuest(LocationBasedQuest):
factoryTypeNames = {FT_FullSuit: TTLocalizer.Cog,
FT_Leg: TTLocalizer.FactoryTypeLeg,
@ -1182,31 +1043,9 @@ class FactoryQuest(LocationBasedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsFactoryQuestHeadline
def doesFactoryCount(self, avId, location, avList):
def doesFactoryCount(self, avId, location):
return self.isLocationMatch(location)
class FactoryNewbieQuest(FactoryQuest, NewbieQuest):
def __init__(self, id, quest):
FactoryQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self)
def getHeadlineString(self):
return TTLocalizer.QuestsNewbieQuestHeadline
def doesFactoryCount(self, avId, location, avList):
if FactoryQuest.doesFactoryCount(self, avId, location, avList):
return self.getNumNewbies(avId, avList)
else:
return num
class MintQuest(LocationBasedQuest):
def __init__(self, id, quest):
LocationBasedQuest.__init__(self, id, quest)
@ -1258,31 +1097,9 @@ class MintQuest(LocationBasedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsMintQuestHeadline
def doesMintCount(self, avId, location, avList):
def doesMintCount(self, avId, location):
return self.isLocationMatch(location)
class MintNewbieQuest(MintQuest, NewbieQuest):
def __init__(self, id, quest):
MintQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self)
def getHeadlineString(self):
return TTLocalizer.QuestsNewbieQuestHeadline
def doesMintCount(self, avId, location, avList):
if MintQuest.doesMintCount(self, avId, location, avList):
return self.getNumNewbies(avId, avList)
else:
return num
class CogPartQuest(LocationBasedQuest):
def __init__(self, id, quest):
LocationBasedQuest.__init__(self, id, quest)
@ -1335,31 +1152,9 @@ class CogPartQuest(LocationBasedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsCogPartQuestHeadline
def doesCogPartCount(self, avId, location, avList):
def doesCogPartCount(self, avId, location):
return self.isLocationMatch(location)
class CogPartNewbieQuest(CogPartQuest, NewbieQuest):
def __init__(self, id, quest):
CogPartQuest.__init__(self, id, quest)
self.checkNewbieLevel(self.quest[2])
def getNewbieLevel(self):
return self.quest[2]
def getString(self):
return NewbieQuest.getString(self, newStr=TTLocalizer.QuestsCogPartNewNewbieQuestObjective, oldStr=TTLocalizer.QuestsCogPartOldNewbieQuestObjective)
def getHeadlineString(self):
return TTLocalizer.QuestsNewbieQuestHeadline
def doesCogPartCount(self, avId, location, avList):
if CogPartQuest.doesCogPartCount(self, avId, location, avList):
return self.getNumNewbies(avId, avList)
else:
return num
class DeliverGagQuest(Quest):
def __init__(self, id, quest):
Quest.__init__(self, id, quest)
@ -1694,7 +1489,7 @@ class RecoverItemQuest(LocationBasedQuest):
def getHeadlineString(self):
return TTLocalizer.QuestsRecoverItemQuestHeadline
def doesCogCount(self, avId, cogDict, zoneId, avList):
def doesCogCount(self, avId, cogDict, zoneId):
questCogType = self.getHolder()
return (questCogType is Any or questCogType is cogDict[self.getHolderType()]) and avId in cogDict['activeToons'] and self.isLocationMatch(zoneId)
@ -1792,56 +1587,6 @@ class FriendQuest(Quest):
def getObjectiveStrings(self):
return [TTLocalizer.QuestsFriendQuestString]
def doesFriendCount(self, av, otherAv):
return 1
class FriendNewbieQuest(FriendQuest, NewbieQuest):
def filterFunc(avatar):
return 1
filterFunc = staticmethod(filterFunc)
def __init__(self, id, quest):
FriendQuest.__init__(self, id, quest)
self.checkNumFriends(self.quest[0])
self.checkNewbieLevel(self.quest[1])
def getNumQuestItems(self):
return self.getNumFriends()
def getNumFriends(self):
return self.quest[0]
def getNewbieLevel(self):
return self.quest[1]
def getCompletionStatus(self, av, questDesc, npc = None):
questId, fromNpcId, toNpcId, rewardId, toonProgress = questDesc
questComplete = toonProgress >= self.getNumFriends()
return getCompleteStatusWithNpc(questComplete, toNpcId, npc)
def getProgressString(self, avatar, questDesc):
if self.getCompletionStatus(avatar, questDesc) == COMPLETE:
return CompleteString
elif self.getNumFriends() == 1:
return ''
else:
return TTLocalizer.QuestsFriendNewbieQuestProgress % {'progress': questDesc[4],
'numFriends': self.getNumFriends()}
def getString(self):
return TTLocalizer.QuestsFriendNewbieQuestObjective % self.getNumFriends()
def getObjectiveStrings(self):
return [TTLocalizer.QuestsFriendNewbieQuestString % (self.getNumFriends(), self.getNewbieLevel())]
def doesFriendCount(self, av, otherAv):
if otherAv != None and otherAv.getMaxHp() <= self.getNewbieLevel():
return 1
return 0
class TrolleyQuest(Quest):
def __init__(self, id, quest):
Quest.__init__(self, id, quest)
@ -1931,60 +1676,6 @@ class PhoneQuest(Quest):
def getObjectiveStrings(self):
return [TTLocalizer.QuestsPhoneQuestString]
class MinigameNewbieQuest(Quest, NewbieQuest):
def __init__(self, id, quest):
Quest.__init__(self, id, quest)
self.checkNumMinigames(self.quest[0])
self.checkNewbieLevel(self.quest[1])
def getNumQuestItems(self):
return self.getNumMinigames()
def getNumMinigames(self):
return self.quest[0]
def getNewbieLevel(self):
return self.quest[1]
def getCompletionStatus(self, av, questDesc, npc = None):
questId, fromNpcId, toNpcId, rewardId, toonProgress = questDesc
questComplete = toonProgress >= self.getNumMinigames()
return getCompleteStatusWithNpc(questComplete, toNpcId, npc)
def getProgressString(self, avatar, questDesc):
if self.getCompletionStatus(avatar, questDesc) == COMPLETE:
return CompleteString
elif self.getNumMinigames() == 1:
return ''
else:
return TTLocalizer.QuestsMinigameNewbieQuestProgress % {'progress': questDesc[4],
'numMinigames': self.getNumMinigames()}
def getString(self):
return TTLocalizer.QuestsMinigameNewbieQuestObjective % self.getNumMinigames()
def getObjectiveStrings(self):
return [TTLocalizer.QuestsMinigameNewbieQuestString % self.getNumMinigames()]
def getHeadlineString(self):
return TTLocalizer.QuestsNewbieQuestHeadline
def getSCStrings(self, toNpcId, progress):
if progress:
return getFinishToonTaskSCStrings(toNpcId)
return TTLocalizer.QuestsTrolleyQuestSCString
def doesMinigameCount(self, av, avList):
newbieHp = self.getNewbieLevel()
points = 0
for toon in avList:
if toon != av and toon.getMaxHp() <= newbieHp:
points += 1
return points
DefaultDialog = {GREETING: DefaultGreeting,
QUEST: DefaultQuest,
INCOMPLETE: DefaultIncomplete,
@ -2612,14 +2303,6 @@ QuestDict = {
5039: (BR_TIER, Start, (CogLevelQuest, Anywhere, 12, 8), Any, ToonHQ, Any, NA, DefaultDialog),
5040: (BR_TIER, Start, (CogQuest, ToontownGlobals.TheBrrrgh, 75, Any), Any, ToonHQ, NA, 5041, DefaultDialog),
5041: (BR_TIER, Cont, (DeliverItemQuest, 1000), Any, 3008, 1000, NA, DefaultDialog),
5060: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5061: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5062: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5063: (BR_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 5, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5064: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5065: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5066: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5067: (BR_TIER, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5070: (BR_TIER, Start, (CogQuest, ToontownGlobals.SellbotHQ, 20, Any), Any, ToonHQ, Any, NA, DefaultDialog),
5071: (BR_TIER, Start, (CogQuest, ToontownGlobals.SellbotHQ, 22, Any), Any, ToonHQ, Any, NA, DefaultDialog),
5072: (BR_TIER, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 15, 4), Any, ToonHQ, Any, NA, DefaultDialog),
@ -2792,14 +2475,6 @@ QuestDict = {
5310: (BR_TIER + 1, Cont, (VisitQuest,), Same, 3113, NA, 5311, TTLocalizer.QuestDialogDict[5310]),
5311: (BR_TIER + 1, Cont, (RecoverItemQuest, Anywhere, 2, 3026, Medium, 'le'), Same, Same, NA, 5312, TTLocalizer.QuestDialogDict[5311]),
5312: (BR_TIER + 1, Cont, (DeliverItemQuest, 3026), Same, 3312, 502, NA, TTLocalizer.QuestDialogDict[5312]),
5290: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5291: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5292: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5293: (BR_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 12, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5294: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5295: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5296: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5297: (BR_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5500: (BR_TIER + 1, Start, (CogQuest, ToontownGlobals.TheBrrrgh, 75, Any), Any, ToonHQ, NA, 5501, DefaultDialog),
5501: (BR_TIER + 1, Cont, (DeliverItemQuest, 1000), Any, 3008, 1000, NA, DefaultDialog),
5502: (BR_TIER + 1, Start, (RescueQuest, InVP, 3), Any, ToonHQ, Any, NA, DefaultDialog),
@ -2840,14 +2515,6 @@ QuestDict = {
5339: (BR_TIER + 2, Start, (CogLevelQuest, Anywhere, 12, 8), Any, ToonHQ, Any, NA, DefaultDialog),
5340: (BR_TIER + 2, Start, (CogQuest, ToontownGlobals.TheBrrrgh, 75, Any), Any, ToonHQ, NA, 5341, DefaultDialog),
5341: (BR_TIER + 2, Cont, (DeliverItemQuest, 1000), Any, 3008, 1000, NA, DefaultDialog),
5360: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5361: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5362: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5363: (BR_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 20, Any, NEWBIE_HP), Any, ToonHQ, 606, NA, DefaultDialog),
5364: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5365: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5366: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5367: (BR_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
5370: (BR_TIER + 2, Start, (CogQuest, ToontownGlobals.SellbotHQ, 22, Any), Any, ToonHQ, Any, NA, DefaultDialog),
5371: (BR_TIER + 2, Start, (CogQuest, ToontownGlobals.SellbotHQ, 25, Any), Any, ToonHQ, Any, NA, DefaultDialog),
5372: (BR_TIER + 2, Start, (CogLevelQuest, ToontownGlobals.SellbotHQ, 16, 4), Any, ToonHQ, Any, NA, DefaultDialog),
@ -2923,14 +2590,6 @@ QuestDict = {
6156: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
6157: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
6158: (DL_TIER, Start, (BuildingQuest, Anywhere, 2, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
6160: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
6161: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
6162: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
6163: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 25, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
6164: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
6165: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
6166: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
6167: (DL_TIER, Start, (BuildingNewbieQuest, Anywhere, 2, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
6170: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 40, Any), Any, ToonHQ, Any, NA, DefaultDialog),
6171: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 45, Any), Any, ToonHQ, Any, NA, DefaultDialog),
6172: (DL_TIER, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 50, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -2949,13 +2608,6 @@ QuestDict = {
6185: (DL_TIER, OBSOLETE, (SkelecogLevelQuest, ToontownGlobals.SellbotHQ, 4, 6), Any, ToonHQ, Any, NA, DefaultDialog),
6186: (DL_TIER, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog),
6187: (DL_TIER, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 4), Any, ToonHQ, Any, NA, DefaultDialog),
6190: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 15, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6191: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 15, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6192: (DL_TIER, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 15, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6193: (DL_TIER, Start, (SkelecogNewbieQuest, ToontownGlobals.SellbotHQ, 3, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6194: (DL_TIER, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6195: (DL_TIER, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6196: (DL_TIER, Start, (ForemanNewbieQuest, ToontownGlobals.SellbotFactoryInt, 1, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
6197: (DL_TIER, Start, (BuildingQuest, Anywhere, 10, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog),
6198: (DL_TIER, Start, (BuildingQuest, Anywhere, 8, Any, 0, 1), Any, ToonHQ, Any, NA, DefaultDialog),
6199: (DL_TIER, Start, (BuildingQuest, Anywhere, 6, 's', 0, 1), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3083,14 +2735,6 @@ QuestDict = {
7156: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
7157: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
7158: (DL_TIER + 1, Start, (BuildingQuest, Anywhere, 5, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
7160: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
7161: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
7162: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
7163: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 35, Any, NEWBIE_HP), Any, ToonHQ, 607, NA, DefaultDialog),
7164: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
7165: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
7166: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
7167: (DL_TIER + 1, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 2, 0, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
7170: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 80, Any), Any, ToonHQ, Any, NA, DefaultDialog),
7171: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 90, Any), Any, ToonHQ, Any, NA, DefaultDialog),
7172: (DL_TIER + 1, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 100, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3109,13 +2753,6 @@ QuestDict = {
7185: (DL_TIER + 1, OBSOLETE, (SkelecogLevelQuest, ToontownGlobals.SellbotHQ, 8, 6), Any, ToonHQ, Any, NA, DefaultDialog),
7186: (DL_TIER + 1, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 6), Any, ToonHQ, Any, NA, DefaultDialog),
7187: (DL_TIER + 1, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 8), Any, ToonHQ, Any, NA, DefaultDialog),
7190: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 25, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7191: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 25, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7192: (DL_TIER + 1, Start, (CogNewbieQuest, ToontownGlobals.SellbotHQ, 25, Any, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7193: (DL_TIER + 1, Start, (SkelecogNewbieQuest, ToontownGlobals.SellbotHQ, 6, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7194: (DL_TIER + 1, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7195: (DL_TIER + 1, Start, (FactoryNewbieQuest, ToontownGlobals.SellbotHQ, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7196: (DL_TIER + 1, Start, (ForemanNewbieQuest, ToontownGlobals.SellbotFactoryInt, 2, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
7201: (DL_TIER + 1, Start, (VisitQuest,), Any, 9124, NA, 7202, TTLocalizer.QuestDialogDict[7201]),
7202: (DL_TIER + 1, Start, (VisitQuest,), 9124, 9128, NA, 7203, TTLocalizer.QuestDialogDict[7202]),
7203: (DL_TIER + 1, Cont, (DeliverItemQuest, 7001), Same, 9124, NA, 7204, TTLocalizer.QuestDialogDict[7203]),
@ -3239,14 +2876,6 @@ QuestDict = {
8156: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 's', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
8157: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'c', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
8158: (DL_TIER + 2, Start, (BuildingQuest, Anywhere, 10, 'l', 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
8160: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
8161: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
8162: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
8163: (DL_TIER + 2, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 40, Any, NEWBIE_HP), Any, ToonHQ, 608, NA, DefaultDialog),
8164: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
8165: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
8166: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
8167: (DL_TIER + 2, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
8170: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 160, Any), Any, ToonHQ, Any, NA, DefaultDialog),
8171: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 180, Any), Any, ToonHQ, Any, NA, DefaultDialog),
8172: (DL_TIER + 2, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 200, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3267,15 +2896,7 @@ QuestDict = {
8187: (DL_TIER + 2, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 16), Any, ToonHQ, Any, NA, DefaultDialog),
8188: (DL_TIER + 2, Start, (BossQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog),
8189: (DL_TIER + 2, Start, (RescueQuest, InVP, 4), 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),
8193: (DL_TIER + 2, OBSOLETE, (SkelecogNewbieQuest, ToontownGlobals.SellbotHQ, 8, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 610, NA, DefaultDialog),
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, Start, (RescueQuest, InFO, 8), Any, ToonHQ, Any, NA, DefaultDialog),
#8197: (DL_TIER + 2, OBSOLETE, (VPNewbieQuest, 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),
@ -3358,14 +2979,6 @@ QuestDict = {
9156: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
9157: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
9158: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 100, Any, 5, 0), Any, ToonHQ, Any, NA, DefaultDialog),
9160: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9161: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9162: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9163: (DL_TIER + 3, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 45, Any, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9164: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9165: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9166: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9167: (DL_TIER + 3, Start, (BuildingNewbieQuest, Anywhere, 1, Any, 3, 0, NEWBIE_HP), Any, ToonHQ, 609, NA, DefaultDialog),
9170: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 350, Any), Any, ToonHQ, Any, NA, DefaultDialog),
9171: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 400, Any), Any, ToonHQ, Any, NA, DefaultDialog),
9172: (DL_TIER + 3, OBSOLETE, (CogQuest, ToontownGlobals.SellbotHQ, 500, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3386,14 +2999,6 @@ QuestDict = {
9187: (DL_TIER + 3, OBSOLETE, (ForemanQuest, ToontownGlobals.SellbotHQ, 35), Any, ToonHQ, Any, NA, DefaultDialog),
9188: (DL_TIER + 3, Start, (BossQuest, ToontownGlobals.SellbotHQ, 3), Any, ToonHQ, Any, NA, DefaultDialog),
9189: (DL_TIER + 3, Start, (RescueQuest, InVP, 5), 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),
9193: (DL_TIER + 3, OBSOLETE, (SkelecogNewbieQuest, ToontownGlobals.SellbotHQ, 10, SELLBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
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),
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),
@ -3413,16 +3018,6 @@ QuestDict = {
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, (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),
9223: (DL_TIER + 3, Start, (SkelecogNewbieQuest, ToontownGlobals.CashbotHQ, 10, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9224: (DL_TIER + 3, Start, (MintNewbieQuest, ToontownGlobals.CashbotMintIntA, 6, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9225: (DL_TIER + 3, Start, (MintNewbieQuest, ToontownGlobals.CashbotMintIntB, 4, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9226: (DL_TIER + 3, Start, (MintNewbieQuest, ToontownGlobals.CashbotMintIntC, 2, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9227: (DL_TIER + 3, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotMintIntA, 6, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9228: (DL_TIER + 3, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotMintIntB, 4, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9229: (DL_TIER + 3, Start, (SupervisorNewbieQuest, ToontownGlobals.CashbotMintIntC, 2, CASHBOT_HQ_NEWBIE_HP), Any, ToonHQ, 611, NA, DefaultDialog),
9500: (DL_TIER + 3, Start, (CogQuest, ToontownGlobals.DonaldsDreamland, 1000, Any), Any, ToonHQ, NA, 9501, DefaultDialog),
9501: (DL_TIER + 3, Cont, (DeliverItemQuest, 1000), Any, 2004, 1000, NA, DefaultDialog),
9502: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 30, Any, 2, 1), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3430,8 +3025,6 @@ QuestDict = {
9504: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 20, 's', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog),
9505: (DL_TIER + 3, Start, (BuildingQuest, Anywhere, 20, 'l', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog),
9506: (DL_TIER + 3, Start, (RescueQuest, InFO, 10), Any, ToonHQ, Any, NA, DefaultDialog),
10001: (ELDER_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 50, Any, NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog),
10002: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, Any, NA, DefaultDialog),
10100: (ELDER_TIER, Start, (CogQuest, Anywhere, 80, Any), Any, ToonHQ, Any, NA, DefaultDialog),
10101: (ELDER_TIER, Start, (CogQuest, Anywhere, 100, Any), Any, ToonHQ, Any, NA, DefaultDialog),
10102: (ELDER_TIER, Start, (CogQuest, Anywhere, 120, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3454,16 +3047,10 @@ QuestDict = {
10123: (ELDER_TIER, Start, (BossQuest, ToontownGlobals.SellbotHQ, 2), Any, ToonHQ, Any, NA, DefaultDialog),
10124: (ELDER_TIER, Start, (RescueQuest, InVP, 6), Any, ToonHQ, Any, NA, DefaultDialog),
10125: (ELDER_TIER, Start, (RescueQuest, InFO, 12), 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),
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, (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, (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),
@ -3471,10 +3058,6 @@ QuestDict = {
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),
10203: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog),
10204: (ELDER_TIER, Start, (CogNewbieQuest, ToontownGlobals.ToontownCentral, 60, Any, NEWBIE_HP), Any, ToonHQ, NA, 10205, DefaultDialog),
10205: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog),
10206: (ELDER_TIER, Start, (BuildingNewbieQuest, Anywhere, 4, Any, 1, 0, NEWBIE_HP), Any, ToonHQ, NA, 10207, DefaultDialog),
10207: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog),
10208: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 25, Any, 4, 1), Any, ToonHQ, Any, NA, DefaultDialog),
10209: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 's', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog),
10210: (ELDER_TIER, Start, (BuildingQuest, Anywhere, 20, 'l', 5, 1), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3538,8 +3121,7 @@ QuestDict = {
12029: (BOSSBOT_HQ_TIER + 14, Start, (SkeleReviveQuest, Anywhere, 1), Same, Same, 4214, NA, TTLocalizer.QuestDialogDict[12029]),
12030: (BOSSBOT_HQ_TIER + 15, Start, (VisitQuest,), Any, 1222, NA, 12031, TTLocalizer.QuestDialogDict[12030]),
12031: (BOSSBOT_HQ_TIER + 15, Start, (SkeleReviveQuest, Anywhere, 1), Same, Same, 4215, NA, TTLocalizer.QuestDialogDict[12031]),
12032: (BOSSBOT_HQ_TIER + 16, Start, (VisitQuest,), Any, 2001, 4216, NA, TTLocalizer.QuestDialogDict[12032]),
10207: (ELDER_TIER, Cont, (DeliverItemQuest, 1000), Any, ToonTailor, 1000, NA, DefaultDialog)}
12032: (BOSSBOT_HQ_TIER + 16, Start, (VisitQuest,), Any, 2001, 4216, NA, TTLocalizer.QuestDialogDict[12032])}
Tier2QuestsDict = {}
@ -4915,14 +4497,14 @@ OptionalRewardTrackDict = {
MM_TIER: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3002, 3002, 3002, 3002),
MM_TIER + 1: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002),
MM_TIER + 2: (1000, 604, 604, 605, 605, 2403, 2404, 2405, 2406, 2407, 2408, 2409, 3003, 3003, 3002, 3002),
BR_TIER: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
BR_TIER + 1: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
BR_TIER + 2: (1000, 606, 606, 606, 606, 606, 607, 607, 607, 607, 607, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
DL_TIER: (607, 607, 607, 607, 608, 608, 608, 608, 2901, 2902, 2907, 2908, 2909, 2910, 2911, 3003, 3003, 3004, 3004),
DL_TIER + 1: (1000, 607, 607, 607, 607, 608, 608, 608, 608, 2923, 2924, 2927, 2928, 2929, 2930, 2931, 3003, 3003, 3004, 3004),
DL_TIER + 2: (608, 608, 608, 608, 609, 609, 609, 609, 2941, 2942, 2943, 2944, 2947, 2948, 2949, 2950, 2951, 3004, 3004, 3004, 3004),
DL_TIER + 3: (1000, 609, 609, 609, 609, 609, 609, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004, 3004),
ELDER_TIER: (1000, 1000, 610, 611, 612, 613, 614, 615, 616, 617, 618, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004)
BR_TIER: (1000, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
BR_TIER + 1: (1000, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
BR_TIER + 2: (1000, 2305, 2306, 2307, 2308, 2309, 2310, 2311, 3003, 3003, 3003, 3003),
DL_TIER: (2901, 2902, 2907, 2908, 2909, 2910, 2911, 3003, 3003, 3004, 3004),
DL_TIER + 1: (1000, 2923, 2924, 2927, 2928, 2929, 2930, 2931, 3003, 3003, 3004, 3004),
DL_TIER + 2: (2941, 2942, 2943, 2944, 2947, 2948, 2949, 2950, 2951, 3004, 3004, 3004, 3004),
DL_TIER + 3: (1000, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004, 3004),
ELDER_TIER: (1000, 1000, 613, 614, 615, 616, 617, 618, 2961, 2962, 2963, 2964, 2965, 2966, 2967, 2968, 2969, 2970, 2971, 3004, 3004, 3004)
}
def isRewardOptional(tier, rewardId):

View file

@ -250,12 +250,6 @@ QuestsCogQuestSCStringS = 'I need to defeat %(cogName)s%(cogLoc)s.'
QuestsCogQuestSCStringP = 'I need to defeat some %(cogName)s%(cogLoc)s.'
QuestsCogQuestDefeat = 'Defeat %s'
QuestsCogQuestDefeatDesc = '%(numCogs)s %(cogName)s'
QuestsCogNewNewbieQuestObjective = 'Help a new Toon defeat %s'
QuestsCogNewNewbieQuestCaption = 'Help a new Toon %d Laff or less'
QuestsCogOldNewbieQuestObjective = 'Help a Toon with %(laffPoints)d Laff or less defeat %(objective)s'
QuestsCogOldNewbieQuestCaption = 'Help a Toon %d Laff or less'
QuestsCogNewbieQuestAux = 'Defeat:'
QuestsNewbieQuestHeadline = 'APPRENTICE'
QuestsCogTrackQuestProgress = '%(progress)s of %(numCogs)s defeated'
QuestsCogTrackQuestHeadline = 'WANTED'
QuestsCogTrackQuestSCStringS = 'I need to defeat %(cogText)s%(cogLoc)s.'
@ -317,8 +311,6 @@ QuestsRescueQuestRescueDesc = '%(numToons)s Toons'
QuestsRescueQuestToonS = 'a Toon'
QuestsRescueQuestToonP = 'Toons'
QuestsRescueQuestAux = 'Rescue:'
QuestsRescueNewNewbieQuestObjective = 'Help a new Toon rescue %s'
QuestsRescueOldNewbieQuestObjective = 'Help a Toon with %(laffPoints)d Laff or less rescue %(objective)s'
QuestCogPartQuestCogPart = 'Cog Suit Part'
QuestsCogPartQuestFactories = 'Factories'
QuestsCogPartQuestHeadline = 'RETRIEVE'
@ -329,8 +321,6 @@ QuestsCogPartQuestAux = 'Retrieve:'
QuestsCogPartQuestDesc = 'a Cog Suit Part'
QuestsCogPartQuestDescC = '%(count)s Cog Suit Parts'
QuestsCogPartQuestDescI = 'some Cog Suit Parts'
QuestsCogPartNewNewbieQuestObjective = 'Help a new Toon retrieve %s'
QuestsCogPartOldNewbieQuestObjective = 'Help a Toon with %(laffPoints)d Laff or less retrieve %(objective)s'
QuestsDeliverGagQuestProgress = '%(progress)s of %(numGags)s delivered'
QuestsDeliverGagQuestHeadline = 'DELIVER'
QuestsDeliverGagQuestToSCStringS = 'I need to deliver %(gagName)s.'
@ -375,19 +365,10 @@ QuestsMailboxQuestString = 'Check your mail'
QuestsPhoneQuestHeadline = 'CLARABELLE'
QuestsPhoneQuestSCString = 'I need to call Clarabelle.'
QuestsPhoneQuestString = 'Call Clarabelle'
QuestsFriendNewbieQuestString = 'Make %d friends %d laff or less'
QuestsFriendNewbieQuestProgress = '%(progress)s of %(numFriends)s made'
QuestsFriendNewbieQuestObjective = 'Make friends with %d new Toons'
QuestsTrolleyQuestHeadline = 'TROLLEY'
QuestsTrolleyQuestSCString = 'I need to ride the trolley.'
QuestsTrolleyQuestString = 'Ride on the trolley'
QuestsTrolleyQuestStringShort = 'Ride the trolley'
QuestsMinigameNewbieQuestString = '%d Minigames'
QuestsMinigameNewbieQuestProgress = '%(progress)s of %(numMinigames)s Played'
QuestsMinigameNewbieQuestObjective = 'Play %d minigames with new Toons'
QuestsMinigameNewbieQuestSCString = 'I need to play minigames with new Toons.'
QuestsMinigameNewbieQuestCaption = 'Help a new Toon %d laff or less'
QuestsMinigameNewbieQuestAux = 'Play:'
QuestsMaxHpReward = 'Your Laff limit has been increased by %s.'
QuestsMaxHpRewardPoster = 'Reward: %s point Laff boost'
QuestsMoneyRewardSingular = 'You get 1 Jellybean.'