Core/Scripting: Move Text for Zul'jin to creature text

2 files changed, 87 insertions, 107 deletions

diff --git a/sql/updates/world/2013_01_07_08_world_creature_text.sql b/sql/updates/world/2013_01_07_08_world_creature_text.sql
new file mode 100644
index 00000000000..94ab4d925ee
--- /dev/null
+++ b/sql/updates/world/2013_01_07_08_world_creature_text.sql
@@ -0,0 +1,14 @@
+-- Texts for Zul'jin
+DELETE FROM `creature_text` WHERE `entry`= 23863;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23863,0,0, 'Everybody always wanna take from us. Now we gonna start takin'' back. Anybody who get in our way...gonna drown in their own blood! De Amani empire be back now...seekin'' vengeance. And we gonna start...with you!',14,0,100,0,0,12090, 'Zul''jin YELL_INTRO'),
+(23863,1,0, 'Nobody badduh dan me!',14,0,100,0,0,12091, 'Zul''jin YELL_AGGRO'),
+(23863,2,0, 'Got me some new tricks...like me bruddah bear!',14,0,100,0,0,12092, 'Zul''jin YELL_TRANSFORM_TO_BEAR'),
+(23863,3,0, 'Dere be no hidin'' from da eagle!',14,0,100,0,0,12093, 'Zul''jin YELL_TRANSFORM_TO_EAGLE'),
+(23863,4,0, 'Let me introduce to you my new bruddahs: fang and claw!',14,0,100,0,0,12094, 'Zul''jin YELL_TRANSFORM_TO_LYNX'),
+(23863,5,0, 'Ya don'' have to look to da sky to see da dragonhawk!',14,0,100,0,0,12095, 'Zul''jin YELL_TRANSFORM_TO_DRAGONHAWK'),
+(23863,6,0, 'Fire kill you just as quick!',14,0,100,0,0,12096, 'Zul''jin YELL_FIRE_BREATH'),
+(23863,7,0, 'You too slow! Me too strong!',14,0,100,0,0,12097, 'Zul''jin YELL_BERSERK'),
+(23863,8,0, 'Da Amani de chuka!',14,0,100,0,0,12098, 'Zul''jin YELL_KILL'),
+(23863,8,1, 'Lot more gonna fall like you!',14,0,100,0,0,12099, 'Zul''jin YELL_KILL'),
+(23863,9,0, 'Mebbe me fall...but da Amani empire...never gonna die...',14,0,100,0,0,12100, 'Zul''jin YELL_DEATH');
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index a7764fc4c4c..2305c360fd2 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -27,86 +27,68 @@ EndScriptData */
 #include "zulaman.h"
 #include "SpellInfo.h"
 
-//Speech
-const char* YELL_TRANSFORM_TO_LYNX = "Let me introduce to you my new bruddahs: fang and claw!";
-#define SOUND_TRANSFORM_TO_LYNX 12094
-
-const char* YELL_TRANSFORM_TO_BEAR = "Got me some new tricks...like me bruddah bear!";
-#define SOUND_TRANSFORM_TO_BEAR 12092
-
-const char* YELL_TRANSFORM_TO_DRAGONHAWK = "Ya don' have to look to da sky to see da dragonhawk!";
-#define SOUND_TRANSFORM_TO_DRAGONHAWK 12095
-
-const char* YELL_TRANSFORM_TO_EAGLE = "Dere be no hidin' from da eagle!";
-#define SOUND_TRANSFORM_TO_EAGLE 12093
-
-#define YELL_KILL_ONE "Da Amani de chuka!"
-#define SOUND_KILL_ONE 12098
-
-#define YELL_KILL_TWO "Lot more gonna fall like you!"
-#define SOUND_KILL_TWO 12099
-
-#define YELL_FIRE_BREATH "Fire kill you just as quick!"
-#define SOUND_FIRE_BRETH 12096
-
-#define YELL_AGGRO "Nobody badduh dan me!"
-#define SOUND_AGGRO 12091
-
-#define YELL_BERSERK "You too slow! Me too strong!"
-#define SOUND_BERSERK 12097
-
-#define YELL_DEATH "Mebbe me fall...but da Amani empire...never gonna die..."
-#define SOUND_DEATH 12100
-
-//Still not used, need more info
-#define YELL_INTRO "Everybody always wanna take from us. Now we gonna start takin' back. Anybody who get in our way...gonna drown in their own blood! De Amani empire be back now...seekin' vengeance. And we gonna start...with you!"
-#define SOUND_INTRO 12090
-
-//Spells:
-//====== Troll Form
-#define SPELL_WHIRLWIND             17207
-#define SPELL_GRIEVOUS_THROW        43093   // remove debuff after full healed
-//====== Bear Form
-#define SPELL_CREEPING_PARALYSIS    43095   // should cast on the whole raid
-#define SPELL_OVERPOWER             43456   // use after melee attack dodged
-//====== Eagle Form
-#define SPELL_ENERGY_STORM          43983   // enemy area aura, trigger 42577
-#define SPELL_ZAP_INFORM            42577
-#define SPELL_ZAP_DAMAGE            43137   // 1250 damage
-#define SPELL_SUMMON_CYCLONE        43112   // summon four feather vortex
-#define CREATURE_FEATHER_VORTEX     24136
-#define SPELL_CYCLONE_VISUAL        43119   // trigger 43147 visual
-#define SPELL_CYCLONE_PASSIVE       43120   // trigger 43121 (4y aoe) every second
-//Lynx Form
-#define SPELL_CLAW_RAGE_HASTE       42583
-#define SPELL_CLAW_RAGE_TRIGGER     43149
-#define SPELL_CLAW_RAGE_DAMAGE      43150
-#define SPELL_LYNX_RUSH_HASTE       43152
-#define SPELL_LYNX_RUSH_DAMAGE      43153
-//Dragonhawk Form
-#define SPELL_FLAME_WHIRL           43213   // trigger two spells
-#define SPELL_FLAME_BREATH          43215
-#define SPELL_SUMMON_PILLAR         43216   // summon 24187
-#define CREATURE_COLUMN_OF_FIRE     24187
-#define SPELL_PILLAR_TRIGGER        43218   // trigger 43217
-
-//cosmetic
-#define SPELL_SPIRIT_AURA           42466
-#define SPELL_SIPHON_SOUL           43501
-
-//Transforms:
-#define SPELL_SHAPE_OF_THE_BEAR     42594   // 15% dmg
-#define SPELL_SHAPE_OF_THE_EAGLE    42606
-#define SPELL_SHAPE_OF_THE_LYNX     42607   // haste melee 30%
-#define SPELL_SHAPE_OF_THE_DRAGONHAWK   42608
-
-#define SPELL_BERSERK 45078
-
-#define PHASE_BEAR 0
-#define PHASE_EAGLE 1
-#define PHASE_LYNX 2
-#define PHASE_DRAGONHAWK 3
-#define PHASE_TROLL 4
+enum Says
+{
+    YELL_INTRO                    = 0,
+    YELL_AGGRO                    = 1,
+    YELL_TRANSFORM_TO_BEAR        = 2,
+    YELL_TRANSFORM_TO_EAGLE       = 3,
+    YELL_TRANSFORM_TO_LYNX        = 4,
+    YELL_TRANSFORM_TO_DRAGONHAWK  = 5,
+    YELL_FIRE_BREATH              = 6,
+    YELL_BERSERK                  = 7,
+    YELL_KILL                     = 8,
+    YELL_DEATH                    = 9
+};
+
+enum Spells
+{
+    // Troll Form
+    SPELL_WHIRLWIND               = 17207,
+    SPELL_GRIEVOUS_THROW          = 43093, // remove debuff after full healed
+    // Bear Form
+    SPELL_CREEPING_PARALYSIS      = 43095, // should cast on the whole raid
+    SPELL_OVERPOWER               = 43456, // use after melee attack dodged
+    // Eagle Form
+    SPELL_ENERGY_STORM            = 43983, // enemy area aura, trigger 42577
+    SPELL_ZAP_INFORM              = 42577,
+    SPELL_ZAP_DAMAGE              = 43137, // 1250 damage
+    SPELL_SUMMON_CYCLONE          = 43112, // summon four feather vortex
+    CREATURE_FEATHER_VORTEX       = 24136,
+    SPELL_CYCLONE_VISUAL          = 43119, // trigger 43147 visual
+    SPELL_CYCLONE_PASSIVE         = 43120, // trigger 43121 (4y aoe) every second
+    // Lynx Form
+    SPELL_CLAW_RAGE_HASTE         = 42583,
+    SPELL_CLAW_RAGE_TRIGGER       = 43149,
+    SPELL_CLAW_RAGE_DAMAGE        = 43150,
+    SPELL_LYNX_RUSH_HASTE         = 43152,
+    SPELL_LYNX_RUSH_DAMAGE        = 43153,
+    // Dragonhawk Form
+    SPELL_FLAME_WHIRL             = 43213, // trigger two spells
+    SPELL_FLAME_BREATH            = 43215,
+    SPELL_SUMMON_PILLAR           = 43216, // summon 24187
+    CREATURE_COLUMN_OF_FIRE       = 24187,
+    SPELL_PILLAR_TRIGGER          = 43218, // trigger 43217
+    // Cosmetic
+    SPELL_SPIRIT_AURA             = 42466,
+    SPELL_SIPHON_SOUL             = 43501,
+    // Transforms:
+    SPELL_SHAPE_OF_THE_BEAR       = 42594, // 15% dmg
+    SPELL_SHAPE_OF_THE_EAGLE      = 42606,
+    SPELL_SHAPE_OF_THE_LYNX       = 42607, // haste melee 30%
+    SPELL_SHAPE_OF_THE_DRAGONHAWK = 42608,
+
+    SPELL_BERSERK                 = 45078
+};
+
+enum Phase
+{
+    PHASE_BEAR                    = 0,
+    PHASE_EAGLE                   = 1,
+    PHASE_LYNX                    = 2,
+    PHASE_DRAGONHAWK              = 3,
+    PHASE_TROLL                   = 4
+};
 
 //coords for going for changing form
 #define CENTER_X 120.148811f
@@ -129,17 +111,16 @@ static SpiritInfoStruct SpiritInfo[4] =
 
 struct TransformStruct
 {
-    uint32 sound;
-    std::string text;
+    uint8  text;
     uint32 spell, unaura;
 };
 
 static TransformStruct Transform[4] =
 {
-    {SOUND_TRANSFORM_TO_BEAR, YELL_TRANSFORM_TO_BEAR, SPELL_SHAPE_OF_THE_BEAR, SPELL_WHIRLWIND},
-    {SOUND_TRANSFORM_TO_EAGLE, YELL_TRANSFORM_TO_EAGLE, SPELL_SHAPE_OF_THE_EAGLE, SPELL_SHAPE_OF_THE_BEAR},
-    {SOUND_TRANSFORM_TO_LYNX, YELL_TRANSFORM_TO_LYNX, SPELL_SHAPE_OF_THE_LYNX, SPELL_SHAPE_OF_THE_EAGLE},
-    {SOUND_TRANSFORM_TO_DRAGONHAWK, YELL_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX}
+    {YELL_TRANSFORM_TO_BEAR, SPELL_SHAPE_OF_THE_BEAR, SPELL_WHIRLWIND},
+    {YELL_TRANSFORM_TO_EAGLE, SPELL_SHAPE_OF_THE_EAGLE, SPELL_SHAPE_OF_THE_BEAR},
+    {YELL_TRANSFORM_TO_LYNX, SPELL_SHAPE_OF_THE_LYNX, SPELL_SHAPE_OF_THE_EAGLE},
+    {YELL_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX}
 };
 
 class boss_zuljin : public CreatureScript
@@ -230,8 +211,7 @@ class boss_zuljin : public CreatureScript
 
                 DoZoneInCombat();
 
-                me->MonsterYell(YELL_INTRO, LANG_UNIVERSAL, 0);
-                DoPlaySoundToSet(me, SOUND_INTRO);
+                Talk(YELL_INTRO);
                 SpawnAdds();
                 EnterPhase(0);
             }
@@ -241,17 +221,7 @@ class boss_zuljin : public CreatureScript
                 if (Intro_Timer)
                     return;
 
-                switch (urand(0, 1))
-                {
-                    case 0:
-                        me->MonsterYell(YELL_KILL_ONE, LANG_UNIVERSAL, 0);
-                        DoPlaySoundToSet(me, SOUND_KILL_ONE);
-                        break;
-                    case 1:
-                        me->MonsterYell(YELL_KILL_TWO, LANG_UNIVERSAL, 0);
-                        DoPlaySoundToSet(me, SOUND_KILL_TWO);
-                        break;
-                }
+                Talk(YELL_KILL);
             }
 
             void JustDied(Unit* /*killer*/)
@@ -259,8 +229,7 @@ class boss_zuljin : public CreatureScript
                 if (instance)
                     instance->SetData(DATA_ZULJINEVENT, DONE);
 
-                me->MonsterYell(YELL_DEATH, LANG_UNIVERSAL, 0);
-                DoPlaySoundToSet(me, SOUND_DEATH);
+                Talk(YELL_DEATH);
                 Summons.DespawnEntry(CREATURE_COLUMN_OF_FIRE);
 
                 if (Unit* Temp = Unit::GetUnit(*me, SpiritGUID[3]))
@@ -353,8 +322,7 @@ class boss_zuljin : public CreatureScript
                     me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0);
                     me->RemoveAurasDueToSpell(Transform[Phase].unaura);
                     DoCast(me, Transform[Phase].spell);
-                    me->MonsterYell(Transform[Phase].text.c_str(), LANG_UNIVERSAL, 0);
-                    DoPlaySoundToSet(me, Transform[Phase].sound);
+                    Talk(Transform[Phase].text);
                     if (Phase > 0)
                     {
                         if (Unit* Temp = Unit::GetUnit(*me, SpiritGUID[Phase - 1]))
@@ -409,8 +377,7 @@ class boss_zuljin : public CreatureScript
                 if (Berserk_Timer <= diff)
                 {
                     DoCast(me, SPELL_BERSERK, true);
-                    me->MonsterYell(YELL_BERSERK, LANG_UNIVERSAL, 0);
-                    DoPlaySoundToSet(me, SOUND_BERSERK);
+                    Talk(YELL_BERSERK);
                     Berserk_Timer = 60000;
                 } else Berserk_Timer -= diff;
 
@@ -421,8 +388,7 @@ class boss_zuljin : public CreatureScript
                     {
                         if (Intro_Timer <= diff)
                         {
-                            me->MonsterYell(YELL_AGGRO, LANG_UNIVERSAL, 0);
-                            DoPlaySoundToSet(me, SOUND_AGGRO);
+                            Talk(YELL_AGGRO);
                             Intro_Timer = 0;
                         } else Intro_Timer -= diff;
                     }