Core/Scripting: Updates to Zul'Grub Instance.

15 files changed, 404 insertions, 403 deletions

diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 54a5f5c706c..593ee05d951 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -27,14 +27,14 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-enum eYells
+enum Says
 {
     SAY_AGGRO                   = 0,
     SAY_FEAST_PANTHER           = 1,
-    SAY_DEATH                   = 2,
+    SAY_DEATH                   = 2
 };
 
-enum eSpells
+enum Spells
 {
     SPELL_SHADOWWORDPAIN        = 23952,
     SPELL_GOUGE                 = 24698,
@@ -51,21 +51,11 @@ enum eSpells
 
 class boss_arlokk : public CreatureScript
 {
-    public:
-
-        boss_arlokk()
-            : CreatureScript("boss_arlokk")
-        {
-        }
+    public: boss_arlokk() : CreatureScript("boss_arlokk") {}
 
-        struct boss_arlokkAI : public ScriptedAI
+        struct boss_arlokkAI : public BossAI
         {
-            boss_arlokkAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
-
-            InstanceScript* instance;
+            boss_arlokkAI(Creature* creature) : BossAI(creature, DATA_ARLOKK) {}
 
             uint32 m_uiShadowWordPain_Timer;
             uint32 m_uiGouge_Timer;
@@ -104,8 +94,17 @@ class boss_arlokk : public CreatureScript
                 me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+                Talk(SAY_DEATH);
+                me->SetDisplayId(MODEL_ID_NORMAL);
+                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+            }
+
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
                 Talk(SAY_AGGRO);
             }
 
@@ -118,17 +117,6 @@ class boss_arlokk : public CreatureScript
                 me->DespawnOrUnsummon();
             }
 
-            void JustDied(Unit* /*killer*/)
-            {
-                Talk(SAY_DEATH);
-
-                me->SetDisplayId(MODEL_ID_NORMAL);
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-
-                if (instance)
-                    instance->SetData(DATA_ARLOKK, DONE);
-            }
-
             void DoSummonPhanters()
             {
                 if (MarkedTargetGUID)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
index e7d54aecb31..7943e51a7cd 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
@@ -25,62 +25,73 @@ EndScriptData */
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "zulgurub.h"
 
-#define SPELL_FROSTBREATH            16099
-#define SPELL_MASSIVEGEYSER          22421                  //Not working. Cause its a summon...
-#define SPELL_SLAM                   24326
+enum Spells
+{
+    SPELL_FROSTBREATH               = 16099,
+    SPELL_MASSIVEGEYSER             = 22421, // Not working. (summon)
+    SPELL_SLAM                      = 24326
+};
+
+enum Events
+{
+    EVENT_FROSTBREATH               = 0,
+    EVENT_MASSIVEGEYSER             = 1,
+    EVENT_SLAM                      = 2
+};
 
-class boss_gahzranka : public CreatureScript
+class boss_gahzranka : public CreatureScript // gahzranka
 {
-    public:
-        boss_gahzranka() : CreatureScript("boss_gahzranka") { }
+    public: boss_gahzranka() : CreatureScript("boss_gahzranka") {}
 
-        struct boss_gahzrankaAI : public ScriptedAI
+        struct boss_gahzrankaAI : public BossAI
         {
-            boss_gahzrankaAI(Creature* creature) : ScriptedAI(creature) { }
-            uint32 Frostbreath_Timer;
-            uint32 MassiveGeyser_Timer;
-            uint32 Slam_Timer;
+            boss_gahzrankaAI(Creature* creature) : BossAI(creature, DATA_GAHZRANKA) {}
 
-            void Reset()
+            void JustDied(Unit* /*killer*/)
             {
-                Frostbreath_Timer = 8000;
-                MassiveGeyser_Timer = 25000;
-                Slam_Timer = 17000;
+                _JustDied();
             }
 
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
+                events.ScheduleEvent(EVENT_FROSTBREATH, 8000);
+                events.ScheduleEvent(EVENT_MASSIVEGEYSER, 25000);
+                events.ScheduleEvent(EVENT_SLAM, 17000);
             }
 
-            void UpdateAI(const uint32 diff)
+            void UpdateAI(uint32 const diff)
             {
-                //Return since we have no target
                 if (!UpdateVictim())
                     return;
 
-                //Frostbreath_Timer
-                if (Frostbreath_Timer <= diff)
-                {
-                    DoCast(me->getVictim(), SPELL_FROSTBREATH);
-                    Frostbreath_Timer = urand(7000, 11000);
-                } else Frostbreath_Timer -= diff;
-
-                //MassiveGeyser_Timer
-                if (MassiveGeyser_Timer <= diff)
-                {
-                    DoCast(me->getVictim(), SPELL_MASSIVEGEYSER);
-                    DoResetThreat();
+                events.Update(diff);
 
-                    MassiveGeyser_Timer = urand(22000, 32000);
-                } else MassiveGeyser_Timer -= diff;
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
 
-                //Slam_Timer
-                if (Slam_Timer <= diff)
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    DoCast(me->getVictim(), SPELL_SLAM);
-                    Slam_Timer = urand(12000, 20000);
-                } else Slam_Timer -= diff;
+                    switch (eventId)
+                    {
+                        case EVENT_FROSTBREATH:
+                            DoCastVictim(SPELL_FROSTBREATH, true);
+                            events.ScheduleEvent(EVENT_FROSTBREATH, urand(7000, 11000));
+                            break;
+                        case EVENT_MASSIVEGEYSER:
+                            DoCastVictim(SPELL_MASSIVEGEYSER, true);
+                            events.ScheduleEvent(EVENT_MASSIVEGEYSER, urand(22000, 32000));
+                            break;
+                        case EVENT_SLAM:
+                            DoCastVictim(SPELL_SLAM, true);
+                            events.ScheduleEvent(EVENT_SLAM, urand(12000, 20000));
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
index 4ccdbceb466..686ecb55c88 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
@@ -27,60 +27,68 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-#define SPELL_AVARTAR                24646                  //The Enrage Spell
-#define SPELL_GROUNDTREMOR            6524
+enum Spells
+{
+    SPELL_AVARTAR                   = 24646, // Enrage Spell
+    SPELL_GROUNDTREMOR              = 6524
+};
+
+enum Events
+{
+    EVENT_AVARTAR                   = 0,
+    EVENT_GROUNDTREMOR              = 1
+};
 
-class boss_grilek : public CreatureScript
+class boss_grilek : public CreatureScript // grilek
 {
-    public:
-        boss_grilek() : CreatureScript("boss_grilek") { }
+    public: boss_grilek() : CreatureScript("boss_grilek") {}
 
-        struct boss_grilekAI : public ScriptedAI
+        struct boss_grilekAI : public BossAI
         {
-            boss_grilekAI(Creature* creature) : ScriptedAI(creature) { }
-
-            uint32 Avartar_Timer;
-            uint32 GroundTremor_Timer;
+            boss_grilekAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {}
 
-            void Reset()
+            void JustDied(Unit* /*killer*/)
             {
-                Avartar_Timer = urand(15000, 25000);
-                GroundTremor_Timer = urand(8000, 16000);
+                _JustDied();
             }
 
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
+                events.ScheduleEvent(EVENT_AVARTAR, urand(15000, 25000));
+                events.ScheduleEvent(EVENT_GROUNDTREMOR, urand(15000, 25000));
             }
 
-            void UpdateAI(const uint32 diff)
+            void UpdateAI(uint32 const diff)
             {
-                //Return since we have no target
                 if (!UpdateVictim())
                     return;
 
-                //Avartar_Timer
-                if (Avartar_Timer <= diff)
-                {
-
-                    DoCast(me, SPELL_AVARTAR);
-                    Unit* target = NULL;
-
-                    target = SelectTarget(SELECT_TARGET_RANDOM, 1);
+                events.Update(diff);
 
-                    if (DoGetThreat(me->getVictim()))
-                        DoModifyThreatPercent(me->getVictim(), -50);
-                    if (target)
-                        AttackStart(target);
-
-                    Avartar_Timer = urand(25000, 35000);
-                } else Avartar_Timer -= diff;
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
 
-                //GroundTremor_Timer
-                if (GroundTremor_Timer <= diff)
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    DoCast(me->getVictim(), SPELL_GROUNDTREMOR);
-                    GroundTremor_Timer = urand(12000, 16000);
-                } else GroundTremor_Timer -= diff;
+                    switch (eventId)
+                    {
+                        case EVENT_AVARTAR:
+                            DoCast(me, SPELL_AVARTAR);
+                            if (DoGetThreat(me->getVictim()))
+                                DoModifyThreatPercent(me->getVictim(), -50);
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
+                                AttackStart(target);
+                            events.ScheduleEvent(EVENT_AVARTAR, urand(25000, 35000));
+                            break;
+                        case EVENT_GROUNDTREMOR:
+                            DoCastVictim(SPELL_GROUNDTREMOR, true);
+                            events.ScheduleEvent(EVENT_GROUNDTREMOR, urand(12000, 16000));
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
index 781b68bfcb0..87a9c02e3ed 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
@@ -27,19 +27,21 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-enum Hakkar
+enum Says
 {
     SAY_AGGRO                   = 0,
     SAY_FLEEING                 = 1,
     SAY_MINION_DESTROY          = 2,                //where does it belong?
-    SAY_PROTECT_ALTAR           = 3,                //where does it belong?
+    SAY_PROTECT_ALTAR           = 3                 //where does it belong?
+};
 
+enum Spells
+{
     SPELL_BLOODSIPHON           = 24322,
     SPELL_CORRUPTEDBLOOD        = 24328,
     SPELL_CAUSEINSANITY         = 24327,                 //Not working disabled.
     SPELL_WILLOFHAKKAR          = 24178,
     SPELL_ENRAGE                = 24318,
-
 // The Aspects of all High Priests
     SPELL_ASPECT_OF_JEKLIK      = 24687,
     SPELL_ASPECT_OF_VENOXIS     = 24688,
@@ -48,23 +50,13 @@ enum Hakkar
     SPELL_ASPECT_OF_ARLOKK      = 24690
 };
 
-class boss_hakkar : public CreatureScript
+class boss_hakkar : public CreatureScript // hakkar
 {
-    public:
-
-        boss_hakkar()
-            : CreatureScript("boss_hakkar")
-        {
-        }
+    public: boss_hakkar() : CreatureScript("boss_hakkar") {}
 
-        struct boss_hakkarAI : public ScriptedAI
+        struct boss_hakkarAI : public BossAI
         {
-            boss_hakkarAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
-
-            InstanceScript* instance;
+            boss_hakkarAI(Creature* creature) : BossAI(creature, DATA_HAKKAR) {}
 
             uint32 BloodSiphon_Timer;
             uint32 CorruptedBlood_Timer;
@@ -109,8 +101,14 @@ class boss_hakkar : public CreatureScript
                 Enraged = false;
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+            }
+
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
                 Talk(SAY_AGGRO);
             }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
index bbdc2905874..d7266794f7d 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
@@ -27,75 +27,81 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-#define SPELL_MANABURN         26046
-#define SPELL_SLEEP            24664
+enum Spells
+{
+    SPELL_MANABURN              = 26046,
+    SPELL_SLEEP                 = 24664
+};
 
-class boss_hazzarah : public CreatureScript
+enum Events
 {
-    public:
+    EVENT_MANABURN              = 0,
+    EVENT_SLEEP                 = 1,
+    EVENT_ILLUSIONS             = 2
+};
 
-        boss_hazzarah()
-            : CreatureScript("boss_hazzarah")
-        {
-        }
+class boss_hazzarah : public CreatureScript
+{
+    public: boss_hazzarah() : CreatureScript("boss_hazzarah") {}
 
-        struct boss_hazzarahAI : public ScriptedAI
+        struct boss_hazzarahAI : public BossAI
         {
-            boss_hazzarahAI(Creature* creature) : ScriptedAI(creature) {}
-
-            uint32 ManaBurn_Timer;
-            uint32 Sleep_Timer;
-            uint32 Illusions_Timer;
+            boss_hazzarahAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {}
 
-            void Reset()
+            void JustDied(Unit* /*killer*/)
             {
-                ManaBurn_Timer = urand(4000, 10000);
-                Sleep_Timer = urand(10000, 18000);
-                Illusions_Timer = urand(10000, 18000);
+                _JustDied();
             }
 
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
+                events.ScheduleEvent(EVENT_MANABURN, urand(4000, 10000));
+                events.ScheduleEvent(EVENT_SLEEP, urand(10000, 18000));
+                events.ScheduleEvent(EVENT_ILLUSIONS, urand(10000, 18000));
             }
 
-            void UpdateAI(const uint32 diff)
+            void UpdateAI(uint32 const diff)
             {
                 if (!UpdateVictim())
                     return;
 
-                //ManaBurn_Timer
-                if (ManaBurn_Timer <= diff)
-                {
-                    DoCast(me->getVictim(), SPELL_MANABURN);
-                    ManaBurn_Timer = urand(8000, 16000);
-                } else ManaBurn_Timer -= diff;
+                events.Update(diff);
 
-                //Sleep_Timer
-                if (Sleep_Timer <= diff)
-                {
-                    DoCast(me->getVictim(), SPELL_SLEEP);
-                    Sleep_Timer = urand(12000, 20000);
-                } else Sleep_Timer -= diff;
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
 
-                //Illusions_Timer
-                if (Illusions_Timer <= diff)
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    //We will summon 3 illusions that will spawn on a random gamer and attack this gamer
-                    //We will just use one model for the beginning
-                    Unit* target = NULL;
-                    for (uint8 i = 0; i < 3; ++i)
+                    switch (eventId)
                     {
-                        target = SelectTarget(SELECT_TARGET_RANDOM, 0);
-                        if (!target)
-                            return;
-
-                        Creature* Illusion = me->SummonCreature(15163, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
-                        if (Illusion)
-                            Illusion->AI()->AttackStart(target);
+                        case EVENT_MANABURN:
+                            DoCastVictim(SPELL_MANABURN, true);
+                            events.ScheduleEvent(EVENT_MANABURN, urand(8000, 16000));
+                            break;
+                        case EVENT_SLEEP:
+                            DoCastVictim(SPELL_SLEEP, true);
+                            events.ScheduleEvent(EVENT_SLEEP, urand(12000, 20000));
+                            break;
+                        case EVENT_ILLUSIONS:
+                            // We will summon 3 illusions that will spawn on a random gamer and attack this gamer
+                            // We will just use one model for the beginning
+                            for (uint8 i = 0; i < 3; ++i)
+                            {
+                                Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0);
+                                if (!target)
+                                    return;
+
+                                Creature* Illusion = me->SummonCreature(NPC_NIGHTMARE_ILLUSION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
+                                if (Illusion)
+                                    Illusion->AI()->AttackStart(target);
+                            }
+                            events.ScheduleEvent(EVENT_ILLUSIONS, urand(15000, 25000));
+                            break;
+                        default:
+                            break;
                     }
-
-                    Illusions_Timer = urand(15000, 25000);
-                } else Illusions_Timer -= diff;
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
index 10431ec84bd..4d27fd99769 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
@@ -27,42 +27,34 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-enum Jeklik
+enum Says
 {
     SAY_AGGRO                   = 0,
     SAY_RAIN_FIRE               = 1,
-    SAY_DEATH                   = 2,
+    SAY_DEATH                   = 2
+};
 
+enum Spells
+{
     SPELL_CHARGE                = 22911,
     SPELL_SONICBURST            = 23918,
     SPELL_SCREECH               = 6605,
     SPELL_SHADOW_WORD_PAIN      = 23952,
     SPELL_MIND_FLAY             = 23953,
-    SPELL_CHAIN_MIND_FLAY       = 26044, //Right ID unknown. So disabled
+    SPELL_CHAIN_MIND_FLAY       = 26044, // Right ID unknown. So disabled
     SPELL_GREATERHEAL           = 23954,
     SPELL_BAT_FORM              = 23966,
-
     // Batriders Spell
-    SPELL_BOMB                  = 40332 //Wrong ID but Magmadars bomb is not working...
+    SPELL_BOMB                  = 40332 // Wrong ID but Magmadars bomb is not working...
 };
 
-class boss_jeklik : public CreatureScript
+class boss_jeklik : public CreatureScript //jeklik
 {
-    public:
-
-        boss_jeklik()
-            : CreatureScript("boss_jeklik")
-        {
-        }
+    public: boss_jeklik() : CreatureScript("boss_jeklik") {}
 
-        struct boss_jeklikAI : public ScriptedAI
+        struct boss_jeklikAI : public BossAI
         {
-            boss_jeklikAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
-
-            InstanceScript* instance;
+            boss_jeklikAI(Creature* creature) : BossAI(creature, DATA_JEKLIK) {}
 
             uint32 Charge_Timer;
             uint32 SonicBurst_Timer;
@@ -91,18 +83,17 @@ class boss_jeklik : public CreatureScript
                 PhaseTwo = false;
             }
 
-            void EnterCombat(Unit* /*who*/)
-            {
-                Talk(SAY_AGGRO);
-                DoCast(me, SPELL_BAT_FORM);
-            }
-
             void JustDied(Unit* /*killer*/)
             {
+                _JustDied();
                 Talk(SAY_DEATH);
+            }
 
-                if (instance)
-                    instance->SetData(DATA_JEKLIK, DONE);
+            void EnterCombat(Unit* /*who*/)
+            {
+                _EnterCombat();
+                Talk(SAY_AGGRO);
+                DoCast(me, SPELL_BAT_FORM);
             }
 
             void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
index 7c4c9626f9a..61f8fa08c2f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
@@ -27,19 +27,20 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-enum Jindo
+enum Say
 {
-    SAY_AGGRO                       = 1,
+    SAY_AGGRO                       = 1
+};
 
+enum Spells
+{
     SPELL_BRAINWASHTOTEM            = 24262,
     SPELL_POWERFULLHEALINGWARD      = 24309,               //We will not use this spell. We will summon a totem by script cause the spell totems will not cast.
     SPELL_HEX                       = 24053,
     SPELL_DELUSIONSOFJINDO          = 24306,
     SPELL_SHADEOFJINDO              = 24308,               //We will not use this spell. We will summon a shade by script.
-
     //Healing Ward Spell
     SPELL_HEAL                      = 38588,               //Totems are not working right. Right heal spell ID is 24311 but this spell is not casting...
-
     //Shade of Jindo Spell
     SPELL_SHADOWSHOCK               = 19460,
     SPELL_INVISIBLE                 = 24699
@@ -47,16 +48,11 @@ enum Jindo
 
 class boss_jindo : public CreatureScript
 {
-    public:
+    public: boss_jindo() : CreatureScript("boss_jindo") {}
 
-        boss_jindo()
-            : CreatureScript("boss_jindo")
+        struct boss_jindoAI : public BossAI
         {
-        }
-
-        struct boss_jindoAI : public ScriptedAI
-        {
-            boss_jindoAI(Creature* creature) : ScriptedAI(creature) {}
+            boss_jindoAI(Creature* creature) : BossAI(creature, DATA_JINDO) {}
 
             uint32 BrainWashTotem_Timer;
             uint32 HealingWard_Timer;
@@ -73,8 +69,14 @@ class boss_jindo : public CreatureScript
                 Teleport_Timer = 5000;
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+            }
+
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
                 Talk(SAY_AGGRO);
             }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index bcc080bb8a5..b7230aa8b65 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -50,21 +50,13 @@ enum Mandokir
     NPC_SPEAKER             = 11391
 };
 
-class boss_mandokir : public CreatureScript
+class boss_mandokir : public CreatureScript //mandokir
 {
-    public:
+    public: boss_mandokir() : CreatureScript("boss_mandokir") {}
 
-        boss_mandokir()
-            : CreatureScript("boss_mandokir")
+        struct boss_mandokirAI : public BossAI
         {
-        }
-
-        struct boss_mandokirAI : public ScriptedAI
-        {
-            boss_mandokirAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
+            boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR) {}
 
             uint32 KillCount;
             uint32 Watch_Timer;
@@ -114,6 +106,11 @@ class boss_mandokir : public CreatureScript
                 DoCast(me, 23243);
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+            }
+
             void KilledUnit(Unit* victim)
             {
                 if (victim->GetTypeId() == TYPEID_PLAYER)
@@ -144,6 +141,7 @@ class boss_mandokir : public CreatureScript
 
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
                 Talk(SAY_AGGRO);
             }
 
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
index 56aeee93ee2..35ddb93c83e 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
@@ -27,40 +27,32 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "zulgurub.h"
 
-enum Marli
+enum Says
 {
     SAY_AGGRO               = 0,
     SAY_TRANSFORM           = 1,
     SAY_SPIDER_SPAWN        = 2,
-    SAY_DEATH               = 3,
+    SAY_DEATH               = 3
+};
 
+enum Spells
+{
     SPELL_CHARGE            = 22911,
     SPELL_ASPECT_OF_MARLI   = 24686,                     // A stun spell
     SPELL_ENVOLWINGWEB      = 24110,
     SPELL_POISONVOLLEY      = 24099,
     SPELL_SPIDER_FORM       = 24084,
-
 //The Spider Spells
-    SPELL_LEVELUP           = 24312                     //Not right Spell.
+    SPELL_LEVELUP           = 24312                     // Not right Spell.
 };
 
-class boss_marli : public CreatureScript
+class boss_marli : public CreatureScript // marli
 {
-    public:
+    public: boss_marli() : CreatureScript("boss_marli") {}
 
-        boss_marli()
-            : CreatureScript("boss_marli")
+        struct boss_marliAI : public BossAI
         {
-        }
-
-        struct boss_marliAI : public ScriptedAI
-        {
-            boss_marliAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
-
-            InstanceScript* instance;
+            boss_marliAI(Creature* creature) : BossAI(creature, DATA_MARLI) {}
 
             uint32 SpawnStartSpiders_Timer;
             uint32 PoisonVolley_Timer;
@@ -87,16 +79,16 @@ class boss_marli : public CreatureScript
                 PhaseTwo = false;
             }
 
-            void EnterCombat(Unit* /*who*/)
+            void JustDied(Unit* /*killer*/)
             {
-                Talk(SAY_AGGRO);
+                _JustDied();
+                Talk(SAY_DEATH);
             }
 
-            void JustDied(Unit* /*killer*/)
+            void EnterCombat(Unit* /*who*/)
             {
-                Talk(SAY_DEATH);
-                if (instance)
-                    instance->SetData(DATA_MARLI, DONE);
+                _EnterCombat();
+                Talk(SAY_AGGRO);
             }
 
             void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
index d562b7cdf9b..65730d1baf2 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
@@ -40,16 +40,11 @@ enum Misc
 
 class boss_renataki : public CreatureScript
 {
-    public:
+    public: boss_renataki() : CreatureScript("boss_renataki") {}
 
-        boss_renataki()
-            : CreatureScript("boss_renataki")
+        struct boss_renatakiAI : public BossAI
         {
-        }
-
-        struct boss_renatakiAI : public ScriptedAI
-        {
-            boss_renatakiAI(Creature* creature) : ScriptedAI(creature) {}
+            boss_renatakiAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {}
 
             uint32 Invisible_Timer;
             uint32 Ambush_Timer;
@@ -72,8 +67,14 @@ class boss_renataki : public CreatureScript
                 Ambushed = false;
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+            }
+
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
             }
 
             void UpdateAI(const uint32 diff)
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
index d91b8f0b483..69a1348db15 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
@@ -30,8 +30,11 @@ EndScriptData */
 enum Thekal
 {
     SAY_AGGRO                 = 0,
-    SAY_DEATH                 = 1,
+    SAY_DEATH                 = 1
+};
 
+enum Spells
+{
     SPELL_MORTALCLEAVE        = 22859,
     SPELL_SILENCE             = 22666,
     SPELL_FRENZY              = 8269,
@@ -56,21 +59,13 @@ enum Thekal
     SPELL_BLIND               = 21060
 };
 
-class boss_thekal : public CreatureScript
+class boss_thekal : public CreatureScript // thekal
 {
-    public:
+    public: boss_thekal() : CreatureScript("boss_thekal") {}
 
-        boss_thekal()
-            : CreatureScript("boss_thekal")
+        struct boss_thekalAI : public BossAI
         {
-        }
-
-        struct boss_thekalAI : public ScriptedAI
-        {
-            boss_thekalAI(Creature* creature) : ScriptedAI(creature)
-            {
-                instance = creature->GetInstanceScript();
-            }
+            boss_thekalAI(Creature* creature) : BossAI(creature, DATA_THEKAL) {}
 
             uint32 MortalCleave_Timer;
             uint32 Silence_Timer;
@@ -104,16 +99,16 @@ class boss_thekal : public CreatureScript
                 WasDead = false;
             }
 
-            void EnterCombat(Unit* /*who*/)
+            void JustDied(Unit* /*killer*/)
             {
-                Talk(SAY_AGGRO);
+                _JustDied();
+                Talk(SAY_DEATH);
             }
 
-            void JustDied(Unit* /*killer*/)
+            void EnterCombat(Unit* /*who*/)
             {
-                Talk(SAY_DEATH);
-                if (instance)
-                    instance->SetData(DATA_THEKAL, DONE);
+                _EnterCombat();
+                Talk(SAY_AGGRO);
             }
 
             void JustReachedHome()
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
index ff63e4a8adb..7fe250eda57 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
@@ -27,10 +27,10 @@
  * - Fix timers (research some more)
  */
 
-enum Texts
+enum Says
 {
     SAY_VENOXIS_TRANSFORM           = 1,        // Let the coils of hate unfurl!
-    SAY_VENOXIS_DEATH               = 2,        // Ssserenity.. at lassst!
+    SAY_VENOXIS_DEATH               = 2         // Ssserenity.. at lassst!
 };
 
 enum Spells
@@ -53,12 +53,12 @@ enum Spells
 
     // used when swapping event-stages
     SPELL_VENOXIS_TRANSFORM         = 23849,    // 50% health - shapechange to cobra
-    SPELL_FRENZY                    = 8269,     // 20% health - frenzy
+    SPELL_FRENZY                    = 8269      // 20% health - frenzy
 };
 
 enum NPCs
 {
-    NPC_PARASITIC_SERPENT           = 14884,
+    NPC_PARASITIC_SERPENT           = 14884
 };
 
 enum Events
@@ -70,10 +70,8 @@ enum Events
     EVENT_HOLY_NOVA                 = 4,
     EVENT_HOLY_FIRE                 = 5,
     EVENT_HOLY_WRATH                = 6,
-
     // phase-changing
     EVENT_TRANSFORM                 = 7,
-
     // snake form events
     EVENT_POISON_CLOUD              = 8,
     EVENT_VENOM_SPIT                = 9,
@@ -84,19 +82,16 @@ enum Events
 enum Phases
 {
     PHASE_ONE                       = 1,    // troll form
-    PHASE_TWO                       = 2,    // snake form
+    PHASE_TWO                       = 2     // snake form
 };
 
 class boss_venoxis : public CreatureScript
 {
-    public:
-        boss_venoxis() : CreatureScript("boss_venoxis") {}
+    public: boss_venoxis() : CreatureScript("boss_venoxis") {}
 
         struct boss_venoxisAI : public BossAI
         {
-            boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS)
-            {
-            }
+            boss_venoxisAI(Creature* creature) : BossAI(creature, DATA_VENOXIS) {}
 
             void Reset()
             {
@@ -118,15 +113,19 @@ class boss_venoxis : public CreatureScript
                 events.SetPhase(PHASE_ONE);
             }
 
+            void JustDied(Unit* /*killer*/)
+            {
+                _JustDied();
+                Talk(SAY_VENOXIS_DEATH);
+                me->RemoveAllAuras();
+            }
+
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
                 me->SetReactState(REACT_AGGRESSIVE);
-
-                instance->SetBossState(DATA_VENOXIS, IN_PROGRESS);
-
                 // Always running events
                 events.ScheduleEvent(EVENT_THRASH, 5000);
-
                 // Phase one events (regular form)
                 events.ScheduleEvent(EVENT_HOLY_NOVA, 5000, 0, PHASE_ONE);
                 events.ScheduleEvent(EVENT_DISPEL_MAGIC, 35000, 0, PHASE_ONE);
@@ -157,14 +156,6 @@ class boss_venoxis : public CreatureScript
                 }
             }
 
-            void JustDied(Unit* /*killer*/)
-            {
-                Talk(SAY_VENOXIS_DEATH);
-                // venoxis is dead, mark him as such for the instance
-                instance->SetBossState(DATA_VENOXIS, DONE);
-                me->RemoveAllAuras();
-            }
-
             void UpdateAI(const uint32 diff)
             {
                 if (!UpdateVictim())
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
index 810ee5e900e..196df2b98b9 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
@@ -33,53 +33,58 @@ enum Spells
     SPELL_LIGHTNINGWAVE         = 24819
 };
 
-class boss_wushoolay : public CreatureScript
+enum Events
 {
-    public:
+    EVENT_LIGHTNINGCLOUD        = 0,
+    EVENT_LIGHTNINGWAVE         = 1
+};
 
-        boss_wushoolay()
-            : CreatureScript("boss_wushoolay")
-        {
-        }
+class boss_wushoolay : public CreatureScript
+{
+    public: boss_wushoolay() : CreatureScript("boss_wushoolay") {}
 
-        struct boss_wushoolayAI : public ScriptedAI
+        struct boss_wushoolayAI : public BossAI
         {
-            boss_wushoolayAI(Creature* creature) : ScriptedAI(creature) {}
+            boss_wushoolayAI(Creature* creature) : BossAI(creature, DATA_EDGE_OF_MADNESS) {}
 
-            uint32 LightningCloud_Timer;
-            uint32 LightningWave_Timer;
-
-            void Reset()
+            void JustDied(Unit* /*killer*/)
             {
-                LightningCloud_Timer = urand(5000, 10000);
-                LightningWave_Timer = urand(8000, 16000);
+                _JustDied();
             }
 
             void EnterCombat(Unit* /*who*/)
             {
+                _EnterCombat();
+                events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(5000, 10000));
+                events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(8000, 16000));
             }
 
-            void UpdateAI(const uint32 diff)
+            void UpdateAI(uint32 const diff)
             {
                 if (!UpdateVictim())
                     return;
 
-                //LightningCloud_Timer
-                if (LightningCloud_Timer <= diff)
-                {
-                    DoCast(me->getVictim(), SPELL_LIGHTNINGCLOUD);
-                    LightningCloud_Timer = urand(15000, 20000);
-                } else LightningCloud_Timer -= diff;
+                events.Update(diff);
 
-                //LightningWave_Timer
-                if (LightningWave_Timer <= diff)
-                {
-                    Unit* target = NULL;
-                    target = SelectTarget(SELECT_TARGET_RANDOM, 0);
-                    if (target) DoCast(target, SPELL_LIGHTNINGWAVE);
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
 
-                    LightningWave_Timer = urand(12000, 16000);
-                } else LightningWave_Timer -= diff;
+                while (uint32 eventId = events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_LIGHTNINGCLOUD:
+                            DoCastVictim(SPELL_LIGHTNINGCLOUD, true);
+                            events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(15000, 20000));
+                            break;
+                        case EVENT_LIGHTNINGWAVE:
+                            DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_LIGHTNINGWAVE);
+                            events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(12000, 16000));
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
                 DoMeleeAttackIfReady();
             }
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index cfaf19642f2..a4fb19b708a 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -29,33 +29,28 @@ EndScriptData */
 
 class instance_zulgurub : public InstanceMapScript
 {
-    public:
-        instance_zulgurub()
-            : InstanceMapScript("instance_zulgurub", 309)
-        {
-        }
+    public: instance_zulgurub(): InstanceMapScript("instance_zulgurub", 309) {}
 
         struct instance_zulgurub_InstanceMapScript : public InstanceScript
         {
-            instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map) {}
+            instance_zulgurub_InstanceMapScript(Map* map) : InstanceScript(map)
+            {
+                SetBossNumber(EncounterCount);
+            }
 
             //If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
-            uint32 m_auiEncounter[MAX_ENCOUNTERS];
-
             //Storing Lorkhan, Zath and Thekal because we need to cast on them later. Jindo is needed for healfunction too.
-            uint64 m_uiLorKhanGUID;
-            uint64 m_uiZathGUID;
-            uint64 m_uiThekalGUID;
-            uint64 m_uiJindoGUID;
+            uint64 LorKhanGUID;
+            uint64 ZathGUID;
+            uint64 ThekalGUID;
+            uint64 JindoGUID;
 
             void Initialize()
             {
-                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-                m_uiLorKhanGUID = 0;
-                m_uiZathGUID = 0;
-                m_uiThekalGUID = 0;
-                m_uiJindoGUID = 0;
+                LorKhanGUID = 0;
+                ZathGUID = 0;
+                ThekalGUID = 0;
+                JindoGUID = 0;
             }
 
             bool IsEncounterInProgress() const
@@ -68,73 +63,39 @@ class instance_zulgurub : public InstanceMapScript
             {
                 switch (creature->GetEntry())
                 {
-                    case 11347: m_uiLorKhanGUID = creature->GetGUID(); break;
-                    case 11348: m_uiZathGUID = creature->GetGUID(); break;
-                    case 14509: m_uiThekalGUID = creature->GetGUID(); break;
-                    case 11380: m_uiJindoGUID = creature->GetGUID(); break;
+                    case NPC_ZEALOT_LORKHAN: LorKhanGUID = creature->GetGUID(); break;
+                    case NPC_ZEALOT_ZATH: ZathGUID = creature->GetGUID(); break;
+                    case NPC_HIGH_PRIEST_THEKAL: ThekalGUID = creature->GetGUID(); break;
+                    case NPC_JINDO_THE_HEXXER: JindoGUID = creature->GetGUID(); break;
                 }
             }
 
-            void SetData(uint32 uiType, uint32 uiData)
+            bool SetBossState(uint32 type, EncounterState state)
             {
-                switch (uiType)
-                {
-                    case DATA_ARLOKK:
-                        m_auiEncounter[0] = uiData;
-                        break;
+                if (!InstanceScript::SetBossState(type, state))
+                    return false;
 
+                switch (type)
+                {
                     case DATA_JEKLIK:
-                        m_auiEncounter[1] = uiData;
-                        break;
-
                     case DATA_VENOXIS:
-                        m_auiEncounter[2] = uiData;
-                        break;
-
                     case DATA_MARLI:
-                        m_auiEncounter[3] = uiData;
-                        break;
-
+                    case DATA_ARLOKK:
+                    case DATA_HAKKAR:
+                    case DATA_MANDOKIR:
+                    case DATA_JINDO:
+                    case DATA_GAHZRANKA:
+                    case DATA_EDGE_OF_MADNESS:
                     case DATA_THEKAL:
-                        m_auiEncounter[4] = uiData;
-                        break;
-
                     case DATA_LORKHAN:
-                        m_auiEncounter[5] = uiData;
-                        break;
-
                     case DATA_ZATH:
-                        m_auiEncounter[6] = uiData;
-                        break;
-
                     case DATA_OHGAN:
-                        m_auiEncounter[7] = uiData;
+                        break;
+                    default:
                         break;
                 }
-            }
 
-            uint32 GetData(uint32 uiType) const
-            {
-                switch (uiType)
-                {
-                    case DATA_ARLOKK:
-                        return m_auiEncounter[0];
-                    case DATA_JEKLIK:
-                        return m_auiEncounter[1];
-                    case DATA_VENOXIS:
-                        return m_auiEncounter[2];
-                    case DATA_MARLI:
-                        return m_auiEncounter[3];
-                    case DATA_THEKAL:
-                        return m_auiEncounter[4];
-                    case DATA_LORKHAN:
-                        return m_auiEncounter[5];
-                    case DATA_ZATH:
-                        return m_auiEncounter[6];
-                    case DATA_OHGAN:
-                        return m_auiEncounter[7];
-                }
-                return 0;
+                return true;
             }
 
             uint64 GetData64(uint32 uiData) const
@@ -142,16 +103,59 @@ class instance_zulgurub : public InstanceMapScript
                 switch (uiData)
                 {
                     case DATA_LORKHAN:
-                        return m_uiLorKhanGUID;
+                        return LorKhanGUID;
                     case DATA_ZATH:
-                        return m_uiZathGUID;
+                        return ZathGUID;
                     case DATA_THEKAL:
-                        return m_uiThekalGUID;
+                        return ThekalGUID;
                     case DATA_JINDO:
-                        return m_uiJindoGUID;
+                        return JindoGUID;
                 }
                 return 0;
             }
+
+            std::string GetSaveData()
+            {
+                OUT_SAVE_INST_DATA;
+
+                std::ostringstream saveStream;
+                saveStream << "M C " << GetBossSaveData();
+
+                OUT_SAVE_INST_DATA_COMPLETE;
+                return saveStream.str();
+            }
+
+            void Load(const char* str)
+            {
+                if (!str)
+                {
+                    OUT_LOAD_INST_DATA_FAIL;
+                    return;
+                }
+
+                OUT_LOAD_INST_DATA(str);
+
+                char dataHead1, dataHead2;
+
+                std::istringstream loadStream(str);
+                loadStream >> dataHead1 >> dataHead2;
+
+                if (dataHead1 == 'M' && dataHead2 == 'C')
+                {
+                    for (uint32 i = 0; i < EncounterCount; ++i)
+                    {
+                        uint32 tmpState;
+                        loadStream >> tmpState;
+                        if (tmpState == IN_PROGRESS || tmpState > SPECIAL)
+                            tmpState = NOT_STARTED;
+                        SetBossState(i, EncounterState(tmpState));
+                    }
+                }
+                else
+                    OUT_LOAD_INST_DATA_FAIL;
+
+                OUT_LOAD_INST_DATA_COMPLETE;
+            }
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
index 22637315066..55bf0e50e3c 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
@@ -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
@@ -19,20 +18,32 @@
 #ifndef DEF_ZULGURUB_H
 #define DEF_ZULGURUB_H
 
+uint32 const EncounterCount = 13;
+
 enum DataTypes
 {
-    MAX_ENCOUNTERS          = 8,
+    DATA_JEKLIK             = 0,  // Main boss
+    DATA_VENOXIS            = 1,  // Main boss
+    DATA_MARLI              = 2,  // Main boss
+    DATA_ARLOKK             = 3,  // Main boss
+    DATA_HAKKAR             = 4,  // Main boss
+    DATA_MANDOKIR           = 5,  // Optional boss
+    DATA_JINDO              = 6,  // Optional boss
+    DATA_GAHZRANKA          = 7,  // Optional boss
+    DATA_EDGE_OF_MADNESS    = 8,  // Optional Event Edge of Madness - one of: Gri'lek, Renataki, Hazza'rah, or Wushoolay
+    DATA_THEKAL             = 9,  // ??
+    DATA_LORKHAN            = 10, // ??
+    DATA_ZATH               = 11, // ??
+    DATA_OHGAN              = 12  // ??
+};
 
-    DATA_ARLOKK             = 1,
-    DATA_JEKLIK             = 2,
-    DATA_VENOXIS            = 3,
-    DATA_MARLI              = 4,
-    DATA_OHGAN              = 5,
-    DATA_THEKAL             = 6,
-    DATA_ZATH               = 7,
-    DATA_LORKHAN            = 8,
-    DATA_JINDO              = 10,
+enum CreatureIds
+{
+    NPC_ZEALOT_LORKHAN      = 11347,
+    NPC_ZEALOT_ZATH         = 11348,
+    NPC_HIGH_PRIEST_THEKAL  = 14509,
+    NPC_JINDO_THE_HEXXER    = 11380,
+    NPC_NIGHTMARE_ILLUSION  = 15163
 };
 
 #endif
-