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

Animation skip fix and increased 1 minute stay to 2 minute stay with quest giver toons

Browse source
This commit is contained in:
John 2015-09-04 11:30:36 +03:00
parent 17b459b00e
commit 6a5d16b054
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toontown/battle/BattleBase.py
View file

@ -40,7 +40,7 @@ SOUND = SOUND_TRACK
THROW = THROW_TRACK THROW = THROW_TRACK
SQUIRT = SQUIRT_TRACK SQUIRT = SQUIRT_TRACK
DROP = DROP_TRACK DROP = DROP_TRACK
TOON_ATTACK_TIME = 14.0 TOON_ATTACK_TIME = 15.0
SUIT_ATTACK_TIME = 12.0 SUIT_ATTACK_TIME = 12.0
TOON_TRAP_DELAY = 0.8 TOON_TRAP_DELAY = 0.8
TOON_SOUND_DELAY = 1.0 TOON_SOUND_DELAY = 1.0

14
toontown/toon/DistributedNPCSpecialQuestGiverAI.py
View file

@ -144,7 +144,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
[questId, rewardId, 0], [questId, rewardId, 0],
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def incompleteQuest(self, avId, questId, completeStatus, toNpcId):
self.busy = avId self.busy = avId
@ -154,7 +154,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
[questId, completeStatus, toNpcId], [questId, completeStatus, toNpcId],
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def assignQuest(self, avId, questId, rewardId, toNpcId):
self.busy = avId self.busy = avId
@ -166,7 +166,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
[questId, rewardId, toNpcId], [questId, rewardId, toNpcId],
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def presentQuestChoice(self, avId, quests):
self.busy = avId self.busy = avId
@ -182,7 +182,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
flatQuests, flatQuests,
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def presentTrackChoice(self, avId, questId, tracks):
self.busy = avId self.busy = avId
@ -195,7 +195,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
tracks, tracks,
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def cancelChoseQuest(self, avId):
self.busy = avId self.busy = avId
@ -205,7 +205,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
[], [],
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def cancelChoseTrack(self, avId):
self.busy = avId self.busy = avId
@ -215,7 +215,7 @@ class DistributedNPCSpecialQuestGiverAI(DistributedNPCToonBaseAI):
[], [],
ClockDelta.globalClockDelta.getRealNetworkTime()]) ClockDelta.globalClockDelta.getRealNetworkTime()])
if not self.tutorial: 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): def setMovieDone(self):
avId = self.air.getAvatarIdFromSender() avId = self.air.getAvatarIdFromSender()

4
toontown/toon/DistributedNPCToonAI.py
View file

@ -236,7 +236,7 @@ class DistributedNPCToonAI(DistributedNPCToonBaseAI):
if not self.tutorial: if not self.tutorial:
self.clearTasks() self.clearTasks()
self.task = self.uniqueName('clearMovie') 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): def cancelChoseTrack(self, avId):
self.busy = avId self.busy = avId
@ -248,7 +248,7 @@ class DistributedNPCToonAI(DistributedNPCToonBaseAI):
if not self.tutorial: if not self.tutorial:
self.clearTasks() self.clearTasks()
self.task = self.uniqueName('clearMovie') 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): def setMovieDone(self):
avId = self.air.getAvatarIdFromSender() avId = self.air.getAvatarIdFromSender()

1
toontown/toon/NPCToons.py
View file

@ -58,6 +58,7 @@ NPC_FLIPPYTOONHALL = 10
NPC_SCIENTIST = 11 NPC_SCIENTIST = 11
NPC_GLOVE = 12 NPC_GLOVE = 12
NPC_LAFF_RESTOCK = 13 NPC_LAFF_RESTOCK = 13
QUEST_COUNTDOWN_TIME = 120
CLERK_COUNTDOWN_TIME = 120 CLERK_COUNTDOWN_TIME = 120
TAILOR_COUNTDOWN_TIME = 300 TAILOR_COUNTDOWN_TIME = 300