Core/DB: Creature text for 53 script files

2 files changed, 54 insertions, 60 deletions

diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 3443103fa70..797d0f0d799 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -30,17 +30,13 @@ EndScriptData */
 
 enum eEnums
 {
-    SAY_AGGRO                   = -1565010,
-    SAY_SLAM1                   = -1565011,
-    SAY_SLAM2                   = -1565012,
-    SAY_SHATTER1                = -1565013,
-    SAY_SHATTER2                = -1565014,
-    SAY_SLAY1                   = -1565015,
-    SAY_SLAY2                   = -1565016,
-    SAY_SLAY3                   = -1565017,
-    SAY_DEATH                   = -1565018,
-
-    EMOTE_GROW                  = -1565019,
+    SAY_AGGRO                   = 0,
+    SAY_SLAM                    = 1,
+    SAY_SHATTER                 = 2,
+    SAY_SLAY                    = 3,
+    SAY_DEATH                   = 4,
+
+    EMOTE_GROW                  = 5,
 
     SPELL_GROWTH                = 36300,
     SPELL_CAVE_IN               = 36240,
@@ -100,7 +96,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (instance)
                 instance->SetData(DATA_GRUULEVENT, IN_PROGRESS);
@@ -108,12 +104,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
+            Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (instance)
             {
@@ -172,7 +168,7 @@ public:
             // Gruul can cast this spell up to 30 times
             if (m_uiGrowth_Timer <= uiDiff)
             {
-                DoScriptText(EMOTE_GROW, me);
+                Talk(EMOTE_GROW);
                 DoCast(me, SPELL_GROWTH);
                 m_uiGrowth_Timer = 30000;
             }
diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
index 03089d646f9..2d2c36104a2 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp
@@ -27,46 +27,44 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "gruuls_lair.h"
 
-#define SAY_AGGRO               -1565000
-#define SAY_ENRAGE              -1565001
-#define SAY_OGRE_DEATH1         -1565002
-#define SAY_OGRE_DEATH2         -1565003
-#define SAY_OGRE_DEATH3         -1565004
-#define SAY_OGRE_DEATH4         -1565005
-#define SAY_SLAY1               -1565006
-#define SAY_SLAY2               -1565007
-#define SAY_SLAY3               -1565008
-#define SAY_DEATH               -1565009
-
-// High King Maulgar
-#define SPELL_ARCING_SMASH      39144
-#define SPELL_MIGHTY_BLOW       33230
-#define SPELL_WHIRLWIND         33238
-#define SPELL_BERSERKER_C       26561
-#define SPELL_ROAR              16508
-#define SPELL_FLURRY            33232
-#define SPELL_DUAL_WIELD        29651 //used in phase
-
-// Olm the Summoner
-#define SPELL_DARK_DECAY        33129
-#define SPELL_DEATH_COIL        33130
-#define SPELL_SUMMON_WFH        33131
-
-//Kiggler the Craed
-#define SPELL_GREATER_POLYMORPH     33173
-#define SPELL_LIGHTNING_BOLT        36152
-#define SPELL_ARCANE_SHOCK          33175
-#define SPELL_ARCANE_EXPLOSION      33237
-
-//Blindeye the Seer
-#define SPELL_GREATER_PW_SHIELD         33147
-#define SPELL_HEAL                      33144
-#define SPELL_PRAYER_OH                 33152
-
-//Krosh Firehand
-#define SPELL_GREATER_FIREBALL  33051
-#define SPELL_SPELLSHIELD       33054
-#define SPELL_BLAST_WAVE        33061
+enum HighKingMaulgar
+{
+    SAY_AGGRO                   = 0,
+    SAY_ENRAGE                  = 1,
+    SAY_OGRE_DEATH              = 2,
+    SAY_SLAY                    = 3,
+    SAY_DEATH                   = 4,
+
+    // High King Maulgar
+    SPELL_ARCING_SMASH          = 39144,
+    SPELL_MIGHTY_BLOW           = 33230,
+    SPELL_WHIRLWIND             = 33238,
+    SPELL_BERSERKER_C           = 26561,
+    SPELL_ROAR                  = 16508,
+    SPELL_FLURRY                = 33232,
+    SPELL_DUAL_WIELD            = 29651,
+
+    // Olm the Summoner
+    SPELL_DARK_DECAY            = 33129,
+    SPELL_DEATH_COIL            = 33130,
+    SPELL_SUMMON_WFH            = 33131,
+
+    //Kiggler the Craed
+    SPELL_GREATER_POLYMORPH     = 33173,
+    SPELL_LIGHTNING_BOLT        = 36152,
+    SPELL_ARCANE_SHOCK          = 33175,
+    SPELL_ARCANE_EXPLOSION      = 33237,
+
+    //Blindeye the Seer
+    SPELL_GREATER_PW_SHIELD     = 33147,
+    SPELL_HEAL                  = 33144,
+    SPELL_PRAYER_OH             = 33152,
+
+    //Krosh Firehand
+    SPELL_GREATER_FIREBALL      = 33051,
+    SPELL_SPELLSHIELD           = 33054,
+    SPELL_BLAST_WAVE            = 33061
+};
 
 bool CheckAllBossDied(InstanceScript* instance, Creature* me)
 {
@@ -171,12 +169,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
+            Talk(SAY_SLAY);
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (CheckAllBossDied(instance, me))
                 instance->SetData(DATA_MAULGAREVENT, DONE);
@@ -184,7 +182,7 @@ public:
 
            void AddDeath()
            {
-                DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me);
+                Talk(SAY_OGRE_DEATH);
            }
 
         void EnterCombat(Unit* who)
@@ -211,7 +209,7 @@ public:
 
             GetCouncil();
 
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             instance->SetData64(DATA_MAULGAREVENT_TANK, who->GetGUID());
             instance->SetData(DATA_MAULGAREVENT, IN_PROGRESS);
@@ -269,7 +267,7 @@ public:
             if (!Phase2 && HealthBelowPct(50))
             {
                 Phase2 = true;
-                DoScriptText(SAY_ENRAGE, me);
+                Talk(SAY_ENRAGE);
 
                 DoCast(me, SPELL_DUAL_WIELD, true);
                 me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, 0);