Core/DB: Converted 7 more scripts to creature text

7 files changed, 181 insertions, 209 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
index a93519bcbe7..1335f189286 100644
--- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp
@@ -30,9 +30,9 @@ EndScriptData */
 
 enum Says
 {
-    SAY_GAMESBEGIN_1        = -1469004,
-    SAY_GAMESBEGIN_2        = -1469005,
-    SAY_VAEL_INTRO          = -1469006                    //when he corrupts Vaelastrasz
+    SAY_GAMESBEGIN_1        = 0,
+    SAY_GAMESBEGIN_2        = 1,
+  //SAY_VAEL_INTRO          = 2, Not used - when he corrupts Vaelastrasz
 };
 
 #define GOSSIP_ITEM_1           "I've made no mistakes."
@@ -101,7 +101,7 @@ public:
                 break;
             case GOSSIP_ACTION_INFO_DEF+3:
                 player->CLOSE_GOSSIP_MENU();
-                DoScriptText(SAY_GAMESBEGIN_1, creature);
+                creature->AI()->Talk(SAY_GAMESBEGIN_1);
                 CAST_AI(boss_victor_nefarius::boss_victor_nefariusAI, creature->AI())->BeginEvent(player);
                 break;
         }
@@ -238,7 +238,7 @@ public:
 
         void BeginEvent(Player* target)
         {
-            DoScriptText(SAY_GAMESBEGIN_2, me);
+            Talk(SAY_GAMESBEGIN_2);
 
             //Trinity::Singleton<MapManager>::Instance().GetMap(me->GetMapId(), me)->GetPlayers().begin();
             /*
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
index c763cb69dec..3e9d2e991fc 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -28,41 +28,37 @@ EndScriptData */
 
 enum Quotes
 {
- YELL_INTRO                 =   -1580017,
- YELL_INTRO_BREAK_ICE       =   -1580018,
- YELL_INTRO_CHARGE          =   -1580019,
- YELL_INTRO_KILL_MADRIGOSA  =   -1580020,
- YELL_INTRO_TAUNT           =   -1580021,
-
- YELL_MADR_ICE_BARRIER      =   -1580031,
- YELL_MADR_INTRO            =   -1580032,
- YELL_MADR_ICE_BLOCK        =   -1580033,
- YELL_MADR_TRAP             =   -1580034,
- YELL_MADR_DEATH            =   -1580035,
-
- YELL_AGGRO                 =   -1580022,
- YELL_KILL1                 =   -1580023,
- YELL_KILL2                 =   -1580024,
- YELL_KILL3                 =   -1580025,
- YELL_LOVE1                 =   -1580026,
- YELL_LOVE2                 =   -1580027,
- YELL_LOVE3                 =   -1580028,
- YELL_BERSERK               =   -1580029,
- YELL_DEATH                 =   -1580030
+    YELL_INTRO                          = 0,
+    YELL_INTRO_BREAK_ICE                = 1,
+    YELL_INTRO_CHARGE                   = 2,
+    YELL_INTRO_KILL_MADRIGOSA           = 3,
+    YELL_INTRO_TAUNT                    = 4,
+
+    YELL_AGGRO                          = 5,
+    YELL_KILL                           = 6,
+    YELL_LOVE                           = 7,
+    YELL_BERSERK                        = 8,
+    YELL_DEATH                          = 9,
+
+    YELL_MADR_ICE_BARRIER               = 0,
+    YELL_MADR_INTRO                     = 1,
+    YELL_MADR_ICE_BLOCK                 = 2,
+    YELL_MADR_TRAP                      = 3,
+    YELL_MADR_DEATH                     = 4,
 };
 
 enum Spells
 {
-    SPELL_METEOR_SLASH                 =   45150,
-    SPELL_BURN                         =   46394,
-    SPELL_STOMP                        =   45185,
-    SPELL_BERSERK                      =   26662,
-    SPELL_DUAL_WIELD                   =   42459,
-
-    SPELL_INTRO_FROST_BLAST            =   45203,
-    SPELL_INTRO_FROSTBOLT              =   44843,
-    SPELL_INTRO_ENCAPSULATE            =   45665,
-    SPELL_INTRO_ENCAPSULATE_CHANELLING =   45661
+    SPELL_METEOR_SLASH                  = 45150,
+    SPELL_BURN                          = 46394,
+    SPELL_STOMP                         = 45185,
+    SPELL_BERSERK                       = 26662,
+    SPELL_DUAL_WIELD                    = 42459,
+
+    SPELL_INTRO_FROST_BLAST             = 45203,
+    SPELL_INTRO_FROSTBOLT               = 44843,
+    SPELL_INTRO_ENCAPSULATE             = 45665,
+    SPELL_INTRO_ENCAPSULATE_CHANELLING  = 45661
 };
 
 #define FELMYST 25038
@@ -122,7 +118,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(YELL_AGGRO, me);
+            Talk(YELL_AGGRO);
 
             if (instance)
                 instance->SetData(DATA_BRUTALLUS_EVENT, IN_PROGRESS);
@@ -130,12 +126,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(YELL_KILL1, YELL_KILL2, YELL_KILL3), me);
+            Talk(YELL_KILL);
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(YELL_DEATH, me);
+            Talk(YELL_DEATH);
 
             if (instance)
             {
@@ -199,19 +195,19 @@ public:
             switch (IntroPhase)
             {
                 case 0:
-                    DoScriptText(YELL_MADR_ICE_BARRIER, Madrigosa);
+                    Madrigosa->AI()->Talk(YELL_MADR_ICE_BARRIER);
                     IntroPhaseTimer = 7000;
                     ++IntroPhase;
                     break;
                 case 1:
                     me->SetInFront(Madrigosa);
                     Madrigosa->SetInFront(me);
-                    DoScriptText(YELL_MADR_INTRO, Madrigosa, me);
+                    Madrigosa->AI()->Talk(YELL_MADR_INTRO, me->GetGUID());
                     IntroPhaseTimer = 9000;
                     ++IntroPhase;
                     break;
                 case 2:
-                    DoScriptText(YELL_INTRO, me, Madrigosa);
+                    Talk(YELL_INTRO, Madrigosa->GetGUID());
                     IntroPhaseTimer = 13000;
                     ++IntroPhase;
                     break;
@@ -225,32 +221,32 @@ public:
                     ++IntroPhase;
                     break;
                 case 4:
-                    DoScriptText(YELL_INTRO_BREAK_ICE, me);
+                    Talk(YELL_INTRO_BREAK_ICE);
                     IntroPhaseTimer = 6000;
                     ++IntroPhase;
                     break;
                 case 5:
                     Madrigosa->CastSpell(me, SPELL_INTRO_ENCAPSULATE_CHANELLING, false);
-                    DoScriptText(YELL_MADR_TRAP, Madrigosa);
+                    Madrigosa->AI()->Talk(YELL_MADR_TRAP);
                     DoCast(me, SPELL_INTRO_ENCAPSULATE);
                     IntroPhaseTimer = 11000;
                     ++IntroPhase;
                     break;
                 case 6:
-                    DoScriptText(YELL_INTRO_CHARGE, me);
+                    Talk(YELL_INTRO_CHARGE);
                     IntroPhaseTimer = 5000;
                     ++IntroPhase;
                     break;
                 case 7:
                     me->Kill(Madrigosa);
-                    DoScriptText(YELL_MADR_DEATH, Madrigosa);
+                    Madrigosa->AI()->Talk(YELL_MADR_DEATH);
                     me->SetFullHealth();
                     me->AttackStop();
                     IntroPhaseTimer = 4000;
                     ++IntroPhase;
                     break;
                 case 8:
-                    DoScriptText(YELL_INTRO_KILL_MADRIGOSA, me);
+                    Talk(YELL_INTRO_KILL_MADRIGOSA);
                     me->SetOrientation(0.14f);
                     me->StopMoving();
                     Madrigosa->setDeathState(CORPSE);
@@ -258,7 +254,7 @@ public:
                     ++IntroPhase;
                     break;
                 case 9:
-                    DoScriptText(YELL_INTRO_TAUNT, me);
+                    Talk(YELL_INTRO_TAUNT);
                     IntroPhaseTimer = 5000;
                     ++IntroPhase;
                     break;
@@ -316,7 +312,7 @@ public:
 
             if (StompTimer <= diff)
             {
-                DoScriptText(RAND(YELL_LOVE1, YELL_LOVE2, YELL_LOVE3), me);
+                Talk(YELL_LOVE);
                 DoCast(me->getVictim(), SPELL_STOMP);
                 StompTimer = 30000;
             } else StompTimer -= diff;
@@ -336,7 +332,7 @@ public:
 
             if (BerserkTimer < diff && !Enraged)
             {
-                DoScriptText(YELL_BERSERK, me);
+                Talk(YELL_BERSERK);
                 DoCast(me, SPELL_BERSERK);
                 Enraged = true;
             } else BerserkTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
index 95dde4f0ada..23a83a7ee8f 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -28,35 +28,27 @@ EndScriptData */
 
 enum Quotes
 {
-    //Alytesh
-    YELL_CANFLAGRATION          =   -1580044,
-    YELL_SISTER_SACROLASH_DEAD  =   -1580045,
-    YELL_ALY_KILL_1             =   -1580046,
-    YELL_ALY_KILL_2             =   -1580047,
-    YELL_ALY_DEAD               =   -1580048,
-    YELL_BERSERK                =   -1580049,
-
-    //Sacrolash
-    YELL_SHADOW_NOVA            =   -1580050,
-    YELL_SISTER_ALYTHESS_DEAD   =   -1580051,
-    YELL_SAC_KILL_1             =   -1580052,
-    YELL_SAC_KILL_2             =   -1580053,
-    SAY_SAC_DEAD                =   -1580054,
-    YELL_ENRAGE                 =   -1580055,
-
-    //Intro
-    YELL_INTRO_SAC_1            =   -1580056,
-    YELL_INTRO_ALY_2            =   -1580057,
-    YELL_INTRO_SAC_3            =   -1580058,
-    YELL_INTRO_ALY_4            =   -1580059,
-    YELL_INTRO_SAC_5            =   -1580060,
-    YELL_INTRO_ALY_6            =   -1580061,
-    YELL_INTRO_SAC_7            =   -1580062,
-    YELL_INTRO_ALY_8            =   -1580063,
-
-    //Emote
-    EMOTE_SHADOW_NOVA           =   -1580064,
-    EMOTE_CONFLAGRATION         =   -1580065
+    YELL_INTRO_SAC_1            = 0,
+    YELL_INTRO_SAC_3            = 1,
+    YELL_INTRO_SAC_5            = 2,
+    YELL_INTRO_SAC_7            = 3,
+    YELL_SAC_DEAD               = 4,
+    EMOTE_SHADOW_NOVA           = 5,
+    YELL_ENRAGE                 = 6,
+    YELL_SISTER_ALYTHESS_DEAD   = 7,
+    YELL_SAC_KILL               = 8,
+    YELL_SHADOW_NOVA            = 9,
+
+    YELL_INTRO_ALY_2            = 0,
+    YELL_INTRO_ALY_4            = 1,
+    YELL_INTRO_ALY_6            = 2,
+    YELL_INTRO_ALY_8            = 3,
+    EMOTE_CONFLAGRATION         = 4,
+    YELL_ALY_KILL               = 5,
+    YELL_ALY_DEAD               = 6,
+    YELL_SISTER_SACROLASH_DEAD  = 7,
+    YELL_CANFLAGRATION          = 8,
+    YELL_BERSERK                = 9,
 };
 
 enum Spells
@@ -165,7 +157,7 @@ public:
         void KilledUnit(Unit* /*victim*/)
         {
             if (rand()%4 == 0)
-                DoScriptText(RAND(YELL_SAC_KILL_1, YELL_SAC_KILL_2), me);
+                Talk(YELL_SAC_KILL);
         }
 
         void JustDied(Unit* /*killer*/)
@@ -173,7 +165,7 @@ public:
             // only if ALY death
             if (SisterDeath)
             {
-                DoScriptText(SAY_SAC_DEAD, me);
+                Talk(YELL_SAC_DEAD);
 
                 if (instance)
                     instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
@@ -235,7 +227,7 @@ public:
                     Temp = Unit::GetUnit(*me, instance->GetData64(DATA_ALYTHESS));
                     if (Temp && Temp->isDead())
                     {
-                        DoScriptText(YELL_SISTER_ALYTHESS_DEAD, me);
+                        Talk(YELL_SISTER_ALYTHESS_DEAD);
                         DoCast(me, SPELL_EMPOWER);
                         me->InterruptSpell(CURRENT_GENERIC_SPELL);
                         SisterDeath = true;
@@ -275,8 +267,8 @@ public:
                         if (!SisterDeath)
                         {
                             if (target)
-                                DoScriptText(EMOTE_SHADOW_NOVA, me, target);
-                            DoScriptText(YELL_SHADOW_NOVA, me);
+                                Talk(EMOTE_SHADOW_NOVA, target->GetGUID());
+                            Talk(YELL_SHADOW_NOVA);
                         }
                         ShadownovaTimer = 30000+(rand()%5000);
                     }
@@ -324,7 +316,7 @@ public:
             if (EnrageTimer < diff && !Enraged)
             {
                 me->InterruptSpell(CURRENT_GENERIC_SPELL);
-                DoScriptText(YELL_ENRAGE, me);
+                Talk(YELL_ENRAGE);
                 DoCast(me, SPELL_ENRAGE);
                 Enraged = true;
             } else EnrageTimer -= diff;
@@ -457,7 +449,7 @@ public:
         {
             if (rand()%4 == 0)
             {
-                DoScriptText(RAND(YELL_ALY_KILL_1, YELL_ALY_KILL_2), me);
+                Talk(YELL_ALY_KILL);
             }
         }
 
@@ -465,7 +457,7 @@ public:
         {
             if (SisterDeath)
             {
-                DoScriptText(YELL_ALY_DEAD, me);
+                Talk(YELL_ALY_DEAD);
 
                 if (instance)
                     instance->SetData(DATA_EREDAR_TWINS_EVENT, DONE);
@@ -528,24 +520,24 @@ public:
             case 0: return 0;
             case 1:
                 if (Sacrolash)
-                    DoScriptText(YELL_INTRO_SAC_1, Sacrolash);
+                    Sacrolash->AI()->Talk(YELL_INTRO_SAC_1);
                 return 1000;
-            case 2: DoScriptText(YELL_INTRO_ALY_2, me); return 1000;
+            case 2: Talk(YELL_INTRO_ALY_2); return 1000;
             case 3:
                 if (Sacrolash)
-                    DoScriptText(YELL_INTRO_SAC_3, Sacrolash);
+                    Sacrolash->AI()->Talk(YELL_INTRO_SAC_3);
                 return 2000;
-            case 4: DoScriptText(YELL_INTRO_ALY_4, me); return 1000;
+            case 4: Talk(YELL_INTRO_ALY_4); return 1000;
             case 5:
                 if (Sacrolash)
-                    DoScriptText(YELL_INTRO_SAC_5, Sacrolash);
+                    Sacrolash->AI()->Talk(YELL_INTRO_SAC_5);
                 return 2000;
-            case 6: DoScriptText(YELL_INTRO_ALY_6, me); return 1000;
+            case 6: Talk(YELL_INTRO_ALY_6); return 1000;
             case 7:
                 if (Sacrolash)
-                    DoScriptText(YELL_INTRO_SAC_7, Sacrolash);
+                    Sacrolash->AI()->Talk(YELL_INTRO_SAC_7);
                 return 3000;
-            case 8: DoScriptText(YELL_INTRO_ALY_8, me); return 900000;
+            case 8: Talk(YELL_INTRO_ALY_8); return 900000;
             }
             return 10000;
         }
@@ -568,7 +560,7 @@ public:
                     Temp = Unit::GetUnit(*me, instance->GetData64(DATA_SACROLASH));
                     if (Temp && Temp->isDead())
                     {
-                        DoScriptText(YELL_SISTER_SACROLASH_DEAD, me);
+                        Talk(YELL_SISTER_SACROLASH_DEAD);
                         DoCast(me, SPELL_EMPOWER);
                         me->InterruptSpell(CURRENT_GENERIC_SPELL);
                         SisterDeath = true;
@@ -622,8 +614,8 @@ public:
                         if (!SisterDeath)
                         {
                             if (target)
-                                DoScriptText(EMOTE_CONFLAGRATION, me, target);
-                            DoScriptText(YELL_CANFLAGRATION, me);
+                                Talk(EMOTE_CONFLAGRATION, target->GetGUID());
+                            Talk(YELL_CANFLAGRATION);
                         }
 
                         BlazeTimer = 4000;
@@ -661,7 +653,7 @@ public:
             if (EnrageTimer < diff && !Enraged)
             {
                 me->InterruptSpell(CURRENT_GENERIC_SPELL);
-                DoScriptText(YELL_BERSERK, me);
+                Talk(YELL_BERSERK);
                 DoCast(me, SPELL_ENRAGE);
                 Enraged = true;
             } else EnrageTimer -= diff;
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
index bc841d76714..89f541304cd 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -31,14 +31,13 @@ EndScriptData */
 
 enum Yells
 {
-    YELL_BIRTH                                    = -1580036,
-    YELL_KILL1                                    = -1580037,
-    YELL_KILL2                                    = -1580038,
-    YELL_BREATH                                   = -1580039,
-    YELL_TAKEOFF                                  = -1580040,
-    YELL_BERSERK                                  = -1580041,
-    YELL_DEATH                                    = -1580042,
-    YELL_KALECGOS                                 = -1580043, // after felmyst's death spawned and say this
+    YELL_BIRTH                                    = 0,
+    YELL_KILL1                                    = 1,
+    YELL_BREATH                                   = 2,
+    YELL_TAKEOFF                                  = 3,
+    YELL_BERSERK                                  = 4,
+    YELL_DEATH                                    = 5,
+  //YELL_KALECGOS                                 = 6, Not used. After felmyst's death spawned and say this
 };
 
 enum Spells
@@ -181,17 +180,17 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(YELL_KILL1, YELL_KILL2), me);
+            Talk(YELL_KILL);
         }
 
         void JustRespawned()
         {
-            DoScriptText(YELL_BIRTH, me);
+            Talk(YELL_BIRTH);
         }
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(YELL_DEATH, me);
+            Talk(YELL_DEATH);
 
             if (instance)
                 instance->SetData(DATA_FELMYST_EVENT, DONE);
@@ -279,7 +278,7 @@ public:
                 me->GetMotionMaster()->Clear(false);
                 me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
                 me->StopMoving();
-                DoScriptText(YELL_TAKEOFF, me);
+                Talk(YELL_TAKEOFF);
                 events.ScheduleEvent(EVENT_FLIGHT_SEQUENCE, 2000);
                 break;
             case 1:
@@ -424,7 +423,7 @@ public:
                 switch (events.ExecuteEvent())
                 {
                     case EVENT_BERSERK:
-                        DoScriptText(YELL_BERSERK, me);
+                        Talk(YELL_BERSERK);
                         DoCast(me, SPELL_BERSERK, true);
                         events.ScheduleEvent(EVENT_BERSERK, 10000);
                         break;
@@ -459,7 +458,7 @@ public:
                 switch (events.ExecuteEvent())
                 {
                     case EVENT_BERSERK:
-                        DoScriptText(YELL_BERSERK, me);
+                        Talk(YELL_BERSERK);
                         DoCast(me, SPELL_BERSERK, true);
                         break;
                     case EVENT_FLIGHT_SEQUENCE:
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index ce8338e2b2d..c2552963b0e 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -33,46 +33,34 @@ EndScriptData */
 /*** Speech and sounds***/
 enum Yells
 {
-    // These are used throughout Sunwell and Magisters(?). Players can hear this while running through the instances.
-    SAY_KJ_OFFCOMBAT1                           = -1580066,
-    SAY_KJ_OFFCOMBAT2                           = -1580067,
-    SAY_KJ_OFFCOMBAT3                           = -1580068,
-    SAY_KJ_OFFCOMBAT4                           = -1580069,
-    SAY_KJ_OFFCOMBAT5                           = -1580070,
-
-    // Encounter speech and sounds
-    SAY_KJ_EMERGE                               = -1580071,
-    SAY_KJ_SLAY1                                = -1580072,
-    SAY_KJ_SLAY2                                = -1580073,
-    SAY_KJ_REFLECTION1                          = -1580074,
-    SAY_KJ_REFLECTION2                          = -1580075,
-    SAY_KJ_DARKNESS1                            = -1580076,
-    SAY_KJ_DARKNESS2                            = -1580077,
-    SAY_KJ_DARKNESS3                            = -1580078,
-    SAY_KJ_PHASE3                               = -1580079,
-    SAY_KJ_PHASE4                               = -1580080,
-    SAY_KJ_PHASE5                               = -1580081,
-    SAY_KJ_DEATH                                = -1580093,
-    EMOTE_KJ_DARKNESS                           = -1580094,
-
-    /*** Kalecgos - Anveena speech at the beginning of Phase 5; Anveena's sacrifice ***/
-    SAY_KALECGOS_AWAKEN                         = -1580082,
-    SAY_ANVEENA_IMPRISONED                      = -1580083,
-    SAY_KALECGOS_LETGO                          = -1580084,
-    SAY_ANVEENA_LOST                            = -1580085,
-    SAY_KALECGOS_FOCUS                          = -1580086,
-    SAY_ANVEENA_KALEC                           = -1580087,
-    SAY_KALECGOS_FATE                           = -1580088,
-    SAY_ANVEENA_GOODBYE                         = -1580089,
-    SAY_KALECGOS_GOODBYE                        = -1580090,
-    SAY_KALECGOS_ENCOURAGE                      = -1580091,
-
-    /*** Kalecgos says throughout the fight ***/
-    SAY_KALECGOS_JOIN                           = -1580092,
-    SAY_KALEC_ORB_READY1                        = -1580095,
-    SAY_KALEC_ORB_READY2                        = -1580096,
-    SAY_KALEC_ORB_READY3                        = -1580097,
-    SAY_KALEC_ORB_READY4                        = -1580098
+    SAY_KJ_OFFCOMBAT                            = 0,
+    
+    SAY_KALECGOS_ENCOURAGE                      = 0,
+    SAY_KALECGOS_READY1                         = 1,
+    SAY_KALECGOS_READY2                         = 2,
+    SAY_KALECGOS_READY3                         = 3,
+    SAY_KALECGOS_READY4                         = 4,
+    SAY_KALECGOS_AWAKEN                         = 5,
+    SAY_KALECGOS_LETGO                          = 6,
+    SAY_KALECGOS_FOCUS                          = 7,
+    SAY_KALECGOS_FATE                           = 8,
+    SAY_KALECGOS_GOODBYE                        = 9,
+    SAY_KALECGOS_JOIN                           = 10,
+
+    SAY_KJ_DEATH                                = 0,
+    SAY_KJ_SLAY                                 = 1,
+    SAY_KJ_REFLECTION                           = 2,
+    SAY_KJ_EMERGE                               = 3,
+    SAY_KJ_DARKNESS                             = 4,
+    SAY_KJ_PHASE3                               = 5,
+    SAY_KJ_PHASE4                               = 6,
+    SAY_KJ_PHASE5                               = 7,
+    EMOTE_KJ_DARKNESS                           = 8,
+
+    SAY_ANVEENA_IMPRISONED                      = 0,
+    SAY_ANVEENA_LOST                            = 1,
+    SAY_ANVEENA_KALEC                           = 2,
+    SAY_ANVEENA_GOODBYE                         = 3,
 };
 
 /*** Spells used during the encounter ***/
@@ -322,7 +310,7 @@ public:
                         pOrb->Refresh();
                     }
                 }
-                DoScriptText(SAY_KALECGOS_ENCOURAGE, me);
+                Talk(SAY_KALECGOS_ENCOURAGE);
             }
             else
             {
@@ -338,10 +326,10 @@ public:
                     ++EmpowerCount;
                     switch (EmpowerCount)
                     {
-                        case 1: DoScriptText(SAY_KALEC_ORB_READY1, me); break;
-                        case 2: DoScriptText(SAY_KALEC_ORB_READY2, me); break;
-                        case 3: DoScriptText(SAY_KALEC_ORB_READY3, me); break;
-                        case 4: DoScriptText(SAY_KALEC_ORB_READY4, me); break;
+                        case 1: Talk(SAY_KALECGOS_READY1); break;
+                        case 2: Talk(SAY_KALECGOS_READY2); break;
+                        case 3: Talk(SAY_KALECGOS_READY3); break;
+                        case 4: Talk(SAY_KALECGOS_READY4); break;
                     }
                 }
             }
@@ -469,7 +457,7 @@ public:
             if (uiRandomSayTimer < diff)
             {
                 if (instance && instance->GetData(DATA_MURU_EVENT) != DONE && instance->GetData(DATA_KILJAEDEN_EVENT) == NOT_STARTED)
-                    DoScriptText(RAND(SAY_KJ_OFFCOMBAT1, SAY_KJ_OFFCOMBAT2, SAY_KJ_OFFCOMBAT3, SAY_KJ_OFFCOMBAT4, SAY_KJ_OFFCOMBAT5), me);
+                    Talk(SAY_KJ_OFFCOMBAT);
                 uiRandomSayTimer = 30000;
             } else uiRandomSayTimer -= diff;
 
@@ -613,7 +601,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_KJ_DEATH, me);
+            Talk(SAY_KJ_DEATH);
             summons.DespawnAll();
 
             if (instance)
@@ -622,7 +610,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_KJ_SLAY1, SAY_KJ_SLAY2), me);
+            Talk(SAY_KJ_SLAY);
         }
 
         void EnterEvadeMode()
@@ -657,7 +645,7 @@ public:
 
         void CastSinisterReflection()
         {
-            DoScriptText(RAND(SAY_KJ_REFLECTION1, SAY_KJ_REFLECTION2), me);
+            Talk(SAY_KJ_REFLECTION);
             for (uint8 i = 0; i < 4; ++i)
             {
                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true, -SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT))
@@ -717,8 +705,8 @@ public:
                             {
                                 SpeechTimer = 0;
                                 if (instance)
-                                    if (Creature* pSpeechCreature = Unit::GetCreature(*me, instance->GetData64(Speeches[speechCount].creature)))
-                                        DoScriptText(Speeches[speechCount].textid, pSpeechCreature);
+                                    if (Creature* speechCreature = Unit::GetCreature(*me, instance->GetData64(Speeches[speechCount].creature)))
+                                        speechCreature->AI()->Talk(Speeches[speechCount].textid);
                                 if (speechCount == 12)
                                     if (Creature* pAnveena =  Unit::GetCreature(*me, instance->GetData64(DATA_ANVEENA)))
                                         pAnveena->CastSpell(me, SPELL_SACRIFICE_OF_ANVEENA, false);
@@ -799,7 +787,7 @@ public:
                                 // Begins to channel for 8 seconds, then deals 50'000 damage to all raid members.
                                 if (!IsInDarkness)
                                 {
-                                    DoScriptText(EMOTE_KJ_DARKNESS, me);
+                                    Talk(EMOTE_KJ_DARKNESS);
                                     DoCastAOE(SPELL_DARKNESS_OF_A_THOUSAND_SOULS, false);
                                     ChangeTimers(true, 9000);
                                     Timer[TIMER_DARKNESS] = 8750;
@@ -813,7 +801,7 @@ public:
                                     Timer[TIMER_DARKNESS] = (Phase == PHASE_SACRIFICE) ? 15000 : urand(40000, 70000);
                                     IsInDarkness = false;
                                     DoCastAOE(SPELL_DARKNESS_OF_A_THOUSAND_SOULS_DAMAGE);
-                                    DoScriptText(RAND(SAY_KJ_DARKNESS1, SAY_KJ_DARKNESS2, SAY_KJ_DARKNESS3), me);
+                                    Talk(SAY_KJ_DARKNESS);
                                 }
                                 Timer[TIMER_SOUL_FLAY] = 9000;
                             }
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 8a102757036..ed10dec97dd 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -31,16 +31,15 @@ EndScriptData */
 
 enum eEnums
 {
-    SAY_AGGRO                   = -1568000,
-    SAY_FIRE_BOMBS              = -1568001,
-    SAY_SUMMON_HATCHER          = -1568002,
-    SAY_ALL_EGGS                = -1568003,
-    SAY_BERSERK                 = -1568004,
-    SAY_SLAY_1                  = -1568005,
-    SAY_SLAY_2                  = -1568006,
-    SAY_DEATH                   = -1568007,
-    SAY_EVENT_STRANGERS         = -1568008,
-    SAY_EVENT_FRIENDS           = -1568009,
+    SAY_AGGRO                   = 0,
+    SAY_FIRE_BOMBS              = 1,
+    SAY_SUMMON_HATCHER          = 2,
+    SAY_ALL_EGGS                = 3,
+    SAY_BERSERK                 = 4,
+    SAY_SLAY                    = 5,
+    SAY_DEATH                   = 6,
+    SAY_EVENT_STRANGERS         = 7,
+    SAY_EVENT_FRIENDS           = 8,
 
 // Jan'alai
     SPELL_FLAME_BREATH          = 43140,
@@ -163,7 +162,7 @@ class boss_janalai : public CreatureScript
 
             void JustDied(Unit* /*killer*/)
             {
-                DoScriptText(SAY_DEATH, me);
+                Talk(SAY_DEATH);
 
                 if (instance)
                     instance->SetData(DATA_JANALAIEVENT, DONE);
@@ -171,7 +170,7 @@ class boss_janalai : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
+                Talk(SAY_SLAY);
             }
 
             void EnterCombat(Unit* /*who*/)
@@ -179,7 +178,7 @@ class boss_janalai : public CreatureScript
                 if (instance)
                     instance->SetData(DATA_JANALAIEVENT, IN_PROGRESS);
 
-                DoScriptText(SAY_AGGRO, me);
+                Talk(SAY_AGGRO);
         //        DoZoneInCombat();
             }
 
@@ -352,7 +351,7 @@ class boss_janalai : public CreatureScript
                     }
                     else
                     {
-                        DoScriptText(SAY_BERSERK, me);
+                        Talk(SAY_BERSERK);
                         DoCast(me, SPELL_BERSERK, true);
                         EnrageTimer = 300000;
                     }
@@ -360,7 +359,7 @@ class boss_janalai : public CreatureScript
 
                 if (BombTimer <= diff)
                 {
-                    DoScriptText(SAY_FIRE_BOMBS, me);
+                    Talk(SAY_FIRE_BOMBS);
 
                     me->AttackStop();
                     me->GetMotionMaster()->Clear();
@@ -393,7 +392,7 @@ class boss_janalai : public CreatureScript
                 {
                     if (HealthBelowPct(35))
                     {
-                        DoScriptText(SAY_ALL_EGGS, me);
+                        Talk(SAY_ALL_EGGS);
 
                         me->AttackStop();
                         me->GetMotionMaster()->Clear();
@@ -407,7 +406,7 @@ class boss_janalai : public CreatureScript
                     {
                         if (HatchAllEggs(0))
                         {
-                            DoScriptText(SAY_SUMMON_HATCHER, me);
+                            Talk(SAY_SUMMON_HATCHER);
                             me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[0][0][0], hatcherway[0][0][1], hatcherway[0][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                             me->SummonCreature(MOB_AMANI_HATCHER, hatcherway[1][0][0], hatcherway[1][0][1], hatcherway[1][0][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
                             HatcherTimer = 90000;
diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/hinterlands.cpp
index fc7f52ae9b5..544ea0fd175 100644
--- a/src/server/scripts/EasternKingdoms/hinterlands.cpp
+++ b/src/server/scripts/EasternKingdoms/hinterlands.cpp
@@ -39,11 +39,11 @@ EndContentData */
 
 enum eOOX
 {
-    SAY_OOX_START           = -1000287,
-    SAY_OOX_AGGRO1          = -1000288,
-    SAY_OOX_AGGRO2          = -1000289,
-    SAY_OOX_AMBUSH          = -1000290,
-    SAY_OOX_END             = -1000292,
+    SAY_OOX_START           = 0,
+    SAY_OOX_AGGRO           = 1,
+    SAY_OOX_AMBUSH          = 3,
+    SAY_OOX_AMBUSH_REPLY    = 4,
+    SAY_OOX_END             = 5,
 
     QUEST_RESQUE_OOX_09     = 836,
 
@@ -70,7 +70,7 @@ public:
             else if (player->GetTeam() == HORDE)
                 creature->setFaction(FACTION_ESCORTEE_H);
 
-            DoScriptText(SAY_OOX_START, creature, player);
+            creature->AI()->Talk(SAY_OOX_START, player->GetGUID());
 
             if (npc_00x09hlAI* pEscortAI = CAST_AI(npc_00x09hl::npc_00x09hlAI, creature->AI()))
                 pEscortAI->Start(false, false, player->GetGUID(), quest);
@@ -94,13 +94,13 @@ public:
             switch (waypointId)
             {
                 case 26:
-                    DoScriptText(SAY_OOX_AMBUSH, me);
+                    Talk(SAY_OOX_AMBUSH);
                     break;
                 case 43:
-                    DoScriptText(SAY_OOX_AMBUSH, me);
+                    Talk(SAY_OOX_AMBUSH);
                     break;
                 case 64:
-                    DoScriptText(SAY_OOX_END, me);
+                    Talk(SAY_OOX_END);
                     if (Player* player = GetPlayerForEscort())
                         player->GroupEventHappens(QUEST_RESQUE_OOX_09, me);
                     break;
@@ -137,10 +137,7 @@ public:
             if (who->GetEntry() == NPC_MARAUDING_OWL || who->GetEntry() == NPC_VILE_AMBUSHER)
                 return;
 
-            if (rand()%1)
-                DoScriptText(SAY_OOX_AGGRO1, me);
-            else
-                DoScriptText(SAY_OOX_AGGRO2, me);
+            Talk(SAY_OOX_AGGRO);
         }
 
         void JustSummoned(Creature* summoned)
@@ -156,13 +153,13 @@ public:
 
 enum eRinji
 {
-    SAY_RIN_FREE            = -1000403, //from here
-    SAY_RIN_BY_OUTRUNNER    = -1000404,
-    SAY_RIN_HELP_1          = -1000405,
-    SAY_RIN_HELP_2          = -1000406, //to here, are used also by 6182 but this is wrong...
-    SAY_RIN_COMPLETE        = -1000407,
-    SAY_RIN_PROGRESS_1      = -1000408,
-    SAY_RIN_PROGRESS_2      = -1000409,
+    SAY_RIN_BY_OUTRUNNER    = 0,
+
+    SAY_RIN_FREE            = 0, //from here
+    SAY_RIN_HELP            = 1,
+    SAY_RIN_COMPLETE        = 2,
+    SAY_RIN_PROGRESS_1      = 3,
+    SAY_RIN_PROGRESS_2      = 4,
 
     QUEST_RINJI_TRAPPED     = 2742,
     NPC_RANGER              = 2694,
@@ -243,7 +240,8 @@ public:
             {
                 if (who->GetEntry() == NPC_OUTRUNNER && !m_bIsByOutrunner)
                 {
-                    DoScriptText(SAY_RIN_BY_OUTRUNNER, who);
+                    if (Creature* talker = who->ToCreature())
+                        talker->AI()->Talk(SAY_RIN_BY_OUTRUNNER);
                     m_bIsByOutrunner = true;
                 }
 
@@ -251,7 +249,7 @@ public:
                     return;
 
                 //only if attacked and escorter is not in combat?
-                DoScriptText(RAND(SAY_RIN_HELP_1, SAY_RIN_HELP_2), me);
+                Talk(SAY_RIN_HELP);
             }
         }
 
@@ -287,7 +285,7 @@ public:
             switch (waypointId)
             {
                 case 1:
-                    DoScriptText(SAY_RIN_FREE, me, player);
+                    Talk(SAY_RIN_FREE, player->GetGUID());
                     break;
                 case 7:
                     DoSpawnAmbush(true);
@@ -296,7 +294,7 @@ public:
                     DoSpawnAmbush(false);
                     break;
                 case 17:
-                    DoScriptText(SAY_RIN_COMPLETE, me, player);
+                    Talk(SAY_RIN_COMPLETE, player->GetGUID());
                     player->GroupEventHappens(QUEST_RINJI_TRAPPED, me);
                     SetRun();
                     m_uiPostEventCount = 1;
@@ -320,11 +318,11 @@ public:
                             switch (m_uiPostEventCount)
                             {
                                 case 1:
-                                    DoScriptText(SAY_RIN_PROGRESS_1, me, player);
+                                    Talk(SAY_RIN_PROGRESS_1, player->GetGUID());
                                     ++m_uiPostEventCount;
                                     break;
                                 case 2:
-                                    DoScriptText(SAY_RIN_PROGRESS_2, me, player);
+                                    Talk(SAY_RIN_PROGRESS_2, player->GetGUID());
                                     m_uiPostEventCount = 0;
                                     break;
                             }