From 8c0eed8214858114d2d04e613a959af14bdbf0aa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 10 Jun 2015 17:45:44 +0300 Subject: [PATCH] DANIEL: "Toon has went sad" --- toontown/battle/MovieSuitAttacks.py | 8 +++++--- toontown/battle/PlayByPlayText.py | 2 +- toontown/toonbase/TTLocalizerEnglish.py | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/toontown/battle/MovieSuitAttacks.py b/toontown/battle/MovieSuitAttacks.py index c90bb42f..3d3c6451 100755 --- a/toontown/battle/MovieSuitAttacks.py +++ b/toontown/battle/MovieSuitAttacks.py @@ -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) diff --git a/toontown/battle/PlayByPlayText.py b/toontown/battle/PlayByPlayText.py index 7e36e399..6bcabfbf 100755 --- a/toontown/battle/PlayByPlayText.py +++ b/toontown/battle/PlayByPlayText.py @@ -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), diff --git a/toontown/toonbase/TTLocalizerEnglish.py b/toontown/toonbase/TTLocalizerEnglish.py index 632a081b..42b4f799 100755 --- a/toontown/toonbase/TTLocalizerEnglish.py +++ b/toontown/toonbase/TTLocalizerEnglish.py @@ -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!'