Core/Scripts: Move text for Boss Akil'zon to db.

2 files changed, 34 insertions, 39 deletions

diff --git a/sql/updates/world/2013_01_07_03_world_creature_text,sql b/sql/updates/world/2013_01_07_03_world_creature_text,sql
new file mode 100644
index 00000000000..c006dc5ef99
--- /dev/null
+++ b/sql/updates/world/2013_01_07_03_world_creature_text,sql
@@ -0,0 +1,10 @@
+-- Texts for Akil'zon
+DELETE FROM `creature_text` WHERE `entry`= 23574;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23574,0,0, 'I be da predator! You da prey...',14,0,100,0,0,12013, 'Akil''zon On Aggro'),
+(23574,1,0, 'Feed, me bruddahs!',14,0,100,0,0,12014, 'Akil''zon On Summon'),
+(23574,2,0, 'Your death gonna be quick, strangers. You shoulda never have come to this place...',14,0,100,0,0,12015, 'Akil''zon Intro'),
+(23574,3,0, 'All you be doing is wasting my time!',14,0,100,0,0,12016, 'Akil''zon On Enrage'),
+(23574,4,0, 'Ya got nothin''!',14,0,100,0,0,12017, 'Akil''zon On Player Kill'),
+(23574,4,1, 'Stop your cryin''!',14,0,100,0,0,12018, 'Akil''zon On Player Kill'),
+(23574,5,0, 'You can''t... kill... me spirit!',14,0,100,0,0,12019, 'Akil''zon On Dearh');
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 89b14ff0f4d..1b2512ccf63 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -38,7 +38,7 @@ enum Spells
 {
     SPELL_STATIC_DISRUPTION     = 43622,
     SPELL_STATIC_VISUAL         = 45265,
-    SPELL_CALL_LIGHTNING        = 43661, //Missing timer
+    SPELL_CALL_LIGHTNING        = 43661, // Missing timer
     SPELL_GUST_OF_WIND          = 43621,
     SPELL_ELECTRICAL_STORM      = 43648,
     SPELL_BERSERK               = 45078,
@@ -46,25 +46,24 @@ enum Spells
     SPELL_EAGLE_SWOOP           = 44732
 };
 
-//"Your death gonna be quick, strangers. You shoulda never have come to this place..."
-#define SAY_ONAGGRO "I be da predator! You da prey..."
-#define SAY_ONDEATH "You can't... kill... me spirit!"
-#define SAY_ONSLAY1 "Ya got nothin'!"
-#define SAY_ONSLAY2 "Stop your cryin'!"
-#define SAY_ONSUMMON "Feed, me bruddahs!"
-#define SAY_ONENRAGE "All you be doing is wasting my time!"
-#define SOUND_ONAGGRO 12013
-#define SOUND_ONDEATH 12019
-#define SOUND_ONSLAY1 12017
-#define SOUND_ONSLAY2 12018
-#define SOUND_ONSUMMON 12014
-#define SOUND_ONENRAGE 12016
-
-#define MOB_SOARING_EAGLE 24858
-#define SE_LOC_X_MAX 400
-#define SE_LOC_X_MIN 335
-#define SE_LOC_Y_MAX 1435
-#define SE_LOC_Y_MIN 1370
+enum Says
+{
+    SAY_AGGRO                   = 0,
+    SAY_SUMMON                  = 1,
+    SAY_INTRO                   = 2, // Not used in script
+    SAY_ENRAGE                  = 3,
+    SAY_KILL                    = 4,
+    SAY_DEATH                   = 5
+};
+
+enum Misc
+{
+    MOB_SOARING_EAGLE           = 24858,
+    SE_LOC_X_MAX                = 400,
+    SE_LOC_X_MIN                = 335,
+    SE_LOC_Y_MAX                = 1435,
+    SE_LOC_Y_MIN                = 1370
+};
 
 class boss_akilzon : public CreatureScript
 {
@@ -130,8 +129,7 @@ class boss_akilzon : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                me->MonsterYell(SAY_ONAGGRO, LANG_UNIVERSAL, 0);
-                DoPlaySoundToSet(me, SOUND_ONAGGRO);
+                Talk(SAY_AGGRO);
                 //DoZoneInCombat();
                 if (instance)
                     instance->SetData(DATA_AKILZONEVENT, IN_PROGRESS);
@@ -139,8 +137,7 @@ class boss_akilzon : public CreatureScript
 
             void JustDied(Unit* /*killer*/)
             {
-                me->MonsterYell(SAY_ONDEATH, LANG_UNIVERSAL, 0);
-                DoPlaySoundToSet(me, SOUND_ONDEATH);
+                Talk(SAY_DEATH);
                 if (instance)
                     instance->SetData(DATA_AKILZONEVENT, DONE);
                 DespawnSummons();
@@ -148,17 +145,7 @@ class boss_akilzon : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                switch (urand(0, 1))
-                {
-                    case 0:
-                        me->MonsterYell(SAY_ONSLAY1, LANG_UNIVERSAL, 0);
-                        DoPlaySoundToSet(me, SOUND_ONSLAY1);
-                        break;
-                    case 1:
-                        me->MonsterYell(SAY_ONSLAY2, LANG_UNIVERSAL, 0);
-                        DoPlaySoundToSet(me, SOUND_ONSLAY2);
-                        break;
-                }
+                Talk(SAY_KILL);
             }
 
             void DespawnSummons()
@@ -276,8 +263,7 @@ class boss_akilzon : public CreatureScript
 
                 if (Enrage_Timer <= diff)
                 {
-                    me->MonsterYell(SAY_ONENRAGE, LANG_UNIVERSAL, 0);
-                    DoPlaySoundToSet(me, SOUND_ONENRAGE);
+                    Talk(SAY_ENRAGE);
                     DoCast(me, SPELL_BERSERK, true);
                     Enrage_Timer = 600000;
                 } else Enrage_Timer -= diff;
@@ -351,8 +337,7 @@ class boss_akilzon : public CreatureScript
 
                 if (SummonEagles_Timer <= diff)
                 {
-                    me->MonsterYell(SAY_ONSUMMON, LANG_UNIVERSAL, 0);
-                    DoPlaySoundToSet(me, SOUND_ONSUMMON);
+                    Talk(SAY_SUMMON);
 
                     float x, y, z;
                     me->GetPosition(x, y, z);