Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ItemHandler.cpp
	src/server/scripts/Spells/spell_dk.cpp

11 files changed, 762 insertions, 608 deletions

diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
index 4ac039e9138..3e4097daf20 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -24,64 +23,74 @@ enum Spells
     SPELL_FIREBLAST                                        = 15573
 };
 
-class boss_ambassador_flamelash : public CreatureScript
+enum Events
 {
-public:
-    boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_ambassador_flamelashAI(creature);
-    }
-
-    struct boss_ambassador_flamelashAI : public ScriptedAI
-    {
-        boss_ambassador_flamelashAI(Creature* creature) : ScriptedAI(creature) { }
+    EVENT_FIREBLAST                                        = 1,
+    EVENT_SUMMON_SPIRITS                                   = 2
+};
 
-        uint32 FireBlast_Timer;
-        uint32 Spirit_Timer;
+class boss_ambassador_flamelash : public CreatureScript
+{
+    public:
+        boss_ambassador_flamelash() : CreatureScript("boss_ambassador_flamelash") { }
 
-        void Reset() override
+        struct boss_ambassador_flamelashAI : public ScriptedAI
         {
-            FireBlast_Timer = 2000;
-            Spirit_Timer = 24000;
-        }
+            boss_ambassador_flamelashAI(Creature* creature) : ScriptedAI(creature) { }
 
-        void EnterCombat(Unit* /*who*/) override { }
-
-        void SummonSpirits(Unit* victim)
-        {
-            if (Creature* Spirit = DoSpawnCreature(9178, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000))
-                Spirit->AI()->AttackStart(victim);
-        }
+            void Reset() override
+            {
+                _events.Reset();
+            }
 
-        void UpdateAI(uint32 diff) override
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            void EnterCombat(Unit* /*who*/) override
+            {
+                _events.ScheduleEvent(EVENT_FIREBLAST, 2000);
+                _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 24000);
+            }
 
-            //FireBlast_Timer
-            if (FireBlast_Timer <= diff)
+            void SummonSpirit(Unit* victim)
             {
-                DoCastVictim(SPELL_FIREBLAST);
-                FireBlast_Timer = 7000;
-            } else FireBlast_Timer -= diff;
+                if (Creature* spirit = DoSpawnCreature(9178, frand(-9, 9), frand(-9, 9), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 60000))
+                    spirit->AI()->AttackStart(victim);
+            }
 
-            //Spirit_Timer
-            if (Spirit_Timer <= diff)
+            void UpdateAI(uint32 diff) override
             {
-                SummonSpirits(me->GetVictim());
-                SummonSpirits(me->GetVictim());
-                SummonSpirits(me->GetVictim());
-                SummonSpirits(me->GetVictim());
+                if (!UpdateVictim())
+                    return;
 
-                Spirit_Timer = 30000;
-            } else Spirit_Timer -= diff;
+                _events.Update(diff);
 
-            DoMeleeAttackIfReady();
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_FIREBLAST:
+                            DoCastVictim(SPELL_FIREBLAST);
+                            _events.ScheduleEvent(EVENT_FIREBLAST, 7000);
+                            break;
+                        case EVENT_SUMMON_SPIRITS:
+                            for (uint32 i = 0; i < 4; ++i)
+                                SummonSpirit(me->GetVictim());
+                            _events.ScheduleEvent(EVENT_SUMMON_SPIRITS, 30000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_ambassador_flamelashAI(creature);
         }
-    };
 };
 
 void AddSC_boss_ambassador_flamelash()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
index fd8b77ea8d4..1a2e8bba805 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -21,90 +20,94 @@
 
 enum Spells
 {
-    SPELL_SHADOWBOLT                                       = 17228,
-    SPELL_CURSEOFTONGUES                                   = 15470,
-    SPELL_CURSEOFWEAKNESS                                  = 17227,
-    SPELL_DEMONARMOR                                       = 11735,
-    SPELL_ENVELOPINGWEB                                    = 15471
+    SPELL_SHADOWBOLT                    = 17228,
+    SPELL_CURSEOFTONGUES                = 15470,
+    SPELL_CURSEOFWEAKNESS               = 17227,
+    SPELL_DEMONARMOR                    = 11735,
+    SPELL_ENVELOPINGWEB                 = 15471
 };
 
-class boss_anubshiah : public CreatureScript
+enum Events
 {
-public:
-    boss_anubshiah() : CreatureScript("boss_anubshiah") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_anubshiahAI(creature);
-    }
-
-    struct boss_anubshiahAI : public ScriptedAI
-    {
-        boss_anubshiahAI(Creature* creature) : ScriptedAI(creature) { }
-
-        uint32 ShadowBolt_Timer;
-        uint32 CurseOfTongues_Timer;
-        uint32 CurseOfWeakness_Timer;
-        uint32 DemonArmor_Timer;
-        uint32 EnvelopingWeb_Timer;
-
-        void Reset() override
-        {
-            ShadowBolt_Timer = 7000;
-            CurseOfTongues_Timer = 24000;
-            CurseOfWeakness_Timer = 12000;
-            DemonArmor_Timer = 3000;
-            EnvelopingWeb_Timer = 16000;
-        }
+    EVENT_SHADOWBOLT                    = 1,
+    EVENT_CURSE_OF_TONGUES              = 2,
+    EVENT_CURSE_OF_WEAKNESS             = 3,
+    EVENT_DEMON_ARMOR                   = 4,
+    EVENT_ENVELOPING_WEB                = 5
+};
 
-        void EnterCombat(Unit* /*who*/) override { }
+class boss_anubshiah : public CreatureScript
+{
+    public:
+        boss_anubshiah() : CreatureScript("boss_anubshiah") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_anubshiahAI : public ScriptedAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
-
-            //ShadowBolt_Timer
-            if (ShadowBolt_Timer <= diff)
-            {
-                DoCastVictim(SPELL_SHADOWBOLT);
-                ShadowBolt_Timer = 7000;
-            } else ShadowBolt_Timer -= diff;
-
-            //CurseOfTongues_Timer
-            if (CurseOfTongues_Timer <= diff)
-            {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_CURSEOFTONGUES);
-                CurseOfTongues_Timer = 18000;
-            } else CurseOfTongues_Timer -= diff;
+            boss_anubshiahAI(Creature* creature) : ScriptedAI(creature) { }
 
-            //CurseOfWeakness_Timer
-            if (CurseOfWeakness_Timer <= diff)
+            void Reset() override
             {
-                DoCastVictim(SPELL_CURSEOFWEAKNESS);
-                CurseOfWeakness_Timer = 45000;
-            } else CurseOfWeakness_Timer -= diff;
+                _events.Reset();
+            }
 
-            //DemonArmor_Timer
-            if (DemonArmor_Timer <= diff)
+            void EnterCombat(Unit* /*who*/) override 
             {
-                DoCast(me, SPELL_DEMONARMOR);
-                DemonArmor_Timer = 300000;
-            } else DemonArmor_Timer -= diff;
-
-            //EnvelopingWeb_Timer
-            if (EnvelopingWeb_Timer <= diff)
+                _events.ScheduleEvent(EVENT_SHADOWBOLT, 7000);
+                _events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 24000);
+                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 12000);
+                _events.ScheduleEvent(EVENT_DEMON_ARMOR, 3000);
+                _events.ScheduleEvent(EVENT_ENVELOPING_WEB, 16000);
+            }
+
+            void UpdateAI(uint32 diff) override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_ENVELOPINGWEB);
-                EnvelopingWeb_Timer = 12000;
-            } else EnvelopingWeb_Timer -= diff;
-
-            DoMeleeAttackIfReady();
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_SHADOWBOLT:
+                            DoCast(me, SPELL_SHADOWBOLT);
+                            _events.ScheduleEvent(EVENT_SHADOWBOLT, 7000);
+                            break;
+                        case EVENT_CURSE_OF_TONGUES:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
+                                DoCast(target, SPELL_CURSEOFTONGUES);
+                            _events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 18000);
+                            break;
+                        case EVENT_CURSE_OF_WEAKNESS:
+                            DoCastVictim(SPELL_CURSEOFWEAKNESS);
+                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45000);
+                            break;
+                        case EVENT_DEMON_ARMOR:
+                            DoCast(me, SPELL_DEMONARMOR);
+                            _events.ScheduleEvent(EVENT_DEMON_ARMOR, 300000);
+                            break;
+                        case EVENT_ENVELOPING_WEB:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
+                                DoCast(target, SPELL_ENVELOPINGWEB);
+                            _events.ScheduleEvent(EVENT_ENVELOPING_WEB, 12000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_anubshiahAI(creature);
         }
-    };
 };
 
 void AddSC_boss_anubshiah()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
index fffdf9c7514..cec29bcd4d1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -32,89 +31,89 @@ enum Spells
     SPELL_AVATAROFFLAME                                    = 15636
 };
 
-class boss_emperor_dagran_thaurissan : public CreatureScript
+enum Events
 {
-public:
-    boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetInstanceAI<boss_draganthaurissanAI>(creature);
-    }
-
-    struct boss_draganthaurissanAI : public ScriptedAI
-    {
-        boss_draganthaurissanAI(Creature* creature) : ScriptedAI(creature)
-        {
-            instance = me->GetInstanceScript();
-        }
-
-        InstanceScript* instance;
-        uint32 HandOfThaurissan_Timer;
-        uint32 AvatarOfFlame_Timer;
-        //uint32 Counter;
+    EVENT_HANDOFTHAURISSAN                                 = 1,
+    EVENT_AVATAROFFLAME                                    = 2
+};
 
-        void Reset() override
-        {
-            HandOfThaurissan_Timer = 4000;
-            AvatarOfFlame_Timer = 25000;
-            //Counter= 0;
-        }
+class boss_emperor_dagran_thaurissan : public CreatureScript
+{
+    public:
+        boss_emperor_dagran_thaurissan() : CreatureScript("boss_emperor_dagran_thaurissan") { }
 
-        void EnterCombat(Unit* /*who*/) override
+        struct boss_draganthaurissanAI : public ScriptedAI
         {
-            Talk(SAY_AGGRO);
-            me->CallForHelp(VISIBLE_RANGE);
-        }
+            boss_draganthaurissanAI(Creature* creature) : ScriptedAI(creature)
+            {
+                _instance = me->GetInstanceScript();
+            }
 
-        void KilledUnit(Unit* /*victim*/) override
-        {
-            Talk(SAY_SLAY);
-        }
+            void Reset() override
+            {
+                _events.Reset();
+            }
 
-        void JustDied(Unit* /*killer*/) override
-        {
-            if (Creature* Moira = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_MOIRA)))
+            void EnterCombat(Unit* /*who*/) override
             {
-                Moira->AI()->EnterEvadeMode();
-                Moira->setFaction(35);
+                Talk(SAY_AGGRO);
+                me->CallForHelp(VISIBLE_RANGE);
+                _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 4000);
+                _events.ScheduleEvent(EVENT_AVATAROFFLAME, 25000);
             }
-        }
 
-        void UpdateAI(uint32 diff) override
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            void KilledUnit(Unit* who) override
+            {
+                if (who->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_SLAY);
+            }
 
-            if (HandOfThaurissan_Timer <= diff)
+            void JustDied(Unit* /*killer*/) override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
-                    DoCast(target, SPELL_HANDOFTHAURISSAN);
-
-                //3 Hands of Thaurissan will be cast
-                //if (Counter < 3)
-                //{
-                //    HandOfThaurissan_Timer = 1000;
-                //    ++Counter;
-                //}
-                //else
-                //{
-                    HandOfThaurissan_Timer = 5000;
-                    //Counter = 0;
-                //}
-            } else HandOfThaurissan_Timer -= diff;
-
-            //AvatarOfFlame_Timer
-            if (AvatarOfFlame_Timer <= diff)
+                if (Creature* moira = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_MOIRA)))
+                {
+                    moira->AI()->EnterEvadeMode();
+                    moira->setFaction(35);
+                }
+            }
+
+            void UpdateAI(uint32 diff) override
             {
-                DoCastVictim(SPELL_AVATAROFFLAME);
-                AvatarOfFlame_Timer = 18000;
-            } else AvatarOfFlame_Timer -= diff;
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_HANDOFTHAURISSAN:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
+                                DoCast(target, SPELL_HANDOFTHAURISSAN);
+                            _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5000);
+                            break;
+                        case EVENT_AVATAROFFLAME:
+                            DoCastVictim(SPELL_AVATAROFFLAME);
+                            _events.ScheduleEvent(EVENT_AVATAROFFLAME, 18000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
+            }
+
+        private:
+            InstanceScript* _instance;
+            EventMap _events;
+        };
 
-            DoMeleeAttackIfReady();
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return GetInstanceAI<boss_draganthaurissanAI>(creature);
         }
-    };
 };
 
 void AddSC_boss_draganthaurissan()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
index 34ce2276a54..79ffedc8c17 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -26,101 +25,113 @@ enum Spells
     SPELL_CLEAVE                                           = 20691
 };
 
-class boss_general_angerforge : public CreatureScript
+enum Events
 {
-public:
-    boss_general_angerforge() : CreatureScript("boss_general_angerforge") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_general_angerforgeAI(creature);
-    }
-
-    struct boss_general_angerforgeAI : public ScriptedAI
-    {
-        boss_general_angerforgeAI(Creature* creature) : ScriptedAI(creature) { }
-
-        uint32 MightyBlow_Timer;
-        uint32 HamString_Timer;
-        uint32 Cleave_Timer;
-        uint32 Adds_Timer;
-        bool Medics;
-
-        void Reset() override
-        {
-            MightyBlow_Timer = 8000;
-            HamString_Timer = 12000;
-            Cleave_Timer = 16000;
-            Adds_Timer = 0;
-            Medics = false;
-        }
-
-        void EnterCombat(Unit* /*who*/) override { }
+    EVENT_MIGHTYBLOW                                       = 1,
+    EVENT_HAMSTRING                                        = 2,
+    EVENT_CLEAVE                                           = 3,
+    EVENT_MEDIC                                            = 4,
+    EVENT_ADDS                                             = 5
+};
 
-        void SummonAdds(Unit* victim)
-        {
-            if (Creature* SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
-                SummonedAdd->AI()->AttackStart(victim);
-        }
+enum Phases
+{
+    PHASE_ONE                                              = 1,
+    PHASE_TWO                                              = 2
+};
 
-        void SummonMedics(Unit* victim)
-        {
-            if (Creature* SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
-                SummonedMedic->AI()->AttackStart(victim);
-        }
+class boss_general_angerforge : public CreatureScript
+{
+    public:
+        boss_general_angerforge() : CreatureScript("boss_general_angerforge") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_general_angerforgeAI : public ScriptedAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            boss_general_angerforgeAI(Creature* creature) : ScriptedAI(creature) { }
 
-            //MightyBlow_Timer
-            if (MightyBlow_Timer <= diff)
+            void Reset() override
             {
-                DoCastVictim(SPELL_MIGHTYBLOW);
-                MightyBlow_Timer = 18000;
-            } else MightyBlow_Timer -= diff;
+                _events.Reset();
+            }
 
-            //HamString_Timer
-            if (HamString_Timer <= diff)
+            void EnterCombat(Unit* /*who*/) override 
             {
-                DoCastVictim(SPELL_HAMSTRING);
-                HamString_Timer = 15000;
-            } else HamString_Timer -= diff;
+                _events.SetPhase(PHASE_ONE);
+                _events.ScheduleEvent(EVENT_MIGHTYBLOW, 8000);
+                _events.ScheduleEvent(EVENT_HAMSTRING, 12000);
+                _events.ScheduleEvent(EVENT_CLEAVE, 16000);
+            }
 
-            //Cleave_Timer
-            if (Cleave_Timer <= diff)
+            void DamageTaken(Unit* /*attacker*/, uint32& damage) override
             {
-                DoCastVictim(SPELL_CLEAVE);
-                Cleave_Timer = 9000;
-            } else Cleave_Timer -= diff;
+                if (me->HealthBelowPctDamaged(20, damage) && _events.IsInPhase(PHASE_ONE))
+                {
+                    _events.SetPhase(PHASE_TWO);
+                    _events.ScheduleEvent(EVENT_MEDIC, 0, 0, PHASE_TWO);
+                    _events.ScheduleEvent(EVENT_ADDS, 0, 0, PHASE_TWO);
+                }
+            }
 
-            //Adds_Timer
-            if (HealthBelowPct(21))
+            void SummonAdd(Unit* victim)
             {
-                if (Adds_Timer <= diff)
-                {
-                    // summon 3 Adds every 25s
-                    SummonAdds(me->GetVictim());
-                    SummonAdds(me->GetVictim());
-                    SummonAdds(me->GetVictim());
+                if (Creature* SummonedAdd = DoSpawnCreature(8901, float(irand(-14, 14)), float(irand(-14, 14)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
+                    SummonedAdd->AI()->AttackStart(victim);
+            }
 
-                    Adds_Timer = 25000;
-                } else Adds_Timer -= diff;
+            void SummonMedic(Unit* victim)
+            {
+                if (Creature* SummonedMedic = DoSpawnCreature(8894, float(irand(-9, 9)), float(irand(-9, 9)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 120000))
+                    SummonedMedic->AI()->AttackStart(victim);
             }
 
-            //Summon Medics
-            if (!Medics && HealthBelowPct(21))
+            void UpdateAI(uint32 diff) override
             {
-                SummonMedics(me->GetVictim());
-                SummonMedics(me->GetVictim());
-                Medics = true;
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_MIGHTYBLOW:
+                            DoCastVictim(SPELL_MIGHTYBLOW);
+                            _events.ScheduleEvent(EVENT_MIGHTYBLOW, 18000);
+                            break;
+                        case EVENT_HAMSTRING:
+                            DoCastVictim(SPELL_HAMSTRING);
+                            _events.ScheduleEvent(EVENT_HAMSTRING, 15000);
+                            break;
+                        case EVENT_CLEAVE:
+                            DoCastVictim(SPELL_CLEAVE);
+                            _events.ScheduleEvent(EVENT_CLEAVE, 9000);
+                            break;
+                        case EVENT_MEDIC:
+                            for (uint8 i = 0; i < 2; ++i)
+                                SummonMedic(me->GetVictim());
+                            break;
+                        case EVENT_ADDS:
+                            for (uint8 i = 0; i < 3; ++i)
+                                SummonAdd(me->GetVictim());
+                            _events.ScheduleEvent(EVENT_ADDS, 25000, 0, PHASE_TWO);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
             }
 
-            DoMeleeAttackIfReady();
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_general_angerforgeAI(creature);
         }
-    };
 };
 
 void AddSC_boss_general_angerforge()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
index b5998576f24..e9034e17d83 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -25,56 +24,67 @@ enum Spells
     SPELL_MORTALSTRIKE                                     = 24573
 };
 
+enum Events
+{
+    EVENT_WHIRLWIND                                        = 1,
+    EVENT_MORTALSTRIKE                                     = 2
+};
+
 class boss_gorosh_the_dervish : public CreatureScript
 {
-public:
-    boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { }
+    public:
+        boss_gorosh_the_dervish() : CreatureScript("boss_gorosh_the_dervish") { }
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_gorosh_the_dervishAI(creature);
-    }
+        struct boss_gorosh_the_dervishAI : public ScriptedAI
+        {
+            boss_gorosh_the_dervishAI(Creature* creature) : ScriptedAI(creature) { }
 
-    struct boss_gorosh_the_dervishAI : public ScriptedAI
-    {
-        boss_gorosh_the_dervishAI(Creature* creature) : ScriptedAI(creature) { }
+            void Reset() override
+            {
+                _events.Reset();
+            }
 
-        uint32 WhirlWind_Timer;
-        uint32 MortalStrike_Timer;
+            void EnterCombat(Unit* /*who*/) override
+            {
+                _events.ScheduleEvent(EVENT_WHIRLWIND, 12000);
+                _events.ScheduleEvent(EVENT_MORTALSTRIKE, 22000);
+            }
 
-        void Reset() override
-        {
-            WhirlWind_Timer = 12000;
-            MortalStrike_Timer = 22000;
-        }
+            void UpdateAI(uint32 diff) override
+            {
+                if (!UpdateVictim())
+                    return;
 
-        void EnterCombat(Unit* /*who*/) override
-        {
-        }
+                _events.Update(diff);
 
-        void UpdateAI(uint32 diff) override
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_WHIRLWIND:
+                            DoCast(me, SPELL_WHIRLWIND);
+                            _events.ScheduleEvent(EVENT_WHIRLWIND, 15000);
+                            break;
+                        case EVENT_MORTALSTRIKE:
+                            DoCastVictim(SPELL_MORTALSTRIKE);
+                            _events.ScheduleEvent(EVENT_MORTALSTRIKE, 15000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
-            //WhirlWind_Timer
-            if (WhirlWind_Timer <= diff)
-            {
-                DoCast(me, SPELL_WHIRLWIND);
-                WhirlWind_Timer = 15000;
-            } else WhirlWind_Timer -= diff;
+                DoMeleeAttackIfReady();
+            }
 
-            //MortalStrike_Timer
-            if (MortalStrike_Timer <= diff)
-            {
-                DoCastVictim(SPELL_MORTALSTRIKE);
-                MortalStrike_Timer = 15000;
-            } else MortalStrike_Timer -= diff;
+        private:
+            EventMap _events;
+        };
 
-            DoMeleeAttackIfReady();
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_gorosh_the_dervishAI(creature);
         }
-    };
 };
 
 void AddSC_boss_gorosh_the_dervish()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
index c4277c2447e..f46c0c118b1 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -26,59 +25,83 @@ enum Grizzle
     EMOTE_FRENZY_KILL       = 0
 };
 
-class boss_grizzle : public CreatureScript
+enum Events
 {
-public:
-    boss_grizzle() : CreatureScript("boss_grizzle") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_grizzleAI(creature);
-    }
+    EVENT_GROUNDTREMOR      = 1,
+    EVENT_FRENZY            = 2
+};
 
-    struct boss_grizzleAI : public ScriptedAI
-    {
-        boss_grizzleAI(Creature* creature) : ScriptedAI(creature) { }
+enum Phases
+{
+    PHASE_ONE               = 1,
+    PHASE_TWO               = 2
+};
 
-        uint32 GroundTremor_Timer;
-        uint32 Frenzy_Timer;
+class boss_grizzle : public CreatureScript
+{
+    public:
+        boss_grizzle() : CreatureScript("boss_grizzle") { }
 
-        void Reset() override
+        struct boss_grizzleAI : public ScriptedAI
         {
-            GroundTremor_Timer = 12000;
-            Frenzy_Timer =0;
-        }
+            boss_grizzleAI(Creature* creature) : ScriptedAI(creature) { }
 
-        void EnterCombat(Unit* /*who*/) override { }
+            void Reset() override
+            {
+                _events.Reset();
+            }
 
-        void UpdateAI(uint32 diff) override
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            void EnterCombat(Unit* /*who*/) override 
+            {
+                _events.SetPhase(PHASE_ONE);
+                _events.ScheduleEvent(EVENT_GROUNDTREMOR, 12000);
+            }
 
-            //GroundTremor_Timer
-            if (GroundTremor_Timer <= diff)
+            void DamageTaken(Unit* /*attacker*/, uint32& damage) override
             {
-                DoCastVictim(SPELL_GROUNDTREMOR);
-                GroundTremor_Timer = 8000;
-            } else GroundTremor_Timer -= diff;
+                if (me->HealthBelowPctDamaged(50, damage) && _events.IsInPhase(PHASE_ONE))
+                {
+                    _events.SetPhase(PHASE_TWO);
+                    _events.ScheduleEvent(EVENT_FRENZY, 0, 0, PHASE_TWO);
+                }
+            }
 
-            //Frenzy_Timer
-            if (HealthBelowPct(51))
+            void UpdateAI(uint32 diff) override
             {
-                if (Frenzy_Timer <= diff)
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
                 {
-                    DoCast(me, SPELL_FRENZY);
-                    Talk(EMOTE_FRENZY_KILL);
+                    switch (eventId)
+                    {
+                        case EVENT_GROUNDTREMOR:
+                            DoCastVictim(SPELL_GROUNDTREMOR);
+                            _events.ScheduleEvent(EVENT_GROUNDTREMOR, 8000);
+                            break;
+                        case EVENT_FRENZY:
+                           DoCast(me, SPELL_FRENZY);
+                           Talk(EMOTE_FRENZY_KILL);
+                            _events.ScheduleEvent(EVENT_FRENZY, 15000, 0, PHASE_TWO);
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
-                    Frenzy_Timer = 15000;
-                } else Frenzy_Timer -= diff;
+                DoMeleeAttackIfReady();
             }
 
-            DoMeleeAttackIfReady();
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_grizzleAI(creature);
         }
-    };
 };
 
 void AddSC_boss_grizzle()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
index 6aa89aa491d..7105d78f2ee 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -27,74 +26,81 @@ enum Spells
     SPELL_SHADOWSHIELD                                     = 22417
 };
 
-class boss_high_interrogator_gerstahn : public CreatureScript
+enum Events
 {
-public:
-    boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_high_interrogator_gerstahnAI(creature);
-    }
-
-    struct boss_high_interrogator_gerstahnAI : public ScriptedAI
-    {
-        boss_high_interrogator_gerstahnAI(Creature* creature) : ScriptedAI(creature) { }
-
-        uint32 ShadowWordPain_Timer;
-        uint32 ManaBurn_Timer;
-        uint32 PsychicScream_Timer;
-        uint32 ShadowShield_Timer;
-
-        void Reset() override
-        {
-            ShadowWordPain_Timer = 4000;
-            ManaBurn_Timer = 14000;
-            PsychicScream_Timer = 32000;
-            ShadowShield_Timer = 8000;
-        }
+    EVENT_SHADOW_WORD_PAIN                                 = 1,
+    EVENT_MANABURN                                         = 2,
+    EVENT_PSYCHIC_SCREAM                                   = 3,
+    EVENT_SHADOWSHIELD                                     = 4
+};
 
-        void EnterCombat(Unit* /*who*/) override { }
+class boss_high_interrogator_gerstahn : public CreatureScript
+{
+    public:
+        boss_high_interrogator_gerstahn() : CreatureScript("boss_high_interrogator_gerstahn") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_high_interrogator_gerstahnAI : public ScriptedAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            boss_high_interrogator_gerstahnAI(Creature* creature) : ScriptedAI(creature) { }
 
-            //ShadowWordPain_Timer
-            if (ShadowWordPain_Timer <= diff)
+            void Reset() override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_SHADOWWORDPAIN);
-                ShadowWordPain_Timer = 7000;
-            } else ShadowWordPain_Timer -= diff;
+                _events.Reset();
+            }
 
-            //ManaBurn_Timer
-            if (ManaBurn_Timer <= diff)
+            void EnterCombat(Unit* /*who*/) override 
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_MANABURN);
-                ManaBurn_Timer = 10000;
-            } else ManaBurn_Timer -= diff;
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 4000);
+                _events.ScheduleEvent(EVENT_MANABURN, 14000);
+                _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 32000);
+                _events.ScheduleEvent(EVENT_SHADOWSHIELD, 8000);
+            }
 
-            //PsychicScream_Timer
-            if (PsychicScream_Timer <= diff)
+            void UpdateAI(uint32 diff) override
             {
-                DoCastVictim(SPELL_PSYCHICSCREAM);
-                PsychicScream_Timer = 30000;
-            } else PsychicScream_Timer -= diff;
+                if (!UpdateVictim())
+                    return;
 
-            //ShadowShield_Timer
-            if (ShadowShield_Timer <= diff)
-            {
-                DoCast(me, SPELL_SHADOWSHIELD);
-                ShadowShield_Timer = 25000;
-            } else ShadowShield_Timer -= diff;
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_SHADOW_WORD_PAIN:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
+                                DoCast(target, SPELL_SHADOWWORDPAIN);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7000);
+                            break;
+                        case EVENT_PSYCHIC_SCREAM:
+                            DoCastVictim(SPELL_PSYCHICSCREAM);
+                            _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30000);
+                            break;
+                        case EVENT_MANABURN:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
+                                DoCast(target, SPELL_MANABURN);
+                            _events.ScheduleEvent(EVENT_MANABURN, 10000);
+                            break;
+                        case EVENT_SHADOWSHIELD:
+                            DoCast(me, SPELL_SHADOWSHIELD);
+                            _events.ScheduleEvent(EVENT_SHADOWSHIELD, 25000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
 
-            DoMeleeAttackIfReady();
+                DoMeleeAttackIfReady();
+            }
+
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_high_interrogator_gerstahnAI(creature);
         }
-    };
 };
 
 void AddSC_boss_high_interrogator_gerstahn()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
index 4cf968ad3b7..efc9a6e793b 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -18,75 +17,96 @@
 
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
+#include "blackrock_depths.h"
 
 enum Spells
 {
-    SPELL_FIERYBURST                                       = 13900,
-    SPELL_WARSTOMP                                         = 24375
+    SPELL_FIERYBURST        = 13900,
+    SPELL_WARSTOMP          = 24375
 };
 
-enum Misc
+enum Events
 {
-    DATA_THRONE_DOOR                                       = 24 // not id or guid of doors but number of enum in blackrock_depths.h
+    EVENT_FIERY_BURST       = 1,
+    EVENT_WARSTOMP          = 2
 };
 
-class boss_magmus : public CreatureScript
+enum Phases
 {
-public:
-    boss_magmus() : CreatureScript("boss_magmus") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_magmusAI(creature);
-    }
-
-    struct boss_magmusAI : public ScriptedAI
-    {
-        boss_magmusAI(Creature* creature) : ScriptedAI(creature) { }
+    PHASE_ONE               = 1,
+    PHASE_TWO               = 2
+};
 
-        uint32 FieryBurst_Timer;
-        uint32 WarStomp_Timer;
+class boss_magmus : public CreatureScript
+{
+    public:
+        boss_magmus() : CreatureScript("boss_magmus") { }
 
-        void Reset() override
+        struct boss_magmusAI : public ScriptedAI
         {
-            FieryBurst_Timer = 5000;
-            WarStomp_Timer =0;
-        }
+            boss_magmusAI(Creature* creature) : ScriptedAI(creature) { }
 
-        void EnterCombat(Unit* /*who*/) override { }
+            void Reset() override
+            {
+                _events.Reset();
+            }
 
-        void UpdateAI(uint32 diff) override
-        {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            void EnterCombat(Unit* /*who*/) override 
+            {
+                _events.SetPhase(PHASE_ONE);
+                _events.ScheduleEvent(EVENT_FIERY_BURST, 5000);
+            }
 
-            //FieryBurst_Timer
-            if (FieryBurst_Timer <= diff)
+            void DamageTaken(Unit* /*attacker*/, uint32& damage) override
             {
-                DoCastVictim(SPELL_FIERYBURST);
-                FieryBurst_Timer = 6000;
-            } else FieryBurst_Timer -= diff;
+                if (me->HealthBelowPctDamaged(50, damage) && _events.IsInPhase(PHASE_ONE))
+                {
+                    _events.SetPhase(PHASE_TWO);
+                    _events.ScheduleEvent(EVENT_WARSTOMP, 0, 0, PHASE_TWO);
+                }
+            }
 
-            //WarStomp_Timer
-            if (HealthBelowPct(51))
+            void UpdateAI(uint32 diff) override
             {
-                if (WarStomp_Timer <= diff)
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
                 {
-                    DoCastVictim(SPELL_WARSTOMP);
-                    WarStomp_Timer = 8000;
-                } else WarStomp_Timer -= diff;
+                    switch (eventId)
+                    {
+                        case EVENT_FIERY_BURST:
+                            DoCastVictim(SPELL_FIERYBURST);
+                            _events.ScheduleEvent(EVENT_FIERY_BURST, 6000);
+                            break;
+                        case EVENT_WARSTOMP:
+                            DoCastVictim(SPELL_WARSTOMP);
+                            _events.ScheduleEvent(EVENT_WARSTOMP, 8000, 0, PHASE_TWO);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
             }
 
-            DoMeleeAttackIfReady();
-        }
-        // When he die open door to last chamber
-        void JustDied(Unit* killer) override
+            void JustDied(Unit* /*killer*/) override
+            {
+                if (InstanceScript* instance = me->GetInstanceScript())
+                    instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true);
+            }
+
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
         {
-            if (InstanceScript* instance = killer->GetInstanceScript())
-                instance->HandleGameObject(instance->GetData64(DATA_THRONE_DOOR), true);
+            return new boss_magmusAI(creature);
         }
-    };
 };
 
 void AddSC_boss_magmus()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
index 98f5f75ae3f..0c36fe9696d 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp
@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2008-2014 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
@@ -29,63 +28,73 @@ enum Spells
     SPELL_SMITE                                            = 10934
 };
 
-class boss_moira_bronzebeard : public CreatureScript
+enum Events
 {
-public:
-    boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new boss_moira_bronzebeardAI(creature);
-    }
-
-    struct boss_moira_bronzebeardAI : public ScriptedAI
-    {
-        boss_moira_bronzebeardAI(Creature* creature) : ScriptedAI(creature) { }
-
-        uint32 Heal_Timer;
-        uint32 MindBlast_Timer;
-        uint32 ShadowWordPain_Timer;
-        uint32 Smite_Timer;
-
-        void Reset() override
-        {
-            Heal_Timer = 12000;                                 //These times are probably wrong
-            MindBlast_Timer = 16000;
-            ShadowWordPain_Timer = 2000;
-            Smite_Timer = 8000;
-        }
+    EVENT_MINDBLAST                                        = 1,
+    EVENT_SHADOW_WORD_PAIN                                 = 2,
+    EVENT_SMITE                                            = 3,
+    EVENT_HEAL                                             = 4  // not used atm
+};
 
-        void EnterCombat(Unit* /*who*/) override { }
+class boss_moira_bronzebeard : public CreatureScript
+{
+    public:
+        boss_moira_bronzebeard() : CreatureScript("boss_moira_bronzebeard") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_moira_bronzebeardAI : public ScriptedAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            boss_moira_bronzebeardAI(Creature* creature) : ScriptedAI(creature) { }
 
-            //MindBlast_Timer
-            if (MindBlast_Timer <= diff)
+            void Reset() override
             {
-                DoCastVictim(SPELL_MINDBLAST);
-                MindBlast_Timer = 14000;
-            } else MindBlast_Timer -= diff;
+                _events.Reset();
+            }
 
-            //ShadowWordPain_Timer
-            if (ShadowWordPain_Timer <= diff)
+            void EnterCombat(Unit* /*who*/) override 
             {
-                DoCastVictim(SPELL_SHADOWWORDPAIN);
-                ShadowWordPain_Timer = 18000;
-            } else ShadowWordPain_Timer -= diff;
+                //_events.ScheduleEvent(EVENT_HEAL, 12000); // not used atm // These times are probably wrong
+                _events.ScheduleEvent(EVENT_MINDBLAST, 16000);
+                _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 2000);
+                _events.ScheduleEvent(EVENT_SMITE, 8000);
+            }
 
-            //Smite_Timer
-            if (Smite_Timer <= diff)
+            void UpdateAI(uint32 diff) override
             {
-                DoCastVictim(SPELL_SMITE);
-                Smite_Timer = 10000;
-            } else Smite_Timer -= diff;
+                if (!UpdateVictim())
+                    return;
+
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_MINDBLAST:
+                            DoCastVictim(SPELL_MINDBLAST);
+                            _events.ScheduleEvent(EVENT_MINDBLAST, 14000);
+                            break;
+                        case EVENT_SHADOW_WORD_PAIN:
+                            DoCastVictim(SPELL_SHADOWWORDPAIN);
+                            _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18000);
+                            break;
+                        case EVENT_SMITE:
+                            DoCastVictim(SPELL_SMITE);
+                            _events.ScheduleEvent(EVENT_SMITE, 10000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+            }
+
+        private:
+            EventMap _events;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return new boss_moira_bronzebeardAI(creature);
         }
-    };
 };
 
 void AddSC_boss_moira_bronzebeard()
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
index cbcafa32a89..83464c12230 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp
@@ -24,18 +24,24 @@
 
 enum Spells
 {
-    SPELL_SMELT_DARK_IRON                         = 14891,
-    SPELL_LEARN_SMELT                             = 14894,
+    SPELL_SMELT_DARK_IRON       = 14891,
+    SPELL_LEARN_SMELT           = 14894,
 };
 
 enum Quests
 {
-    QUEST_SPECTRAL_CHALICE                        = 4083
+    QUEST_SPECTRAL_CHALICE      = 4083
 };
 
 enum Misc
 {
-    DATA_SKILLPOINT_MIN                           = 230
+    DATA_SKILLPOINT_MIN         = 230
+};
+
+enum Phases
+{
+    PHASE_ONE                   = 1,
+    PHASE_TWO                   = 2
 };
 
 #define GOSSIP_ITEM_TEACH_1 "Teach me the art of smelting dark iron"
@@ -99,149 +105,151 @@ enum DoomrelSpells
     SPELL_SUMMON_VOIDWALKERS                               = 15092
 };
 
+enum DoomrelEvents
+{
+    EVENT_SHADOW_BOLT_VOLLEY                               = 1,
+    EVENT_IMMOLATE                                         = 2,
+    EVENT_CURSE_OF_WEAKNESS                                = 3,
+    EVENT_DEMONARMOR                                       = 4,
+    EVENT_SUMMON_VOIDWALKERS                               = 5
+};
+
 #define GOSSIP_ITEM_CHALLENGE   "Your bondage is at an end, Doom'rel. I challenge you!"
 #define GOSSIP_SELECT_DOOMREL   "[PH] Continue..."
 
 class boss_doomrel : public CreatureScript
 {
-public:
-    boss_doomrel() : CreatureScript("boss_doomrel") { }
+    public:
+        boss_doomrel() : CreatureScript("boss_doomrel") { }
 
-    bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
-    {
-        player->PlayerTalkClass->ClearMenus();
-        switch (action)
+        bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) override
         {
-            case GOSSIP_ACTION_INFO_DEF+1:
-                player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
-                player->SEND_GOSSIP_MENU(2605, creature->GetGUID());
-                break;
-            case GOSSIP_ACTION_INFO_DEF+2:
-                player->CLOSE_GOSSIP_MENU();
-                //start event here
-                creature->setFaction(FACTION_HOSTILE);
-                creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
-                creature->AI()->AttackStart(player);
-                InstanceScript* instance = creature->GetInstanceScript();
-                if (instance)
-                    instance->SetData64(DATA_EVENSTARTER, player->GetGUID());
-                break;
+            player->PlayerTalkClass->ClearMenus();
+            switch (action)
+            {
+                case GOSSIP_ACTION_INFO_DEF+1:
+                    player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_SELECT_DOOMREL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+                    player->SEND_GOSSIP_MENU(2605, creature->GetGUID());
+                    break;
+                case GOSSIP_ACTION_INFO_DEF+2:
+                    player->CLOSE_GOSSIP_MENU();
+                    //start event here
+                    creature->setFaction(FACTION_HOSTILE);
+                    creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+                    creature->AI()->AttackStart(player);
+                    InstanceScript* instance = creature->GetInstanceScript();
+                    if (instance)
+                        instance->SetData64(DATA_EVENSTARTER, player->GetGUID());
+                    break;
+            }
+            return true;
         }
-        return true;
-    }
-
-    bool OnGossipHello(Player* player, Creature* creature) override
-    {
-        player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
-        player->SEND_GOSSIP_MENU(2601, creature->GetGUID());
 
-        return true;
-    }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetInstanceAI<boss_doomrelAI>(creature);
-    }
-
-    struct boss_doomrelAI : public ScriptedAI
-    {
-        boss_doomrelAI(Creature* creature) : ScriptedAI(creature)
+        bool OnGossipHello(Player* player, Creature* creature) override
         {
-            instance = creature->GetInstanceScript();
-        }
+            player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_CHALLENGE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            player->SEND_GOSSIP_MENU(2601, creature->GetGUID());
 
-        InstanceScript* instance;
-        uint32 ShadowVolley_Timer;
-        uint32 Immolate_Timer;
-        uint32 CurseOfWeakness_Timer;
-        uint32 DemonArmor_Timer;
-        bool Voidwalkers;
+            return true;
+        }
 
-        void Reset() override
+        struct boss_doomrelAI : public ScriptedAI
         {
-            ShadowVolley_Timer = 10000;
-            Immolate_Timer = 18000;
-            CurseOfWeakness_Timer = 5000;
-            DemonArmor_Timer = 16000;
-            Voidwalkers = false;
+            boss_doomrelAI(Creature* creature) : ScriptedAI(creature)
+            {
+                _instance = creature->GetInstanceScript();
+            }
 
-            me->setFaction(FACTION_FRIEND);
+            void Reset() override
+            {
+                _voidwalkers = false;
 
-            // was set before event start, so set again
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+                me->setFaction(FACTION_FRIEND);
 
-            if (instance->GetData(DATA_GHOSTKILL) >= 7)
-                me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
-            else
-                me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
-        }
+                // was set before event start, so set again
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
 
-        void EnterCombat(Unit* /*who*/) override
-        {
-        }
-
-        void EnterEvadeMode() override
-        {
-            me->RemoveAllAuras();
-            me->DeleteThreatList();
-            me->CombatStop(true);
-            me->LoadCreaturesAddon();
-            if (me->IsAlive())
-                me->GetMotionMaster()->MoveTargetedHome();
-            me->SetLootRecipient(NULL);
-            instance->SetData64(DATA_EVENSTARTER, 0);
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            instance->SetData(DATA_GHOSTKILL, 1);
-        }
+                if (_instance->GetData(DATA_GHOSTKILL) >= 7)
+                    me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                else
+                    me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
+            }
 
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
+            void EnterCombat(Unit* /*who*/) override
+            {
+                _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 10000);
+                _events.ScheduleEvent(EVENT_IMMOLATE, 18000);
+                _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 5000);
+                _events.ScheduleEvent(EVENT_DEMONARMOR, 16000);
+            }
 
-            //ShadowVolley_Timer
-            if (ShadowVolley_Timer <= diff)
+            void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) override
             {
-                DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
-                ShadowVolley_Timer = 12000;
-            } else ShadowVolley_Timer -= diff;
+                if (!_voidwalkers && !HealthAbovePct(50))
+                {
+                    DoCastVictim(SPELL_SUMMON_VOIDWALKERS, true);
+                    _voidwalkers = true;
+                }
+            }
 
-            //Immolate_Timer
-            if (Immolate_Timer <= diff)
+            void EnterEvadeMode() override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_IMMOLATE);
+                ScriptedAI::EnterEvadeMode();
 
-                Immolate_Timer = 25000;
-            } else Immolate_Timer -= diff;
+                _instance->SetData64(DATA_EVENSTARTER, 0);
+            }
 
-            //CurseOfWeakness_Timer
-            if (CurseOfWeakness_Timer <= diff)
+            void JustDied(Unit* /*killer*/) override
             {
-                DoCastVictim(SPELL_CURSEOFWEAKNESS);
-                CurseOfWeakness_Timer = 45000;
-            } else CurseOfWeakness_Timer -= diff;
+                _instance->SetData(DATA_GHOSTKILL, 1);
+            }
 
-            //DemonArmor_Timer
-            if (DemonArmor_Timer <= diff)
+            void UpdateAI(uint32 diff) override
             {
-                DoCast(me, SPELL_DEMONARMOR);
-                DemonArmor_Timer = 300000;
-            } else DemonArmor_Timer -= diff;
+                if (!UpdateVictim())
+                    return;
 
-            //Summon Voidwalkers
-            if (!Voidwalkers && HealthBelowPct(51))
-            {
-                DoCastVictim(SPELL_SUMMON_VOIDWALKERS, true);
-                Voidwalkers = true;
+                _events.Update(diff);
+
+                while (uint32 eventId = _events.ExecuteEvent())
+                {
+                    switch (eventId)
+                    {
+                        case EVENT_SHADOW_BOLT_VOLLEY:
+                            DoCastVictim(SPELL_SHADOWBOLTVOLLEY);
+                            _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12000);
+                            break;
+                        case EVENT_IMMOLATE:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
+                                DoCast(target, SPELL_IMMOLATE);
+                            _events.ScheduleEvent(EVENT_IMMOLATE, 25000);
+                            break;
+                        case EVENT_CURSE_OF_WEAKNESS:
+                            DoCastVictim(SPELL_CURSEOFWEAKNESS);
+                            _events.ScheduleEvent(EVENT_CURSE_OF_WEAKNESS, 45000);
+                            break;
+                        case EVENT_DEMONARMOR:
+                            DoCast(me, SPELL_DEMONARMOR);
+                            _events.ScheduleEvent(EVENT_DEMONARMOR, 300000);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                DoMeleeAttackIfReady();
             }
 
-            DoMeleeAttackIfReady();
+        private:
+            InstanceScript* _instance;
+            EventMap _events;
+            bool _voidwalkers;
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return GetInstanceAI<boss_doomrelAI>(creature);
         }
-    };
 };
 
 void AddSC_boss_tomb_of_seven()
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp
index e6857659d2e..321c3d67dc5 100644
--- a/src/server/scripts/World/npcs_special.cpp
+++ b/src/server/scripts/World/npcs_special.cpp
@@ -56,6 +56,7 @@ EndContentData */
 #include "CellImpl.h"
 #include "SpellAuras.h"
 #include "Pet.h"
+#include "CreatureTextMgr.h"
 
 /*########
 # npc_air_force_bots
@@ -2351,6 +2352,60 @@ public:
     };
 };
 
+class npc_imp_in_a_ball : public CreatureScript
+{
+private:
+    enum
+    {
+        SAY_RANDOM,
+
+        EVENT_TALK = 1,
+    };
+
+public:
+    npc_imp_in_a_ball() : CreatureScript("npc_imp_in_a_ball") { }
+
+    struct npc_imp_in_a_ballAI : public ScriptedAI
+    {
+        npc_imp_in_a_ballAI(Creature* creature) : ScriptedAI(creature)
+        {
+            summonerGUID = 0;
+        }
+
+        void IsSummonedBy(Unit* summoner) override
+        {
+            if (summoner->GetTypeId() == TYPEID_PLAYER)
+            {
+                summonerGUID = summoner->GetGUID();
+                events.ScheduleEvent(EVENT_TALK, 3000);
+            }
+        }
+
+        void UpdateAI(uint32 diff) override
+        {
+            events.Update(diff);
+
+            if (events.ExecuteEvent() == EVENT_TALK)
+            {
+                if (Player* owner = ObjectAccessor::GetPlayer(*me, summonerGUID))
+                {
+                    sCreatureTextMgr->SendChat(me, SAY_RANDOM, owner,
+                        owner->GetGroup() ? CHAT_MSG_MONSTER_PARTY : CHAT_MSG_MONSTER_WHISPER, LANG_ADDON, TEXT_RANGE_NORMAL);
+                }
+            }
+        }
+
+    private:
+        EventMap events;
+        uint64 summonerGUID;
+    };
+
+    CreatureAI* GetAI(Creature* creature) const override
+    {
+        return new npc_imp_in_a_ballAI(creature);
+    }
+};
+
 void AddSC_npcs_special()
 {
     new npc_air_force_bots();
@@ -2373,4 +2428,5 @@ void AddSC_npcs_special()
     new npc_experience();
     new npc_firework();
     new npc_spring_rabbit();
+    new npc_imp_in_a_ball();
 }