From 6a5d16b0548299af338d9bb2c500fdde0f096834 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 4 Sep 2015 11:30:36 +0300 Subject: [PATCH] Animation skip fix and increased 1 minute stay to 2 minute stay with quest giver toons --- toontown/battle/BattleBase.py | 2 +- toontown/toon/DistributedNPCSpecialQuestGiverAI.py | 14 +++++++------- toontown/toon/DistributedNPCToonAI.py | 4 ++-- toontown/toon/NPCToons.py | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/toontown/battle/BattleBase.py b/toontown/battle/BattleBase.py index 8de10b2d..fd00f92c 100755 --- a/toontown/battle/BattleBase.py +++ b/toontown/battle/BattleBase.py @@ -40,7 +40,7 @@ SOUND = SOUND_TRACK THROW = THROW_TRACK SQUIRT = SQUIRT_TRACK DROP = DROP_TRACK -TOON_ATTACK_TIME = 14.0 +TOON_ATTACK_TIME = 15.0 SUIT_ATTACK_TIME = 12.0 TOON_TRAP_DELAY = 0.8 TOON_SOUND_DELAY = 1.0 diff --git a/toontown/toon/DistributedNPCSpecialQuestGiverAI.py b/toontown/toon/DistributedNPCSpecialQuestGiverAI.py index 78f9634f..58e2db3a 100755 --- a/toontown/toon/DistributedNPCSpecialQuestGiverAI.py +++ b/toontown/toon/DistributedNPCSpecialQuestGiverAI.py @@ -144,7 +144,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): [questId, rewardId, 0], ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def incompleteQuest(self, avId, questId, completeStatus, toNpcId): self.busy = avId @@ -154,7 +154,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): [questId, completeStatus, toNpcId], ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def assignQuest(self, avId, questId, rewardId, toNpcId): self.busy = avId @@ -166,7 +166,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): [questId, rewardId, toNpcId], ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def presentQuestChoice(self, avId, quests): self.busy = avId @@ -182,7 +182,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): flatQuests, ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def presentTrackChoice(self, avId, questId, tracks): self.busy = avId @@ -195,7 +195,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): tracks, ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def cancelChoseQuest(self, avId): self.busy = avId @@ -205,7 +205,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): [], ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def cancelChoseTrack(self, avId): self.busy = avId @@ -215,7 +215,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI): [], ClockDelta.globalClockDelta.getRealNetworkTime()]) if not self.tutorial: - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.uniqueName('clearMovie')) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.uniqueName('clearMovie')) def setMovieDone(self): avId = self.air.getAvatarIdFromSender() diff --git a/toontown/toon/DistributedNPCToonAI.py b/toontown/toon/DistributedNPCToonAI.py index ead294f9..33319139 100755 --- a/toontown/toon/DistributedNPCToonAI.py +++ b/toontown/toon/DistributedNPCToonAI.py @@ -236,7 +236,7 @@ class DistributedNPCToonAI(DistributedNPCToonBaseAI): if not self.tutorial: self.clearTasks() self.task = self.uniqueName('clearMovie') - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.task) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.task) def cancelChoseTrack(self, avId): self.busy = avId @@ -248,7 +248,7 @@ class DistributedNPCToonAI(DistributedNPCToonBaseAI): if not self.tutorial: self.clearTasks() self.task = self.uniqueName('clearMovie') - taskMgr.doMethodLater(60.0, self.sendTimeoutMovie, self.task) + taskMgr.doMethodLater(NPCToons.QUEST_COUNTDOWN_TIME, self.sendTimeoutMovie, self.task) def setMovieDone(self): avId = self.air.getAvatarIdFromSender() diff --git a/toontown/toon/NPCToons.py b/toontown/toon/NPCToons.py index 5932afd9..8caffa5d 100755 --- a/toontown/toon/NPCToons.py +++ b/toontown/toon/NPCToons.py @@ -58,6 +58,7 @@ NPC_FLIPPYTOONHALL = 10 NPC_SCIENTIST = 11 NPC_GLOVE = 12 NPC_LAFF_RESTOCK = 13 +QUEST_COUNTDOWN_TIME = 120 CLERK_COUNTDOWN_TIME = 120 TAILOR_COUNTDOWN_TIME = 300