Core/Misc: Refactor scripts to fix static analysis warnings

5 files changed, 75 insertions, 27 deletions

diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
index 84ada04a989..4a9703b509b 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
@@ -50,7 +50,16 @@ class boss_instructor_malicia : public CreatureScript
 
         struct boss_instructormaliciaAI : public BossAI
         {
-            boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTORMALICIA) { }
+            boss_instructormaliciaAI(Creature* creature) : BossAI(creature, DATA_INSTRUCTORMALICIA)
+            {
+                Initialize();
+            }
+
+            void Initialize()
+            {
+                FlashCounter = 0;
+                TouchCounter = 0;
+            }
 
             uint32 FlashCounter;
             uint32 TouchCounter;
@@ -58,8 +67,7 @@ class boss_instructor_malicia : public CreatureScript
             void Reset() override
             {
                 _Reset();
-                FlashCounter = 0;
-                TouchCounter = 0;
+                Initialize();
             }
 
             void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
index 57331d84b82..02c0f70b7c8 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
@@ -47,7 +47,18 @@ public:
 
     struct boss_jandicebarovAI : public ScriptedAI
     {
-        boss_jandicebarovAI(Creature* creature) : ScriptedAI(creature) { }
+        boss_jandicebarovAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            CurseOfBlood_Timer = 15000;
+            Illusion_Timer = 30000;
+            Invisible_Timer = 3000;                             //Too much too low?
+            Invisible = false;
+        }
 
         uint32 CurseOfBlood_Timer;
         uint32 Illusion_Timer;
@@ -57,10 +68,7 @@ public:
 
         void Reset() override
         {
-            CurseOfBlood_Timer = 15000;
-            Illusion_Timer = 30000;
-            Invisible_Timer = 3000;                             //Too much too low?
-            Invisible = false;
+            Initialize();
         }
 
         void EnterCombat(Unit* /*who*/) override
@@ -169,13 +177,21 @@ public:
 
     struct npc_illusionofjandicebarovAI : public ScriptedAI
     {
-        npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature) { }
+        npc_illusionofjandicebarovAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            Cleave_Timer = urand(2000, 8000);
+        }
 
         uint32 Cleave_Timer;
 
         void Reset() override
         {
-            Cleave_Timer = urand(2000, 8000);
+            Initialize();
             me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
         }
 
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
index b88954bd1b7..3864c598459 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp
@@ -44,7 +44,19 @@ public:
 
     struct boss_kormokAI : public ScriptedAI
     {
-        boss_kormokAI(Creature* creature) : ScriptedAI(creature) { }
+        boss_kormokAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            ShadowVolley_Timer = 10000;
+            BoneShield_Timer = 2000;
+            Minion_Timer = 15000;
+            Mage_Timer = 0;
+            Mages = false;
+        }
 
         uint32 ShadowVolley_Timer;
         uint32 BoneShield_Timer;
@@ -54,11 +66,7 @@ public:
 
         void Reset() override
         {
-            ShadowVolley_Timer = 10000;
-            BoneShield_Timer = 2000;
-            Minion_Timer = 15000;
-            Mage_Timer = 0;
-            Mages = false;
+            Initialize();
         }
 
         void EnterCombat(Unit* /*who*/) override
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
index 2aecc8bd491..9351224863c 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp
@@ -48,7 +48,20 @@ public:
 
     struct boss_rasfrostAI : public ScriptedAI
     {
-        boss_rasfrostAI(Creature* creature) : ScriptedAI(creature) { }
+        boss_rasfrostAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            IceArmor_Timer = 2000;
+            Frostbolt_Timer = 8000;
+            ChillNova_Timer = 12000;
+            Freeze_Timer = 18000;
+            FrostVolley_Timer = 24000;
+            Fear_Timer = 45000;
+        }
 
         uint32 IceArmor_Timer;
         uint32 Frostbolt_Timer;
@@ -59,12 +72,7 @@ public:
 
         void Reset() override
         {
-            IceArmor_Timer = 2000;
-            Frostbolt_Timer = 8000;
-            ChillNova_Timer = 12000;
-            Freeze_Timer = 18000;
-            FrostVolley_Timer = 24000;
-            Fear_Timer = 45000;
+            Initialize();
 
             DoCast(me, SPELL_ICEARMOR, true);
         }
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
index c111eb103b4..fba5f3faa14 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_vectus.cpp
@@ -51,7 +51,17 @@ public:
 
     struct boss_vectusAI : public ScriptedAI
     {
-        boss_vectusAI(Creature* creature) : ScriptedAI(creature) { }
+        boss_vectusAI(Creature* creature) : ScriptedAI(creature)
+        {
+            Initialize();
+        }
+
+        void Initialize()
+        {
+            m_uiFireShield_Timer = 2000;
+            m_uiBlastWave_Timer = 14000;
+            m_uiFrenzy_Timer = 0;
+        }
 
         uint32 m_uiFireShield_Timer;
         uint32 m_uiBlastWave_Timer;
@@ -59,9 +69,7 @@ public:
 
         void Reset() override
         {
-            m_uiFireShield_Timer = 2000;
-            m_uiBlastWave_Timer = 14000;
-            m_uiFrenzy_Timer = 0;
+            Initialize();
         }
 
         void UpdateAI(uint32 uiDiff) override