From 9bd970ab002b6b6dd246c40b5d3ed86a3e88eb9a Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 23 Mar 2015 10:42:20 +0200 Subject: [PATCH] Lil Oldman --- toontown/quest/Quests.py | 26 ++++++++++++++----------- toontown/toonbase/TTLocalizerEnglish.py | 10 ++++------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/toontown/quest/Quests.py b/toontown/quest/Quests.py index 091a0784..20eda575 100644 --- a/toontown/quest/Quests.py +++ b/toontown/quest/Quests.py @@ -2587,11 +2587,10 @@ QuestDict = { 5247: (BR_TIER, Start, (VisitQuest,), Any, 3112, NA, 5248, TTLocalizer.QuestDialogDict[5247]), 5248: (BR_TIER, Start, (CogLevelQuest, Anywhere, 10, 8), 3112, Same, NA, 5249, TTLocalizer.QuestDialogDict[5248]), 5249: (BR_TIER, Cont, (RecoverItemQuest, Anywhere, 3, 3018, VeryHard, AnyFish), Same, Same, NA, (5250, 5258, 5259, 5260), TTLocalizer.QuestDialogDict[5249]), - 5250: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'l', 4), Same, Same, NA, 5001, TTLocalizer.QuestDialogDict[5250]), - 5258: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'c', 4), Same, Same, NA, 5001, TTLocalizer.QuestDialogDict[5258]), - 5259: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'm', 4), Same, Same, NA, 5001, TTLocalizer.QuestDialogDict[5259]), - 5260: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 's', 4), Same, Same, NA, 5001, TTLocalizer.QuestDialogDict[5260]), - 5001: (BR_TIER, Cont, (TrackChoiceQuest,), Same, Same, 400, NA, TTLocalizer.TheBrrrghTrackQuestDict), + 5250: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'l', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5250]), + 5258: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'c', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5258]), + 5259: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 'm', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5259]), + 5260: (BR_TIER, Cont, (BuildingQuest, Anywhere, 2, 's', 4), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5260]), 5020: (BR_TIER, Start, (CogQuest, Anywhere, 36, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5021: (BR_TIER, Start, (CogQuest, Anywhere, 38, Any), Any, ToonHQ, Any, NA, DefaultDialog), 5022: (BR_TIER, Start, (CogQuest, Anywhere, 40, Any), Any, ToonHQ, Any, NA, DefaultDialog), @@ -3599,7 +3598,7 @@ def chooseMatchingQuest(tier, validQuestPool, rewardId, npc, av): questsMatchingReward = Tier2Reward2QuestsDict[tier].get(rewardId, []) if notify.getDebug(): notify.debug('questsMatchingReward: %s tier: %s = %s' % (rewardId, tier, questsMatchingReward)) - if rewardId == 400: + if rewardId == 400 and QuestDict[questsMatchingReward[0]][QuestDictNextQuestIndex] == NA: bestQuest = chooseTrackChoiceQuest(tier, av) if notify.getDebug(): notify.debug('single part track choice quest: %s tier: %s avId: %s trackAccess: %s bestQuest: %s' % (rewardId, @@ -4060,21 +4059,25 @@ class TrackTrainingReward(Reward): def __init__(self, id, reward): Reward.__init__(self, id, reward) - def getTrack(self): + def getTrack(self, av): track = self.reward[0] if track == None: - track = 0 + trackAccess = av.getTrackAccess() + + for i in xrange(len(trackAccess)): + if trackAccess[i] == 0: + return i return track def sendRewardAI(self, av): - av.b_setTrackProgress(self.getTrack(), 0) + av.b_setTrackProgress(self.getTrack(av), 0) def countReward(self, qrc): - qrc.trackProgressId = self.getTrack() + qrc.trackProgressId = self.getTrack(base.localAvatar) qrc.trackProgress = 0 def getString(self): - trackName = ToontownBattleGlobals.Tracks[self.getTrack()].capitalize() + trackName = ToontownBattleGlobals.Tracks[self.getTrack(base.localAvatar)].capitalize() return TTLocalizer.QuestsTrackTrainingReward % trackName def getPosterString(self): @@ -4404,6 +4407,7 @@ RewardDict = { 405: (TrackTrainingReward, ToontownBattleGlobals.THROW_TRACK), 406: (TrackTrainingReward, ToontownBattleGlobals.SQUIRT_TRACK), 407: (TrackTrainingReward, ToontownBattleGlobals.DROP_TRACK), + 408: (TrackTrainingReward, None), 500: (MaxQuestCarryReward, 2), 501: (MaxQuestCarryReward, 3), 502: (MaxQuestCarryReward, 4), diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 6449c08e..69c0aa22 100644 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -577,12 +577,6 @@ INCOMPLETE_PROGRESS = 3 INCOMPLETE_WRONG_NPC = 4 COMPLETE = 5 LEAVING = 6 -TheBrrrghTrackQuestDict = {GREETING: '', - QUEST: 'Now you are ready.\x07Go out and walk the earth until you know which track you would like to choose.\x07When you are certain, return to me.', - INCOMPLETE_PROGRESS: 'Choose wisely.', - INCOMPLETE_WRONG_NPC: 'Choose wisely.', - COMPLETE: 'Very wise choice!\x07Good luck. Return to me when you have mastered your new skill.', - LEAVING: ''} QuestDialog_3225 = {QUEST: "Oh, thanks for coming, _avName_!\x07The Cogs in the neighborhood frightened away my delivery person.\x07I don't have anyone to deliver this salad to _toNpcName_!\x07Can you do it for me? Thanks so much!_where_"} QuestDialog_2910 = {QUEST: 'Back so soon?\x07Great job on the spring.\x07The final item is a counter weight.\x07Stop by and see _toNpcName_ and bring back whatever you can get._where_'} QuestDialogDict = {160: {GREETING: '', @@ -990,18 +984,22 @@ QuestDialogDict = {160: {GREETING: '', INCOMPLETE_PROGRESS: 'It seems you may not be so clever with the rod and reel.'}, 5250: {GREETING: '', LEAVING: '', + COMPLETE: 'Now you are ready.\x07Good luck. Return to me when you have mastered your new skill.', QUEST: 'Aha! These dice will look great hanging from the rearview mirror of my ox cart!\x07Now, show me that you can tell your enemies from one another.\x07Return when you have restored two of the tallest Lawbot buildings.', INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'}, 5258: {GREETING: '', LEAVING: '', + COMPLETE: 'Now you are ready.\x07Good luck. Return to me when you have mastered your new skill.', QUEST: 'Aha! These dice will look great hanging from the rearview mirror of my ox cart!\x07Now, show me that you can tell your enemies from one another.\x07Return when you have restored two of the tallest Bossbot buildings.', INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'}, 5259: {GREETING: '', LEAVING: '', + COMPLETE: 'Now you are ready.\x07Good luck. Return to me when you have mastered your new skill.', QUEST: 'Aha! These dice will look great hanging from the rearview mirror of my ox cart!\x07Now, show me that you can tell your enemies from one another.\x07Return when you have restored two of the tallest Cashbot buildings.', INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'}, 5260: {GREETING: '', LEAVING: '', + COMPLETE: 'Now you are ready.\x07Good luck. Return to me when you have mastered your new skill.', QUEST: 'Aha! These dice will look great hanging from the rearview mirror of my ox cart!\x07Now, show me that you can tell your enemies from one another.\x07Return when you have restored two of the tallest Sellbot buildings.', INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'}, 5200: {QUEST: 'Those sneaky Cogs are at it again.\x07_toNpcName_ has reported another missing item. Stop by and see if you can straighten it out._where_'},