Scripts/ZulAman: Add emote for creature_text

6 files changed, 113 insertions, 56 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index 6a893697ae4..2dbb1f4170f 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2013 TrinityCore <http://www.trinitycore.org/>
- * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -16,24 +15,22 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* ScriptData
-SDName: boss_Akilzon
-SD%Complete: 75%
-SDComment: Missing timer for Call Lightning and Sound ID's
-SQLUpdate:
-#Temporary fix for Soaring Eagles
-
-EndScriptData */
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
+    SAY_AGGRO               = 0,
+    SAY_PLAYER_KILL         = 1,
+    EMOTE_ELECTRICAL_STORM  = 2,
+    SAY_SUMMON_EAGLE        = 3,
+    SAY_SUMMON_BIRDS        = 4,
+    SAY_BERSERK             = 5,
+    SAY_DEATH               = 6
 };
 
-enum Says
+enum Spells
 {
 };
 
@@ -58,19 +55,20 @@ class boss_akilzon : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
-                //Talk(SAY_AGGRO);
+                Talk(SAY_AGGRO);
                 _EnterCombat();
             }
 
             void JustDied(Unit* /*killer*/)
             {
-                //Talk(SAY_DEATH);
+                Talk(SAY_DEATH);
                 _JustDied();
             }
 
-            void KilledUnit(Unit* /*victim*/)
+            void KilledUnit(Unit* victim)
             {
-                //Talk(SAY_KILL);
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
             }
 
             void UpdateAI(uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
index fc556fb357d..64237502803 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
@@ -19,11 +19,24 @@
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
+    SAY_INTRO                       = 0,
+    SAY_AGGRO                       = 1,
+    SAY_PLAYER_KILL                 = 2,
+    SAY_FIRE_BREATH                 = 3,
+    SAY_TRANSFORMS_BEAR             = 4,
+    SAY_TRANSFORMS_EAGLE            = 5,
+    SAY_TRANSFORMS_LYNX             = 6,
+    SAY_TRANSFORMS_DRAGONHAWK       = 7,
+    SAY_ABSORBS_BEAR_SPIRIT         = 8,
+    SAY_ABSORBS_EAGLE_SPIRIT        = 9,
+    SAY_ABSORBS_LYNX_SPIRIT         = 10,
+    SAY_ABSORBS_DRAGONHAWK_SPIRIT   = 11,
+    SAY_DEATH                       = 12
 };
 
-enum Says
+enum Spells
 {
 };
 
@@ -48,16 +61,20 @@ class boss_daakara : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
+                Talk(SAY_AGGRO);
                 _EnterCombat();
             }
 
-            void KilledUnit(Unit* /*victim*/)
+            void JustDied(Unit* /*killer*/)
             {
+                Talk(SAY_DEATH);
+                _JustDied();
             }
 
-            void JustDied(Unit* /*killer*/)
+            void KilledUnit(Unit* victim)
             {
-                _JustDied();
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
             }
 
             void UpdateAI(uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index c11b2f63dcf..76c6917c3ce 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -19,11 +19,17 @@
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
+    SAY_AGGRO               = 0,
+    SAY_PLAYER_KILL         = 1,
+    SAY_MELEE               = 2,
+    SAY_SPLIT               = 3,
+    SAY_COMBINE             = 4,
+    SAY_DEATH               = 5
 };
 
-enum Says
+enum Spells
 {
 };
 
@@ -48,10 +54,23 @@ class boss_halazzi : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
+                Talk(SAY_AGGRO);
                 _EnterCombat();
             }
 
-             void UpdateAI(uint32 diff)
+            void JustDied(Unit* /*killer*/)
+            {
+                Talk(SAY_DEATH);
+                _JustDied();
+            }
+
+            void KilledUnit(Unit* victim)
+            {
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
+            }
+
+            void UpdateAI(uint32 diff)
             {
                 if (!UpdateVictim())
                     return;
@@ -73,15 +92,6 @@ class boss_halazzi : public CreatureScript
 
                 DoMeleeAttackIfReady();
             }
-
-            void KilledUnit(Unit* /*victim*/)
-            {
-            }
-
-            void JustDied(Unit* /*killer*/)
-            {
-                _JustDied();
-            }
         };
 
         CreatureAI* GetAI(Creature* creature) const
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 6f1bcbdccb7..5b1d194eb08 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -21,14 +21,20 @@
 #include "SpellAuraEffects.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
-    SPELL_WL_UNSTABLE_AFFL          = 43522,
-    SPELL_WL_UNSTABLE_AFFL_DISPEL   = 43523,
+    SAY_AGGRO               = 0,
+    SAY_PLAYER_KILL         = 1,
+    SAY_SPIRIT_BOLTS        = 2,
+    SAY_SIPHON_SOUL         = 3,
+    SAY_PET_DEATH           = 4,
+    SAY_DEATH               = 5
 };
 
-enum Says
+enum Spells
 {
+    SPELL_WL_UNSTABLE_AFFL          = 43522,
+    SPELL_WL_UNSTABLE_AFFL_DISPEL   = 43523,
 };
 
 enum Events
@@ -52,16 +58,20 @@ class boss_hexlord_malacrass : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
+                Talk(SAY_AGGRO);
                 _EnterCombat();
             }
 
-            void KilledUnit(Unit* /*victim*/)
+            void JustDied(Unit* /*killer*/)
             {
+                Talk(SAY_DEATH);
+                _JustDied();
             }
 
-            void JustDied(Unit* /*killer*/)
+            void KilledUnit(Unit* victim)
             {
-                _JustDied();
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
             }
 
             void UpdateAI(uint32 diff)
@@ -133,4 +143,3 @@ void AddSC_boss_hex_lord_malacrass()
     new boss_hexlord_malacrass();
     new spell_hexlord_unstable_affliction();
 }
-
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 7ed90479c82..0521fb28101 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -19,11 +19,18 @@
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
+    SAY_AGGRO               = 0,
+    SAY_PLAYER_KILL         = 1,
+    SAY_SUMMON_HATCHER      = 2,
+    SAY_FIRE_BOMB           = 3,
+    SAY_HATCH_ALL_EGGS      = 4,
+    EMOTE_FRENZY            = 5,
+    SAY_DEATH               = 6
 };
 
-enum Says
+enum Spells
 {
 };
 
@@ -46,23 +53,22 @@ class boss_janalai : public CreatureScript
                 _Reset();
             }
 
-            void JustDied(Unit* /*killer*/)
+            void EnterCombat(Unit* /*who*/)
             {
-                //Talk(SAY_DEATH);
-
-                _JustDied();
+                Talk(SAY_AGGRO);
+                _EnterCombat();
             }
 
-            void KilledUnit(Unit* /*victim*/)
+            void JustDied(Unit* /*killer*/)
             {
-                //Talk(SAY_KILL_PLAYER);
+                Talk(SAY_DEATH);
+                _JustDied();
             }
 
-            void EnterCombat(Unit* /*who*/)
+            void KilledUnit(Unit* victim)
             {
-                _EnterCombat();
-
-                //Talk(SAY_AGGRO);
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
             }
 
             void UpdateAI(uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
index 7770856e9cf..444b6447f60 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
@@ -19,11 +19,23 @@
 #include "ScriptedCreature.h"
 #include "zulaman.h"
 
-enum Spells
+enum Says
 {
+    SAY_WAVE_1              = 0,
+    SAY_WAVE_2              = 1,
+    SAY_WAVE_3              = 2,
+    SAY_WAVE_4              = 3,
+    SAY_AGGRO               = 4,
+    SAY_PLAYER_KILL         = 5,
+    SAY_SURGE               = 6,
+    EMOTE_SURGE             = 7,
+    EMOTE_BEAR              = 8,
+    SAY_BEAR                = 9,
+    SAY_TROLL               = 10,
+    SAY_DEATH               = 11
 };
 
-enum Says
+enum Spells
 {
 };
 
@@ -45,18 +57,23 @@ class boss_nalorakk : public CreatureScript
             {
                 _Reset();
             }
+
             void EnterCombat(Unit* /*who*/)
             {
+                Talk(SAY_AGGRO);
                 _EnterCombat();
             }
 
             void JustDied(Unit* /*killer*/)
             {
+                Talk(SAY_DEATH);
                 _JustDied();
             }
 
-            void KilledUnit(Unit* /*victim*/)
+            void KilledUnit(Unit* victim)
             {
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_PLAYER_KILL);
             }
 
             void UpdateAI(uint32 diff)