refactor(Scripts/Mechanar): Modernize Mechano Lord Capacitus script (#15491)

src/common/Utilities/Util.h

@@ -211,6 +211,11 @@ inline bool isNumeric(char c)
     return (c >= '0' && c <= '9');
 }
 
+inline bool IsEvenNumber(int32 n)
+{
+    return n % 2 == 0;
+}
+
 inline bool isNumeric(char const* str)
 {
     for (char const* c = str; *c; ++c)

src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp

@@ -32,11 +32,11 @@ enum Spells
 
 enum Yells
 {
-    YELL_AGGRO                      = 0,
+    SAY_AGGRO                      = 0,
-    YELL_REFLECTIVE_MAGIC_SHIELD    = 1,
+    SAY_REFLECTIVE_MAGIC_SHIELD    = 1,
-    YELL_REFLECTIVE_DAMAGE_SHIELD   = 2,
+    SAY_REFLECTIVE_DAMAGE_SHIELD   = 2,
-    YELL_KILL                       = 3,
+    SAY_KILL                       = 3,
-    YELL_DEATH                      = 4
+    SAY_DEATH                      = 4
 };
 
 enum Creatures
@@ -44,45 +44,75 @@ enum Creatures
     NPC_NETHER_CHARGE               = 20405
 };
 
-enum Events
+struct boss_mechano_lord_capacitus : public BossAI
 {
-    EVENT_HEADCRACK                 = 1,
+    boss_mechano_lord_capacitus(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS)
-    EVENT_REFLECTIVE_DAMAGE_SHIELD  = 2,
-    EVENT_REFLECTIVE_MAGIE_SHIELD   = 3,
-    EVENT_POSITIVE_SHIFT            = 4,
-    EVENT_SUMMON_NETHER_CHARGE      = 5,
-    EVENT_BERSERK                   = 6
-};
-
-class boss_mechano_lord_capacitus : public CreatureScript
-{
-public:
-    boss_mechano_lord_capacitus() : CreatureScript("boss_mechano_lord_capacitus") { }
-
-    struct boss_mechano_lord_capacitusAI : public BossAI
     {
-        boss_mechano_lord_capacitusAI(Creature* creature) : BossAI(creature, DATA_MECHANOLORD_CAPACITUS) { }
+        scheduler.SetValidator([this]
+        {
+            return !me->HasUnitState(UNIT_STATE_CASTING);
+        });
+    }
 
     void JustEngagedWith(Unit* /*who*/) override
     {
         _JustEngagedWith();
-            Talk(YELL_AGGRO);
+        Talk(SAY_AGGRO);
-            events.ScheduleEvent(EVENT_HEADCRACK, 6000);
+
-            events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 10000);
+        scheduler.Schedule(6s, [this](TaskContext context)
-            events.ScheduleEvent(EVENT_BERSERK, 180000);
+        {
-            events.ScheduleEvent(IsHeroic() ? EVENT_POSITIVE_SHIFT : EVENT_REFLECTIVE_DAMAGE_SHIELD, 15000);
+            DoCastVictim(SPELL_HEADCRACK);
+            context.Repeat(20s);
+        }).Schedule(10s, [this](TaskContext context)
+        {
+            Position pos = me->GetRandomNearPosition(8.0f);
+            me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
+            context.Repeat(5s);
+        }).Schedule(3min, [this](TaskContext /*context*/)
+        {
+            DoCastSelf(SPELL_BERSERK, true);
+        });
+
+        if (IsHeroic())
+        {
+            scheduler.Schedule(15s, [this](TaskContext context)
+            {
+                DoCastSelf(SPELL_POLARITY_SHIFT, true);
+                context.Repeat(30s);
+            });
+        }
+        else
+        {
+            scheduler.Schedule(15s, [this](TaskContext context)
+            {
+                if (IsEvenNumber(context.GetRepeatCounter()))
+                {
+                    Talk(SAY_REFLECTIVE_DAMAGE_SHIELD);
+                    DoCastSelf(SPELL_REFLECTIVE_DAMAGE_SHIELD);
+                }
+                else
+                {
+                    Talk(SAY_REFLECTIVE_MAGIC_SHIELD);
+                    DoCastSelf(SPELL_REFLECTIVE_MAGIC_SHIELD);
+                }
+
+                context.Repeat(20s);
+            });
+        }
     }
 
     void KilledUnit(Unit* victim) override
     {
-            if (victim->GetTypeId() == TYPEID_PLAYER)
+        if (victim->IsPlayer())
-                Talk(YELL_KILL);
+        {
+            Talk(SAY_KILL);
+        }
     }
 
     void JustDied(Unit* /*killer*/) override
     {
         _JustDied();
-            Talk(YELL_DEATH);
+        Talk(SAY_DEATH);
     }
 
     void JustSummoned(Creature* summon) override
@@ -90,56 +120,6 @@ public:
         summons.Summon(summon);
         summon->GetMotionMaster()->MoveRandom(30.0f);
     }
-
-        void UpdateAI(uint32 diff) override
-        {
-            if (!UpdateVictim())
-                return;
-
-            events.Update(diff);
-            if (me->HasUnitState(UNIT_STATE_CASTING))
-                return;
-
-            switch (events.ExecuteEvent())
-            {
-                case EVENT_HEADCRACK:
-                    me->CastSpell(me->GetVictim(), SPELL_HEADCRACK, false);
-                    events.ScheduleEvent(EVENT_HEADCRACK, 20000);
-                    break;
-                case EVENT_REFLECTIVE_DAMAGE_SHIELD:
-                    Talk(YELL_REFLECTIVE_DAMAGE_SHIELD);
-                    me->CastSpell(me, SPELL_REFLECTIVE_DAMAGE_SHIELD, false);
-                    events.ScheduleEvent(EVENT_REFLECTIVE_MAGIE_SHIELD, 20000);
-                    break;
-                case EVENT_REFLECTIVE_MAGIE_SHIELD:
-                    Talk(YELL_REFLECTIVE_MAGIC_SHIELD);
-                    me->CastSpell(me, SPELL_REFLECTIVE_MAGIC_SHIELD, false);
-                    events.ScheduleEvent(EVENT_REFLECTIVE_DAMAGE_SHIELD, 20000);
-                    break;
-                case EVENT_SUMMON_NETHER_CHARGE:
-                    {
-                        Position pos = me->GetRandomNearPosition(8.0f);
-                        me->SummonCreature(NPC_NETHER_CHARGE, pos, TEMPSUMMON_TIMED_DESPAWN, 18000);
-                        events.ScheduleEvent(EVENT_SUMMON_NETHER_CHARGE, 5000);
-                        break;
-                    }
-                case EVENT_POSITIVE_SHIFT:
-                    me->CastSpell(me, SPELL_POLARITY_SHIFT, true);
-                    events.ScheduleEvent(EVENT_POSITIVE_SHIFT, 30000);
-                    break;
-                case EVENT_BERSERK:
-                    me->CastSpell(me, SPELL_BERSERK, true);
-                    break;
-            }
-
-            DoMeleeAttackIfReady();
-        }
-    };
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return GetMechanarAI<boss_mechano_lord_capacitusAI>(creature);
-    }
 };
 
 enum polarityShift
@@ -153,14 +133,9 @@ enum polarityShift
     SPELL_NEGATIVE_CHARGE           = 39093
 };
 
-class spell_capacitus_polarity_charge : public SpellScriptLoader
+class spell_capacitus_polarity_charge : public SpellScript
 {
-public:
+    PrepareSpellScript(spell_capacitus_polarity_charge);
-    spell_capacitus_polarity_charge() : SpellScriptLoader("spell_capacitus_polarity_charge") { }
-
-    class spell_capacitus_polarity_charge_SpellScript : public SpellScript
-    {
-        PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript);
 
     void HandleTargets(std::list<WorldObject*>& targetList)
     {
@@ -190,25 +165,14 @@ public:
 
     void Register() override
     {
-            OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
+        OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
-            OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
+        OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
-        }
-    };
-
-    SpellScript* GetSpellScript() const override
-    {
-        return new spell_capacitus_polarity_charge_SpellScript();
     }
 };
 
-class spell_capacitus_polarity_shift : public SpellScriptLoader
+class spell_capacitus_polarity_shift : public SpellScript
 {
-public:
+    PrepareSpellScript(spell_capacitus_polarity_shift);
-    spell_capacitus_polarity_shift() : SpellScriptLoader("spell_capacitus_polarity_shift") { }
-
-    class spell_capacitus_polarity_shift_SpellScript : public SpellScript
-    {
-        PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript);
 
     void HandleDummy(SpellEffIndex /*effIndex*/)
     {
@@ -218,19 +182,13 @@ public:
 
     void Register() override
     {
-            OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
+        OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
-        }
-    };
-
-    SpellScript* GetSpellScript() const override
-    {
-        return new spell_capacitus_polarity_shift_SpellScript();
     }
 };
 
 void AddSC_boss_mechano_lord_capacitus()
 {
-    new boss_mechano_lord_capacitus();
+    RegisterMechanarCreatureAI(boss_mechano_lord_capacitus);
-    new spell_capacitus_polarity_charge();
+    RegisterSpellScript(spell_capacitus_polarity_charge);
-    new spell_capacitus_polarity_shift();
+    RegisterSpellScript(spell_capacitus_polarity_shift);
 }

src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h

@@ -72,4 +72,6 @@ inline AI* GetMechanarAI(T* obj)
     return GetInstanceAI<AI>(obj, MechanarScriptName);
 }
 
+#define RegisterMechanarCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetMechanarAI)
+
 #endif