From 747bcd898b74d0df892ee30538c9b8cc5a20565d Mon Sep 17 00:00:00 2001
From: Zach <zachgatestech@gmail.com>
Date: Sun, 10 May 2015 06:25:02 -0500
Subject: [PATCH] rage emote

---
 otp/otpbase/OTPLocalizerEnglish.py   |  9 ++++++---
 toontown/catalog/CatalogEmoteItem.py |  2 +-
 toontown/catalog/CatalogGenerator.py |  4 +++-
 toontown/toon/TTEmote.py             | 21 ++++++++++++++++++---
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/otp/otpbase/OTPLocalizerEnglish.py b/otp/otpbase/OTPLocalizerEnglish.py
index b71133e2..e20f7097 100644
--- a/otp/otpbase/OTPLocalizerEnglish.py
+++ b/otp/otpbase/OTPLocalizerEnglish.py
@@ -262,7 +262,8 @@ EmoteList = ['Wave',
  'Delighted',
  'Furious',
  'Laugh',
- 'Taunt']
+ 'Taunt',
+ 'Rage']
 EmoteWhispers = ['%s waves.',
  '%s is happy.',
  '%s is sad.',
@@ -288,7 +289,8 @@ EmoteWhispers = ['%s waves.',
  '%s is delighted.',
  '%s is furious.',
  '%s is laughing.',
- '%s taunts you.']
+ '%s taunts you.',
+ '%s is raging.']
 EmoteFuncDict = {'Wave': 0,
  'Happy': 1,
  'Sad': 2,
@@ -314,7 +316,8 @@ EmoteFuncDict = {'Wave': 0,
  'Delighted': 22,
  'Furious': 23,
  'Laugh': 24,
- 'Taunt': 25}
+ 'Taunt': 25,
+ 'Rage': 26}
 SuitBrushOffs = {'f': ["I'm late for a meeting."],
  'p': ['Push off.'],
  'ym': ['Yes Man says NO.'],
diff --git a/toontown/catalog/CatalogEmoteItem.py b/toontown/catalog/CatalogEmoteItem.py
index ed421a1f..2b6596ce 100644
--- a/toontown/catalog/CatalogEmoteItem.py
+++ b/toontown/catalog/CatalogEmoteItem.py
@@ -3,7 +3,7 @@ from toontown.toonbase import ToontownGlobals
 from toontown.toonbase import TTLocalizer
 from otp.otpbase import OTPLocalizer
 from direct.interval.IntervalGlobal import *
-LoyaltyEmoteItems = (20, 21, 22, 23, 24)
+LoyaltyEmoteItems = (20, 21, 22, 23, 24, 25, 26)
 
 class CatalogEmoteItem(CatalogItem.CatalogItem):
     sequenceNumber = 0
diff --git a/toontown/catalog/CatalogGenerator.py b/toontown/catalog/CatalogGenerator.py
index 412da365..9dd95367 100644
--- a/toontown/catalog/CatalogGenerator.py
+++ b/toontown/catalog/CatalogGenerator.py
@@ -553,7 +553,9 @@ MonthlySchedule = ((7,
    CatalogEmoteItem(21, 45),
    CatalogEmoteItem(22, 60),
    CatalogEmoteItem(23, 75),
-   CatalogEmoteItem(24, 90))),
+   CatalogEmoteItem(24, 90),
+   CatalogEmoteItem(25, 115),
+   CatalogEmoteItem(26, 130))),
  (5,
   26,
   6,
diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py
index 1eb00db5..5fabf8fc 100644
--- a/toontown/toon/TTEmote.py
+++ b/toontown/toon/TTEmote.py
@@ -318,7 +318,9 @@ def doLaugh(toon, volume = 1):
 
 
 def doTaunt(toon, volume=1):
-    sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
+    duration = toon.getDuration('angry', 'torso')
+    sfx = None
+    sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
 
     track = Sequence(
         Func(toon.blinkEyes),
@@ -328,6 +330,17 @@ def doTaunt(toon, volume=1):
     duration = toon.getDuration('taunt')
     return (track, duration, None)
 
+def doRage(toon, volume=1):
+    sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
+
+    track = Sequence(
+        Func(toon.blinkEyes),
+        Func(toon.play, 'good-putt', fromFrame=12),
+        Func(base.playSfx, sfx, volume=volume, node=toon)
+    )
+    duration = toon.getDuration('rage')
+    return (track, duration, None)
+
 def returnToLastAnim(toon):
     if hasattr(toon, 'playingAnim') and toon.playingAnim:
         toon.loop(toon.playingAnim)
@@ -362,7 +375,8 @@ EmoteFunc = [[doWave, 0],
  [doDelighted, 0],
  [doFurious, 0],
  [doLaugh, 0],
- [doTaunt, 0]]
+ [doTaunt, 0],
+ [doRage, 0]]
 
 class TTEmote(Emote.Emote):
     notify = DirectNotifyGlobal.directNotify.newCategory('TTEmote')
@@ -390,7 +404,8 @@ class TTEmote(Emote.Emote):
          22,
          23,
          24,
-         25]
+         25,
+         26]
         self.headEmotes = [2,
          17,
          18,