From 3acb8eca4aee67885ad2cb6fa3419fc08ab6533e Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Tue, 16 Mar 2021 15:44:25 -0400
Subject: [PATCH] Core/Scripts: Cleanups on scripts.

---
 Source/Scripts/Spells/Druid.cs | 101 ++++++++++++++++++++++-----------
 Source/Scripts/Spells/Mage.cs  |  20 -------
 2 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/Source/Scripts/Spells/Druid.cs b/Source/Scripts/Spells/Druid.cs
index d38b46f5d..405e15a95 100644
--- a/Source/Scripts/Spells/Druid.cs
+++ b/Source/Scripts/Spells/Druid.cs
@@ -83,31 +83,6 @@ namespace Scripts.Spells.Druid
         public const uint ThrashCat = 106830;
     }
 
-    abstract class spell_dru_base_transformer : SpellScript
-    {
-        public override bool Validate(SpellInfo spellInfo)
-        {
-            return ValidateSpellInfo(GetShapeshiftFormSpell());
-        }
-
-        void HandleOnCast()
-        {
-            // Change into cat form
-            if (GetCaster().GetShapeshiftForm() != GetShapeshiftForm())
-                GetCaster().CastSpell(GetCaster(), GetShapeshiftFormSpell(), true);
-        }
-
-        public override void Register()
-        {
-            BeforeCast.Add(new CastHandler(HandleOnCast));
-        }
-
-        public abstract bool ToCatForm();
-
-        ShapeShiftForm GetShapeshiftForm() { return ToCatForm() ? ShapeShiftForm.CatForm : ShapeShiftForm.BearForm; }
-        uint GetShapeshiftFormSpell() { return ToCatForm() ? SpellIds.CatForm : SpellIds.BearForm; }
-    }
-
     [Script] // 22812 - Barkskin
     class spell_dru_barkskin : AuraScript
     {
@@ -130,9 +105,24 @@ namespace Scripts.Spells.Druid
     }
 
     [Script] // 77758 - Berserk
-    class spell_dru_berserk : spell_dru_base_transformer
+    class spell_dru_berserk : SpellScript
     {
-        public override bool ToCatForm() { return false; }
+        public override bool Validate(SpellInfo spellInfo)
+        {
+            return ValidateSpellInfo(SpellIds.BearForm);
+        }
+
+        void HandleOnCast()
+        {
+            // Change into cat form
+            if (GetCaster().GetShapeshiftForm() != ShapeShiftForm.BearForm)
+                GetCaster().CastSpell(GetCaster(), SpellIds.BearForm, true);
+        }
+
+        public override void Register()
+        {
+            BeforeCast.Add(new CastHandler(HandleOnCast));
+        }
     }
 
     [Script] // 203953 - Brambles - SPELL_DRUID_BRAMBLES_PASSIVE
@@ -440,9 +430,24 @@ namespace Scripts.Spells.Druid
     }
 
     [Script] // 99 - Incapacitating Roar
-    class spell_dru_incapacitating_roar : spell_dru_base_transformer
+    class spell_dru_incapacitating_roar : SpellScript
     {
-        public override bool ToCatForm() { return false; }
+        public override bool Validate(SpellInfo spellInfo)
+        {
+            return ValidateSpellInfo(SpellIds.BearForm);
+        }
+
+        void HandleOnCast()
+        {
+            // Change into cat form
+            if (GetCaster().GetShapeshiftForm() != ShapeShiftForm.BearForm)
+                GetCaster().CastSpell(GetCaster(), SpellIds.BearForm, true);
+        }
+
+        public override void Register()
+        {
+            BeforeCast.Add(new CastHandler(HandleOnCast));
+        }
     }
 
     [Script] // 29166 - Innervate
@@ -690,9 +695,24 @@ namespace Scripts.Spells.Druid
     }
 
     [Script] // 5215 - Prowl
-    class spell_dru_prowl : spell_dru_base_transformer
+    class spell_dru_prowl : SpellScript
     {
-        public override bool ToCatForm() { return true; }
+        public override bool Validate(SpellInfo spellInfo)
+        {
+            return ValidateSpellInfo(SpellIds.CatForm);
+        }
+
+        void HandleOnCast()
+        {
+            // Change into cat form
+            if (GetCaster().GetShapeshiftForm() != ShapeShiftForm.CatForm)
+                GetCaster().CastSpell(GetCaster(), SpellIds.CatForm, true);
+        }
+
+        public override void Register()
+        {
+            BeforeCast.Add(new CastHandler(HandleOnCast));
+        }
     }
 
     [Script] // 1079 - Rip
@@ -831,9 +851,24 @@ namespace Scripts.Spells.Druid
     }
 
     [Script] // 106898 - Stampeding Roar
-    class spell_dru_stampeding_roar : spell_dru_base_transformer
+    class spell_dru_stampeding_roar : SpellScript
     {
-        public override bool ToCatForm() { return false; }
+        public override bool Validate(SpellInfo spellInfo)
+        {
+            return ValidateSpellInfo(SpellIds.BearForm);
+        }
+
+        void HandleOnCast()
+        {
+            // Change into cat form
+            if (GetCaster().GetShapeshiftForm() != ShapeShiftForm.BearForm)
+                GetCaster().CastSpell(GetCaster(), SpellIds.BearForm, true);
+        }
+
+        public override void Register()
+        {
+            BeforeCast.Add(new CastHandler(HandleOnCast));
+        }
     }
 
     [Script] // 50286 - Starfall (Dummy)
diff --git a/Source/Scripts/Spells/Mage.cs b/Source/Scripts/Spells/Mage.cs
index 11444123d..f3aa50ce9 100644
--- a/Source/Scripts/Spells/Mage.cs
+++ b/Source/Scripts/Spells/Mage.cs
@@ -246,26 +246,6 @@ namespace Scripts.Spells.Mage
         }
     }
 
-    [Script] // 44544 - Fingers of Frost
-    class spell_mage_fingers_of_frost : AuraScript
-    {
-        void SuppressWarning(AuraEffect aurEff, ProcEventInfo procInfo)
-        {
-            PreventDefaultAction();
-        }
-
-        void DropFingersOfFrost(ProcEventInfo eventInfo)
-        {
-            GetAura().ModStackAmount(-1);
-        }
-
-        public override void Register()
-        {
-            OnEffectProc.Add(new EffectProcHandler(SuppressWarning, 1, AuraType.Dummy));
-            AfterProc.Add(new AuraProcHandler(DropFingersOfFrost));
-        }
-    }
-
     [Script] // 112965 - Fingers of Frost
     class spell_mage_fingers_of_frost_AuraScript : AuraScript
     {