Core/DB: Converted 11 scripts to creature text

11 files changed, 185 insertions, 167 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
index ceca6330152..d05b6220441 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_broodlord_lashlayer.cpp
@@ -28,8 +28,8 @@ EndScriptData */
 
 enum Say
 {
-    SAY_AGGRO               = -1469000,
-    SAY_LEASH               = -1469001
+    SAY_AGGRO               = 0,
+    SAY_LEASH               = 1,
 };
 
 enum Spells
@@ -69,7 +69,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
             DoZoneInCombat();
         }
 
@@ -110,7 +110,7 @@ public:
             } else KnockBack_Timer -= diff;
 
             if (EnterEvadeIfOutOfCombatArea(diff))
-                DoScriptText(SAY_LEASH, me);
+                Talk(SAY_LEASH);
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
index 9beb3bb10fe..8f12ab3f2e8 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_chromaggus.cpp
@@ -28,8 +28,8 @@ EndScriptData */
 
 enum Emotes
 {
-    EMOTE_FRENZY                                           = -1469002,
-    EMOTE_SHIMMER                                          = -1469003
+    EMOTE_FRENZY                                           = 0,
+    EMOTE_SHIMMER                                          = 1,
 };
 
 enum Spells
@@ -219,7 +219,7 @@ public:
                 DoCast(me, spell);
                 CurrentVurln_Spell = spell;
 
-                DoScriptText(EMOTE_SHIMMER, me);
+                Talk(EMOTE_SHIMMER);
                 Shimmer_Timer = 45000;
             } else Shimmer_Timer -= diff;
 
@@ -280,7 +280,7 @@ public:
             if (Frenzy_Timer <= diff)
             {
                 DoCast(me, SPELL_FRENZY);
-                DoScriptText(EMOTE_FRENZY, me);
+                Talk(EMOTE_FRENZY);
                 Frenzy_Timer = urand(10000, 15000);
             } else Frenzy_Timer -= diff;
 
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
index e84ccd0e160..b191d2fbb02 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_flamegor.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 
 enum Emotes
 {
-    EMOTE_FRENZY            = -1469031
+    EMOTE_FRENZY            = 0,
 };
 
 enum Spells
@@ -93,7 +93,7 @@ public:
             //Frenzy_Timer
             if (Frenzy_Timer <= diff)
             {
-                DoScriptText(EMOTE_FRENZY, me);
+                Talk(EMOTE_FRENZY);
                 DoCast(me, SPELL_FRENZY);
                 Frenzy_Timer = urand(8000, 10000);
             } else Frenzy_Timer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
index 787fbe5312b..5a3c72054b4 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp
@@ -28,22 +28,20 @@ EndScriptData */
 
 enum Say
 {
-    SAY_AGGRO               = -1469007,
-    SAY_XHEALTH             = -1469008,
-    SAY_SHADOWFLAME         = -1469009,
-    SAY_RAISE_SKELETONS     = -1469010,
-    SAY_SLAY                = -1469011,
-    SAY_DEATH               = -1469012,
-
-    SAY_MAGE                = -1469013,
-    SAY_WARRIOR             = -1469014,
-    SAY_DRUID               = -1469015,
-    SAY_PRIEST              = -1469016,
-    SAY_PALADIN             = -1469017,
-    SAY_SHAMAN              = -1469018,
-    SAY_WARLOCK             = -1469019,
-    SAY_HUNTER              = -1469020,
-    SAY_ROGUE               = -1469021
+    SAY_RANDOM              = 0,
+    SAY_RAISE_SKELETONS     = 1,
+    SAY_SLAY                = 2,
+    SAY_DEATH               = 3,
+
+    SAY_MAGE                = 4,
+    SAY_WARRIOR             = 5,
+    SAY_DRUID               = 6,
+    SAY_PRIEST              = 7,
+    SAY_PALADIN             = 8,
+    SAY_SHAMAN              = 9,
+    SAY_WARLOCK             = 10,
+    SAY_HUNTER              = 11,
+    SAY_ROGUE               = 12,
 };
 
 enum Spells
@@ -109,17 +107,17 @@ public:
             if (rand()%5)
                 return;
 
-            DoScriptText(SAY_SLAY, me, Victim);
+            Talk(SAY_SLAY, Victim->GetGUID());
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
         }
 
         void EnterCombat(Unit* who)
         {
-            DoScriptText(RAND(SAY_XHEALTH, SAY_AGGRO, SAY_SHADOWFLAME), me);
+            Talk(SAY_RANDOM);
 
             DoCast(who, SPELL_SHADOWFLAME_INITIAL);
             DoZoneInCombat();
@@ -184,39 +182,39 @@ public:
                 switch (urand(0, 8))
                 {
                     case 0:
-                        DoScriptText(SAY_MAGE, me);
+                        Talk(SAY_MAGE);
                         DoCast(me, SPELL_MAGE);
                         break;
                     case 1:
-                        DoScriptText(SAY_WARRIOR, me);
+                        Talk(SAY_WARRIOR);
                         DoCast(me, SPELL_WARRIOR);
                         break;
                     case 2:
-                        DoScriptText(SAY_DRUID, me);
+                        Talk(SAY_DRUID);
                         DoCast(me, SPELL_DRUID);
                         break;
                     case 3:
-                        DoScriptText(SAY_PRIEST, me);
+                        Talk(SAY_PRIEST);
                         DoCast(me, SPELL_PRIEST);
                         break;
                     case 4:
-                        DoScriptText(SAY_PALADIN, me);
+                        Talk(SAY_PALADIN);
                         DoCast(me, SPELL_PALADIN);
                         break;
                     case 5:
-                        DoScriptText(SAY_SHAMAN, me);
+                        Talk(SAY_SHAMAN);
                         DoCast(me, SPELL_SHAMAN);
                         break;
                     case 6:
-                        DoScriptText(SAY_WARLOCK, me);
+                        Talk(SAY_WARLOCK);
                         DoCast(me, SPELL_WARLOCK);
                         break;
                     case 7:
-                        DoScriptText(SAY_HUNTER, me);
+                        Talk(SAY_HUNTER);
                         DoCast(me, SPELL_HUNTER);
                         break;
                     case 8:
-                        DoScriptText(SAY_ROGUE, me);
+                        Talk(SAY_ROGUE);
                         DoCast(me, SPELL_ROGUE);
                         break;
                 }
@@ -228,7 +226,7 @@ public:
             if (!Phase3 && HealthBelowPct(20))
             {
                 Phase3 = true;
-                DoScriptText(SAY_RAISE_SKELETONS, me);
+                Talk(SAY_RAISE_SKELETONS);
             }
 
             DoMeleeAttackIfReady();
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
index 04eca3586cc..577516383b2 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_razorgore.cpp
@@ -30,10 +30,10 @@ EndScriptData */
 
 enum Say
 {
-    SAY_EGGS_BROKEN1        = -1469022,
-    SAY_EGGS_BROKEN2        = -1469023,
-    SAY_EGGS_BROKEN3        = -1469024,
-    SAY_DEATH               = -1469025
+    SAY_EGGS_BROKEN1        = 0,
+    SAY_EGGS_BROKEN2        = 1,
+    SAY_EGGS_BROKEN3        = 2,
+    SAY_DEATH               = 3,
 };
 
 enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
index 359f218cd5c..6ffe30d2c50 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_vaelastrasz.cpp
@@ -30,11 +30,11 @@ EndScriptData */
 
 enum Says
 {
-   SAY_LINE1           = -1469026,
-   SAY_LINE2           = -1469027,
-   SAY_LINE3           = -1469028,
-   SAY_HALFLIFE        = -1469029,
-   SAY_KILLTARGET      = -1469030
+   SAY_LINE1           = 0,
+   SAY_LINE2           = 1,
+   SAY_LINE3           = 2,
+   SAY_HALFLIFE        = 3,
+   SAY_KILLTARGET      = 4
 };
 
 #define GOSSIP_ITEM         "Start Event <Needs Gossip Text>"
@@ -130,7 +130,7 @@ public:
             PlayerGUID = target->GetGUID();
 
             //10 seconds
-            DoScriptText(SAY_LINE1, me);
+            Talk(SAY_LINE1);
 
             SpeechTimer = 10000;
             SpeechNum = 0;
@@ -144,7 +144,7 @@ public:
             if (rand()%5)
                 return;
 
-            DoScriptText(SAY_KILLTARGET, me, victim);
+            Talk(SAY_KILLTARGET, victim->GetGUID());
         }
 
         void EnterCombat(Unit* /*who*/)
@@ -167,13 +167,13 @@ public:
                     {
                         case 0:
                             //16 seconds till next line
-                            DoScriptText(SAY_LINE2, me);
+                            Talk(SAY_LINE2);
                             SpeechTimer = 16000;
                             ++SpeechNum;
                             break;
                         case 1:
                             //This one is actually 16 seconds but we only go to 10 seconds because he starts attacking after he says "I must fight this!"
-                            DoScriptText(SAY_LINE3, me);
+                            Talk(SAY_LINE3);
                             SpeechTimer = 10000;
                             ++SpeechNum;
                             break;
@@ -198,7 +198,7 @@ public:
             // Yell if hp lower than 15%
             if (HealthBelowPct(15) && !HasYelled)
             {
-                DoScriptText(SAY_HALFLIFE, me);
+                Talk(SAY_HALFLIFE);
                 HasYelled = true;
             }
 
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
index f107fd7c5ec..712f7fbe8c5 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp
@@ -35,7 +35,7 @@ enum eSpels
     EQUIP_SWORD             = 5191,
     EQUIP_MACE              = 7230,
 
-    SAY_AGGRO               = -1036001
+    SAY_AGGRO               = 0,
 };
 
 class boss_mr_smite : public CreatureScript
@@ -82,7 +82,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-           DoScriptText(SAY_AGGRO, me);
+           Talk(SAY_AGGRO);
         }
 
         bool bCheckChances()
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 7a6e9aab31d..cedcafc9f98 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -25,28 +25,27 @@
 // texts signed for creature 28939 but used for 28939, 28940, 28610
 enum win_friends
 {
-    SAY_PERSUADE1                     = -1609501,
-    SAY_PERSUADE2                     = -1609502,
-    SAY_PERSUADE3                     = -1609503,
-    SAY_PERSUADE4                     = -1609504,
-    SAY_PERSUADE5                     = -1609505,
-    SAY_PERSUADE6                     = -1609506,
-    SAY_PERSUADE7                     = -1609507,
-    SAY_CRUSADER1                     = -1609508,
-    SAY_CRUSADER2                     = -1609509,
-    SAY_CRUSADER3                     = -1609510,
-    SAY_CRUSADER4                     = -1609511,
-    SAY_CRUSADER5                     = -1609512,
-    SAY_CRUSADER6                     = -1609513,
-    SAY_PERSUADED1                    = -1609514,
-    SAY_PERSUADED2                    = -1609515,
-    SAY_PERSUADED3                    = -1609516,
-    SAY_PERSUADED4                    = -1609517,
-    SAY_PERSUADED5                    = -1609518,
-    SAY_PERSUADED6                    = -1609519,
-    SPELL_PERSUASIVE_STRIKE           = 52781
+    SAY_CRUSADER                      = 1,
+    SAY_PERSUADED1                    = 2,
+    SAY_PERSUADED2                    = 3,
+    SAY_PERSUADED3                    = 4,
+    SAY_PERSUADED4                    = 5,
+    SAY_PERSUADED6                    = 6,
+    SPELL_PERSUASIVE_STRIKE           = 52781,
+    SPELL_THREAT_PULSE                = 58111,
+    QUEST_HOW_TO_WIN_FRIENDS          = 12720,
 };
 
+#define SAY_PERSUADED5  "LIES! The pain you are about to endure will be talked about for years to come!"
+
+#define SAY_PERSUADE1   "I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"
+#define SAY_PERSUADE2   "Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"
+#define SAY_PERSUADE3   "I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"
+#define SAY_PERSUADE4   "Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."
+#define SAY_PERSUADE5   "I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"
+#define SAY_PERSUADE6   "What is the \"Crimson Dawn\"?"
+#define SAY_PERSUADE7   "\"Crimson Dawn\"! What is it! Speak!"
+
 class npc_crusade_persuaded : public CreatureScript
 {
 public:
@@ -61,97 +60,119 @@ public:
     {
         npc_crusade_persuadedAI(Creature* creature) : ScriptedAI(creature) {}
 
-        uint32 uiSpeech_timer;
-        uint32 uiSpeech_counter;
-        uint64 uiPlayerGUID;
+        uint32 speechTimer;
+        uint32 speechCounter;
+        uint64 playerGUID;
 
         void Reset()
         {
-            uiSpeech_timer = 0;
-            uiSpeech_counter = 0;
-            uiPlayerGUID = 0;
+            speechTimer = 0;
+            speechCounter = 0;
+            playerGUID = 0;
             me->SetReactState(REACT_AGGRESSIVE);
             me->RestoreFaction();
         }
 
         void SpellHit(Unit* caster, const SpellInfo* spell)
         {
-            if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !uiSpeech_counter)
+            if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->isAlive() && !speechCounter)
             {
-                if (CAST_PLR(caster)->GetQuestStatus(12720) == QUEST_STATUS_INCOMPLETE)
+                if (Player* player = caster->ToPlayer())
                 {
-                    uiPlayerGUID = caster->GetGUID();
-                    uiSpeech_timer = 1000;
-                    uiSpeech_counter = 1;
-                    me->setFaction(caster->getFaction());
-                    me->CombatStop(true);
-                    me->GetMotionMaster()->MoveIdle();
-                    me->SetReactState(REACT_PASSIVE);
-                    DoCastAOE(58111, true);
-
-                    DoScriptText(RAND(SAY_PERSUADE1, SAY_PERSUADE2, SAY_PERSUADE3,
-                                      SAY_PERSUADE4, SAY_PERSUADE5, SAY_PERSUADE6,
-                                      SAY_PERSUADE7), caster);
-
-                    DoScriptText(RAND(SAY_CRUSADER1, SAY_CRUSADER2, SAY_CRUSADER3,
-                                      SAY_CRUSADER4, SAY_CRUSADER5, SAY_CRUSADER6), me);
+                    if (player->GetQuestStatus(QUEST_HOW_TO_WIN_FRIENDS) == QUEST_STATUS_INCOMPLETE)
+                    {
+                        playerGUID = player->GetGUID();
+                        speechTimer = 1000;
+                        speechCounter = 1;
+                        me->setFaction(player->getFaction());
+                        me->CombatStop(true);
+                        me->GetMotionMaster()->MoveIdle();
+                        me->SetReactState(REACT_PASSIVE);
+                        DoCastAOE(SPELL_THREAT_PULSE, true);
+
+                        switch (urand(1, 7))
+                        {
+                            case 1:
+                                player->Say(SAY_PERSUADE1, LANG_UNIVERSAL);
+                                break;
+                            case 2:
+                                player->Say(SAY_PERSUADE2, LANG_UNIVERSAL);
+                                break;
+                            case 3:
+                                player->Say(SAY_PERSUADE3, LANG_UNIVERSAL);
+                                break;
+                            case 4:
+                                player->Say(SAY_PERSUADE4, LANG_UNIVERSAL);
+                                break;
+                            case 5:
+                                player->Say(SAY_PERSUADE5, LANG_UNIVERSAL);
+                                break;
+                            case 6:
+                                player->Say(SAY_PERSUADE6, LANG_UNIVERSAL);
+                                break;
+                            case 7:
+                                player->Say(SAY_PERSUADE7, LANG_UNIVERSAL);
+                                break;
+                        }
+                        Talk(SAY_CRUSADER);
+                    }
                 }
             }
         }
 
         void UpdateAI(const uint32 diff)
         {
-            if (uiSpeech_counter)
+            if (speechCounter)
             {
-                if (uiSpeech_timer <= diff)
+                if (speechTimer <= diff)
                 {
-                    Player* player = Unit::GetPlayer(*me, uiPlayerGUID);
+                    Player* player = Unit::GetPlayer(*me, playerGUID);
                     if (!player)
                     {
                         EnterEvadeMode();
                         return;
                     }
 
-                    switch (uiSpeech_counter)
+                    switch (speechCounter)
                     {
                         case 1:
-                            DoScriptText(SAY_PERSUADED1, me);
-                            uiSpeech_timer = 8000;
+                            Talk(SAY_PERSUADED1);
+                            speechTimer = 8000;
                             break;
 
                         case 2:
-                            DoScriptText(SAY_PERSUADED2, me);
-                            uiSpeech_timer = 8000;
+                            Talk(SAY_PERSUADED2);
+                            speechTimer = 8000;
                             break;
 
                         case 3:
-                            DoScriptText(SAY_PERSUADED3, me);
-                            uiSpeech_timer = 8000;
+                            Talk(SAY_PERSUADED3);
+                            speechTimer = 8000;
                             break;
 
                         case 4:
-                            DoScriptText(SAY_PERSUADED4, me);
-                            uiSpeech_timer = 8000;
+                            Talk(SAY_PERSUADED4);
+                            speechTimer = 8000;
                             break;
 
                         case 5:
-                            DoScriptText(SAY_PERSUADED5, player);
-                            uiSpeech_timer = 8000;
+                            player->Say(SAY_PERSUADED5, LANG_UNIVERSAL);
+                            speechTimer = 8000;
                             break;
 
                         case 6:
-                            DoScriptText(SAY_PERSUADED6, me);
+                            Talk(SAY_PERSUADED6);
                             player->Kill(me);
-                            //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-                            //me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                            uiSpeech_counter = 0;
-                            player->GroupEventHappens(12720, me);
+                            speechCounter = 0;
+                            player->GroupEventHappens(QUEST_HOW_TO_WIN_FRIENDS, me);
                             return;
                     }
 
-                    ++uiSpeech_counter;
-                    DoCastAOE(58111, true);
-                } else uiSpeech_timer -= diff;
+                    ++speechCounter;
+                    DoCastAOE(SPELL_THREAT_PULSE, true);
+
+                } else 
+                    speechTimer -= diff;
 
                 return;
             }
@@ -171,16 +192,16 @@ public:
 
 enum eKoltira
 {
-    SAY_BREAKOUT1                   = -1609561,
-    SAY_BREAKOUT2                   = -1609562,
-    SAY_BREAKOUT3                   = -1609563,
-    SAY_BREAKOUT4                   = -1609564,
-    SAY_BREAKOUT5                   = -1609565,
-    SAY_BREAKOUT6                   = -1609566,
-    SAY_BREAKOUT7                   = -1609567,
-    SAY_BREAKOUT8                   = -1609568,
-    SAY_BREAKOUT9                   = -1609569,
-    SAY_BREAKOUT10                  = -1609570,
+    SAY_BREAKOUT1                   = 0,
+    SAY_BREAKOUT2                   = 1,
+    SAY_BREAKOUT3                   = 2,
+    SAY_BREAKOUT4                   = 3,
+    SAY_BREAKOUT5                   = 4,
+    SAY_BREAKOUT6                   = 5,
+    SAY_BREAKOUT7                   = 6,
+    SAY_BREAKOUT8                   = 7,
+    SAY_BREAKOUT9                   = 8,
+    SAY_BREAKOUT10                  = 9,
 
     SPELL_KOLTIRA_TRANSFORM         = 52899,
     SPELL_ANTI_MAGIC_ZONE           = 52894,
@@ -247,7 +268,7 @@ public:
             switch (waypointId)
             {
                 case 0:
-                    DoScriptText(SAY_BREAKOUT1, me);
+                    Talk(SAY_BREAKOUT1);
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                     break;
                 case 1:
@@ -262,7 +283,7 @@ public:
                 case 3:
                     SetEscortPaused(true);
                     me->SetStandState(UNIT_STAND_STATE_KNEEL);
-                    DoScriptText(SAY_BREAKOUT2, me);
+                    Talk(SAY_BREAKOUT2);
                     DoCast(me, SPELL_ANTI_MAGIC_ZONE);  // cast again that makes bubble up
                     break;
                 case 4:
@@ -306,22 +327,22 @@ public:
                     switch (m_uiWave)
                     {
                         case 0:
-                            DoScriptText(SAY_BREAKOUT3, me);
+                            Talk(SAY_BREAKOUT3);
                             SummonAcolyte(3);
                             m_uiWave_Timer = 20000;
                             break;
                         case 1:
-                            DoScriptText(SAY_BREAKOUT4, me);
+                            Talk(SAY_BREAKOUT4);
                             SummonAcolyte(3);
                             m_uiWave_Timer = 20000;
                             break;
                         case 2:
-                            DoScriptText(SAY_BREAKOUT5, me);
+                            Talk(SAY_BREAKOUT5);
                             SummonAcolyte(4);
                             m_uiWave_Timer = 20000;
                             break;
                         case 3:
-                            DoScriptText(SAY_BREAKOUT6, me);
+                            Talk(SAY_BREAKOUT6);
                             me->SummonCreature(NPC_HIGH_INQUISITOR_VALROTH, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000);
                             m_uiWave_Timer = 1000;
                             break;
@@ -331,7 +352,7 @@ public:
 
                             if (!temp || !temp->isAlive())
                             {
-                                DoScriptText(SAY_BREAKOUT8, me);
+                                Talk(SAY_BREAKOUT8);
                                 m_uiWave_Timer = 5000;
                             }
                             else
@@ -342,13 +363,13 @@ public:
                             break;
                         }
                         case 5:
-                            DoScriptText(SAY_BREAKOUT9, me);
+                            Talk(SAY_BREAKOUT9);
                             me->RemoveAurasDueToSpell(SPELL_ANTI_MAGIC_ZONE);
                             // i do not know why the armor will also be removed
                             m_uiWave_Timer = 2500;
                             break;
                         case 6:
-                            DoScriptText(SAY_BREAKOUT10, me);
+                            Talk(SAY_BREAKOUT10);
                             SetEscortPaused(false);
                             break;
                     }
@@ -366,8 +387,8 @@ public:
 //Scarlet courier
 enum ScarletCourierEnum
 {
-    SAY_TREE1                          = -1609531,
-    SAY_TREE2                          = -1609532,
+    SAY_TREE1                          = 0,
+    SAY_TREE2                          = 1,
     SPELL_SHOOT                        = 52818,
     GO_INCONSPICUOUS_TREE              = 191144,
     NPC_SCARLET_COURIER                = 29076
@@ -399,7 +420,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_TREE2, me);
+            Talk(SAY_TREE2);
             me->Dismount();
             uiStage = 0;
         }
@@ -425,7 +446,7 @@ public:
                         me->SetWalk(true);
                         if (GameObject* tree = me->FindNearestGameObject(GO_INCONSPICUOUS_TREE, 40.0f))
                         {
-                            DoScriptText(SAY_TREE1, me);
+                            Talk(SAY_TREE1);
                             float x, y, z;
                             tree->GetContactPoint(me, x, y, z);
                             me->GetMotionMaster()->MovePoint(1, x, y, z);
@@ -455,12 +476,10 @@ public:
 
 enum valroth
 {
-    SAY_VALROTH1                      = -1609581,
-    SAY_VALROTH2                      = -1609582,
-    SAY_VALROTH3                      = -1609583,
-    SAY_VALROTH4                      = -1609584,
-    SAY_VALROTH5                      = -1609585,
-    SAY_VALROTH6                      = -1609586,
+  //SAY_VALROTH1                      = 0, Unused
+    SAY_VALROTH_AGGRO                 = 1,
+    SAY_VALROTH_RAND                  = 2,
+    SAY_VALROTH_DEATH                 = 3,
     SPELL_RENEW                       = 38210,
     SPELL_INQUISITOR_PENANCE          = 52922,
     SPELL_VALROTH_SMITE               = 52926,
@@ -494,7 +513,7 @@ public:
 
         void EnterCombat(Unit* who)
         {
-            DoScriptText(SAY_VALROTH2, me);
+            Talk(SAY_VALROTH_AGGRO);
             DoCast(who, SPELL_VALROTH_SMITE);
         }
 
@@ -527,12 +546,12 @@ public:
         void Shout()
         {
             if (rand()%100 < 15)
-                DoScriptText(RAND(SAY_VALROTH3, SAY_VALROTH4, SAY_VALROTH5), me);
+                Talk(SAY_VALROTH_RAND);
         }
 
         void JustDied(Unit* killer)
         {
-            DoScriptText(SAY_VALROTH6, me);
+            Talk(SAY_VALROTH_DEATH);
             killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true);
         }
     };
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
index 5151268b70d..08aa86d6a06 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp
@@ -29,6 +29,7 @@ EndScriptData */
 
 enum eEnums
 {
+    EMOTE_FRENZY_KILL           = 0,
     SPELL_REND                  = 16509,
     SPELL_BACKHAND              = 18103,
     SPELL_FRENZY                = 8269
@@ -103,7 +104,7 @@ public:
                 if (m_uiFrenzy_Timer <= uiDiff)
                 {
                     DoCast(me, SPELL_FRENZY);
-                    DoScriptText(EMOTE_GENERIC_FRENZY_KILL, me);
+                    Talk(EMOTE_FRENZY_KILL);
 
                     m_uiFrenzy_Timer = 120000;
                 }
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index 3c7771612e2..dd3e591bf61 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -28,6 +28,7 @@ EndScriptData */
 
 enum eEnums
 {
+    EMOTE_FRENZY_KILL            = 0,
     SPELL_FLAMESTRIKE            = 18399,
     SPELL_BLAST_WAVE             = 16046,
     SPELL_FIRESHIELD             = 19626,
@@ -88,7 +89,7 @@ public:
                 if (m_uiFrenzy_Timer <= uiDiff)
                 {
                     DoCast(me, SPELL_FRENZY);
-                    DoScriptText(EMOTE_GENERIC_FRENZY_KILL, me);
+                    Talk(EMOTE_FRENZY_KILL);
 
                     m_uiFrenzy_Timer = 24000;
                 }
diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
index 4997fc49da9..099bc0770b7 100644
--- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
+++ b/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
@@ -31,13 +31,12 @@ enum Galen
 
     GO_GALENS_CAGE          = 37118,
 
-    SAY_PERIODIC            = -1000500,
-    SAY_QUEST_ACCEPTED      = -1000501,
-    SAY_ATTACKED_1          = -1000502,
-    SAY_ATTACKED_2          = -1000503,
-    SAY_QUEST_COMPLETE      = -1000504,
-    EMOTE_WHISPER           = -1000505,
-    EMOTE_DISAPPEAR         = -1000506
+    SAY_PERIODIC            = 0,
+    SAY_QUEST_ACCEPTED      = 1,
+    SAY_ATTACKED            = 2,
+    SAY_QUEST_COMPLETE      = 3,
+    EMOTE_WHISPER           = 4,
+    EMOTE_DISAPPEAR         = 5,
 };
 
 class npc_galen_goodward : public CreatureScript
@@ -52,7 +51,7 @@ public:
         {
             CAST_AI(npc_galen_goodward::npc_galen_goodwardAI, creature->AI())->Start(false, false, player->GetGUID());
             creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE);
-            DoScriptText(SAY_QUEST_ACCEPTED, creature);
+            creature->AI()->Talk(SAY_QUEST_ACCEPTED);
         }
         return true;
     }
@@ -81,7 +80,7 @@ public:
         void EnterCombat(Unit* who)
         {
             if (HasEscortState(STATE_ESCORT_ESCORTING))
-                DoScriptText(RAND(SAY_ATTACKED_1, SAY_ATTACKED_2), me, who);
+                Talk(SAY_ATTACKED, who->GetGUID());
         }
 
         void WaypointStart(uint32 uiPointId)
@@ -103,7 +102,7 @@ public:
                     break;
                 }
             case 21:
-                DoScriptText(EMOTE_DISAPPEAR, me);
+                Talk(EMOTE_DISAPPEAR);
                 break;
             }
         }
@@ -120,8 +119,8 @@ public:
                     if (Player* player = GetPlayerForEscort())
                     {
                         me->SetFacingToObject(player);
-                        DoScriptText(SAY_QUEST_COMPLETE, me, player);
-                        DoScriptText(EMOTE_WHISPER, me, player);
+                        Talk(SAY_QUEST_COMPLETE, player->GetGUID());
+                        Talk(EMOTE_WHISPER, player->GetGUID());
                         player->GroupEventHappens(QUEST_GALENS_ESCAPE, me);
                     }
                     SetRun(true);
@@ -139,7 +138,7 @@ public:
             if (m_uiPeriodicSay < uiDiff)
             {
                 if (!HasEscortState(STATE_ESCORT_ESCORTING))
-                    DoScriptText(SAY_PERIODIC, me);
+                    Talk(SAY_PERIODIC);
                 m_uiPeriodicSay = 15000;
             }
             else