Blackfathom Deeps: Corrected says in Kelris script.

--HG--
branch : trunk

3 files changed, 21 insertions, 13 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 702fa8821b2..82787a3bdfa 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -464,6 +464,9 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (4508,-1047010,'Many thanks for your help.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'Willix'),
 
 -- -1 048 000 BLACKFATHOM DEEPS
+   (4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''),
+   (4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
+   (4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,''),
 
 -- -1 060 000 863_world_scripts.sql
    (0,-1060005,'REUSE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE'),
diff --git a/sql/updates/6683_world_script_texts.sql b/sql/updates/6683_world_script_texts.sql
new file mode 100644
index 00000000000..05e679be8e3
--- /dev/null
+++ b/sql/updates/6683_world_script_texts.sql
@@ -0,0 +1,5 @@
+DELETE FROM `script_texts` WHERE `entry` IN (-1048000,-1048001,-1048002);
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+   (4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''),
+   (4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
+   (4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,'');
diff --git a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
index 9cd4c8c9245..8c0ffce4c54 100644
--- a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/boss_kelris.cpp
@@ -28,9 +28,9 @@ enum Spells
 //Id's from ACID
 enum Yells
 {
-    SAY_AGGRO                                              = -566,
-    SAY_SLEEP                                              = -567,
-    SAY_DEATH                                              = -568
+    SAY_AGGRO                                              = -1048002,
+    SAY_SLEEP                                              = -1048001,
+    SAY_DEATH                                              = -1048000
 };
 
 struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
@@ -39,12 +39,12 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
     {
         pInstance = c->GetInstanceData();
     }
-    
+
     uint32 uiMindBlastTimer;
     uint32 uiSleepTimer;
-    
+
     ScriptedInstance *pInstance;
-    
+
     void Reset()
     {
         uiMindBlastTimer = urand(2000,5000);
@@ -52,26 +52,26 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
         if (pInstance)
             pInstance->SetData(TYPE_KELRIS, NOT_STARTED);
     }
-    
+
     void EnterCombat(Unit* who)
     {
         DoScriptText(SAY_AGGRO, m_creature);
         if (pInstance)
             pInstance->SetData(TYPE_KELRIS, IN_PROGRESS);
     }
-    
+
     void JustDied(Unit* killer)
     {
         DoScriptText(SAY_DEATH, m_creature);
         if (pInstance)
             pInstance->SetData(TYPE_KELRIS, DONE);
     }
-    
+
     void UpdateAI(const uint32 diff)
     {
         if (!UpdateVictim())
             return;
-        
+
         if (uiMindBlastTimer < diff)
         {
             DoCastVictim(SPELL_MIND_BLAST);
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL boss_kelrisAI : public ScriptedAI
             }
             uiSleepTimer = urand(15000,20000);
         } else uiSleepTimer -= diff;
-        
+
         DoMeleeAttackIfReady();
     }
 };
@@ -100,9 +100,9 @@ CreatureAI* GetAI_boss_kelris(Creature* pCreature)
 void AddSC_boss_kelris()
 {
     Script *newscript;
-    
+
     newscript = new Script;
     newscript->Name = "boss_kelris";
     newscript->GetAI = &GetAI_boss_kelris;
     newscript->RegisterSelf();
-}
\ No newline at end of file
+}