DB/Creature_Text: Convert script_texts to creature_text for boss Loken, Halls of Lightning & Added sound.

2 files changed, 36 insertions, 22 deletions

diff --git a/sql/updates/world/2012_02_29_03_world_creature_text.sql b/sql/updates/world/2012_02_29_03_world_creature_text.sql
new file mode 100644
index 00000000000..2e1d3d77dde
--- /dev/null
+++ b/sql/updates/world/2012_02_29_03_world_creature_text.sql
@@ -0,0 +1,18 @@
+-- NPC talk text insert from sniff
+DELETE FROM `script_texts` WHERE `npc_entry`=28923;
+DELETE FROM `creature_text` WHERE `entry`=28923;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(28923,0,0, 'I have witnessed the rise and fall of empires... the birth and extinction of entire species... Over countless millennia the foolishness of mortals has remained the only constant. Your presence here confirms this.',14,0,100,0,0,14160, 'Loken'),
+(28923,1,0, 'My master has shown me the future, and you have no place in it. Azeroth will be reborn in darkness. Yogg-Saron shall be released! The Pantheon shall fall!',14,0,100,0,0,14161, 'Loken'),
+(28923,2,0, 'What hope is there for you? None!',14,0,100,0,0,14162, 'Loken'),
+(28923,3,0, 'You cannot hide from fate!',14,0,100,0,0,14163, 'Loken'),
+(28923,3,1, 'Come closer. I will make it quick.',14,0,100,0,0,14164, 'Loken'),
+(28923,3,2, 'Your flesh cannot hold out for long.',14,0,100,0,0,14165, 'Loken'),
+(28923,4,0, 'Only mortal...',14,0,100,0,0,14166, 'Loken'),
+(28923,4,1, 'I... am... FOREVER!',14,0,100,0,0,14167, 'Loken'),
+(28923,4,2, 'What little time you had, you wasted!',14,0,100,0,0,14168, 'Loken'),
+(28923,5,0, 'You stare blindly into the abyss!',14,0,100,0,0,14169, 'Loken'),
+(28923,6,0, 'Your ignorance is profound. Can you not see where this path leads?',14,0,100,0,0,14170, 'Loken'),
+(28923,7,0, 'You cross the precipice of oblivion!',14,0,100,0,0,14171, 'Loken'),
+(28923,8,0, 'My death... heralds the end of this world.',14,0,100,0,0,14172, 'Loken'),
+(28923,9,0, '%s begins to cast Lightning Nova!',41,0,100,0,0,0, 'Loken');
diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
index 171215c605a..e4f2bb5ce01 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -30,20 +30,16 @@ enum eEnums
 {
     ACHIEV_TIMELY_DEATH_START_EVENT               = 20384,
 
-    SAY_AGGRO                                     = -1602018,
-    SAY_INTRO_1                                   = -1602019,
-    SAY_INTRO_2                                   = -1602020,
-    SAY_SLAY_1                                    = -1602021,
-    SAY_SLAY_2                                    = -1602022,
-    SAY_SLAY_3                                    = -1602023,
-    SAY_DEATH                                     = -1602024,
-    SAY_NOVA_1                                    = -1602025,
-    SAY_NOVA_2                                    = -1602026,
-    SAY_NOVA_3                                    = -1602027,
-    SAY_75HEALTH                                  = -1602028,
-    SAY_50HEALTH                                  = -1602029,
-    SAY_25HEALTH                                  = -1602030,
-    EMOTE_NOVA                                    = -1602031,
+    SAY_INTRO_1                                   = 0,
+    SAY_INTRO_2                                   = 1,
+    SAY_AGGRO                                     = 2,
+    SAY_NOVA                                      = 3,
+    SAY_SLAY                                      = 4,
+    SAY_75HEALTH                                  = 5,
+    SAY_50HEALTH                                  = 6,
+    SAY_25HEALTH                                  = 7,
+    SAY_DEATH                                     = 8,
+    EMOTE_NOVA                                    = 9,
 
     SPELL_ARC_LIGHTNING                           = 52921,
     SPELL_LIGHTNING_NOVA_N                        = 52960,
@@ -106,7 +102,7 @@ public:
 
         void EnterCombat(Unit* /*who*/)
         {
-            DoScriptText(SAY_AGGRO, me);
+            Talk(SAY_AGGRO);
 
             if (m_instance)
             {
@@ -117,7 +113,7 @@ public:
 
         void JustDied(Unit* /*killer*/)
         {
-            DoScriptText(SAY_DEATH, me);
+            Talk(SAY_DEATH);
 
             if (m_instance)
                 m_instance->SetData(TYPE_LOKEN, DONE);
@@ -125,7 +121,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
+            Talk(SAY_SLAY);
         }
 
         void UpdateAI(const uint32 uiDiff)
@@ -190,8 +186,8 @@ public:
 
             if (m_uiLightningNova_Timer <= uiDiff)
             {
-                DoScriptText(RAND(SAY_NOVA_1, SAY_NOVA_2, SAY_NOVA_3), me);
-                DoScriptText(EMOTE_NOVA, me);
+                Talk(SAY_NOVA);
+                Talk(EMOTE_NOVA);
                 DoCast(me, SPELL_LIGHTNING_NOVA_N);
 
                 m_bIsAura = false;
@@ -206,9 +202,9 @@ public:
             {
                 switch (m_uiHealthAmountModifier)
                 {
-                    case 1: DoScriptText(SAY_75HEALTH, me); break;
-                    case 2: DoScriptText(SAY_50HEALTH, me); break;
-                    case 3: DoScriptText(SAY_25HEALTH, me); break;
+                    case 1: Talk(SAY_75HEALTH); break;
+                    case 2: Talk(SAY_50HEALTH); break;
+                    case 3: Talk(SAY_25HEALTH); break;
                 }
 
                 ++m_uiHealthAmountModifier;