Implement generic script loaders to greatly reduce code duplication

Scripts/Spells/Monk.cs

@@ -37,133 +37,103 @@ namespace Scripts.Spells.Monk
     }
 
     [Script] // 117952 - Crackling Jade Lightning
-    class spell_monk_crackling_jade_lightning : SpellScriptLoader
+    class spell_monk_crackling_jade_lightning : AuraScript
     {
-        public spell_monk_crackling_jade_lightning() : base("spell_monk_crackling_jade_lightning") { }
-
-        class spell_monk_crackling_jade_lightning_AuraScript : AuraScript
+        public override bool Validate(SpellInfo spellInfo)
         {
-            public override bool Validate(SpellInfo spellInfo)
-            {
-                return ValidateSpellInfo(SpellIds.CracklingJadeLightningChiProc);
-            }
-
-            void OnTick(AuraEffect aurEff)
-            {
-                Unit caster = GetCaster();
-                if (caster)
-                    if (caster.HasAura(SpellIds.StanceOfTheSpiritedCrane))
-                        caster.CastSpell(caster, SpellIds.CracklingJadeLightningChiProc, TriggerCastFlags.FullMask);
-            }
-
-            public override void Register()
-            {
-                OnEffectPeriodic.Add(new EffectPeriodicHandler(OnTick, 0, Framework.Constants.AuraType.PeriodicDamage));
-            }
+            return ValidateSpellInfo(SpellIds.CracklingJadeLightningChiProc);
         }
 
-        public override AuraScript GetAuraScript()
+        void OnTick(AuraEffect aurEff)
         {
-            return new spell_monk_crackling_jade_lightning_AuraScript();
+            Unit caster = GetCaster();
+            if (caster)
+                if (caster.HasAura(SpellIds.StanceOfTheSpiritedCrane))
+                    caster.CastSpell(caster, SpellIds.CracklingJadeLightningChiProc, TriggerCastFlags.FullMask);
+        }
+
+        public override void Register()
+        {
+            OnEffectPeriodic.Add(new EffectPeriodicHandler(OnTick, 0, Framework.Constants.AuraType.PeriodicDamage));
         }
     }
 
     [Script] // 117959 - Crackling Jade Lightning
-    class spell_monk_crackling_jade_lightning_knockback_proc_aura : SpellScriptLoader
+    class spell_monk_crackling_jade_lightning_aura : AuraScript
     {
-        public spell_monk_crackling_jade_lightning_knockback_proc_aura() : base("spell_monk_crackling_jade_lightning_knockback_proc_aura") { }
-
-        class spell_monk_crackling_jade_lightning_aura_AuraScript : AuraScript
+        public override bool Validate(SpellInfo spellInfo)
         {
-            public override bool Validate(SpellInfo spellInfo)
-            {
-                return ValidateSpellInfo(SpellIds.CracklingJadeLightningKnockback, SpellIds.CracklingJadeLightningKnockbackCd);
-            }
-
-            bool CheckProc(ProcEventInfo eventInfo)
-            {
-                if (GetTarget().HasAura(SpellIds.CracklingJadeLightningKnockbackCd))
-                    return false;
-
-                if (eventInfo.GetActor().HasAura(SpellIds.CracklingJadeLightningChannel, GetTarget().GetGUID()))
-                    return false;
-
-                Spell currentChanneledSpell = GetTarget().GetCurrentSpell(CurrentSpellTypes.Channeled);
-                if (!currentChanneledSpell || currentChanneledSpell.GetSpellInfo().Id != SpellIds.CracklingJadeLightningChannel)
-                    return false;
-
-                return true;
-            }
-
-            void HandleProc(AuraEffect aurEff, ProcEventInfo eventInfo)
-            {
-                GetTarget().CastSpell(eventInfo.GetActor(), SpellIds.CracklingJadeLightningKnockback, TriggerCastFlags.FullMask);
-                GetTarget().CastSpell(GetTarget(), SpellIds.CracklingJadeLightningKnockbackCd, TriggerCastFlags.FullMask);
-            }
-
-            public override void Register()
-            {
-                DoCheckProc.Add(new CheckProcHandler(CheckProc));
-                OnEffectProc.Add(new EffectProcHandler(HandleProc, 0, Framework.Constants.AuraType.Dummy));
-            }
+            return ValidateSpellInfo(SpellIds.CracklingJadeLightningKnockback, SpellIds.CracklingJadeLightningKnockbackCd);
         }
 
-        public override AuraScript GetAuraScript()
+        bool CheckProc(ProcEventInfo eventInfo)
         {
-            return new spell_monk_crackling_jade_lightning_aura_AuraScript();
+            if (GetTarget().HasAura(SpellIds.CracklingJadeLightningKnockbackCd))
+                return false;
+
+            if (eventInfo.GetActor().HasAura(SpellIds.CracklingJadeLightningChannel, GetTarget().GetGUID()))
+                return false;
+
+            Spell currentChanneledSpell = GetTarget().GetCurrentSpell(CurrentSpellTypes.Channeled);
+            if (!currentChanneledSpell || currentChanneledSpell.GetSpellInfo().Id != SpellIds.CracklingJadeLightningChannel)
+                return false;
+
+            return true;
+        }
+
+        void HandleProc(AuraEffect aurEff, ProcEventInfo eventInfo)
+        {
+            GetTarget().CastSpell(eventInfo.GetActor(), SpellIds.CracklingJadeLightningKnockback, TriggerCastFlags.FullMask);
+            GetTarget().CastSpell(GetTarget(), SpellIds.CracklingJadeLightningKnockbackCd, TriggerCastFlags.FullMask);
+        }
+
+        public override void Register()
+        {
+            DoCheckProc.Add(new CheckProcHandler(CheckProc));
+            OnEffectProc.Add(new EffectProcHandler(HandleProc, 0, Framework.Constants.AuraType.Dummy));
         }
     }
 
     [Script] // 115546 - Provoke
-    class spell_monk_provoke : SpellScriptLoader
+    class spell_monk_provoke : SpellScript
     {
-        public spell_monk_provoke() : base("spell_monk_provoke") { }
+        const uint BlackOxStatusEntry = 61146;
 
-        class spell_monk_provoke_SpellScript : SpellScript
+        public override bool Validate(SpellInfo spellInfo)
         {
-            const uint BlackOxStatusEntry = 61146;
-
-            public override bool Validate(SpellInfo spellInfo)
-            {
-                if (!spellInfo.GetExplicitTargetMask().HasAnyFlag(SpellCastTargetFlags.UnitMask)) // ensure GetExplTargetUnit() will return something meaningful during CheckCast
-                    return false;
-                return ValidateSpellInfo(SpellIds.ProvokeSingleTarget, SpellIds.ProvokeAoe);
-            }
-
-            SpellCastResult CheckExplicitTarget()
-            {
-                if (GetExplTargetUnit().GetEntry() != BlackOxStatusEntry)
-                {
-                    SpellInfo singleTarget = Global.SpellMgr.GetSpellInfo(SpellIds.ProvokeSingleTarget);
-                    SpellCastResult singleTargetExplicitResult = singleTarget.CheckExplicitTarget(GetCaster(), GetExplTargetUnit());
-                    if (singleTargetExplicitResult != SpellCastResult.SpellCastOk)
-                        return singleTargetExplicitResult;
-                }
-                else if (GetExplTargetUnit().GetOwnerGUID() != GetCaster().GetGUID())
-                    return SpellCastResult.BadTargets;
-
-                return SpellCastResult.SpellCastOk;
-            }
-
-            void HandleDummy(uint effIndex)
-            {
-                PreventHitDefaultEffect(effIndex);
-                if (GetHitUnit().GetEntry() != BlackOxStatusEntry)
-                    GetCaster().CastSpell(GetHitUnit(), SpellIds.ProvokeSingleTarget, true);
-                else
-                    GetCaster().CastSpell(GetHitUnit(), SpellIds.ProvokeAoe, true);
-            }
-
-            public override void Register()
-            {
-                OnCheckCast.Add(new CheckCastHandler(CheckExplicitTarget));
-                OnEffectHitTarget.Add(new EffectHandler(HandleDummy, 0, SpellEffectName.Dummy));
-            }
+            if (!spellInfo.GetExplicitTargetMask().HasAnyFlag(SpellCastTargetFlags.UnitMask)) // ensure GetExplTargetUnit() will return something meaningful during CheckCast
+                return false;
+            return ValidateSpellInfo(SpellIds.ProvokeSingleTarget, SpellIds.ProvokeAoe);
         }
 
-        public override SpellScript GetSpellScript()
+        SpellCastResult CheckExplicitTarget()
         {
-            return new spell_monk_provoke_SpellScript();
+            if (GetExplTargetUnit().GetEntry() != BlackOxStatusEntry)
+            {
+                SpellInfo singleTarget = Global.SpellMgr.GetSpellInfo(SpellIds.ProvokeSingleTarget);
+                SpellCastResult singleTargetExplicitResult = singleTarget.CheckExplicitTarget(GetCaster(), GetExplTargetUnit());
+                if (singleTargetExplicitResult != SpellCastResult.SpellCastOk)
+                    return singleTargetExplicitResult;
+            }
+            else if (GetExplTargetUnit().GetOwnerGUID() != GetCaster().GetGUID())
+                return SpellCastResult.BadTargets;
+
+            return SpellCastResult.SpellCastOk;
+        }
+
+        void HandleDummy(uint effIndex)
+        {
+            PreventHitDefaultEffect(effIndex);
+            if (GetHitUnit().GetEntry() != BlackOxStatusEntry)
+                GetCaster().CastSpell(GetHitUnit(), SpellIds.ProvokeSingleTarget, true);
+            else
+                GetCaster().CastSpell(GetHitUnit(), SpellIds.ProvokeAoe, true);
+        }
+
+        public override void Register()
+        {
+            OnCheckCast.Add(new CheckCastHandler(CheckExplicitTarget));
+            OnEffectHitTarget.Add(new EffectHandler(HandleDummy, 0, SpellEffectName.Dummy));
         }
     }
 }

Scripts/Spells/Rogue.cs

@@ -41,177 +41,132 @@ namespace Scripts.Spells.Rogue
         public const uint HonorAmongThievesEnergize = 51699;
         public const uint T52pSetBonus = 37169;
     }
-    
+
     [Script] // 51690 - Killing Spree
-    class spell_rog_killing_spree : SpellScriptLoader
+    class spell_rog_killing_spree : SpellScript
     {
-        public spell_rog_killing_spree() : base("spell_rog_killing_spree") { }
-
-        class spell_rog_killing_spree_SpellScript : SpellScript
+        void FilterTargets(List<WorldObject> targets)
         {
-            void FilterTargets(List<WorldObject> targets)
-            {
-                if (targets.Empty() || GetCaster().GetVehicleBase())
-                    FinishCast(SpellCastResult.OutOfRange);
-            }
+            if (targets.Empty() || GetCaster().GetVehicleBase())
+                FinishCast(SpellCastResult.OutOfRange);
+        }
 
-            void HandleDummy(uint effIndex)
+        void HandleDummy(uint effIndex)
+        {
+            Aura aura = GetCaster().GetAura(SpellIds.KillingSpree);
+            if (aura != null)
             {
-                Aura aura = GetCaster().GetAura(SpellIds.KillingSpree);
-                if (aura != null)
+                var script = aura.GetScript<spell_rog_killing_spree_AuraScript>(nameof(spell_rog_killing_spree_AuraScript));
+                if (script != null)
+                    script.AddTarget(GetHitUnit());
+            }
+        }
+
+        public override void Register()
+        {
+            OnObjectAreaTargetSelect.Add(new ObjectAreaTargetSelectHandler(FilterTargets, 1, Targets.UnitDestAreaEnemy));
+            OnEffectHitTarget.Add(new EffectHandler(HandleDummy, 1, SpellEffectName.Dummy));
+        }
+    }
+
+    public class spell_rog_killing_spree_AuraScript : AuraScript
+    {
+        public override bool Validate(SpellInfo spellInfo)
+        {
+            return ValidateSpellInfo(SpellIds.KillingSpreeTeleport, SpellIds.KillingSpreeWeaponDmg, SpellIds.KillingSpreeDmgBuff);
+        }
+
+        void HandleApply(AuraEffect aurEff, AuraEffectHandleModes mode)
+        {
+            GetTarget().CastSpell(GetTarget(), SpellIds.KillingSpreeDmgBuff, true);
+        }
+
+        void HandleEffectPeriodic(AuraEffect aurEff)
+        {
+            while (!_targets.Empty())
+            {
+                ObjectGuid guid = _targets.SelectRandom();
+                Unit target = Global.ObjAccessor.GetUnit(GetTarget(), guid);
+                if (target)
                 {
-                    var script = aura.GetScript<spell_rog_killing_spree_AuraScript>(nameof(spell_rog_killing_spree_AuraScript));
-                    if (script != null)
-                        script.AddTarget(GetHitUnit());
+                    GetTarget().CastSpell(target, SpellIds.KillingSpreeTeleport, true);
+                    GetTarget().CastSpell(target, SpellIds.KillingSpreeWeaponDmg, true);
+                    break;
                 }
-            }
-
-            public override void Register()
-            {
-                OnObjectAreaTargetSelect.Add(new ObjectAreaTargetSelectHandler(FilterTargets, 1, Targets.UnitDestAreaEnemy));
-                OnEffectHitTarget.Add(new EffectHandler(HandleDummy, 1, SpellEffectName.Dummy));
+                else
+                    _targets.Remove(guid);
             }
         }
 
-        public override SpellScript GetSpellScript()
+        void HandleRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
         {
-            return new spell_rog_killing_spree_SpellScript();
+            GetTarget().RemoveAurasDueToSpell(SpellIds.KillingSpreeDmgBuff);
         }
 
-        public class spell_rog_killing_spree_AuraScript : AuraScript
+        public override void Register()
         {
-            public override bool Validate(SpellInfo spellInfo)
-            {
-                return ValidateSpellInfo(SpellIds.KillingSpreeTeleport, SpellIds.KillingSpreeWeaponDmg, SpellIds.KillingSpreeDmgBuff);
-            }
-
-            void HandleApply(AuraEffect aurEff, AuraEffectHandleModes mode)
-            {
-                GetTarget().CastSpell(GetTarget(), SpellIds.KillingSpreeDmgBuff, true);
-            }
-
-            void HandleEffectPeriodic(AuraEffect aurEff)
-            {
-                while (!_targets.Empty())
-                {
-                    ObjectGuid guid = _targets.SelectRandom();
-                    Unit target = Global.ObjAccessor.GetUnit(GetTarget(), guid);
-                    if (target)
-                    {
-                        GetTarget().CastSpell(target, SpellIds.KillingSpreeTeleport, true);
-                        GetTarget().CastSpell(target, SpellIds.KillingSpreeWeaponDmg, true);
-                        break;
-                    }
-                    else
-                        _targets.Remove(guid);
-                }
-            }
-
-            void HandleRemove(AuraEffect aurEff, AuraEffectHandleModes mode)
-            {
-                GetTarget().RemoveAurasDueToSpell(SpellIds.KillingSpreeDmgBuff);
-            }
-
-            public override void Register()
-            {
-                AfterEffectApply.Add(new EffectApplyHandler(HandleApply, 0, AuraType.Dummy, AuraEffectHandleModes.Real));
-                OnEffectPeriodic.Add(new EffectPeriodicHandler(HandleEffectPeriodic, 0, AuraType.PeriodicDummy));
-                AfterEffectRemove.Add(new EffectApplyHandler(HandleRemove, 0, AuraType.PeriodicDummy, AuraEffectHandleModes.Real));
-            }
-
-            public void AddTarget(Unit target)
-            {
-                _targets.Add(target.GetGUID());
-            }
-
-            List<ObjectGuid> _targets = new List<ObjectGuid>();
+            AfterEffectApply.Add(new EffectApplyHandler(HandleApply, 0, AuraType.Dummy, AuraEffectHandleModes.Real));
+            OnEffectPeriodic.Add(new EffectPeriodicHandler(HandleEffectPeriodic, 0, AuraType.PeriodicDummy));
+            AfterEffectRemove.Add(new EffectApplyHandler(HandleRemove, 0, AuraType.PeriodicDummy, AuraEffectHandleModes.Real));
         }
 
-        public override AuraScript GetAuraScript()
+        public void AddTarget(Unit target)
         {
-            return new spell_rog_killing_spree_AuraScript();
+            _targets.Add(target.GetGUID());
         }
+
+        List<ObjectGuid> _targets = new List<ObjectGuid>();
     }
 
     [Script] // 70805 - Rogue T10 2P Bonus -- THIS SHOULD BE REMOVED WITH NEW PROC SYSTEM.
-    class spell_rog_t10_2p_bonus : SpellScriptLoader
+    class spell_rog_t10_2p_bonus : AuraScript
     {
-        public spell_rog_t10_2p_bonus() : base("spell_rog_t10_2p_bonus") { }
-
-        class spell_rog_t10_2p_bonus_AuraScript : AuraScript
+        bool CheckProc(ProcEventInfo eventInfo)
         {
-            bool CheckProc(ProcEventInfo eventInfo)
-            {
-                return eventInfo.GetActor() == eventInfo.GetActionTarget();
-            }
-
-            public override void Register()
-            {
-                DoCheckProc.Add(new CheckProcHandler(CheckProc));
-            }
+            return eventInfo.GetActor() == eventInfo.GetActionTarget();
         }
 
-        public override AuraScript GetAuraScript()
+        public override void Register()
         {
-            return new spell_rog_t10_2p_bonus_AuraScript();
+            DoCheckProc.Add(new CheckProcHandler(CheckProc));
         }
     }
-    
+
     [Script] // 2098 - Eviscerate
-    class spell_rog_eviscerate : SpellScriptLoader
+    class spell_rog_eviscerate : SpellScript
     {
-        public spell_rog_eviscerate() : base("spell_rog_eviscerate") { }
-
-        class spell_rog_eviscerate_SpellScript : SpellScript
+        void CalculateDamage(uint effIndex)
         {
-            void CalculateDamage(uint effIndex)
-            {
-                int damagePerCombo = (int)(GetCaster().GetTotalAttackPowerValue(WeaponAttackType.BaseAttack) * 0.559f);
-                AuraEffect t5 = GetCaster().GetAuraEffect(SpellIds.T52pSetBonus, 0);
-                if (t5 != null)
-                    damagePerCombo += t5.GetAmount();
+            int damagePerCombo = (int)(GetCaster().GetTotalAttackPowerValue(WeaponAttackType.BaseAttack) * 0.559f);
+            AuraEffect t5 = GetCaster().GetAuraEffect(SpellIds.T52pSetBonus, 0);
+            if (t5 != null)
+                damagePerCombo += t5.GetAmount();
 
-                SetEffectValue(GetEffectValue() + damagePerCombo * GetCaster().GetPower(PowerType.ComboPoints));
-            }
-
-            public override void Register()
-            {
-                OnEffectLaunchTarget.Add(new EffectHandler(CalculateDamage, 0, SpellEffectName.SchoolDamage));
-            }
+            SetEffectValue(GetEffectValue() + damagePerCombo * GetCaster().GetPower(PowerType.ComboPoints));
         }
 
-        public override SpellScript GetSpellScript()
+        public override void Register()
         {
-            return new spell_rog_eviscerate_SpellScript();
+            OnEffectLaunchTarget.Add(new EffectHandler(CalculateDamage, 0, SpellEffectName.SchoolDamage));
         }
     }
-    
+
     [Script] // 32645 - Envenom
-    class spell_rog_envenom : SpellScriptLoader
+    class spell_rog_envenom : SpellScript
     {
-        public spell_rog_envenom() : base("spell_rog_envenom") { }
-
-        class spell_rog_envenom_SpellScript : SpellScript
+        void CalculateDamage(uint effIndex)
         {
-            void CalculateDamage(uint effIndex)
-            {
-                int damagePerCombo = (int)(GetCaster().GetTotalAttackPowerValue(WeaponAttackType.BaseAttack) * 0.417f);
-                AuraEffect t5 = GetCaster().GetAuraEffect(SpellIds.T52pSetBonus, 0);
-                if (t5 != null)
-                    damagePerCombo += t5.GetAmount();
+            int damagePerCombo = (int)(GetCaster().GetTotalAttackPowerValue(WeaponAttackType.BaseAttack) * 0.417f);
+            AuraEffect t5 = GetCaster().GetAuraEffect(SpellIds.T52pSetBonus, 0);
+            if (t5 != null)
+                damagePerCombo += t5.GetAmount();
 
-                SetEffectValue(GetEffectValue() + damagePerCombo * GetCaster().GetPower(PowerType.ComboPoints));
-            }
-
-            public override void Register()
-            {
-                OnEffectLaunchTarget.Add(new EffectHandler(CalculateDamage, 0, SpellEffectName.SchoolDamage));
-            }
+            SetEffectValue(GetEffectValue() + damagePerCombo * GetCaster().GetPower(PowerType.ComboPoints));
         }
 
-        public override SpellScript GetSpellScript()
+        public override void Register()
         {
-            return new spell_rog_envenom_SpellScript();
+            OnEffectLaunchTarget.Add(new EffectHandler(CalculateDamage, 0, SpellEffectName.SchoolDamage));
         }
     }
 }