Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Thank you Joey and the TTR team

Browse source
This commit is contained in:
John 2015-05-26 23:55:39 +03:00 committed by Loudrob
parent 63b34432a2
commit 20d8727825
3 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
toontown/ai/QuestManagerAI.py
View file

@ -476,7 +476,20 @@ class QuestManagerAI:
pass pass
def toonKilledCogs(self, av, suitsKilled, zoneId, activeToonList): def toonKilledCogs(self, av, suitsKilled, zoneId, activeToonList):
pass avQuests = av.getQuests()
questList = []
for i in xrange(0, len(avQuests), 5):
questDesc = avQuests[i : i + 5]
questClass = Quests.getQuest(questDesc[QuestIdIndex])
if isinstance(questClass, Quests.CogQuest):
for suit in suitsKilled:
for x in xrange(questClass.doesCogCount(av.getDoId(), suit, zoneId, activeToonList)):
questDesc[QuestProgressIndex] += 1
questList.append(questDesc)
av.b_setQuests(questList)
@magicWord(category=CATEGORY_PROGRAMMER, types=[str, int, int]) @magicWord(category=CATEGORY_PROGRAMMER, types=[str, int, int])
def quests(command, arg0=0, arg1=0): def quests(command, arg0=0, arg1=0):

12
toontown/battle/RewardPanel.py
View file

@ -622,16 +622,8 @@ class RewardPanel(DirectFrame):
earned = itemList.count(questItem) earned = itemList.count(questItem)
else: else:
for cogDict in cogList: for cogDict in cogList:
if cogDict['isVP']: num = quest.doesCogCount(avId, cogDict, zoneId, toonShortList)
num = quest.doesVPCount(avId, cogDict, zoneId, toonShortList)
elif cogDict['isCFO']:
num = quest.doesCFOCount(avId, cogDict, zoneId, toonShortList)
elif cogDict['isCJ']:
num = quest.doesCJCount(avId, cogDict, zoneId, toonShortList)
elif cogDict['isCEO']:
num = quest.doesCEOCount(avId, cogDict, zoneId, toonShortList)
else:
num = quest.doesCogCount(avId, cogDict, zoneId, toonShortList)
if num: if num:
if base.config.GetBool('battle-passing-no-credit', True): if base.config.GetBool('battle-passing-no-credit', True):
if avId in helpfulToonsList: if avId in helpfulToonsList:

12
toontown/quest/Quests.py
View file

@ -358,18 +358,6 @@ class Quest:
def doesCogCount(self, avId, cogDict, zoneId, avList): def doesCogCount(self, avId, cogDict, zoneId, avList):
return 0 return 0
def doesVPCount(self, avId, cogDict, zoneId, avList):
return 0
def doesCFOCount(self, avId, cogDict, zoneId, avList):
return 0
def doesCJCount(self, avId, cogDict, zoneId, avList):
return 0
def doesCEOCount(self, avId, cogDict, zoneId, avList):
return 0
def doesFactoryCount(self, avId, location, avList): def doesFactoryCount(self, avId, location, avList):
return 0 return 0