Scripts/Trial of the Crusader: Convert script_texts in creature_text

10 files changed, 317 insertions, 151 deletions

diff --git a/sql/updates/world/2012_08_13_00_world_creature_text.sql b/sql/updates/world/2012_08_13_00_world_creature_text.sql
new file mode 100644
index 00000000000..aeb24dbfe90
--- /dev/null
+++ b/sql/updates/world/2012_08_13_00_world_creature_text.sql
@@ -0,0 +1,133 @@
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1649999 AND -1649000;
+DELETE FROM `creature_text` WHERE `entry` IN (34996,34990,34995,36095,34796,35144,34799,34797,34780,35458,34496,34497,16980,35877,34564,34660);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+-- Highlord Tirion Fordring
+    -- Northrend Beasts
+(34996, 0, 0, 'Welcome, champions! You have heard the call of the Argent Crusade and you have boldly answered! It is here, in the Crusaders'' Coliseum, that you will face your greatest challenges. Those of you who survive the rigors of the coliseum will join the Argent Crusade on its march to Icecrown Citadel.', 14, 0, 100, 0, 0, 16036, 'Highlord Tirion Fordring - Welcome'),
+(34996, 1, 0, 'Hailing from the deepest, darkest caverns of the Storm Peaks, Gormok the Impaler! Battle on, heroes!', 14, 0, 100, 0, 0, 16038, 'Highlord Tirion Fordring - Summing Gormok the Impaler'),
+(34996, 2, 0, 'Steel yourselves, heroes, for the twin terrors, Acidmaw and Dreadscale, enter the arena!', 14, 0, 100, 0, 0, 16039, 'Highlord Tirion Fordring - Summing Acidmaw and Dreadscale'),
+(34996, 3, 0, 'The air itself freezes with the introduction of our next combatant, Icehowl! Kill or be killed, champions!', 14, 0, 100, 0, 0, 16040, 'Highlord Tirion Fordring Summing Icehowl'),
+(34996, 4, 0, 'The monstrous menagerie has been vanquished!', 14, 0, 100, 0, 0, 16041, 'Highlord Tirion Fordring - Northrend Beasts Done'),
+(34996, 5, 0, 'Tragic... They fought valiantly, but the beasts of Northrend triumphed. Let us observe a moment of silence for our fallen heroes.', 14, 0, 0, 0, 0, 16042, 'Highlord Tirion Fordring - Northrend Beasts FAIL'),
+    -- Lord Jaraxxus
+(34996, 6, 0, 'Grand Warlock Wilfred Fizzlebang will summon forth your next challenge. Stand by for his entry.', 14, 0, 100, 0, 0, 16043, 'Highlord Tirion Fordring - Summing Wilfred Fizzlebang'),
+(34996, 7, 0, 'Quickly, heroes, destroy the demon lord before it can open a portal to its twisted demonic realm!', 14, 0, 100, 5, 0, 16044, 'Highlord Tirion Fordring to Wilfred Fizzlebang - Lord Jaraxxus Intro'),
+(34996, 8, 0, 'The loss of Wilfred Fizzlebang, while unfortunate, should be a lesson to those that dare dabble in dark magic. Alas, you are victorious and must now face the next challenge.', 14, 0, 100, 0, 0, 16045, 'Highlord Tirion Fordring - Lord Jaraxxus Outro'),
+(34996, 9, 0, 'Everyone calm down! Compose yourselves! There is no conspiracy at play here! The warlock acted on his own volition, outside of influences from the Alliance. The tournament must go on!', 14, 0, 100, 5, 0, 16046, 'Highlord Tirion Fordring - Lord Jaraxxus Outro'),
+    -- Faction Champions
+(34996, 10, 0, 'The next battle will be against the Argent Crusade''s most powerful knights! Only by defeating them will you be deemed worthy...', 14, 0, 100, 0, 0, 16047, 'Highlord Tirion Fordring - Faction Champions Intro'),
+(34996, 11, 0, 'Very well. I will allow it. Fight with honor!', 14, 0, 100, 1, 0, 16048, 'Highlord Tirion Fordring - Faction Champions Intro'),
+(34996, 12, 0, 'A shallow and tragic victory. We are weaker as a whole from the losses suffered today. Who but the Lich King could benefit from such foolishness? Great warriors have lost their lives. And for what? The true threat looms ahead - the Lich King awaits us all in death.', 14, 0, 100, 0, 0, 16049, 'Highlord Tirion Fordring - Faction Champions Outro'),
+    -- Twin Val'kyr
+(34996, 13, 0, 'Only by working together will you overcome the final challenge. From the depths of Icecrown come two of the Scourge''s most powerful lieutenants: fearsome val''kyr, winged harbingers of the Lich King!', 14, 0, 100, 0, 0, 16050, 'Highlord Tirion Fordring - Twin Val''kyr Intro'),
+(34996, 14, 0, 'Let the games begin!', 14, 0, 100, 0, 0, 16037, 'Highlord Tirion Fordring - Twin Val''kyr Intro'),
+    -- Anub''arak
+(34996, 15, 0, 'A mighty blow has been dealt to the Lich King! You have proven yourselves as able bodied champions of the Argent Crusade. Together we will strike against Icecrown Citadel and destroy what remains of the Scourge! There is no challenge that we cannot face united!', 14, 0, 100, 5, 0, 16051, 'Highlord Tirion Fordring - Anub''arak Intro'),
+(34996, 16, 0, 'Arthas! You are hopelessly outnumbered! Lay down Frostmourne and I will grant you a just death.', 14, 0, 100, 25, 0, 16052, 'Highlord Tirion Fordring'),
+
+-- King Varian Wrynn
+(34990, 0, 0, 'Your beasts will be no match for my champions, Tirion!', 14, 0, 0, 0, 0, 16069, 'King Varian Wrynn'),
+(34990, 1, 0, 'The Alliance doesn''t need the help of a demon lord to deal with Horde filth! Come, pig!', 14, 0, 100, 5, 0, 16064, 'King Varian Wrynn'),
+(34990, 2, 0, 'Our honor has been besmirched! They make wild claims and false accusations against us. I demand justice! Allow my champions to fight in place of your knights, Tirion. We challenge the Horde!', 14, 0, 100, 5, 0, 16066, 'King Varian Wrynn'),
+(34990, 3, 0, 'Fight for the glory of the Alliance, heroes! Honor your king and your people!', 14, 0, 100, 5, 0, 16065, 'King Varian Wrynn'),
+(34990, 4, 0, 'GLORY TO THE ALLIANCE!', 14, 0, 0, 0, 0, 16067, 'King Varian Wrynn'),
+(34990, 5, 0, 'Not even the Lich King most powerful minions can stand against the Alliance! All hail our victors!', 14, 0, 0, 0, 0, 16068, 'King Varian Wrynn'),
+(34990, 6, 0, 'Hardly a challenge.', 14, 0, 100, 274, 0, 16061, 'King Varian Wrynn - Faction Champions Kill Player'),
+(34990, 6, 1, 'HAH!', 14, 0, 100, 5, 0, 16060, 'King Varian Wrynn - Faction Champions Kill Player'),
+(34990, 6, 2, 'Is this the best the Horde has to offer?', 14, 0, 100, 6, 0, 16063, 'King Varian Wrynn  - Faction Champions Kill Player'),
+(34990, 6, 3, 'Worthless scrub.', 14, 0, 100, 25, 0, 16062, 'King Varian Wrynn  - Faction Champions Kill Player'),
+
+-- Garrosh Hellscream
+(34995, 0, 0, 'The Horde demands justice! We challenge the Alliance. Allow us to battle in place of your knights, paladin. We will show these dogs what it means to insult the Horde!', 14, 0, 100, 1, 0, 16023, 'Garrosh Hellscream'),
+(34995, 1, 0, 'I''ve seen more worthy challenges in the Ring of Blood. You waste our time, paladin.', 14, 0, 100, 1, 0, 16026, 'Garrosh Hellscream'),
+(34995, 2, 0, 'Treacherous Alliance dogs! You summon a demon lord against warriors of the Horde? Your deaths will be swift!', 14, 0, 100, 5, 0, 16021, 'Garrosh Hellscream'),
+(34995, 3, 0, 'That was just a taste of what the future brings. FOR THE HORDE!', 14, 0, 100, 1, 0, 16024, 'Garrosh Hellscream'),
+(34995, 4, 0, 'Show them no mercy, Horde champions! LOK''TAR OGAR!', 14, 0, 0, 0, 0, 16022, 'Garrosh - Faction Champions Intro'),
+(34995, 5, 0, 'Do you still question the might of the Horde, paladin? We will take on all comers!', 14, 0, 100, 1, 0, 16025, 'Garrosh Hellscream'),
+(34995, 6, 0, 'Weakling!', 14, 0, 0, 0, 0, 16017, 'Garrosh Hellscream - Faction Champions Kill Player'),
+(34995, 6, 1, 'Pathetic!', 14, 0, 0, 0, 0, 16018, 'Garrosh Hellscream - Faction Champions Kill Player'),
+(34995, 6, 2, 'Overpowered.', 14, 0, 0, 0, 0, 16019, 'Garrosh Hellscream - Faction Champions Kill Player'),
+(34995, 6, 3, 'Lok''tar!', 14, 0, 0, 0, 0, 16020, 'Garrosh Hellscream - Faction Champions Kill Player'),
+
+-- Highlord Tirion Fordring
+(36095, 0, 0, 'Champions, you''re alive! Not only have you defeated every challenge of the Trial of the Crusader, but also thwarted Arthas'' plans! Your skill and cunning will prove to be a powerful weapon against the Scourge. Well done! Allow one of the Crusade''s mages to transport you to the surface!', 14, 0, 100, 5, 0, 16053, 'Highlord Tirion Fordring'),
+(36095, 1, 0, 'Let me hand you the chests as a reward, and let its contents will serve you faithfully in the campaign against Arthas in the heart of the Icecrown Citadel!', 41, 0, 0, 0, 0, 0, 'Highlord Tirion Fordring'),
+
+-- Gormok
+(34796, 0, 0, 'My slaves! Destroy the enemy!', 41, 0, 0, 0, 0, 0, 'Gormok the Impaler - Snowball'),
+
+-- Acidmaw
+(35144, 0, 0, 'Upon seeing its companion perish, %s becomes enraged!', 41, 0, 100, 0, 0, 0, 'Acidmaw to Beasts Controller - Enrage'),
+
+-- Dreadscale
+(34799, 0, 0, 'Upon seeing its companion perish, %s becomes enraged!', 41, 0, 100, 0, 0, 0, 'Dreadscale to Beasts Controller - Enrage'),
+
+-- Icehowl
+(34797, 0, 0, '%s glares at $n and lets out a bellowing roar!', 41, 0, 100, 0, 0, 0, 'Icehowl - Start'),
+(34797, 1, 0, '%s crashes into the Coliseum wall and is stunned!', 41, 0, 100, 0, 0, 0, 'Icehowl - Crash'),
+(34797, 2, 0, 'Trampling combatants underfoot, %s goes into a frothing rage!', 41, 0, 100, 0, 0, 0, 'Icehowl - Fail'),
+
+-- Wilfred Fizzlebang
+(35458, 0, 0, 'Thank you, Highlord. Now, challengers, I will begin the ritual of summoning. When I am done a fearsome doomguard will appear!', 14, 0, 100, 2, 0, 16268, 'Wilfred Fizzlebang - Intro'),
+(35458, 1, 0, 'Prepare for oblivion!', 14, 0, 100, 0, 0, 16269, 'Wilfred Fizzlebang - Intro'),
+(35458, 2, 0, 'A-HA! I''ve done it! Behold the absolute power of Wilfred Fizzlebang, master summoner! You are bound to me, demon!', 14, 0, 100, 5, 0, 16270, 'Wilfred Fizzlebang to Wilfred Fizzlebang - Intro'),
+(35458, 3, 0, 'But I''m in charge here...', 14, 0, 100, 5, 0, 16271, 'Wilfred Fizzlebang to Wilfred Fizzlebang - Death'),
+
+-- Lord Jaraxxus
+(34780, 0, 0, 'Trifling gnome! Your arrogance will be your undoing!', 14, 0, 100, 397, 0, 16143, 'Lord Jaraxxus to Wilfred Fizzlebang - Intro'),
+(34780, 1, 0, 'You face Jaraxxus, Eredar Lord of the Burning Legion!', 14, 0, 100, 0, 0, 16144, 'Lord Jaraxxus - Aggro'),
+(34780, 2, 0, '$n has |cFFFF0000Legion Flames!|r', 41, 0, 100, 0, 0, 0, 'Lord Jaraxxus - Legion Flame'),
+(34780, 3, 0, '%s creates a Nether Portal!', 41, 0, 100, 0, 0, 16150, 'Lord Jaraxxus - Summing Nether Portal'),
+(34780, 4, 0, 'Come forth, sister! Your master calls!', 14, 0, 100, 0, 0, 16150, 'Lord Jaraxxus - Summoning Mistress of Pain'),
+(34780, 5, 0, '$n has |cFF00FFFFIncinerate Flesh!|r Heal $g him:her;!', 41, 0, 100, 0, 0, 16149, 'Lord Jaraxxus - Incinerate Flesh'),
+(34780, 6, 0, 'FLESH FROM BONE!', 14, 0, 100, 0, 0, 16149, 'Lord Jaraxxus - Incinerate Flesh'),
+(34780, 7, 0, '%s creates an |cFF00FF00Infernal Volcano!|r', 41, 0, 100, 0, 0, 16151, 'Lord Jaraxxus - Summoning Infernal Volcano emote'),
+(34780, 8, 0, 'IN-FER-NO!', 14, 0, 100, 0, 0, 16151, 'Lord Jaraxxus - Summoning Infernals'),
+(34780, 9, 0, 'Insignificant gnat!', 14, 0, 0, 0, 0, 16145, 'Lord Jaraxxus - Killing a player'),
+(34780, 9, 1, 'Banished to the Nether!', 14, 0, 0, 0, 0, 16146, 'Lord Jaraxxus - Killing a player'),
+(34780, 10, 0, 'Another will take my place. Your world is doomed...', 14, 0, 100, 0, 0, 16147, 'Lord Jaraxxus - Death'),
+(34780, 11, 0,'<Laughs>', 14, 0, 0, 0, 0, 16148, 'Lord Jaraxxus - Berserk'),
+
+-- Eydis Darkban
+(34496, 0, 0, 'In the name of our dark master. For the Lich King. You. Will. Die.', 14, 0, 100, 0, 0, 16272, 'Eydis Darkbane - Aggro'),
+(34496, 1, 0, 'Let the light consume you!', 14, 0, 100, 0, 0, 16279, 'Eydis Darkbane to Fjola Lightbane - Light Vortex'),
+(34496, 2, 0, 'Let the dark consume you!', 14, 0, 100, 0, 0, 16278, 'Eydis Darkbane to Fjola Lightbane - Dark Vortex'),
+(34496, 3, 0, '%s begins to cast |cFF9932CDDark Vortex!|r Switch to |cFF9932CDDark|r Essence!', 41, 0, 100, 0, 0, 16278, 'Eydis Darkbane to Fjola Lightbane - Dark Vortex emote'),
+(34496, 4, 0, '%s begins to cast  |cFFFF0000Twin''s Pact!|r', 41, 0, 100, 0, 0, 16274, 'Eydis Darkbane to Fjola Lightbane - Twin''s Pact emote'),
+(34496, 5, 0, 'CHAOS!', 14, 0, 100, 0, 0, 16274, 'Eydis Darkbane to Fjola Lightbane - Twin''s Pact'),
+(34496, 6, 0, 'You have been measured and found wanting.', 14, 0, 100, 0, 0, 16276, 'Eydis Darkbane - Killing a player'),
+(34496, 6, 1, 'UNWORTHY!', 14, 0, 100, 0, 0, 16276, 'Eydis Darkbane - Killing a player'),
+(34496, 7, 0, 'YOU ARE FINISHED!', 14, 0, 0, 0, 0, 16273, 'Eydis Darkbane - Berserk'),
+(34496, 8, 0, 'The Scourge cannot be stopped...', 14, 0, 100, 0, 0, 16275, 'Eydis Darkbane - Death'),
+
+-- Fjola Lightbane
+(34497, 0, 0, 'In the name of our dark master. For the Lich King. You. Will. Die.', 14, 0, 100, 0, 0, 16272, 'Fjola Lightbane - Aggro'),
+(34497, 1, 0, 'Let the light consume you!', 14, 0, 100, 0, 0, 16279, 'Fjola Lightbane to Fjola Lightbane - Light Vortex'),
+(34497, 2, 0, 'Let the dark consume you!', 14, 0, 100, 0, 0, 16278, 'Fjola Lightbane to Fjola Lightbane - Dark Vortex'),
+(34497, 3, 0, '%s begins to cast |cFFFFFFFFLight Vortex!|r Switch to |cFFFFFFFFLight|r Essence!', 41, 0, 100, 0, 0, 16279, 'Fjola Lightbane to Fjola Lightbane - Light Vortex emote'),
+(34497, 4, 0, '%s begins to cast Twin''s Pact!', 41, 0, 100, 0, 0, 16274, 'Fjola Lightbane to Fjola Lightbane - Twin''s Pact emote'),
+(34497, 5, 0, 'CHAOS!', 14, 0, 100, 0, 0, 16274, 'Fjola Lightbane to Fjola Lightbane - Twin''s Pact'),
+(34497, 6, 0, 'You have been measured and found wanting.', 14, 0, 100, 0, 0, 16276, 'Fjola Lightbane - Killing a player'),
+(34497, 6, 1, 'UNWORTHY!', 14, 0, 100, 0, 0, 16276, 'Fjola Lightbane - Killing a player'),
+(34497, 7, 0, 'YOU ARE FINISHED!', 14, 0, 0, 0, 0, 16273, 'Fjola Lightbane - Berserk'),
+(34497, 8, 0, 'The Scourge cannot be stopped...', 14, 0, 100, 0, 0, 16275, 'Fjola Lightbane - Death'),
+
+-- The Lich King
+(35877, 0, 0, 'You will have your challenge, Fordring.', 14, 0, 100, 0, 0, 16321, 'The Lich King'),
+(35877, 1, 0, 'The souls of your fallen champions will be mine, Fordring.', 14, 0, 100, 0, 0, 16323, 'The Lich King'),
+(35877, 2, 0, 'The Nerubians built an empire beneath the frozen wastes of Northrend. An empire that you so foolishly built your structures upon. MY EMPIRE.', 14, 0, 100, 11, 0, 16322, 'The Lich King'),
+
+-- Anub''arak
+(34564, 0, 0, 'Ahhh, our guests have arrived, just as the master promised.', 14, 0, 100, 0, 0, 16235, 'Anub''arak - Intro'),
+(34564, 1, 0, 'This place will serve as your tomb!', 14, 0, 100, 0, 0, 16234, 'Anub''arak - Aggro'),
+(34564, 2, 0, 'Auum na-l ak-k-k-k, isshhh. Rise, minions. Devour...', 14, 0, 100, 0, 0, 16240, 'Anub''arak - Submerge'),
+(34564, 3, 0, '%s burrows into the ground!', 41, 0, 100, 0, 0, 16240, 'Anub''arak - Burrows'),
+(34564, 4, 0, '%s emerges from the ground!', 41, 0, 100, 0, 0, 0, 'Anub''arak - Emerge emote'),
+(34564, 5, 0, 'The swarm shall overtake you!', 14, 0, 100, 0, 0, 16241, 'Anub''arak - Leeching Swarm'),
+(34564, 6, 0, '%s unleashes a Leeching Swarm to heal himself!', 41, 0, 100, 0, 0, 16241, 'Anub''arak - Leeching Swarm emote'),
+(34564, 7, 0, 'F-lakkh shir!', 14, 0, 100, 0, 0, 16236, 'Anub''arak - Killing a player'),
+(34564, 7, 1, 'Another soul to sate the host.', 14, 0, 100, 0, 0, 16237, 'Anub''arak - Killing a player'),
+(34564, 8, 0, 'I have failed you, master...', 14, 0, 100, 0, 0, 16238, 'Anub''arak - Death'),
+
+-- Anub''arak Spike
+(34660, 0, 0, '%s''s spikes pursue $n!', 41, 0, 100, 0, 0, 0, 'Anub''arak - Spike target');
diff --git a/sql/updates/world/2012_08_13_01_world_creature.sql b/sql/updates/world/2012_08_13_01_world_creature.sql
new file mode 100644
index 00000000000..4d8544206dd
--- /dev/null
+++ b/sql/updates/world/2012_08_13_01_world_creature.sql
@@ -0,0 +1,10 @@
+SET @GUID := 42575;
+SET @ENTRY := 36095; -- Highlord Tirion Fordring
+
+DELETE FROM `creature` WHERE `id`=@ENTRY;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES
+(@GUID,@ENTRY,649,15,1,648.9167,131.0208,141.6161,0,7200,0,0);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@ENTRY;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(@ENTRY,0,0x0,0x1,'57545');
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
index b3b9801fd00..1019deac106 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
@@ -37,15 +37,17 @@ EndScriptData */
 
 enum Yells
 {
-    SAY_INTRO               = -1649055,
-    SAY_AGGRO               = -1649056,
-    SAY_KILL1               = -1649057,
-    SAY_KILL2               = -1649058,
-    SAY_DEATH               = -1649059,
-    EMOTE_SPIKE             = -1649060,
-    SAY_BURROWER            = -1649061,
-    EMOTE_LEECHING_SWARM    = -1649062,
-    SAY_LEECHING_SWARM      = -1649063,
+    SAY_INTRO               = 0,
+    SAY_AGGRO               = 1,
+    EMOTE_SUBMERGE          = 2,
+    EMOTE_BURROWER          = 3,
+    SAY_EMERGE              = 4,
+    SAY_LEECHING_SWARM      = 5,
+    EMOTE_LEECHING_SWARM    = 6,
+    SAY_KILL_PLAYER         = 7,
+    SAY_DEATH               = 8,
+
+    EMOTE_SPIKE             = 0,
 };
 
 enum Summons
@@ -195,7 +197,7 @@ public:
         {
             if (who->GetTypeId() == TYPEID_PLAYER)
             {
-                DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me);
+                Talk(SAY_KILL_PLAYER);
                 if (instance)
                     instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
             }
@@ -321,7 +323,7 @@ public:
                     DoCast(me, SPELL_SUBMERGE_ANUBARAK);
                     DoCast(me, SPELL_CLEAR_ALL_DEBUFFS);
                     me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
-                    DoScriptText(SAY_BURROWER, me);
+                    Talk(EMOTE_BURROWER);
                     m_uiScarabSummoned = 0;
                     m_uiSummonScarabTimer = 4*IN_MILLISECONDS;
                     m_uiStage = 2;
@@ -669,6 +671,7 @@ public:
         {
             m_uiTargetGUID = who->GetGUID();
             DoCast(who, SPELL_MARK);
+            Talk(EMOTE_SPIKE, who->GetGUID());
             me->SetSpeed(MOVE_RUN, 0.5f);
             m_uiSpeed = 0;
             m_uiIncreaseSpeedTimer = 1*IN_MILLISECONDS;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
index 3b0aeb958cb..c662daf3671 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
@@ -33,10 +33,9 @@ EndScriptData */
 #include "SpellAuraEffects.h"
 #include "trial_of_the_crusader.h"
 
-enum eYell
+enum Yells
 {
-    SAY_GARROSH_KILL_ALLIANCE_PLAYER4 = -1649118,
-    SAY_VARIAN_KILL_HORDE_PLAYER4     = -1649123,
+    SAY_KILL_PLAYER     = 6,
 };
 
 enum eAIs
@@ -359,11 +358,12 @@ struct boss_faction_championsAI : public ScriptedAI
                 if (TeamInInstance == ALLIANCE)
                 {
                     if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_VARIAN)))
-                        DoScriptText(SAY_VARIAN_KILL_HORDE_PLAYER4+urand(0, 3), temp); // + cause we are on negative
+                        temp->AI()->Talk(SAY_KILL_PLAYER);
                 }
                 else
-                    if (Creature* temp = me->FindNearestCreature(NPC_GARROSH, 300.f))
-                        DoScriptText(SAY_GARROSH_KILL_ALLIANCE_PLAYER4+urand(0, 3), temp); // + cause we are on negative
+                    if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_GARROSH)))
+                        temp->AI()->Talk(SAY_KILL_PLAYER);
+
 
                 instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
             }
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
index 4e791dfc22f..f9e2080895a 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
@@ -36,16 +36,18 @@ EndScriptData */
 
 enum Yells
 {
-    SAY_INTRO               = -1649030,
-    SAY_AGGRO               = -1649031,
-    SAY_DEATH               = -1649032,
-    EMOTE_INCINERATE        = -1649033,
-    SAY_INCINERATE          = -1649034,
-    EMOTE_LEGION_FLAME      = -1649035,
-    EMOTE_NETHER_PORTAL     = -1649036,
-    SAY_NETHER_PORTAL       = -1649037,
-    EMOTE_INFERNAL_ERUPTION = -1649038,
-    SAY_INFERNAL_ERUPTION   = -1649039,
+    SAY_INTRO               = 0,
+    SAY_AGGRO               = 1,
+    EMOTE_LEGION_FLAME      = 2,
+    EMOTE_NETHER_PORTAL     = 3,
+    SAY_MISTRESS_OF_PAIN    = 4,
+    EMOTE_INCINERATE        = 5,
+    SAY_INCINERATE          = 6,
+    EMOTE_INFERNAL_ERUPTION = 7,
+    SAY_INFERNAL_ERUPTION   = 8,
+    SAY_KILL_PLAYER         = 9,
+    SAY_DEATH               = 10,
+    SAY_BERSERK             = 11,
 };
 
 enum Equipment
@@ -192,8 +194,8 @@ public:
 
             if (m_uiSummonNetherPortalTimer <= uiDiff)
             {
-                DoScriptText(EMOTE_NETHER_PORTAL, me);
-                DoScriptText(SAY_NETHER_PORTAL, me);
+                Talk(EMOTE_NETHER_PORTAL);
+                Talk(SAY_MISTRESS_OF_PAIN);
                 DoCast(SPELL_NETHER_PORTAL);
                 m_uiSummonNetherPortalTimer = 2*MINUTE*IN_MILLISECONDS;
             } else m_uiSummonNetherPortalTimer -= uiDiff;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index 6c69ccbc72d..8dd4f7dad3e 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -35,16 +35,16 @@ EndScriptData */
 
 enum Yells
 {
-    //Gormok
-    SAY_SNOBOLLED        = -1649000,
-    //Acidmaw & Dreadscale
-    SAY_SUBMERGE         = -1649010,
-    SAY_EMERGE           = -1649011,
-    SAY_BERSERK          = -1649012,
-    //Icehowl
-    SAY_TRAMPLE_STARE    = -1649020,
-    SAY_TRAMPLE_FAIL     = -1649021,
-    SAY_TRAMPLE_START    = -1649022,
+    // Gormok
+    EMOTE_SNOBOLLED         = 0,
+
+    // Acidmaw & Dreadscale
+    EMOTE_ENRAGE            = 0,
+
+    // Icehowl
+    EMOTE_TRAMPLE_START     = 0,
+    EMOTE_TRAMPLE_CRASH     = 1,
+    EMOTE_TRAMPLE_FAIL      = 2,
 };
 
 enum Equipment
@@ -239,7 +239,7 @@ public:
                 if (m_uiSummonCount > 0)
                 {
                     me->SummonCreature(NPC_SNOBOLD_VASSAL, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN);
-                    DoScriptText(SAY_SNOBOLLED, me);
+                    Talk(EMOTE_SNOBOLLED);
                 }
                 m_uiSummonTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS);
             } else m_uiSummonTimer -= diff;
@@ -460,12 +460,11 @@ struct boss_jormungarAI : public ScriptedAI
 
         if (instanceScript && instanceScript->GetData(TYPE_NORTHREND_BEASTS) == SNAKES_SPECIAL && !enraged)
         {
-            DoScriptText(SAY_EMERGE, me);
             me->RemoveAurasDueToSpell(SPELL_SUBMERGE_0);
             me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
             DoCast(SPELL_ENRAGE);
             enraged = true;
-            DoScriptText(SAY_BERSERK, me);
+            Talk(EMOTE_ENRAGE);
             switch (stage)
             {
                 case 0:
@@ -512,7 +511,6 @@ struct boss_jormungarAI : public ScriptedAI
             case 1: // Submerge
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
                 DoCast(me, SPELL_SUBMERGE_0);
-                DoScriptText(SAY_SUBMERGE, me);
                 me->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX()+ frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionY() + frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionZ());
                 stage = 2;
             case 2: // Wait til emerge
@@ -524,7 +522,6 @@ struct boss_jormungarAI : public ScriptedAI
                 break;
             case 3: // Emerge
                 me->SetDisplayId(modelStationary);
-                DoScriptText(SAY_EMERGE, me);
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_0);
                 DoCast(me, SPELL_EMERGE_0);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -558,7 +555,6 @@ struct boss_jormungarAI : public ScriptedAI
             case 5: // Submerge
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
                 DoCast(me, SPELL_SUBMERGE_0);
-                DoScriptText(SAY_SUBMERGE, me);
                 me->GetMotionMaster()->MovePoint(0, ToCCommonLoc[1].GetPositionX() + frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionY() + frand(-40.0f, 40.0f), ToCCommonLoc[1].GetPositionZ());
                 stage = 6;
             case 6: // Wait til emerge
@@ -570,7 +566,6 @@ struct boss_jormungarAI : public ScriptedAI
                 break;
             case 7: // Emerge
                 me->SetDisplayId(modelMobile);
-                DoScriptText(SAY_EMERGE, me);
                 me->RemoveAurasDueToSpell(SPELL_SUBMERGE_0);
                 DoCast(me, SPELL_EMERGE_0);
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
@@ -925,7 +920,6 @@ public:
                     {
                         m_uiTrampleTargetGUID = target->GetGUID();
                         me->SetTarget(m_uiTrampleTargetGUID);
-                        DoScriptText(SAY_TRAMPLE_STARE, me, target);
                         m_bTrampleCasted = false;
                         SetCombatMovement(false);
                         me->GetMotionMaster()->MoveIdle();
@@ -953,7 +947,7 @@ public:
                     } else m_uiTrampleTimer -= diff;
                     break;
                 case 4:
-                    DoScriptText(SAY_TRAMPLE_START, me);
+                    Talk(EMOTE_TRAMPLE_START, m_uiTrampleTargetGUID);
                     me->GetMotionMaster()->MoveCharge(m_fTrampleTargetX, m_fTrampleTargetY, m_fTrampleTargetZ+2, 42, 1);
                     me->SetTarget(0);
                     m_uiStage = 5;
@@ -985,7 +979,12 @@ public:
                     if (!m_bTrampleCasted)
                     {
                         DoCast(me, SPELL_STAGGERED_DAZE);
-                        DoScriptText(SAY_TRAMPLE_FAIL, me);
+                        Talk(EMOTE_TRAMPLE_CRASH);
+                    }
+                    else
+                    {
+                        DoCast(me, SPELL_FROTHING_RAGE, true);
+                        Talk(EMOTE_TRAMPLE_FAIL);
                     }
                     m_bMovementStarted = false;
                     me->GetMotionMaster()->MovementExpired();
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
index 4cfe4f61dbb..203e49420be 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
@@ -40,17 +40,15 @@ EndScriptData */
 
 enum Yells
 {
-    SAY_AGGRO           = -1649040,
-    SAY_DEATH           = -1649041,
-    SAY_BERSERK         = -1649042,
-    EMOTE_SHIELD        = -1649043,
-    SAY_SHIELD          = -1649044,
-    SAY_KILL1           = -1649045,
-    SAY_KILL2           = -1649046,
-    EMOTE_LIGHT_VORTEX  = -1649047,
-    SAY_LIGHT_VORTEX    = -1649048,
-    EMOTE_DARK_VORTEX   = -1649049,
-    SAY_DARK_VORTEX     = -1649050,
+    SAY_AGGRO               = 0,
+    SAY_NIGHT               = 1,
+    SAY_LIGHT               = 2,
+    EMOTE_VORTEX            = 3,
+    EMOTE_TWINK_PACT        = 4,
+    SAY_TWINK_PACT          = 5,
+    SAY_KILL_PLAYER         = 6,
+    SAY_BERSERK             = 7,
+    SAY_DEATH               = 8,
 };
 
 enum Equipment
@@ -167,7 +165,6 @@ struct boss_twin_baseAI : public ScriptedAI
     uint32 m_uiTouchTimer;
     uint32 m_uiBerserkTimer;
 
-    int32 m_uiVortexSay;
     int32 m_uiVortexEmote;
     uint32 m_uiSisterNpcId;
     uint32 m_uiMyEmphatySpellId;
@@ -179,7 +176,8 @@ struct boss_twin_baseAI : public ScriptedAI
     uint32 m_uiSpikeSpellId;
     uint32 m_uiTouchSpellId;
 
-    void Reset() {
+    void Reset()
+    {
         me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_NOT_SELECTABLE);
         me->SetReactState(REACT_PASSIVE);
         me->ModifyAuraState(m_uiAuraState, true);
@@ -224,7 +222,7 @@ struct boss_twin_baseAI : public ScriptedAI
     {
         if (who->GetTypeId() == TYPEID_PLAYER)
         {
-            DoScriptText(urand(0, 1) ? SAY_KILL1 : SAY_KILL2, me);
+            Talk(SAY_KILL_PLAYER);
             if (instance)
                 instance->SetData(DATA_TRIBUTE_TO_IMMORTALITY_ELEGIBLE, 0);
         }
@@ -336,8 +334,7 @@ struct boss_twin_baseAI : public ScriptedAI
                 {
                     if (Creature* pSister = GetSister())
                         pSister->AI()->DoAction(ACTION_VORTEX);
-                    DoScriptText(m_uiVortexEmote, me);
-                    DoScriptText(m_uiVortexSay, me);
+                    Talk(m_uiVortexEmote);
                     DoCastAOE(m_uiVortexSpellId);
                     m_uiStage = 0;
                     m_uiSpecialAbilityTimer = MINUTE*IN_MILLISECONDS;
@@ -348,8 +345,8 @@ struct boss_twin_baseAI : public ScriptedAI
             case 2: // Shield+Pact
                 if (m_uiSpecialAbilityTimer <= uiDiff)
                 {
-                    DoScriptText(EMOTE_SHIELD, me);
-                    DoScriptText(SAY_SHIELD, me);
+                    Talk(EMOTE_TWINK_PACT);
+                    Talk(SAY_TWINK_PACT);
                     if (Creature* pSister = GetSister())
                     {
                         pSister->AI()->DoAction(ACTION_PACT);
@@ -426,8 +423,7 @@ public:
             m_uiStage = 0;
             m_uiWeapon = EQUIP_MAIN_1;
             m_uiAuraState = AURA_STATE_UNKNOWN22;
-            m_uiVortexEmote = EMOTE_LIGHT_VORTEX;
-            m_uiVortexSay = SAY_LIGHT_VORTEX;
+            m_uiVortexEmote = EMOTE_VORTEX;
             m_uiSisterNpcId = NPC_DARKBANE;
             m_uiMyEmphatySpellId = SPELL_TWIN_EMPATHY_DARK;
             m_uiOtherEssenceSpellId = SPELL_DARK_ESSENCE_HELPER;
@@ -496,8 +492,7 @@ public:
             m_uiStage = 1;
             m_uiWeapon = EQUIP_MAIN_2;
             m_uiAuraState = AURA_STATE_UNKNOWN19;
-            m_uiVortexEmote = EMOTE_DARK_VORTEX;
-            m_uiVortexSay = SAY_DARK_VORTEX;
+            m_uiVortexEmote = EMOTE_VORTEX;
             m_uiSisterNpcId = NPC_LIGHTBANE;
             m_uiMyEmphatySpellId = SPELL_TWIN_EMPATHY_LIGHT;
             m_uiOtherEssenceSpellId = SPELL_LIGHT_ESSENCE_HELPER;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 4dfe5708025..3fb76ea52dc 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -47,6 +47,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
 
             uint64 BarrentGUID;
             uint64 TirionGUID;
+            uint64 TirionFordringGUID;
             uint64 FizzlebangGUID;
             uint64 GarroshGUID;
             uint64 VarianGUID;
@@ -85,6 +86,8 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 TrialCounter = 50;
                 EventStage = 0;
 
+                TirionFordringGUID = 0;
+
                 TributeChestGUID = 0;
 
                 MainGateDoorGUID = 0;
@@ -147,6 +150,9 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                     case NPC_TIRION:
                         TirionGUID = creature->GetGUID();
                         break;
+                    case NPC_TIRION_FORDRING:
+                        TirionFordringGUID = creature->GetGUID();
+                        break;
                     case NPC_FIZZLEBANG:
                         FizzlebangGUID = creature->GetGUID();
                         break;
@@ -422,6 +428,8 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                         return BarrentGUID;
                     case NPC_TIRION:
                         return TirionGUID;
+                    case NPC_TIRION_FORDRING:
+                        return TirionFordringGUID;
                     case NPC_FIZZLEBANG:
                         return FizzlebangGUID;
                     case NPC_GARROSH:
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
index 4ad93c0afe1..2a8eab0040a 100755
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp
@@ -34,45 +34,58 @@ EndScriptData */
 
 enum eYells
 {
-    SAY_STAGE_0_01            = -1649070,
-    SAY_STAGE_0_02            = -1649071,
-    SAY_STAGE_0_03a           = -1649072,
-    SAY_STAGE_0_03h           = -1649073,
-    SAY_STAGE_0_04            = -1649074,
-    SAY_STAGE_0_05            = -1649075,
-    SAY_STAGE_0_06            = -1649076,
-    SAY_STAGE_0_WIPE          = -1649077,
-    SAY_STAGE_1_01            = -1649080,
-    SAY_STAGE_1_02            = -1649081,
-    SAY_STAGE_1_03            = -1649082,
-    SAY_STAGE_1_04            = -1649083,
-    SAY_STAGE_1_05            = -1649030, //INTRO Jaraxxus
-    SAY_STAGE_1_06            = -1649084,
-    SAY_STAGE_1_07            = -1649086,
-    SAY_STAGE_1_08            = -1649087,
-    SAY_STAGE_1_09            = -1649088,
-    SAY_STAGE_1_10            = -1649089,
-    SAY_STAGE_1_11            = -1649090,
-    SAY_STAGE_2_01            = -1649091,
-    SAY_STAGE_2_02a           = -1649092,
-    SAY_STAGE_2_02h           = -1649093,
-    SAY_STAGE_2_03            = -1649094,
-    SAY_STAGE_2_04a           = -1649095,
-    SAY_STAGE_2_04h           = -1649096,
-    SAY_STAGE_2_05a           = -1649097,
-    SAY_STAGE_2_05h           = -1649098,
-    SAY_STAGE_2_06            = -1649099,
-    SAY_STAGE_3_01            = -1649100,
-    SAY_STAGE_3_02            = -1649101,
-    SAY_STAGE_3_03a           = -1649102,
-    SAY_STAGE_3_03h           = -1649103,
-    SAY_STAGE_4_01            = -1649104,
-    SAY_STAGE_4_02            = -1649105,
-    SAY_STAGE_4_03            = -1649106,
-    SAY_STAGE_4_04            = -1649107,
-    SAY_STAGE_4_05            = -1649108,
-    SAY_STAGE_4_06            = -1649109,
-    SAY_STAGE_4_07            = -1649110,
+    // Highlord Tirion Fordring - 34996
+    SAY_STAGE_0_01            = 0,
+    SAY_STAGE_0_02            = 1,
+    SAY_STAGE_0_04            = 2,
+    SAY_STAGE_0_05            = 3,
+    SAY_STAGE_0_06            = 4,
+    SAY_STAGE_0_WIPE          = 5,
+    SAY_STAGE_1_01            = 6,
+    SAY_STAGE_1_07            = 7,
+    SAY_STAGE_1_08            = 8,
+    SAY_STAGE_1_11            = 9,
+    SAY_STAGE_2_01            = 10,
+    SAY_STAGE_2_03            = 11,
+    SAY_STAGE_2_06            = 12,
+    SAY_STAGE_3_01            = 13,
+    SAY_STAGE_3_02            = 14,
+    SAY_STAGE_4_01            = 15,
+    SAY_STAGE_4_03            = 16,
+
+    // Varian Wrynn
+    SAY_STAGE_0_03a           = 0,
+    SAY_STAGE_1_10            = 1,
+    SAY_STAGE_2_02a           = 2,
+    SAY_STAGE_2_04a           = 3,
+    SAY_STAGE_2_05a           = 4,
+    SAY_STAGE_3_03a           = 5,
+
+    // Garrosh
+    SAY_STAGE_0_03h           = 0,
+    SAY_STAGE_1_09            = 1,
+    SAY_STAGE_2_02h           = 2,
+    SAY_STAGE_2_04h           = 3,
+    SAY_STAGE_2_05h           = 4,
+    SAY_STAGE_3_03h           = 5,
+
+    // Wilfred Fizzlebang
+    SAY_STAGE_1_02            = 0,
+    SAY_STAGE_1_03            = 1,
+    SAY_STAGE_1_04            = 2,
+    SAY_STAGE_1_06            = 3,
+
+    // Lord Jaraxxus
+    SAY_STAGE_1_05            = 0,
+
+    //  The Lich King
+    SAY_STAGE_4_02            = 0,
+    SAY_STAGE_4_05            = 1,
+    SAY_STAGE_4_04            = 2,
+
+    // Highlord Tirion Fordring - 36095
+    SAY_STAGE_4_06            = 0,
+    SAY_STAGE_4_07            = 1,
 };
 
 struct _Messages
@@ -289,13 +302,13 @@ class boss_lich_king_toc : public CreatureScript
                     switch (instance->GetData(TYPE_EVENT))
                     {
                         case 5010:
-                            DoScriptText(SAY_STAGE_4_02, me);
+                            Talk(SAY_STAGE_4_02);
                             m_uiUpdateTimer = 3000;
                             me->GetMotionMaster()->MovePoint(0, LichKingLoc[0]);
                             instance->SetData(TYPE_EVENT, 5020);
                             break;
                         case 5030:
-                            DoScriptText(SAY_STAGE_4_04, me);
+                            Talk(SAY_STAGE_4_04);
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK);
                             m_uiUpdateTimer = 10000;
                             instance->SetData(TYPE_EVENT, 5040);
@@ -312,7 +325,7 @@ class boss_lich_king_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 5060);
                             break;
                         case 5060:
-                            DoScriptText(SAY_STAGE_4_05, me);
+                            Talk(SAY_STAGE_4_05);
                             me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL);
                             m_uiUpdateTimer = 2500;
                             instance->SetData(TYPE_EVENT, 5070);
@@ -371,7 +384,7 @@ class npc_fizzlebang_toc : public CreatureScript
 
             void JustDied(Unit* killer)
             {
-                DoScriptText(SAY_STAGE_1_06, me, killer);
+                Talk(SAY_STAGE_1_06, killer->GetGUID());
                 instance->SetData(TYPE_EVENT, 1180);
                 if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_JARAXXUS)))
                 {
@@ -430,13 +443,13 @@ class npc_fizzlebang_toc : public CreatureScript
                             m_uiUpdateTimer = 4000;
                             break;
                         case 1120:
-                            DoScriptText(SAY_STAGE_1_02, me);
+                            Talk(SAY_STAGE_1_02);
                             instance->SetData(TYPE_EVENT, 1130);
                             m_uiUpdateTimer = 12000;
                             break;
                         case 1130:
                             me->GetMotionMaster()->MovementExpired();
-                            DoScriptText(SAY_STAGE_1_03, me);
+                            Talk(SAY_STAGE_1_03);
                             me->HandleEmoteCommand(EMOTE_ONESHOT_SPELL_CAST_OMNI);
                             if (Unit* pTrigger =  me->SummonCreature(NPC_TRIGGER, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 4.69494f, TEMPSUMMON_MANUAL_DESPAWN))
                             {
@@ -470,7 +483,7 @@ class npc_fizzlebang_toc : public CreatureScript
                             m_uiUpdateTimer = 3000;
                             break;
                         case 1140:
-                            DoScriptText(SAY_STAGE_1_04, me);
+                            Talk(SAY_STAGE_1_04);
                             if (Creature* temp = me->SummonCreature(NPC_JARAXXUS, ToCCommonLoc[1].GetPositionX(), ToCCommonLoc[1].GetPositionY(), ToCCommonLoc[1].GetPositionZ(), 5.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
                             {
                                 temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -492,7 +505,7 @@ class npc_fizzlebang_toc : public CreatureScript
                             break;
                         case 1144:
                             if (Creature* temp = Unit::GetCreature(*me, instance->GetData64(NPC_JARAXXUS)))
-                                DoScriptText(SAY_STAGE_1_05, temp);
+                                temp->AI()->Talk(SAY_STAGE_1_05);
                             instance->SetData(TYPE_EVENT, 1150);
                             m_uiUpdateTimer = 5000;
                             break;
@@ -555,13 +568,13 @@ class npc_tirion_toc : public CreatureScript
                     {
                         case 110:
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
-                            DoScriptText(SAY_STAGE_0_01, me);
+                            Talk(SAY_STAGE_0_01);
                             m_uiUpdateTimer = 22000;
                             instance->SetData(TYPE_EVENT, 120);
                             break;
                         case 140:
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
-                            DoScriptText(SAY_STAGE_0_02, me);
+                            Talk(SAY_STAGE_0_02);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 150);
                             break;
@@ -587,7 +600,7 @@ class npc_tirion_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 160);
                             break;
                         case 200:
-                            DoScriptText(SAY_STAGE_0_04, me);
+                            Talk(SAY_STAGE_0_04);
                             m_uiUpdateTimer = 8000;
                             instance->SetData(TYPE_EVENT, 205);
                             break;
@@ -619,7 +632,7 @@ class npc_tirion_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 230);
                             break;
                         case 300:
-                            DoScriptText(SAY_STAGE_0_05, me);
+                            Talk(SAY_STAGE_0_05);
                             m_uiUpdateTimer = 8000;
                             instance->SetData(TYPE_EVENT, 305);
                             break;
@@ -646,54 +659,54 @@ class npc_tirion_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 320);
                             break;
                         case 400:
-                            DoScriptText(SAY_STAGE_0_06, me);
+                            Talk(SAY_STAGE_0_06);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 666:
-                            DoScriptText(SAY_STAGE_0_WIPE, me);
+                            Talk(SAY_STAGE_0_WIPE);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 1010:
-                            DoScriptText(SAY_STAGE_1_01, me);
+                            Talk(SAY_STAGE_1_01);
                             m_uiUpdateTimer = 7000;
                             instance->DoUseDoorOrButton(instance->GetData64(GO_MAIN_GATE_DOOR));
                             me->SummonCreature(NPC_FIZZLEBANG, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME);
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 1180:
-                            DoScriptText(SAY_STAGE_1_07, me);
+                            Talk(SAY_STAGE_1_07);
                             m_uiUpdateTimer = 3000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 2000:
-                            DoScriptText(SAY_STAGE_1_08, me);
+                            Talk(SAY_STAGE_1_08);
                             m_uiUpdateTimer = 18000;
                             instance->SetData(TYPE_EVENT, 2010);
                             break;
                         case 2030:
-                            DoScriptText(SAY_STAGE_1_11, me);
+                            Talk(SAY_STAGE_1_11);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 3000:
-                            DoScriptText(SAY_STAGE_2_01, me);
+                            Talk(SAY_STAGE_2_01);
                             m_uiUpdateTimer = 12000;
                             instance->SetData(TYPE_EVENT, 3050);
                             break;
                         case 3001:
-                            DoScriptText(SAY_STAGE_2_01, me);
+                            Talk(SAY_STAGE_2_01);
                             m_uiUpdateTimer = 12000;
                             instance->SetData(TYPE_EVENT, 3051);
                             break;
                         case 3060:
-                            DoScriptText(SAY_STAGE_2_03, me);
+                            Talk(SAY_STAGE_2_03);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 3070);
                             break;
                         case 3061:
-                            DoScriptText(SAY_STAGE_2_03, me);
+                            Talk(SAY_STAGE_2_03);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 3071);
                             break;
@@ -718,17 +731,17 @@ class npc_tirion_toc : public CreatureScript
                             break;
                         //Crusaders battle end
                         case 3100:
-                            DoScriptText(SAY_STAGE_2_06, me);
+                            Talk(SAY_STAGE_2_06);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
                         case 4000:
-                            DoScriptText(SAY_STAGE_3_01, me);
+                            Talk(SAY_STAGE_3_01);
                             m_uiUpdateTimer = 13000;
                             instance->SetData(TYPE_EVENT, 4010);
                             break;
                         case 4010:
-                            DoScriptText(SAY_STAGE_3_02, me);
+                            Talk(SAY_STAGE_3_02);
                             if (Creature* temp = me->SummonCreature(NPC_LIGHTBANE, ToCSpawnLoc[1].GetPositionX(), ToCSpawnLoc[1].GetPositionY(), ToCSpawnLoc[1].GetPositionZ(), 5, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME))
                             {
                                 temp->SetVisible(false);
@@ -769,7 +782,7 @@ class npc_tirion_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 5000);
                             break;
                         case 5000:
-                            DoScriptText(SAY_STAGE_4_01, me);
+                            Talk(SAY_STAGE_4_01);
                             m_uiUpdateTimer = 10000;
                             instance->SetData(TYPE_EVENT, 5005);
                             break;
@@ -779,7 +792,7 @@ class npc_tirion_toc : public CreatureScript
                             me->SummonCreature(NPC_LICH_KING_1, ToCSpawnLoc[0].GetPositionX(), ToCSpawnLoc[0].GetPositionY(), ToCSpawnLoc[0].GetPositionZ(), 5);
                             break;
                         case 5020:
-                            DoScriptText(SAY_STAGE_4_03, me);
+                            Talk(SAY_STAGE_4_03);
                             m_uiUpdateTimer = 1000;
                             instance->SetData(TYPE_EVENT, 0);
                             break;
@@ -789,14 +802,16 @@ class npc_tirion_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 6005);
                             break;
                         case 6005:
-                            DoScriptText(SAY_STAGE_4_06, me);
+                            if (Creature* tirionFordring = Unit::GetCreature((*me), instance->GetData64(NPC_TIRION_FORDRING)))
+                                tirionFordring->AI()->Talk(NPC_TIRION_FORDRING);
                             m_uiUpdateTimer = 20000;
                             instance->SetData(TYPE_EVENT, 6010);
                             break;
                         case 6010:
                             if (IsHeroic())
                             {
-                                DoScriptText(SAY_STAGE_4_07, me);
+                                if (Creature* tirionFordring = Unit::GetCreature((*me), instance->GetData64(NPC_TIRION_FORDRING)))
+                                    tirionFordring->AI()->Talk(SAY_STAGE_4_07);
                                 m_uiUpdateTimer = 60000;
                                 instance->SetData(TYPE_ANUBARAK, SPECIAL);
                                 instance->SetData(TYPE_EVENT, 6020);
@@ -854,7 +869,7 @@ class npc_garrosh_toc : public CreatureScript
                     {
                         case 130:
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
-                            DoScriptText(SAY_STAGE_0_03h, me);
+                            Talk(SAY_STAGE_0_03h);
                             m_uiUpdateTimer = 3000;
                             instance->SetData(TYPE_EVENT, 132);
                             break;
@@ -864,27 +879,27 @@ class npc_garrosh_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 140);
                             break;
                         case 2010:
-                            DoScriptText(SAY_STAGE_1_09, me);
+                            Talk(SAY_STAGE_1_09);
                             m_uiUpdateTimer = 9000;
                             instance->SetData(TYPE_EVENT, 2020);
                             break;
                         case 3050:
-                            DoScriptText(SAY_STAGE_2_02h, me);
+                            Talk(SAY_STAGE_2_02h);
                             m_uiUpdateTimer = 15000;
                             instance->SetData(TYPE_EVENT, 3060);
                             break;
                         case 3070:
-                            DoScriptText(SAY_STAGE_2_04h, me);
+                            Talk(SAY_STAGE_2_04h);
                             m_uiUpdateTimer = 6000;
                             instance->SetData(TYPE_EVENT, 3080);
                             break;
                         case 3081:
-                            DoScriptText(SAY_STAGE_2_05h, me);
+                            Talk(SAY_STAGE_2_05h);
                             m_uiUpdateTimer = 3000;
                             instance->SetData(TYPE_EVENT, 3091);
                             break;
                         case 4030:
-                            DoScriptText(SAY_STAGE_3_03h, me);
+                            Talk(SAY_STAGE_3_03h);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 4040);
                             break;
@@ -935,7 +950,7 @@ class npc_varian_toc : public CreatureScript
                     {
                         case 120:
                             me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_TALK);
-                            DoScriptText(SAY_STAGE_0_03a, me);
+                            Talk(SAY_STAGE_0_03a);
                             m_uiUpdateTimer = 2000;
                             instance->SetData(TYPE_EVENT, 122);
                             break;
@@ -945,27 +960,27 @@ class npc_varian_toc : public CreatureScript
                             instance->SetData(TYPE_EVENT, 130);
                             break;
                         case 2020:
-                            DoScriptText(SAY_STAGE_1_10, me);
+                            Talk(SAY_STAGE_1_10);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 2030);
                             break;
                         case 3051:
-                            DoScriptText(SAY_STAGE_2_02a, me);
+                            Talk(SAY_STAGE_2_02a);
                             m_uiUpdateTimer = 10000;
                             instance->SetData(TYPE_EVENT, 3061);
                             break;
                         case 3071:
-                            DoScriptText(SAY_STAGE_2_04a, me);
+                            Talk(SAY_STAGE_2_04a);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 3081);
                             break;
                         case 3080:
-                            DoScriptText(SAY_STAGE_2_05a, me);
+                            Talk(SAY_STAGE_2_05a);
                             m_uiUpdateTimer = 3000;
                             instance->SetData(TYPE_EVENT, 3090);
                             break;
                         case 4020:
-                            DoScriptText(SAY_STAGE_3_03a, me);
+                            Talk(SAY_STAGE_3_03a);
                             m_uiUpdateTimer = 5000;
                             instance->SetData(TYPE_EVENT, 4040);
                             break;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 99525b6fb32..f361c3521d1 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -162,6 +162,7 @@ enum eCreature
 {
     NPC_BARRENT                 = 34816,
     NPC_TIRION                  = 34996,
+    NPC_TIRION_FORDRING         = 36095,
     NPC_FIZZLEBANG              = 35458,
     NPC_GARROSH                 = 34995,
     NPC_VARIAN                  = 34990,