Merge pull request #12082 from MitchesD/misc_2

Scripts/Krystallus: converted to EventMap, removed useless code

1 files changed, 85 insertions, 127 deletions

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
index c81cd0b0b80..07cdfa3353c 100644
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp
@@ -15,14 +15,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Script Data Start
-SDName: Boss krystallus
-SDAuthor: LordVanMartin
-SD%Complete:
-SDComment:
-SDCategory:
-Script Data End */
-
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
@@ -30,17 +22,13 @@ Script Data End */
 
 enum Spells
 {
-    SPELL_BOULDER_TOSS                             = 50843,
-    H_SPELL_BOULDER_TOSS                           = 59742,
-    SPELL_GROUND_SPIKE                             = 59750,
-    SPELL_GROUND_SLAM                              = 50827,
-    SPELL_SHATTER                                  = 50810,
-    H_SPELL_SHATTER                                = 61546,
-    SPELL_SHATTER_EFFECT                           = 50811,
-    H_SPELL_SHATTER_EFFECT                         = 61547,
-    SPELL_STONED                                   = 50812,
-    SPELL_STOMP                                    = 48131,
-    H_SPELL_STOMP                                  = 59744
+    SPELL_BOULDER_TOSS                          = 50843,
+    SPELL_GROUND_SPIKE                          = 59750,
+    SPELL_GROUND_SLAM                           = 50827,
+    SPELL_SHATTER                               = 50810,
+    SPELL_SHATTER_EFFECT                        = 50811,
+    SPELL_STONED                                = 50812,
+    SPELL_STOMP                                 = 48131
 };
 
 enum Yells
@@ -51,133 +39,103 @@ enum Yells
     SAY_SHATTER                                 = 3
 };
 
-class boss_krystallus : public CreatureScript
+enum Events
 {
-public:
-    boss_krystallus() : CreatureScript("boss_krystallus") { }
-
-    struct boss_krystallusAI : public ScriptedAI
-    {
-        boss_krystallusAI(Creature* creature) : ScriptedAI(creature)
-        {
-            instance = creature->GetInstanceScript();
-        }
-
-        uint32 uiBoulderTossTimer;
-        uint32 uiGroundSpikeTimer;
-        uint32 uiGroundSlamTimer;
-        uint32 uiShatterTimer;
-        uint32 uiStompTimer;
-
-        bool bIsSlam;
-
-        InstanceScript* instance;
-
-        void Reset() override
-        {
-            bIsSlam = false;
-
-            uiBoulderTossTimer = urand(3000, 9000);
-            uiGroundSpikeTimer = urand(9000, 14000);
-            uiGroundSlamTimer = urand(15000, 18000);
-            uiStompTimer = urand(20000, 29000);
-            uiShatterTimer = 0;
-
-            instance->SetBossState(DATA_KRYSTALLUS, NOT_STARTED);
-        }
-        void EnterCombat(Unit* /*who*/) override
-        {
-            Talk(SAY_AGGRO);
+    EVENT_BOULDER_TOSS                          = 1,
+    EVENT_GROUND_SPIKE,
+    EVENT_GROUND_SLAM,
+    EVENT_STOMP,
+    EVENT_SHATTER
+};
 
-            instance->SetBossState(DATA_KRYSTALLUS, IN_PROGRESS);
-        }
+class boss_krystallus : public CreatureScript
+{
+    public:
+        boss_krystallus() : CreatureScript("boss_krystallus") { }
 
-        void UpdateAI(uint32 diff) override
+        struct boss_krystallusAI : public BossAI
         {
-            //Return since we have no target
-            if (!UpdateVictim())
-                return;
+            boss_krystallusAI(Creature* creature) : BossAI(creature, DATA_KRYSTALLUS) { }
 
-            if (uiBoulderTossTimer <= diff)
+            void Reset() override
             {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_BOULDER_TOSS);
-                uiBoulderTossTimer = urand(9000, 15000);
-            } else uiBoulderTossTimer -= diff;
-
-            if (uiGroundSpikeTimer <= diff)
-            {
-                if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
-                    DoCast(target, SPELL_GROUND_SPIKE);
-                uiGroundSpikeTimer = urand(12000, 17000);
-            } else uiGroundSpikeTimer -= diff;
-
-            if (uiStompTimer <= diff)
-            {
-                DoCast(me, SPELL_STOMP);
-                uiStompTimer = urand(20000, 29000);
-            } else uiStompTimer -= diff;
-
-            if (uiGroundSlamTimer <= diff)
-            {
-                DoCast(me, SPELL_GROUND_SLAM);
-                bIsSlam = true;
-                uiShatterTimer = 10000;
-                uiGroundSlamTimer = urand(15000, 18000);
-            } else uiGroundSlamTimer -= diff;
+                _Reset();
+            }
 
-            if (bIsSlam)
+            void EnterCombat(Unit* /*who*/) override
             {
-                if (uiShatterTimer <= diff)
-                {
-                    DoCast(me, DUNGEON_MODE(SPELL_SHATTER, H_SPELL_SHATTER));
-                } else uiShatterTimer -= diff;
+                Talk(SAY_AGGRO);
+                _EnterCombat();
+
+                events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(3000, 9000));
+                events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000));
+                events.ScheduleEvent(EVENT_STOMP, urand(20000, 29000));
+                if (IsHeroic())
+                    events.ScheduleEvent(EVENT_GROUND_SPIKE, urand(9000, 14000));
             }
 
-            DoMeleeAttackIfReady();
-        }
-
-        void JustDied(Unit* /*killer*/) override
-        {
-            Talk(SAY_DEATH);
-
-            instance->SetBossState(DATA_KRYSTALLUS, DONE);
-        }
+            void UpdateAI(uint32 diff) override
+            {
+                // Return since we have no target
+                if (!UpdateVictim())
+                    return;
 
-        void KilledUnit(Unit* victim) override
-        {
-            if (victim->GetTypeId() != TYPEID_PLAYER)
-                return;
+                events.Update(diff);
 
-            Talk(SAY_KILL);
-        }
+                if (me->HasUnitState(UNIT_STATE_CASTING))
+                    return;
 
-        void SpellHitTarget(Unit* /*target*/, const SpellInfo* pSpell) override
-        {
-            //this part should be in the core
-            if (pSpell->Id == SPELL_SHATTER || pSpell->Id == H_SPELL_SHATTER)
-            {
-                /// @todo we need eventmap to kill this stuff
-                //clear this, if we are still performing
-                if (bIsSlam)
+                while (uint32 eventId = events.ExecuteEvent())
                 {
-                    bIsSlam = false;
-
-                    //and correct movement, if not already
-                    if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE)
+                    switch (eventId)
                     {
-                        if (me->GetVictim())
-                            me->GetMotionMaster()->MoveChase(me->GetVictim());
+                        case EVENT_BOULDER_TOSS:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true))
+                                DoCast(target, SPELL_BOULDER_TOSS);
+                            events.ScheduleEvent(EVENT_BOULDER_TOSS, urand(9000, 15000));
+                            break;
+                        case EVENT_GROUND_SPIKE:
+                            if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true))
+                                DoCast(target, SPELL_GROUND_SPIKE);
+                            events.ScheduleEvent(EVENT_GROUND_SPIKE, urand(12000, 17000));
+                            break;
+                        case EVENT_GROUND_SLAM:
+                            DoCast(me, SPELL_GROUND_SLAM);
+                            events.ScheduleEvent(EVENT_SHATTER, 10000);
+                            events.ScheduleEvent(EVENT_GROUND_SLAM, urand(15000, 18000));
+                            break;
+                        case EVENT_STOMP:
+                            DoCast(me, SPELL_STOMP);
+                            events.ScheduleEvent(EVENT_STOMP, urand(20000, 29000));
+                            break;
+                        case EVENT_SHATTER:
+                            DoCast(me, SPELL_SHATTER);
+                            break;
+                        default:
+                            break;
                     }
                 }
+
+                DoMeleeAttackIfReady();
+            }
+
+            void JustDied(Unit* /*killer*/) override
+            {
+                Talk(SAY_DEATH);
+                _JustDied();
             }
-        }
-    };
 
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetHallsOfStoneAI<boss_krystallusAI>(creature);
-    }
+            void KilledUnit(Unit* victim) override
+            {
+                if (victim->GetTypeId() == TYPEID_PLAYER)
+                    Talk(SAY_KILL);
+            }
+        };
+
+        CreatureAI* GetAI(Creature* creature) const override
+        {
+            return GetHallsOfStoneAI<boss_krystallusAI>(creature);
+        }
 };
 
 class spell_krystallus_shatter : public SpellScriptLoader