Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DANIEL: "Toon has went sad"

Browse source
This commit is contained in:
John 2015-06-10 17:45:44 +03:00 committed by Loudrob
parent 8751f73779
commit 8c0eed8214
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
toontown/battle/MovieSuitAttacks.py
View file

@ -548,7 +548,7 @@ def getToonTrack(attack, damageDelay = 1e-06, damageAnimNames = None, dodgeDelay
animTrack = Sequence()
animTrack.append(Func(toon.headsUp, battle, suitPos))
if dmg > 0:
animTrack.append(getToonTakeDamageTrack(toon, target['died'], dmg, damageDelay, damageAnimNames, splicedDamageAnims, showDamageExtraTime))
animTrack.append(getToonTakeDamageTrack(toon, attack, target['died'], dmg, damageDelay, damageAnimNames, splicedDamageAnims, showDamageExtraTime))
return animTrack
else:
animTrack.append(getToonDodgeTrack(target, dodgeDelay, dodgeAnimNames, splicedDodgeAnims, showMissedExtraTime))
@ -704,7 +704,7 @@ def throwPos(t, object, duration, target, values, gravity = -32.144):
object.setPos(x, y, z)
def getToonTakeDamageTrack(toon, died, dmg, delay, damageAnimNames = None, splicedDamageAnims = None, showDamageExtraTime = 0.01):
def getToonTakeDamageTrack(toon, attack, died, dmg, delay, damageAnimNames = None, splicedDamageAnims = None, showDamageExtraTime = 0.01):
toonTrack = Sequence()
toonTrack.append(Wait(delay))
if damageAnimNames:
@ -718,7 +718,9 @@ def getToonTakeDamageTrack(toon, died, dmg, delay, damageAnimNames = None, splic
indicatorTrack = Sequence(Wait(delay + showDamageExtraTime), Func(__doDamage, toon, dmg, died))
toonTrack.append(Func(toon.loop, 'neutral'))
if died:
toonTrack.append(Wait(5.0))
pbpText = attack['playByPlayText']
toonTrack.append(pbpText.getToonsDiedInterval([TTLocalizer.ToonDefeatedMessage % toon.getName()], 7.0))
return Parallel(toonTrack, indicatorTrack)

2
toontown/battle/PlayByPlayText.py
View file

@ -19,7 +19,7 @@ class PlayByPlayText(OnscreenText.OnscreenText):
return Sequence(Func(self.hide), Wait(duration * 0.3), Func(self.setText, text), Func(self.show), Wait(duration * 0.7), Func(self.hide))
def getToonsDiedInterval(self, textList, duration):
track = Sequence(Func(self.hide), Wait(duration * 0.3))
track = Sequence(Func(self.hide), Wait(duration * 0.1))
waitGap = 0.6 / len(textList) * duration
for text in textList:
newList = [Func(self.setText, text),

4
toontown/toonbase/TTLocalizerEnglish.py
View file

@ -6967,7 +6967,7 @@ TipDict = {TIP_NONE: ('',),
'Each street in Toontown has different Cog levels and types.',
'Sidewalks are safe from Cogs.',
'On the streets, side doors tell knock-knock jokes when approached.',
'Some ToonTasks train you for new Gag Tracks. You only get to choose six of the seven Gag Tracks, so choose carefully!',
'Some ToonTasks train you for new Gag Tracks.',
'Traps are only useful if you or your friends coordinate using Lure in battle.',
'Higher level Lures are less likely to miss.',
'Lower level gags have a lower accuracy against high level Cogs.',
@ -8470,3 +8470,5 @@ def convertSecondsToDate(seconds):
print '%d:%02d:%02d' % (h, m, s)
return '%d:%02d:%02d' % (h, m, s)
ToonDefeatedMessage = '%s was defeated!'