diff --git a/otp/otpbase/OTPLocalizerEnglish.py b/otp/otpbase/OTPLocalizerEnglish.py index e20f7097..ddc7da11 100644 --- a/otp/otpbase/OTPLocalizerEnglish.py +++ b/otp/otpbase/OTPLocalizerEnglish.py @@ -2177,7 +2177,8 @@ CustomSCStrings = {10: 'Oh, well.', 14008: 'Cannon Pinball rocks!', 14009: 'Your Estate rocks!', 14010: 'Your Garden is cool!', - 14011: 'Your Estate is cool!'} + 14011: 'Your Estate is cool!', + 14012: 'Wanna tussle m8?'} SCMenuCommonCogIndices = (20000, 20004) SCMenuCustomCogIndices = {'bf': (20005, 20014), 'nc': (20015, 20024), diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py index 5fabf8fc..70db34a3 100644 --- a/toontown/toon/TTEmote.py +++ b/toontown/toon/TTEmote.py @@ -320,9 +320,10 @@ def doLaugh(toon, volume = 1): def doTaunt(toon, volume=1): duration = toon.getDuration('angry', 'torso') sfx = None - sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg') + sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg') track = Sequence( + Func(toon.setChatAbsolute, OTPLocalizer.CustomSCStrings[14012], CFSpeech|CFTimeout), Func(toon.blinkEyes), Func(toon.play, 'taunt'), Func(base.playSfx, sfx, volume=volume, node=toon) @@ -331,7 +332,7 @@ def doTaunt(toon, volume=1): return (track, duration, None) def doRage(toon, volume=1): - sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg') + sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg') track = Sequence( Func(toon.blinkEyes),