From ccf64c323be4e06de80514b93319a04b8a048cde Mon Sep 17 00:00:00 2001
From: Loudrob <loudhuddles131@yahoo.com>
Date: Sun, 23 Aug 2015 11:00:22 -0400
Subject: [PATCH] No more taunt.

---
 otp/otpbase/OTPLocalizerEnglish.py   |  5 +----
 toontown/catalog/CatalogGenerator.py |  3 +--
 toontown/toon/TTEmote.py             | 16 +---------------
 toontown/toon/Toon.py                |  3 +--
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/otp/otpbase/OTPLocalizerEnglish.py b/otp/otpbase/OTPLocalizerEnglish.py
index fc9a72a7..7878f6f8 100755
--- a/otp/otpbase/OTPLocalizerEnglish.py
+++ b/otp/otpbase/OTPLocalizerEnglish.py
@@ -292,7 +292,6 @@ EmoteList = ['Wave',
  'Delighted',
  'Furious',
  'Laugh',
- 'Taunt',
  'Rage']
 EmoteWhispers = ['%s waves.',
  '%s is happy.',
@@ -319,7 +318,6 @@ EmoteWhispers = ['%s waves.',
  '%s is delighted.',
  '%s is furious.',
  '%s is laughing.',
- '%s taunts you.',
  '%s is raging.']
 EmoteFuncDict = {'Wave': 0,
  'Happy': 1,
@@ -346,8 +344,7 @@ EmoteFuncDict = {'Wave': 0,
  'Delighted': 22,
  'Furious': 23,
  'Laugh': 24,
- 'Taunt': 25,
- 'Rage': 26}
+ 'Rage': 25}
 SuitBrushOffs = {'f': ["I'm late for a meeting."],
  'p': ['Push off.'],
  'ym': ['Yes Man says NO.'],
diff --git a/toontown/catalog/CatalogGenerator.py b/toontown/catalog/CatalogGenerator.py
index 618f01d2..2de0d885 100755
--- a/toontown/catalog/CatalogGenerator.py
+++ b/toontown/catalog/CatalogGenerator.py
@@ -535,13 +535,12 @@ MonthlySchedule = ((7,
    CatalogClothingItem(1606, 0, True),
    CatalogClothingItem(1603, 0, True),
    CatalogClothingItem(1600, 0, True),
-   CatalogEmoteItem(25, True),
-   CatalogEmoteItem(26, True),
    CatalogEmoteItem(20, True),
    CatalogEmoteItem(21, True),
    CatalogEmoteItem(22, True),
    CatalogEmoteItem(23, True),
    CatalogEmoteItem(24, True),
+   CatalogEmoteItem(25, True),
    CatalogClothingItem(1821, 0, True))),
  (5,
   26,
diff --git a/toontown/toon/TTEmote.py b/toontown/toon/TTEmote.py
index 666b7d40..c0770046 100755
--- a/toontown/toon/TTEmote.py
+++ b/toontown/toon/TTEmote.py
@@ -316,18 +316,6 @@ def doLaugh(toon, volume = 1):
     exitTrack = Sequence(Func(toon.hideLaughMuzzle), Func(toon.blinkEyes), Func(stopAnim))
     return (track, 2, exitTrack)
 
-
-def doTaunt(toon, volume=1):
-    duration = toon.getDuration('angry', 'torso')
-    sfx = base.loadSfx('phase_4/audio/sfx/avatar_emotion_taunt.ogg')
-    track = Sequence(
-        Func(toon.blinkEyes),
-        Func(toon.play, 'taunt'),
-        Func(base.playSfx, sfx, volume=volume, node=toon)
-    )
-    duration = toon.getDuration('taunt')
-    return (track, duration, None)
-
 def doRage(toon, volume=1):
     sfx = base.loadSfx('phase_4/audio/sfx/furious_03.ogg')
     track = Sequence(
@@ -372,7 +360,6 @@ EmoteFunc = [[doWave, 0],
  [doDelighted, 0],
  [doFurious, 0],
  [doLaugh, 0],
- [doTaunt, 0],
  [doRage, 0]]
 
 class TTEmote(Emote.Emote):
@@ -401,8 +388,7 @@ class TTEmote(Emote.Emote):
          22,
          23,
          24,
-         25,
-         26]
+         25]
         self.headEmotes = [2,
          17,
          18,
diff --git a/toontown/toon/Toon.py b/toontown/toon/Toon.py
index 9778f10d..dd547c97 100755
--- a/toontown/toon/Toon.py
+++ b/toontown/toon/Toon.py
@@ -124,8 +124,7 @@ Phase4AnimList = (('sit', 'sit'),
  ('scientistJealous', 'scientistJealous'),
  ('scientistEmcee', 'scientistEmcee'),
  ('scientistWork', 'scientistWork'),
- ('scientistGame', 'scientistGame'),
- ('taunt', 'taunt'))
+ ('scientistGame', 'scientistGame'))
 Phase5AnimList = (('water-gun', 'water-gun'),
  ('hold-bottle', 'hold-bottle'),
  ('firehose', 'firehose'),