Merge pull request #7911 from Retriman/master

Core/Script: Update creature_text for boss Elder Nadox 

2 files changed, 33 insertions, 33 deletions

diff --git a/sql/updates/world/2012_XX_XX_XX_world_creature_text.sql b/sql/updates/world/2012_XX_XX_XX_world_creature_text.sql
new file mode 100644
index 00000000000..57e0d6c1a22
--- /dev/null
+++ b/sql/updates/world/2012_XX_XX_XX_world_creature_text.sql
@@ -0,0 +1,12 @@
+-- AzjolNerub/Ahnkahet/Elder Nadox
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1619020 AND -1619014;
+DELETE FROM `creature_text` WHERE `entry`=29309;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(29309,0,0, 'The secrets of the deep shall remain hidden.',14,0,100,0,0,14033, 'SAY_AGGRO'),
+(29309,1,0, 'Sleep now, in the cold dark.',14,0,100,0,0,14036, 'SAY_SLAY_1'),
+(29309,1,1, 'For the Lich King!',14,0,100,0,0,14037, 'SAY_SLAY_2'),
+(29309,1,2, 'Perhaps we will be allies soon.',14,0,100,0,0,14038, 'SAY_SLAY_3'),
+(29309,2,0, 'Master, is my service complete?',14,0,100,0,0,14039, 'SAY_DEATH'),
+(29309,3,0, 'The young must not grow hungry...',14,0,100,0,0,14034, 'SAY_EGG_SAC_1'),
+(29309,3,1, 'Shhhad ak kereeesshh chak-k-k!',14,0,100,0,0,14035, 'SAY_EGG_SAC_2'),
+(29309,4,0, 'An Ahn''kahar Guardian hatches!',16,0,100,0,0,14035, 'EMOTE_HATCHES');
\ No newline at end of file
diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
index 7f4da5666ff..4893191beb3 100644
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
@@ -19,16 +19,13 @@
 #include "ScriptedCreature.h"
 #include "ahnkahet.h"
 
-//not in db
 enum Yells
 {
-    SAY_AGGRO                                     = -1619014,
-    SAY_SLAY_1                                    = -1619015,
-    SAY_SLAY_2                                    = -1619016,
-    SAY_SLAY_3                                    = -1619017,
-    SAY_DEATH                                     = -1619018,
-    SAY_EGG_SAC_1                                 = -1619019,
-    SAY_EGG_SAC_2                                 = -1619020
+    SAY_AGGRO       = 0,
+    SAY_SLAY        = 1,
+    SAY_DEATH       = 2,
+    SAY_EGG_SAC     = 3,
+    EMOTE_HATCHES   = 4 
 };
 
 enum Spells
@@ -50,8 +47,6 @@ enum Creatures
 #define ACTION_AHNKAHAR_GUARDIAN_DEAD             1
 #define DATA_RESPECT_YOUR_ELDERS                  2
 
-#define EMOTE_HATCHES                       "An Ahn'kahar Guardian hatches!"
-
 class boss_elder_nadox : public CreatureScript
 {
     public:
@@ -61,7 +56,7 @@ class boss_elder_nadox : public CreatureScript
         {
             boss_elder_nadoxAI(Creature* creature) : ScriptedAI(creature)
             {
-                instance = me->GetInstanceScript();
+                instance = creature->GetInstanceScript();
             }
 
             uint32 uiPlagueTimer;
@@ -78,16 +73,13 @@ class boss_elder_nadox : public CreatureScript
 
             void Reset()
             {
-                uiPlagueTimer = 13000;
-                uiRagueTimer = 20000;
-
+                uiPlagueTimer       = 13000;
+                uiRagueTimer        = 20000;
                 uiSwarmerSpawnTimer = 10000;
-                uiGuardSpawnTimer = 25000;
-
-                uiEnrageTimer = 5000;
-
-                bGuardSpawned = false;
-                respectYourElders = true;
+                uiGuardSpawnTimer   = 25000;
+                uiEnrageTimer       = 5000;
+                bGuardSpawned       = false;
+                respectYourElders   = true;
 
                 if (instance)
                     instance->SetData(DATA_ELDER_NADOX_EVENT, NOT_STARTED);
@@ -95,7 +87,7 @@ class boss_elder_nadox : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                DoScriptText(SAY_DEATH, me);
+                Talk(SAY_AGGRO);
 
                 if (instance)
                     instance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS);
@@ -103,12 +95,12 @@ class boss_elder_nadox : public CreatureScript
 
             void KilledUnit(Unit* /*who*/)
             {
-                DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
+                Talk(SAY_SLAY);
             }
 
             void JustDied(Unit* /*killer*/)
             {
-                DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death?
+                Talk(SAY_DEATH);
 
                 if (instance)
                     instance->SetData(DATA_ELDER_NADOX_EVENT, DONE);
@@ -135,7 +127,7 @@ class boss_elder_nadox : public CreatureScript
 
                 if (uiPlagueTimer <= diff)
                 {
-                    DoCast(me->getVictim(), SPELL_BROOD_PLAGUE);
+                    DoCastVictim(SPELL_BROOD_PLAGUE);
                     uiPlagueTimer = 15000;
                 }
                 else
@@ -160,7 +152,7 @@ class boss_elder_nadox : public CreatureScript
                     DoCast(me, SPELL_SUMMON_SWARMERS, true);
                     DoCast(me, SPELL_SUMMON_SWARMERS);
                     if (urand(1, 3) == 3) // 33% chance of dialog
-                        DoScriptText(RAND(SAY_EGG_SAC_1, SAY_EGG_SAC_2), me);
+                        Talk(SAY_EGG_SAC);
 
                     uiSwarmerSpawnTimer = 10000;
                 }
@@ -169,7 +161,7 @@ class boss_elder_nadox : public CreatureScript
 
                 if (!bGuardSpawned && uiGuardSpawnTimer <= diff)
                 {
-                    me->MonsterTextEmote(EMOTE_HATCHES, me->GetGUID(), true);
+                    Talk(EMOTE_HATCHES, me->GetGUID());
                     DoCast(me, SPELL_SUMMON_SWARM_GUARD);
                     bGuardSpawned = true;
                 }
@@ -217,7 +209,7 @@ class mob_ahnkahar_nerubian : public CreatureScript
         {
             mob_ahnkahar_nerubianAI(Creature* creature) : ScriptedAI(creature)
             {
-                instance = me->GetInstanceScript();
+                instance = creature->GetInstanceScript();
             }
 
             InstanceScript* instance;
@@ -237,9 +229,7 @@ class mob_ahnkahar_nerubian : public CreatureScript
                         Nadox->AI()->DoAction(ACTION_AHNKAHAR_GUARDIAN_DEAD);
             }
 
-            void EnterCombat(Unit* /*who*/)
-            {
-            }
+            void EnterCombat(Unit* /*who*/) {}
 
             void UpdateAI(uint32 const diff)
             {
@@ -300,9 +290,7 @@ public:
 class achievement_respect_your_elders : public AchievementCriteriaScript
 {
     public:
-        achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders")
-        {
-        }
+        achievement_respect_your_elders() : AchievementCriteriaScript("achievement_respect_your_elders") {}
 
         bool OnCheck(Player* /*player*/, Unit* target)
         {