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

Revert lil oldman track choice.

Browse source
This commit is contained in:
Loudrob 2015-08-23 11:13:42 -04:00
parent ccf64c323b
commit 9e02732ef9
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
toontown/quest/Quests.py
View file

@ -2280,10 +2280,11 @@ QuestDict = {
5247: (BR_TIER, Start, (VisitQuest,), Any, 3112, NA, 5248, TTLocalizer.QuestDialogDict[5247]), 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]), 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]), 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, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5250]), 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, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5258]), 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, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5259]), 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, 0), Same, Same, 408, NA, TTLocalizer.QuestDialogDict[5260]), 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),
5020: (BR_TIER, Start, (CogQuest, Anywhere, 36, Any), Any, ToonHQ, Any, NA, DefaultDialog), 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), 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), 5022: (BR_TIER, Start, (CogQuest, Anywhere, 40, Any), Any, ToonHQ, Any, NA, DefaultDialog),
@ -3329,7 +3330,7 @@ def chooseMatchingQuest(tier, validQuestPool, rewardId, npc, av):
questsMatchingReward = Tier2Reward2QuestsDict[tier].get(rewardId, []) questsMatchingReward = Tier2Reward2QuestsDict[tier].get(rewardId, [])
if notify.getDebug(): if notify.getDebug():
notify.debug('questsMatchingReward: %s tier: %s = %s' % (rewardId, tier, questsMatchingReward)) notify.debug('questsMatchingReward: %s tier: %s = %s' % (rewardId, tier, questsMatchingReward))
if rewardId == 400 and QuestDict[questsMatchingReward[0]][QuestDictNextQuestIndex] == NA: if rewardId == 400:
bestQuest = chooseTrackChoiceQuest(tier, av) bestQuest = chooseTrackChoiceQuest(tier, av)
if notify.getDebug(): if notify.getDebug():
notify.debug('single part track choice quest: %s tier: %s avId: %s trackAccess: %s bestQuest: %s' % (rewardId, notify.debug('single part track choice quest: %s tier: %s avId: %s trackAccess: %s bestQuest: %s' % (rewardId,
@ -3790,26 +3791,28 @@ class TrackTrainingReward(Reward):
def __init__(self, id, reward): def __init__(self, id, reward):
Reward.__init__(self, id, reward) Reward.__init__(self, id, reward)
def getTrack(self, av): def getTrack(self):
track = self.reward[0] track = self.reward[0]
if track == None: if track == None:
track = 0 track = 0
trackAccess = av.getTrackAccess() trackAccess = av.getTrackAccess()
for i in xrange(len(trackAccess)): for i in xrange(len(trackAccess)):
if trackAccess[i] == 0: if trackAccess[i] == 0:
return i return i
return track return track
def sendRewardAI(self, av): def sendRewardAI(self, av):
av.b_setTrackProgress(self.getTrack(av), 0) av.b_setTrackProgress(self.getTrack(), 0)
def countReward(self, qrc): def countReward(self, qrc):
qrc.trackProgressId = self.getTrack(base.localAvatar) qrc.trackProgressId = self.getTrack()
qrc.trackProgress = 0 qrc.trackProgress = 0
def getString(self): def getString(self):
trackName = ToontownBattleGlobals.Tracks[self.getTrack(base.localAvatar)].capitalize() trackName = ToontownBattleGlobals.Tracks[self.getTrack()].capitalize()
return TTLocalizer.QuestsTrackTrainingReward % trackName return TTLocalizer.QuestsTrackTrainingReward % trackName
def getPosterString(self): def getPosterString(self):
@ -4160,7 +4163,6 @@ RewardDict = {
405: (TrackTrainingReward, ToontownBattleGlobals.THROW_TRACK), 405: (TrackTrainingReward, ToontownBattleGlobals.THROW_TRACK),
406: (TrackTrainingReward, ToontownBattleGlobals.SQUIRT_TRACK), 406: (TrackTrainingReward, ToontownBattleGlobals.SQUIRT_TRACK),
407: (TrackTrainingReward, ToontownBattleGlobals.DROP_TRACK), 407: (TrackTrainingReward, ToontownBattleGlobals.DROP_TRACK),
408: (TrackTrainingReward, None),
500: (MaxQuestCarryReward, 2), 500: (MaxQuestCarryReward, 2),
501: (MaxQuestCarryReward, 3), 501: (MaxQuestCarryReward, 3),
502: (MaxQuestCarryReward, 4), 502: (MaxQuestCarryReward, 4),

10
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -551,6 +551,12 @@ INCOMPLETE_PROGRESS = 3
INCOMPLETE_WRONG_NPC = 4 INCOMPLETE_WRONG_NPC = 4
COMPLETE = 5 COMPLETE = 5
LEAVING = 6 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_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_'} 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 = { QuestDialogDict = {
@ -966,22 +972,18 @@ QuestDialogDict = {
INCOMPLETE_PROGRESS: 'It seems you may not be so clever with the rod and reel.'}, INCOMPLETE_PROGRESS: 'It seems you may not be so clever with the rod and reel.'},
5250: {GREETING: '', 5250: {GREETING: '',
LEAVING: '', 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.', 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?'}, INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'},
5258: {GREETING: '', 5258: {GREETING: '',
LEAVING: '', 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.', 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?'}, INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'},
5259: {GREETING: '', 5259: {GREETING: '',
LEAVING: '', 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.', 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?'}, INCOMPLETE_PROGRESS: 'Do the buildings give you trouble?'},
5260: {GREETING: '', 5260: {GREETING: '',
LEAVING: '', 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.', 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?'}, 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_'}, 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_'},