Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 19:52:37 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'features/ttn' of http://git.toontownstride.com/toontownstride/src into features/ttn

Browse source
This commit is contained in:
John Cote 2015-07-22 11:03:42 -04:00
commit 86b825a1f0
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toontown/ai/QuestManagerAI.py
View file

@ -290,6 +290,12 @@ class QuestManagerAI:
questList.append(questDesc) questList.append(questDesc)
av.b_setQuests(questList) av.b_setQuests(questList)
def toonCalledClarabelle(self, toon):
for index, quest in enumerate(self.__toonQuestsList2Quests(toon.quests)):
if isinstance(quest, Quests.PhoneQuest):
self.__incrementQuestProgress(toon.quests[index])
toon.updateQuests()
def toonMadeNPCFriend(self, av, count, method): def toonMadeNPCFriend(self, av, count, method):
avQuests = av.getQuests() avQuests = av.getQuests()

2
toontown/estate/DistributedPhoneAI.py
View file

@ -89,6 +89,8 @@ class DistributedPhoneAI(DistributedFurnitureItemAI):
self.d_setMovie(PHONE_MOVIE_PICKUP, avId) self.d_setMovie(PHONE_MOVIE_PICKUP, avId)
av.b_setCatalogNotify(0, av.mailboxNotify) av.b_setCatalogNotify(0, av.mailboxNotify)
self.air.questManager.toonCalledClarabelle(av)
def avatarExit(self): def avatarExit(self):
if not self.inUse: if not self.inUse:
self.notify.warning('Requested avatarExit but phone isn\'t in use!') self.notify.warning('Requested avatarExit but phone isn\'t in use!')