Scripts/EasternKingdoms: ScarletMonastery

* Fixed a few derps i missed on last patch

10 files changed, 83 insertions, 41 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 5054472c671..a9a9c67e6df 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -105,21 +105,24 @@ public:
                     DoCast(target, SPELL_POLYMORPH);
 
                 Polymorph_Timer = 20000;
-            } else Polymorph_Timer -= diff;
+            }
+            else Polymorph_Timer -= diff;
 
             //AoESilence_Timer
             if (AoESilence_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_AOESILENCE);
                 AoESilence_Timer = urand(15000, 20000);
-            } else AoESilence_Timer -= diff;
+            } 
+            else AoESilence_Timer -= diff;
 
             //ArcaneExplosion_Timer
             if (ArcaneExplosion_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_ARCANEEXPLOSION);
                 ArcaneExplosion_Timer = 8000;
-            } else ArcaneExplosion_Timer -= diff;
+            } 
+            else ArcaneExplosion_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index 1802d828a1b..6a8a1f8fc61 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -24,6 +24,7 @@ SDCategory: Scarlet Monastery
 EndScriptData */
 
 #include "ScriptPCH.h"
+
 enum Spells
 {
     SPELL_CALLOFTHEGRAVE            = 17831,
@@ -73,7 +74,8 @@ public:
                     return;
 
                     //SoulSiphon_Timer = 20000;
-                } else SoulSiphon_Timer -= diff;
+                } 
+                else SoulSiphon_Timer -= diff;
             }
 
             //CallOfTheGrave_Timer
@@ -81,14 +83,16 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_CALLOFTHEGRAVE);
                 CallOftheGrave_Timer = 30000;
-            } else CallOftheGrave_Timer -= diff;
+            } 
+            else CallOftheGrave_Timer -= diff;
 
             //Terrify_Timer
             if (Terrify_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_TERRIFY);
                 Terrify_Timer = 20000;
-            } else Terrify_Timer -= diff;
+            } 
+            else Terrify_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index 669d7bb16f3..f54e93eba21 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -93,28 +93,32 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_FLAMESHOCK);
                 FlameShock_Timer = urand(10000, 15000);
-            } else FlameShock_Timer -= diff;
+            } 
+            else FlameShock_Timer -= diff;
 
             //FlameSpike_Timer
             if (FlameSpike_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_FLAMESPIKE);
                 FlameSpike_Timer = 30000;
-            } else FlameSpike_Timer -= diff;
+            } 
+            else FlameSpike_Timer -= diff;
 
             //FireNova_Timer
             if (FireNova_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_FIRENOVA);
                 FireNova_Timer = 40000;
-            } else FireNova_Timer -= diff;
+            } 
+            else FireNova_Timer -= diff;
 
             //ShadowBolt_Timer
             if (ShadowBolt_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_SHADOWBOLT);
                 ShadowBolt_Timer = 2000;
-            } else ShadowBolt_Timer -= diff;
+            } 
+            else ShadowBolt_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index f53779ea5da..834b1a8ac75 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -322,7 +322,8 @@ public:
                     if (!me->getVictim()) return;
                     me->GetMotionMaster()->Clear(false);
                     me->GetMotionMaster()->MoveFleeing(me->getVictim());
-                } else wait -= diff;
+                } 
+                else wait -= diff;
 
                 if (laugh <= diff)
                 {
@@ -333,7 +334,8 @@ public:
                     if (speaker)
                         speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false);
                     me->MonsterTextEmote(EMOTE_LAUGHS, 0);
-                } else laugh -= diff;
+                } 
+                else laugh -= diff;
             }
             else
             {
@@ -345,7 +347,8 @@ public:
                         if (Unit* body = Unit::GetUnit((*me), bodyGUID))
                             body->Kill(body);
                         me->Kill(me);
-                    } else wait -= diff;
+                    } 
+                    else wait -= diff;
                 }
             }
         }
@@ -641,7 +644,8 @@ public:
                                     break;
                                 }
                                 ++count;
-                            } else say_timer -= diff;
+                            } 
+                            else say_timer -= diff;
                         }
                         else
                         {
@@ -662,7 +666,8 @@ public:
                             if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000))
                                 CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2);
                             burned = true;
-                        } else burn -= diff;
+                        } 
+                        else burn -= diff;
                         break;
                     case 2:
                         if (conflagrate <= diff)
@@ -670,7 +675,8 @@ public:
                             if (Unit* player = SelectRandomPlayer(30.0f))
                                 DoCast(player, SPELL_CONFLAGRATION, false);
                             conflagrate = urand(10000, 16000);
-                        } else conflagrate -= diff;
+                        } 
+                        else conflagrate -= diff;
                         break;
                     case 3:
                         if (summonadds <= diff)
@@ -679,7 +685,8 @@ public:
                             DoCast(me, SPELL_SUMMON_PUMPKIN);
                             SaySound(SAY_SPROUTING_PUMPKINS);
                             summonadds = urand(25000, 35000);
-                        } else summonadds -= diff;
+                        } 
+                        else summonadds -= diff;
                         break;
                 }
 
@@ -688,7 +695,8 @@ public:
                     laugh = urand(11000, 22000);
                     me->MonsterTextEmote(EMOTE_LAUGHS, 0);
                     DoPlaySoundToSet(me, RandomLaugh[rand()%3]);
-                } else laugh -= diff;
+                } 
+                else laugh -= diff;
 
                 if (UpdateVictim())
                 {
@@ -697,7 +705,8 @@ public:
                     {
                         DoCast(me->getVictim(), SPELL_CLEAVE);
                         cleave = urand(2000, 6000);       //1 cleave per 2.0f-6.0fsec
-                    } else cleave -= diff;
+                    } 
+                    else cleave -= diff;
                 }
             }
             else
@@ -730,9 +739,11 @@ public:
                         me->RemoveAurasDueToSpell(SPELL_CONFUSE);
                         DoCast(me, SPELL_WHIRLWIND, true);
                         DoCast(me, SPELL_CONFUSE);
-                    } else
+                    } 
+                    else
                         me->RemoveAurasDueToSpell(SPELL_WHIRLWIND);
-                } else whirlwind -= diff;
+                } 
+                else whirlwind -= diff;
             }
         }
     };
@@ -832,12 +843,12 @@ public:
             if (instance->GetData(DATA_HORSEMAN_EVENT) != NOT_STARTED)
                 return true;
             instance->SetData(DATA_HORSEMAN_EVENT, IN_PROGRESS);
-        }
+        }    
     /*  if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && player->getLevel() > 64)
         {
             player->PrepareQuestMenu(soil->GetGUID());
             player->SendPreparedQuest(soil->GetGUID());
-        }
+        }        
         if (player->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && player->getLevel() > 64)
         { */
             player->AreaExploredOrEventHappens(11405);
@@ -855,6 +866,7 @@ void mob_head::mob_headAI::Disappear()
 {
     if (withbody)
         return;
+    
     if (bodyGUID)
     {
         Creature* body = Unit::GetCreature((*me), bodyGUID);
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index e87581a3bbd..e194f064d85 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -33,6 +33,7 @@ enum Says
     SAY_ENRAGE                  = -1189002,
     SAY_KILL                    = -1189003
 };
+
 enum Emotes
 {
     EMOTE_ENRAGE                = -1189004
@@ -114,7 +115,8 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_CLEAVE);
                 Cleave_Timer = 12000;
-            } else Cleave_Timer -= diff;
+            } 
+            else Cleave_Timer -= diff;
 
             // Whirlwind_Timer
             if (Whirlwind_Timer <= diff)
@@ -122,7 +124,8 @@ public:
                 DoScriptText(SAY_WHIRLWIND, me);
                 DoCast(me->getVictim(), SPELL_WHIRLWIND);
                 Whirlwind_Timer = 30000;
-            } else Whirlwind_Timer -= diff;
+            } 
+            else Whirlwind_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index 22624fd6066..e2c14f97381 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -80,7 +80,8 @@ public:
             {
                 DoCast(me, SPELL_HEAL);
                 Heal_Timer = 30000;
-            } else Heal_Timer -= diff;
+            } 
+            else Heal_Timer -= diff;
 
             //Fear_Timer
             if (Fear_Timer <= diff)
@@ -89,7 +90,8 @@ public:
                     DoCast(target, SPELL_FEAR);
 
                 Fear_Timer = 40000;
-            } else Fear_Timer -= diff;
+            } 
+            else Fear_Timer -= diff;
 
             //Sleep_Timer
             if (Sleep_Timer <= diff)
@@ -98,7 +100,8 @@ public:
                     DoCast(target, SPELL_SLEEP);
 
                 Sleep_Timer = 30000;
-            } else Sleep_Timer -= diff;
+            } 
+            else Sleep_Timer -= diff;
 
             //PowerWordShield_Timer
             if (!PowerWordShield && !HealthAbovePct(25))
@@ -114,14 +117,16 @@ public:
                     DoCast(target, SPELL_DISPELMAGIC);
 
                 DispelMagic_Timer = 30000;
-            } else DispelMagic_Timer -= diff;
+            } 
+            else DispelMagic_Timer -= diff;
 
             //CurseOfBlood_Timer
             if (CurseOfBlood_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_CURSEOFBLOOD);
                 CurseOfBlood_Timer = 25000;
-            } else CurseOfBlood_Timer -= diff;
+            } 
+            else CurseOfBlood_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 4bd3c134c61..f8ccc44aede 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -67,7 +67,8 @@ public:
             {
                 DoCast(me, SPELL_BLOODLUST);
                 BloodLust_Timer = 20000;
-            } else BloodLust_Timer -= diff;
+            } 
+            else BloodLust_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index a5c1f48a11b..c3eccaa7871 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -111,7 +111,8 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_SHADOWWORDPAIN);
                 ShadowWordPain_Timer = urand(5000, 15000);
-            } else ShadowWordPain_Timer -= diff;
+            } 
+            else ShadowWordPain_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index 87bee1ca6ad..9547a152337 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -206,14 +206,16 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_CRUSADERSTRIKE);
                 CrusaderStrike_Timer = 10000;
-            } else CrusaderStrike_Timer -= diff;
+            } 
+            else CrusaderStrike_Timer -= diff;
 
             //HammerOfJustice_Timer
             if (HammerOfJustice_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_HAMMEROFJUSTICE);
                 HammerOfJustice_Timer = 60000;
-            } else HammerOfJustice_Timer -= diff;
+            } 
+            else HammerOfJustice_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
@@ -338,21 +340,24 @@ public:
                     DoCast(target, SPELL_HEAL);
 
                 Heal_Timer = 13000;
-            } else Heal_Timer -= diff;
+            } 
+            else Heal_Timer -= diff;
 
             //PowerWordShield_Timer
             if (PowerWordShield_Timer <= diff)
             {
                 DoCast(me, SPELL_POWERWORDSHIELD);
                 PowerWordShield_Timer = 15000;
-            } else PowerWordShield_Timer -= diff;
+            } 
+            else PowerWordShield_Timer -= diff;
 
             //HolySmite_Timer
             if (HolySmite_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_HOLYSMITE);
                 HolySmite_Timer = 6000;
-            } else HolySmite_Timer -= diff;
+            } 
+            else HolySmite_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index 63ccd29f263..d943053a80d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -72,28 +72,32 @@ public:
             {
                 DoCast(me->getVictim(), SPELL_LICHSLAP);
                 LichSlap_Timer = 45000;
-            } else LichSlap_Timer -= diff;
+            } 
+            else LichSlap_Timer -= diff;
 
             //FrostboltVolley_Timer
             if (FrostboltVolley_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_FROSTBOLTVOLLEY);
                 FrostboltVolley_Timer = 20000;
-            } else FrostboltVolley_Timer -= diff;
+            } 
+            else FrostboltVolley_Timer -= diff;
 
             //MindFlay_Timer
             if (MindFlay_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_MINDFLAY);
                 MindFlay_Timer = 20000;
-            } else MindFlay_Timer -= diff;
+            } 
+            else MindFlay_Timer -= diff;
 
             //FrostNova_Timer
             if (FrostNova_Timer <= diff)
             {
                 DoCast(me->getVictim(), SPELL_FROSTNOVA);
                 FrostNova_Timer = 15000;
-            } else FrostNova_Timer -= diff;
+            } 
+            else FrostNova_Timer -= diff;
 
             DoMeleeAttackIfReady();
         }