Add spaces after commas

src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp

@@ -204,7 +204,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
         }
 
         void JustSummoned(Creature *summoned)
@@ -212,11 +212,11 @@ public:
             if (summoned->GetEntry() == ENTRY_STOLEN_SOUL)
             {
                 //SPELL_STOLEN_SOUL_VISUAL has shapeshift effect, but not implemented feature in Trinity for this spell.
-                summoned->CastSpell(summoned,SPELL_STOLEN_SOUL_VISUAL,false);
+                summoned->CastSpell(summoned, SPELL_STOLEN_SOUL_VISUAL, false);
                 summoned->SetDisplayId(soulmodel);
                 summoned->setFaction(me->getFaction());
 
-                if (Unit *pTarget = Unit::GetUnit(*me,soulholder))
+                if (Unit *pTarget = Unit::GetUnit(*me, soulholder))
                 {
 
                 CAST_AI(mob_stolen_soul::mob_stolen_soulAI, summoned->AI())->SetMyClass(soulclass);
@@ -230,7 +230,7 @@ public:
             if (rand()%2)
                 return;
 
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -259,14 +259,14 @@ public:
 
             if (StolenSoul_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                 {
                     if (pTarget->GetTypeId() == TYPEID_PLAYER)
                     {
                         if (me->IsNonMeleeSpellCasted(false))
                             me->InterruptNonMeleeSpells(true);
 
-                        uint32 i = urand(1,2);
+                        uint32 i = urand(1, 2);
                         if (i == 1)
                             DoScriptText(SAY_ROAR, me);
                         else
@@ -286,7 +286,7 @@ public:
 
             if (Ribbon_of_Souls_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_RIBBON_OF_SOULS);
 
                 Ribbon_of_Souls_timer = 5000 + (rand()%20 * 1000);

src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp

@@ -79,7 +79,7 @@ public:
         {
             if (summoned && summoned->GetEntry() == ENTRY_FOCUS_FIRE)
             {
-                summoned->CastSpell(summoned,SPELL_FOCUS_FIRE_VISUAL,false);
+                summoned->CastSpell(summoned, SPELL_FOCUS_FIRE_VISUAL, false);
                 summoned->setFaction(me->getFaction());
                 summoned->SetLevel(me->getLevel());
                 summoned->AddUnitState(UNIT_STAT_ROOT);
@@ -136,11 +136,11 @@ public:
             if (FocusFire_Timer <= diff)
             {
                 // Summon Focus Fire & Emote
-                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
+                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
                 if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive())
                 {
                     FocusedTargetGUID = pTarget->GetGUID();
-                    me->SummonCreature(ENTRY_FOCUS_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,5500);
+                    me->SummonCreature(ENTRY_FOCUS_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5500);
 
                     // TODO: Find better way to handle emote
                     // Emote

src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp

@@ -116,7 +116,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
 
             DoZoneInCombat();
             summons.DoZoneInCombat();
@@ -126,9 +126,9 @@ public:
         {
             if (summoned->GetEntry() == NPC_BEACON)
             {
-                summoned->CastSpell(summoned,SPELL_ETHEREAL_BEACON_VISUAL,false);
+                summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false);
 
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     summoned->AI()->AttackStart(pTarget);
             }
 
@@ -142,7 +142,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -201,7 +201,7 @@ public:
                 if (me->IsNonMeleeSpellCasted(false))
                     me->InterruptNonMeleeSpells(true);
 
-                if (!urand(0,3))
+                if (!urand(0, 3))
                     DoScriptText(SAY_SUMMON, me);
 
                 DoCast(me, SPELL_ETHEREAL_BEACON, true);

src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp

@@ -75,12 +75,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+            DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
         }
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
         }
 
         void UpdateAI(const uint32 diff)

src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp

@@ -94,7 +94,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -107,12 +107,12 @@ public:
             if (rand()%2)
                 return;
 
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
         }
 
         void JustSummoned(Creature *summoned)
         {
-            if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+            if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                 summoned->AI()->AttackStart(pTarget);
         }
 
@@ -154,7 +154,7 @@ public:
 
             if (flameshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FLAME_SHOCK);
 
                 flameshock_timer = 10000 + rand()%5000;
@@ -162,7 +162,7 @@ public:
 
             if (arcaneshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_ARCANE_SHOCK);
 
                 arcaneshock_timer = 10000 + rand()%5000;
@@ -170,7 +170,7 @@ public:
 
             if (frostshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FROST_SHOCK);
 
                 frostshock_timer = 10000 + rand()%5000;
@@ -178,7 +178,7 @@ public:
 
             if (shadowshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_SHADOW_SHOCK);
 
                 shadowshock_timer = 10000 + rand()%5000;
@@ -186,7 +186,7 @@ public:
 
             if (chainlightning_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
 
                 chainlightning_timer = 25000;
@@ -229,7 +229,7 @@ public:
 
             if (flameshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FLAME_SHOCK);
 
                 flameshock_timer = 5000;
@@ -237,7 +237,7 @@ public:
 
             if (flamebuffet_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FLAME_BUFFET);
 
                 flamebuffet_timer = 5000;
@@ -288,7 +288,7 @@ public:
 
             if (arcaneshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_ARCANE_SHOCK);
 
                 arcaneshock_timer = 5000;
@@ -296,7 +296,7 @@ public:
 
             if (arcanebuffet_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_ARCANE_BUFFET);
 
                 arcanebuffet_timer = 5000;
@@ -342,7 +342,7 @@ public:
 
             if (frostshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FROST_SHOCK);
 
                 frostshock_timer = 5000;
@@ -350,7 +350,7 @@ public:
 
             if (frostbuffet_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_FROST_BUFFET);
 
                 frostbuffet_timer = 5000;
@@ -397,7 +397,7 @@ public:
 
             if (shadowshock_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_SHADOW_SHOCK);
 
                 shadowshock_timer = 5000;
@@ -405,7 +405,7 @@ public:
 
             if (shadowbuffet_timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_SHADOW_BUFFET);
 
                 shadowbuffet_timer = 5000;

src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_tailonking_ikiss.cpp

@@ -115,7 +115,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -128,7 +128,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
         }
 
         void UpdateAI(const uint32 diff)
@@ -155,9 +155,9 @@ public:
 
                 //second top aggro target in normal, random target in heroic correct?
                 if (IsHeroic())
-                    pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
+                    pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
                 else
-                    pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1);
+                    pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1);
 
                 if (pTarget)
                     DoCast(pTarget, SPELL_POLYMORPH);
@@ -184,7 +184,7 @@ public:
             {
                 DoScriptText(EMOTE_ARCANE_EXP, me);
 
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                 {
                     if (me->IsNonMeleeSpellCasted(false))
                         me->InterruptNonMeleeSpells(false);
@@ -196,7 +196,7 @@ public:
                     float Y = pTarget->GetPositionY();
                     float Z = pTarget->GetPositionZ();
 
-                    DoTeleportTo(X,Y,Z);
+                    DoTeleportTo(X, Y, Z);
 
                     DoCast(pTarget, SPELL_BLINK_TELEPORT);
                     Blink = true;

src/server/scripts/Outland/Auchindoun/SethekkHalls/instance_sethekk_halls.cpp

@@ -78,7 +78,7 @@ public:
             {
                 case DATA_IKISSDOOREVENT:
                     if (data == DONE)
-                        DoUseDoorOrButton(m_uiIkissDoorGUID,DAY*IN_MILLISECONDS);
+                        DoUseDoorOrButton(m_uiIkissDoorGUID, DAY*IN_MILLISECONDS);
                     break;
                 case TYPE_ANZU_ENCOUNTER:
                     AnzuEncounter = data;

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_ambassador_hellmaw.cpp

@@ -128,12 +128,12 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
         }
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp

@@ -93,7 +93,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -106,7 +106,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
 
             if (pInstance)
                 pInstance->SetData(DATA_BLACKHEARTTHEINCITEREVENT, IN_PROGRESS);
@@ -138,7 +138,7 @@ public:
                 {
                     Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid());
                     if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
-                        pTarget->CastSpell(pTarget,SPELL_INCITE_CHAOS_B,true);
+                        pTarget->CastSpell(pTarget, SPELL_INCITE_CHAOS_B, true);
                 }
 
                 DoResetThreat();

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp

@@ -51,7 +51,7 @@ EndScriptData */
 #define MOB_VOID_PORTAL             19224
 #define SPELL_VOID_PORTAL_VISUAL    33569
 
-float VorpilPosition[3] = {-252.8820f,-264.3030f,17.1f};
+float VorpilPosition[3] = {-252.8820f, -264.3030f, 17.1f};
 
 float VoidPortalCoords[5][3] =
 {
@@ -115,7 +115,7 @@ public:
                     me->Kill(me);
                     return;
                 }
-                me->GetMotionMaster()->MoveFollow(Vorpil,0,0);
+                me->GetMotionMaster()->MoveFollow(Vorpil, 0, 0);
                 if (me->IsWithinDist(Vorpil, 3))
                 {
                     DoCast(me, SPELL_SACRIFICE, false);
@@ -183,11 +183,11 @@ public:
                 for (uint8 i = 0; i < 5; ++i)
                 {
                     Creature *Portal = NULL;
-                    Portal = me->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000);
+                    Portal = me->SummonCreature(MOB_VOID_PORTAL, VoidPortalCoords[i][0], VoidPortalCoords[i][1], VoidPortalCoords[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 3000000);
                     if (Portal)
                     {
                         PortalsGuid[i] = Portal->GetGUID();
-                        Portal->CastSpell(Portal,SPELL_VOID_PORTAL_VISUAL,false);
+                        Portal->CastSpell(Portal, SPELL_VOID_PORTAL_VISUAL, false);
                     }
                 }
                 sumportals = true;
@@ -212,8 +212,8 @@ public:
 
         void spawnVoidTraveler()
         {
-            int pos = urand(0,4);
-            me->SummonCreature(MOB_VOID_TRAVELER,VoidPortalCoords[pos][0],VoidPortalCoords[pos][1],VoidPortalCoords[pos][2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,5000);
+            int pos = urand(0, 4);
+            me->SummonCreature(MOB_VOID_TRAVELER, VoidPortalCoords[pos][0], VoidPortalCoords[pos][1], VoidPortalCoords[pos][2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000);
             if (!HelpYell)
             {
                 DoScriptText(SAY_HELP, me);
@@ -229,7 +229,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -243,7 +243,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
             summonPortals();
 
             if (pInstance)
@@ -274,7 +274,7 @@ public:
 
             if (IsHeroic() && banish_Timer <= diff)
             {
-                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,false);
+                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false);
                 if (pTarget)
                 {
                     DoCast(pTarget, SPELL_BANISH);
@@ -289,9 +289,9 @@ public:
                 for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                     if (Player* i_pl = i->getSource())
                         if (i_pl->isAlive() && !i_pl->HasAura(SPELL_BANISH))
-                            i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0],VorpilPosition[1],VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT);
+                            i_pl->TeleportTo(me->GetMapId(), VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0, TELE_TO_NOT_LEAVE_COMBAT);
 
-                me->GetMap()->CreatureRelocation(me, VorpilPosition[0],VorpilPosition[1],VorpilPosition[2],0.0f);
+                me->GetMap()->CreatureRelocation(me, VorpilPosition[0], VorpilPosition[1], VorpilPosition[2], 0.0f);
                 DoCast(me, SPELL_DRAW_SHADOWS, true);
 
                 DoCast(me, SPELL_RAIN_OF_FIRE);

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp

@@ -101,7 +101,7 @@ public:
         void SpellHitTarget(Unit *pTarget, const SpellEntry *spell)
         {
             if (pTarget && pTarget->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT))
-                me->DealDamage(pTarget,(pTarget->GetHealth()*90)/100,NULL,SPELL_DIRECT_DAMAGE,SPELL_SCHOOL_MASK_NATURE,spell);
+                me->DealDamage(pTarget, (pTarget->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell);
         }
 
         void UpdateAI(const uint32 diff)
@@ -131,7 +131,7 @@ public:
             // Murmur's Touch
             if (MurmursTouch_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,80,true))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true))
                     DoCast(pTarget, SPELL_MURMURS_TOUCH);
                 MurmursTouch_Timer = 25000 + rand()%10000;
             } else MurmursTouch_Timer -= diff;
@@ -149,7 +149,7 @@ public:
             // Magnetic Pull
             if (MagneticPull_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     if (pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->isAlive())
                     {
                         DoCast(pTarget, SPELL_MAGNETIC_PULL);
@@ -166,7 +166,7 @@ public:
                 {
                     std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
                     for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
-                        if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid()))
+                        if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid()))
                             if (pTarget->isAlive() && !me->IsWithinDist(pTarget, 35, false))
                                 DoCast(pTarget, SPELL_THUNDERING_STORM, true);
                     ThunderingStorm_Timer = 15000;
@@ -175,7 +175,7 @@ public:
                 // Sonic Shock
                 if (SonicShock_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,20,false))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 20, false))
                         if (pTarget->isAlive())
                             DoCast(pTarget, SPELL_SONIC_SHOCK);
                     SonicShock_Timer = 10000+rand()%10000;
@@ -189,7 +189,7 @@ public:
             {
                 std::list<HostileReference*>& m_threatlist = me->getThreatManager().getThreatList();
                 for (std::list<HostileReference*>::const_iterator i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
-                    if (Unit *pTarget = Unit::GetUnit((*me),(*i)->getUnitGuid()))
+                    if (Unit *pTarget = Unit::GetUnit((*me), (*i)->getUnitGuid()))
                         if (pTarget->isAlive() && me->IsWithinMeleeRange(pTarget))
                         {
                             me->TauntApply(pTarget);

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp

@@ -108,7 +108,7 @@ public:
                     if (creature->isAlive())
                     {
                         ++m_uiFelOverseerCount;
-                        sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.",m_uiFelOverseerCount);
+                        sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: counting %u Fel Overseers.", m_uiFelOverseerCount);
                     }
                     break;
             }
@@ -133,7 +133,7 @@ public:
                         --m_uiFelOverseerCount;
 
                         if (m_uiFelOverseerCount)
-                            sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.",m_uiFelOverseerCount);
+                            sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Shadow Labyrinth: %u Fel Overseers left to kill.", m_uiFelOverseerCount);
                         else
                         {
                             m_auiEncounter[1] = DONE;

src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp

@@ -114,7 +114,7 @@ public:
             Phase1 = true;
 
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
-            me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false);
+            me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
         }
 
         void EnterCombat(Unit * /*who*/)
@@ -127,7 +127,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -218,7 +218,7 @@ public:
                 if (EnrageTimer <= diff)
                 {
                     DoCast(me, SPELL_BERSERK);
-                    DoScriptText(RAND(SAY_ENRAGE1,SAY_ENRAGE2), me);
+                    DoScriptText(RAND(SAY_ENRAGE1, SAY_ENRAGE2), me);
                 } else EnrageTimer -= diff;
             }
 
@@ -289,7 +289,7 @@ public:
                             DoModifyThreatPercent(pTarget, -100);
                         me->AddThreat(pTarget, 50000000.0f);
                         me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-                        me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
+                        me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
                                                                 // If VMaps are disabled, this spell can call the whole instance
                         DoCast(me, SPELL_INSIGNIFIGANCE, true);
                         DoCast(pTarget, SPELL_FEL_RAGE_TARGET, true);
@@ -301,7 +301,7 @@ public:
                         //Cast this without triggered so that it appears in combat logs and shows visual.
                         DoCast(me, SPELL_FEL_RAGE_SELF);
 
-                        DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me);
+                        DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me);
 
                         AcidGeyserTimer = 1000;
                         PhaseChangeTimer = 30000;
@@ -320,7 +320,7 @@ public:
                     EjectTimer += 2000;
                     PhaseChangeTimer = 60000;
                     me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
-                    me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false);
+                    me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
                 }
             } else PhaseChangeTimer -= diff;
 

src/server/scripts/Outland/BlackTemple/boss_illidan.cpp

@@ -259,17 +259,17 @@ static const Yells Conversation[22] =
     {0,     "", AKAMA, 2000, 15, true},
     {11466, "You are not prepared!", ILLIDAN_STORMRAGE, 3000, 406, true},
     {0,     "", EMPTY, 1000, 0, true},
-    {0,     "", EMPTY, 0, 0, false},//9
+    {0,     "", EMPTY, 0, 0, false}, //9
     {11476, "Is this it, mortals? Is this all the fury you can muster?", ILLIDAN_STORMRAGE, 8000, 0, true},
     {11491, "Their fury pales before mine, Illidan. We have some unsettled business between us.", MAIEV_SHADOWSONG, 8000, 5, true},
     {11477, "Maiev... How is this even possible?", ILLIDAN_STORMRAGE, 5000, 1, true},
     {11492, "Ah... my long hunt is finally over. Today, Justice will be done!", MAIEV_SHADOWSONG, 8000, 15, true},
-    {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false},//14
-    {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true},//15
+    {11470, "Feel the hatred of ten thousand years!", ILLIDAN_STORMRAGE, 1000, 0, false}, //14
+    {11496, "Ahh... It is finished. You are beaten.", MAIEV_SHADOWSONG, 6000, 0, true}, //15
     {11478, "You have won... Maiev...but the huntress... is nothing...without the hunt... you... are nothing... without me..", ILLIDAN_STORMRAGE, 30000, 65, true}, // Emote dead for now. Kill him later
     {11497, "He is right. I feel nothing... I am nothing... Farewell, champions.", MAIEV_SHADOWSONG, 9000, 0, true},
     {11498, "", MAIEV_SHADOWSONG, 5000, 0, true},
-    {11498, "", EMPTY, 1000, 0, true},//19 Maiev disappear
+    {11498, "", EMPTY, 1000, 0, true}, //19 Maiev disappear
     {11387, "The Light will fill these dismal halls once again. I swear it.", AKAMA, 8000, 0, true},
     {0,     "", EMPTY, 1000, 0, false}//21
 };
@@ -306,14 +306,14 @@ static const Locations HoverPosition[4]=
 static const Locations GlaivePosition[4]=
 {
     {695.105f, 305.303f, 354.256f},
-    {659.338f, 305.303f, 354.256f},//the distance between two glaives is 36
+    {659.338f, 305.303f, 354.256f}, //the distance between two glaives is 36
     {700.105f, 305.303f, 354.256f},
     {664.338f, 305.303f, 354.256f}
 };
 
 static const Locations EyeBlast[2]=
 {
-    {677.0f, 350.0f, 354.0f},//start point, pass through glaive point
+    {677.0f, 350.0f, 354.0f}, //start point, pass through glaive point
     {677.0f, 260.0f, 354.0f}
 };
 
@@ -350,7 +350,7 @@ static const Animation DemonTransformation[10]=
 {
     {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, true},
     {SPELL_DEMON_TRANSFORM_2, SPELL_DEMON_TRANSFORM_1, 4000, 0, 0, 6, true},
-    {0, 0, 3000, 1073741824, 21322, 6, false},//stunned, cannot cast demon form
+    {0, 0, 3000, 1073741824, 21322, 6, false}, //stunned, cannot cast demon form
     {SPELL_DEMON_TRANSFORM_3, SPELL_DEMON_TRANSFORM_2, 3500, 0, 0, 6, false},
     {SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3, 0, 0, 0, 4, false},
     {SPELL_DEMON_TRANSFORM_1, 0, 1000, 0, 0, 6, false},
@@ -568,7 +568,7 @@ public:
         {
             if (victim == me) return;
             // TODO: Find better way to handle emote
-            switch (urand(0,1))
+            switch (urand(0, 1))
             {
             case 0:
                 me->MonsterYell(SAY_KILL1, LANG_UNIVERSAL, victim->GetGUID());
@@ -1655,8 +1655,8 @@ public:
                 break;
             case 2: // spirit help
                 DoCast(Channel, SPELL_AKAMA_DOOR_CHANNEL);
-                Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false);
-                Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL,false);
+                Spirit[0]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false);
+                Spirit[1]->CastSpell(Channel, SPELL_DEATHSWORN_DOOR_CHANNEL, false);
                 Timer = 5000;
                 break;
             case 3: //open the gate
@@ -1991,7 +1991,7 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::HandleTalkSequence()
         {
             Maiev->CastSpell(Maiev, SPELL_TELEPORT_VISUAL, true);
             Maiev->setDeathState(JUST_DIED);
-            me->SetUInt32Value(UNIT_FIELD_BYTES_1,UNIT_STAND_STATE_DEAD);
+            me->SetUInt32Value(UNIT_FIELD_BYTES_1, UNIT_STAND_STATE_DEAD);
         }
         break;
     case 21: // Kill ourself.
@@ -2218,7 +2218,7 @@ public:
                 if (!me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND)
                     && !me->getVictim()->HasAura(SPELL_PARASITIC_SHADOWFIEND2))
                 {
-                    if (Creature* illidan = Unit::GetCreature((*me),IllidanGUID))//summon only in 1. phase
+                    if (Creature* illidan = Unit::GetCreature((*me), IllidanGUID))//summon only in 1. phase
                         if (CAST_AI(boss_illidan_stormrage::boss_illidan_stormrageAI, illidan->AI())->Phase == PHASE_NORMAL)
                             me->CastSpell(me->getVictim(), SPELL_PARASITIC_SHADOWFIEND2, true, 0, 0, IllidanGUID); //do not stack
                 }

src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp

@@ -64,7 +64,7 @@ uint32 PrismaticAuras[]=
 
 struct Locations
 {
-    float x,y,z;
+    float x, y, z;
 };
 
 static Locations TeleportPoint[]=
@@ -146,7 +146,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -235,7 +235,7 @@ public:
 
                 TeleportPlayers();
 
-                DoScriptText(RAND(SAY_SPELL2,SAY_SPELL3), me);
+                DoScriptText(RAND(SAY_SPELL2, SAY_SPELL3), me);
                 FatalAttractionExplodeTimer = 2000;
                 FatalAttractionTimer = 40000 + rand()%31 * 1000;
             } else FatalAttractionTimer -= diff;
@@ -292,7 +292,7 @@ public:
             //Random taunts
             if (RandomYellTimer <= diff)
             {
-                DoScriptText(RAND(SAY_TAUNT1,SAY_TAUNT2,SAY_TAUNT3), me);
+                DoScriptText(RAND(SAY_TAUNT1, SAY_TAUNT2, SAY_TAUNT3), me);
                 RandomYellTimer = 60000 + rand()%91 * 1000;
             } else RandomYellTimer -= diff;
 

src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp

@@ -88,7 +88,7 @@ EndScriptData */
 
 struct Position2d
 {
-    float x,y;
+    float x, y;
 };
 
 static Position2d Coords[]=
@@ -294,7 +294,7 @@ public:
                             MergeThreatList(Essence);
                             Essence->RemoveAllAuras();
                             Essence->DeleteThreatList();
-                            Essence->GetMotionMaster()->MoveFollow(me,0.0f,0.0f);
+                            Essence->GetMotionMaster()->MoveFollow(me, 0.0f, 0.0f);
                         } else return;
                     }
                     break;
@@ -302,7 +302,7 @@ public:
                     Timer = 1500;
                     if (Essence->IsWithinDistInMap(me, 10))
                     {
-                        Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE,374); //rotate and disappear
+                        Essence->SetUInt32Value(UNIT_NPC_EMOTESTATE, 374); //rotate and disappear
                         Timer = 2000;
                         me->RemoveAurasDueToSpell(SPELL_SUBMERGE);
                     }
@@ -325,7 +325,7 @@ public:
                         DoScriptText(DESI_SAY_AFTER, Essence);
                     }
                     Essence->DespawnOrUnsummon();
-                    me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0);
+                    me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
                     EssenceGUID = 0;
                     SoulCount = 0;
                     SoulDeathCount = 0;
@@ -406,7 +406,7 @@ public:
             {
                 damage = 0;
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                me->Yell(SUFF_SAY_RECAP,LANG_UNIVERSAL,0);
+                me->Yell(SUFF_SAY_RECAP, LANG_UNIVERSAL, 0);
                 DoScriptText(SUFF_SAY_RECAP, me);
             }
         }
@@ -426,7 +426,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SUFF_SAY_SLAY1,SUFF_SAY_SLAY2,SUFF_SAY_SLAY3), me);
+            DoScriptText(RAND(SUFF_SAY_SLAY1, SUFF_SAY_SLAY2, SUFF_SAY_SLAY3), me);
         }
 
         void CastFixate()
@@ -450,7 +450,7 @@ public:
             if (pTarget)
                 pTarget->CastSpell(me, SPELL_FIXATE_TAUNT, true);
             DoResetThreat();
-            me->AddThreat(pTarget,1000000);
+            me->AddThreat(pTarget, 1000000);
         }
 
         void UpdateAI(const uint32 diff)
@@ -555,7 +555,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(DESI_SAY_SLAY1,DESI_SAY_SLAY2,DESI_SAY_SLAY3), me);
+            DoScriptText(RAND(DESI_SAY_SLAY1, DESI_SAY_SLAY2, DESI_SAY_SLAY3), me);
         }
 
         void UpdateAI(const uint32 diff)
@@ -634,7 +634,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(ANGER_SAY_FREED,ANGER_SAY_FREED2), me);
+            DoScriptText(RAND(ANGER_SAY_FREED, ANGER_SAY_FREED2), me);
 
             DoZoneInCombat();
             DoCast(me, AURA_OF_ANGER, true);
@@ -647,7 +647,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(ANGER_SAY_SLAY1,ANGER_SAY_SLAY2), me);
+            DoScriptText(RAND(ANGER_SAY_SLAY1, ANGER_SAY_SLAY2), me);
         }
 
         void UpdateAI(const uint32 diff)

src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp

@@ -173,7 +173,7 @@ public:
                 Creature* Shade = Unit::GetCreature((*me), ShadeGUID);
                 if (Shade && Shade->isAlive() && me->isAlive())
                 {
-                    if (me->IsWithinDist(Shade, 20,false))
+                    if (me->IsWithinDist(Shade, 20, false))
                     {
                         me->GetMotionMaster()->Clear(false);
                         me->GetMotionMaster()->MoveIdle();
@@ -208,7 +208,7 @@ public:
             AkamaGUID = pInstance ? pInstance->GetData64(DATA_AKAMA_SHADE) : 0;
             me->setActive(true);//if view distance is too low
             me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-            me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
+            me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
         }
 
         InstanceScript* pInstance;
@@ -381,7 +381,7 @@ public:
         void FindChannelers()
         {
             std::list<Creature*> ChannelerList;
-            me->GetCreatureListWithEntryInGrid(ChannelerList,CREATURE_CHANNELER,50.0f);
+            me->GetCreatureListWithEntryInGrid(ChannelerList, CREATURE_CHANNELER, 50.0f);
 
             if (!ChannelerList.empty())
             {
@@ -437,7 +437,7 @@ public:
                             if (Creature* Akama = Unit::GetCreature(*me, AkamaGUID))
                             {
                                 float x, y, z;
-                                Akama->GetPosition(x,y,z);
+                                Akama->GetPosition(x, y, z);
                                 // They move towards AKama
                                 Defender->GetMotionMaster()->MovePoint(0, x, y, z);
                                 Defender->AI()->AttackStart(Akama);

src/server/scripts/Outland/BlackTemple/boss_supremus.cpp

@@ -73,7 +73,7 @@ public:
             me->GetNearPoint(me, x, y, z, 1, 100, float(M_PI*2*rand_norm()));
             me->GetMotionMaster()->MovePoint(0, x, y, z);
             me->SetVisible(false);
-            me->CastSpell(me,SPELL_MOLTEN_FLAME,true);
+            me->CastSpell(me, SPELL_MOLTEN_FLAME, true);
         }
     };
 
@@ -138,7 +138,7 @@ public:
                 events.ScheduleEvent(EVENT_HATEFUL_STRIKE, 5000, GCD_CAST, PHASE_STRIKE);
                 me->SetSpeed(MOVE_RUN, 1.2f);
                 me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, false);
-                me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, false);
+                me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, false);
             }
             else
             {
@@ -147,7 +147,7 @@ public:
                 events.ScheduleEvent(EVENT_SWITCH_TARGET, 10000, 0, PHASE_CHASE);
                 me->SetSpeed(MOVE_RUN, 0.9f);
                 me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true);
-                me->ApplySpellImmune(0, IMMUNITY_EFFECT,SPELL_EFFECT_ATTACK_ME, true);
+                me->ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
             }
             DoResetThreat();
             DoZoneInCombat();
@@ -232,7 +232,7 @@ public:
                         if (pTarget)
                         {
                             //DoCast(pTarget, SPELL_VOLCANIC_SUMMON);//movement bugged
-                            me->SummonCreature(CREATURE_VOLCANO,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000);
+                            me->SummonCreature(CREATURE_VOLCANO, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
                             DoScriptText(EMOTE_GROUND_CRACK, me);
                             events.DelayEvents(1500, GCD_CAST);
                         }

src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp

@@ -288,7 +288,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -302,7 +302,7 @@ public:
         float CalculateRandomLocation(float Loc, uint32 radius)
         {
             float coord = Loc;
-            switch (urand(0,1))
+            switch (urand(0, 1))
             {
                 case 0:
                     coord += rand()%radius;
@@ -345,8 +345,8 @@ public:
                 Ghost = Unit::GetUnit((*me), GhostGUID);
             if (Ghost && Ghost->isAlive() && Ghost->HasAura(SPELL_SHADOW_OF_DEATH))
             {
-                /*float x,y,z;
-                Ghost->GetPosition(x,y,z);
+                /*float x, y, z;
+                Ghost->GetPosition(x, y, z);
                 Creature* control = me->SummonCreature(CREATURE_GHOST, x, y, z, 0, TEMPSUMMON_TIMED_DESAWN, 30000);
                 if (control)
                 {
@@ -458,7 +458,7 @@ public:
 
                 if (pTarget)
                 {
-                    DoScriptText(RAND(SAY_SPECIAL1,SAY_SPECIAL2), me);
+                    DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me);
                     DoCast(pTarget, SPELL_INCINERATE);
                     IncinerateTimer = 20000 + rand()%31 * 1000;
                 }
@@ -491,7 +491,7 @@ public:
 
             if (RandomYellTimer <= diff)
             {
-                DoScriptText(RAND(SAY_SPELL1,SAY_SPELL2), me);
+                DoScriptText(RAND(SAY_SPELL1, SAY_SPELL2), me);
                 RandomYellTimer = 50000 + rand()%51 * 1000;
             } else RandomYellTimer -= diff;
 

src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp

@@ -189,13 +189,13 @@ public:
                         SelectTargetList(pTargets, 3, SELECT_TARGET_RANDOM, 80, true);
                         for (std::list<Unit*>::const_iterator i = pTargets.begin(); i != pTargets.end(); ++i)
                             DoCast(*i, 39835, true);
-                        events.ScheduleEvent(EVENT_NEEDLE, urand(15000,25000), GCD_CAST);
+                        events.ScheduleEvent(EVENT_NEEDLE, urand(15000, 25000), GCD_CAST);
                         events.DelayEvents(1500, GCD_CAST);
                         return;
                     }
                     case EVENT_YELL:
                         DoScriptText(RAND(SAY_SPECIAL1, SAY_SPECIAL2), me);
-                        events.ScheduleEvent(EVENT_YELL, urand(25000,100000), GCD_YELL);
+                        events.ScheduleEvent(EVENT_YELL, urand(25000, 100000), GCD_YELL);
                         events.DelayEvents(15000, GCD_YELL);
                         break;
                 }

src/server/scripts/Outland/BlackTemple/illidari_council.cpp

@@ -326,7 +326,7 @@ public:
                             if (Creature* VoiceTrigger = (Unit::GetCreature(*me, pInstance->GetData64(DATA_BLOOD_ELF_COUNCIL_VOICE))))
                                 VoiceTrigger->DealDamage(VoiceTrigger, VoiceTrigger->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                             pInstance->SetData(DATA_ILLIDARICOUNCILEVENT, DONE);
-                            //me->SummonCreature(AKAMAID,746.466980f,304.394989f,311.90208f,6.272870f,TEMPSUMMON_DEAD_DESPAWN,0);
+                            //me->SummonCreature(AKAMAID, 746.466980f, 304.394989f, 311.90208f, 6.272870f, TEMPSUMMON_DEAD_DESPAWN, 0);
                         }
                         me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         return;
@@ -518,7 +518,7 @@ public:
         void CastAuraOnCouncil()
         {
             uint32 spellid = 0;
-            switch (urand(0,1))
+            switch (urand(0, 1))
             {
                 case 0: spellid = SPELL_DEVOTION_AURA;   break;
                 case 1: spellid = SPELL_CHROMATIC_AURA;  break;
@@ -540,7 +540,7 @@ public:
             {
                 if (Unit* pUnit = SelectCouncilMember())
                 {
-                    switch (urand(0,1))
+                    switch (urand(0, 1))
                     {
                         case 0: DoCast(pUnit, SPELL_BLESS_SPELLWARD);  break;
                         case 1: DoCast(pUnit, SPELL_BLESS_PROTECTION); break;
@@ -570,7 +570,7 @@ public:
 
             if (SealTimer <= diff)
             {
-                switch (urand(0,1))
+                switch (urand(0, 1))
                 {
                     case 0: DoCast(me, SPELL_SEAL_OF_COMMAND);  break;
                     case 1: DoCast(me, SPELL_SEAL_OF_BLOOD);    break;
@@ -650,7 +650,7 @@ public:
             {
                 DoCast(me, SPELL_DAMPEN_MAGIC);
                 Cooldown = 1000;
-                DampenMagicTimer = 67200;                      // almost 1,12 minutes
+                DampenMagicTimer = 67200;                      // almost 1, 12 minutes
                 ArcaneBoltTimer += 1000;                        // Give the Mage some time to spellsteal Dampen.
             } else DampenMagicTimer -= diff;
 

src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp

@@ -164,24 +164,24 @@ public:
             switch(go->GetEntry())
             {
             case 185483: NajentusGate = go->GetGUID();// Gate past Naj'entus (at the entrance to Supermoose's courtyards)
-                if (m_auiEncounter[0] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[0] == DONE)HandleGameObject(0, true, go);break;
             case 185882: MainTempleDoors = go->GetGUID();// Main Temple Doors - right past Supermoose (Supremus)
-                if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break;
             case 185478: ShadeOfAkamaDoor = go->GetGUID();break;
             case 185480: CommonDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break;
             case 186153: TeronDoor = go->GetGUID();
-                if (m_auiEncounter[3] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[3] == DONE)HandleGameObject(0, true, go);break;
             case 185892: GuurtogDoor = go->GetGUID();
-                if (m_auiEncounter[4] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[4] == DONE)HandleGameObject(0, true, go);break;
             case 185479: TempleDoor = go->GetGUID();
-                if (m_auiEncounter[5] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[5] == DONE)HandleGameObject(0, true, go);break;
             case 185482: MotherDoor = go->GetGUID();
-                if (m_auiEncounter[6] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[6] == DONE)HandleGameObject(0, true, go);break;
             case 185481: CouncilDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break;
             case 186152: SimpleDoor = go->GetGUID();
-                if (m_auiEncounter[7] == DONE)HandleGameObject(0,true,go);break;
+                if (m_auiEncounter[7] == DONE)HandleGameObject(0, true, go);break;
             case 185905: IllidanGate = go->GetGUID(); break; // Gate leading to Temple Summit
             case 186261: IllidanDoor[0] = go->GetGUID(); break; // Right door at Temple Summit
             case 186262: IllidanDoor[1] = go->GetGUID(); break; // Left door at Temple Summit

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp

@@ -201,7 +201,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
         }
 
         void JustDied(Unit * /*killer*/)
@@ -432,7 +432,7 @@ public:
                 pet = true;
                 //uint32 spell_id;
                 uint32 pet_id;
-                if (!urand(0,1))
+                if (!urand(0, 1))
                 {
                     //spell_id = SPELL_SUMMON_FATHOM_LURKER;
                     pet_id = CREATURE_FATHOM_LURKER;
@@ -443,8 +443,8 @@ public:
                     pet_id = CREATURE_FATHOM_SPOREBAT;
                 }
                 //DoCast(me, spell_id, true);
-                Creature *Pet = DoSpawnCreature(pet_id,0,0,0,0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
-                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
+                Creature *Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
+                Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
                 if (Pet && pTarget)
                 {
                     Pet->AI()->AttackStart(pTarget);

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp

@@ -137,18 +137,18 @@ public:
 
         void SummonBeams()
         {
-            Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-258.333f,-356.34f,22.0499f,5.90835f,TEMPSUMMON_CORPSE_DESPAWN,0);
+            Creature* beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -258.333f, -356.34f, 22.0499f, 5.90835f, TEMPSUMMON_CORPSE_DESPAWN, 0);
             if (beamer)
             {
-                beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
+                beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
                 beamer->SetDisplayId(11686);  //invisible
                 beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 beams[0]=beamer->GetGUID();
             }
-            beamer = me->SummonCreature(ENTRY_BEAM_DUMMY,-219.918f,-371.308f,22.0042f,2.73072f,TEMPSUMMON_CORPSE_DESPAWN,0);
+            beamer = me->SummonCreature(ENTRY_BEAM_DUMMY, -219.918f, -371.308f, 22.0042f, 2.73072f, TEMPSUMMON_CORPSE_DESPAWN, 0);
             if (beamer)
             {
-                beamer->CastSpell(me,SPELL_BLUE_BEAM,true);
+                beamer->CastSpell(me, SPELL_BLUE_BEAM, true);
                 beamer->SetDisplayId(11686);  //invisible
                 beamer->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
                 beams[1]=beamer->GetGUID();
@@ -158,7 +158,7 @@ public:
         {
             for (uint8 i=0; i<2; ++i)
             {
-                Creature* mob = Unit::GetCreature(*me,beams[i]);
+                Creature* mob = Unit::GetCreature(*me, beams[i]);
                 if (mob)
                 {
                     mob->setDeathState(DEAD);
@@ -178,11 +178,11 @@ public:
         {
             if (CorruptedForm)
             {
-                DoScriptText(RAND(SAY_CORRUPT_SLAY1,SAY_CORRUPT_SLAY2), me);
+                DoScriptText(RAND(SAY_CORRUPT_SLAY1, SAY_CORRUPT_SLAY2), me);
             }
             else
             {
-                DoScriptText(RAND(SAY_CLEAN_SLAY1,SAY_CLEAN_SLAY2), me);
+                DoScriptText(RAND(SAY_CLEAN_SLAY1, SAY_CLEAN_SLAY2), me);
             }
         }
 
@@ -191,13 +191,13 @@ public:
             if (summoned->GetEntry() == ENTRY_PURE_SPAWN)
             {
                 summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FROST, true);
-                summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
+                summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true);
                 Summons.Summon(summoned);
             }
             if (summoned->GetEntry() == ENTRY_TAINTED_SPAWN)
             {
                 summoned->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_NATURE, true);
-                summoned->CastSpell(summoned,SPELL_ELEMENTAL_SPAWNIN,true);
+                summoned->CastSpell(summoned, SPELL_ELEMENTAL_SPAWNIN, true);
                 Summons.Summon(summoned);
             }
         }

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp

@@ -228,7 +228,7 @@ public:
         }
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -241,7 +241,7 @@ public:
 
         void StartEvent()
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3,SAY_AGGRO4), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3, SAY_AGGRO4), me);
 
             Phase = 1;
 
@@ -301,7 +301,7 @@ public:
 
         void CastShootOrMultishot()
         {
-            switch (urand(0,1))
+            switch (urand(0, 1))
             {
                 case 0:
                     //Shoot
@@ -316,7 +316,7 @@ public:
             }
             if (rand()%3)
             {
-                DoScriptText(RAND(SAY_BOWSHOT1,SAY_BOWSHOT2), me);
+                DoScriptText(RAND(SAY_BOWSHOT1, SAY_BOWSHOT2), me);
             }
         }
 
@@ -601,8 +601,8 @@ public:
 
         void Reset()
         {
-            me->SetSpeed(MOVE_WALK,0.6f);//walk
-            me->SetSpeed(MOVE_RUN,0.6f);//run
+            me->SetSpeed(MOVE_WALK, 0.6f);//walk
+            me->SetSpeed(MOVE_RUN, 0.6f);//run
             move = 0;
             phase = 1;
 
@@ -618,7 +618,7 @@ public:
                 }
                 else
                 {
-                    if (me->GetDistance(ElementWPPos[i][0],ElementWPPos[i][1],ElementWPPos[i][2]) < me->GetDistance(x,y,z))
+                    if (me->GetDistance(ElementWPPos[i][0], ElementWPPos[i][1], ElementWPPos[i][2]) < me->GetDistance(x, y, z))
                     {
                         x = ElementWPPos[i][0];
                         y = ElementWPPos[i][1];
@@ -647,7 +647,7 @@ public:
                 me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
                 if (phase == 1)
                     me->GetMotionMaster()->MovePoint(0, x, y, z);
-                if (phase == 1 && me->IsWithinDist3d(x,y,z, 0.1f))
+                if (phase == 1 && me->IsWithinDist3d(x, y, z, 0.1f))
                     phase = 2;
                 if (phase == 2)
                 {
@@ -676,7 +676,7 @@ public:
 };
 
 //Tainted Elemental
-//This mob has 7,900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3,000 nature damage and placing a posion doing 2,000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
+//This mob has 7, 900 life, doesn't move, and shoots Poison Bolts at one person anywhere in the area, doing 3, 000 nature damage and placing a posion doing 2, 000 damage every 2 seconds. He will switch targets often, or sometimes just hang on a single player, but there is nothing you can do about it except heal the damage and kill the Tainted Elemental
 class mob_tainted_elemental : public CreatureScript
 {
 public:
@@ -812,7 +812,7 @@ public:
             if (movement_timer <= diff)
             {
                 uint32 rndpos = rand()%8;
-                me->GetMotionMaster()->MovePoint(1,SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]);
+                me->GetMotionMaster()->MovePoint(1, SporebatWPPos[rndpos][0], SporebatWPPos[rndpos][1], SporebatWPPos[rndpos][2]);
                 movement_timer = 6000;
             } else movement_timer -= diff;
 
@@ -823,11 +823,11 @@ public:
                 pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
                 if (pTarget)
                 {
-                    Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,30000);
+                    Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000);
                     if (trig)
                     {
                         trig->setFaction(14);
-                        trig->CastSpell(trig, SPELL_TOXIC_SPORES,true);
+                        trig->CastSpell(trig, SPELL_TOXIC_SPORES, true);
                     }
                 }
                 bolt_timer = 10000+rand()%5000;
@@ -859,7 +859,7 @@ public:
 };
 
 //Coilfang Elite
-//It's an elite Naga mob with 170,000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
+//It's an elite Naga mob with 170, 000 HP. It does about 5000 damage on plate, and has a nasty cleave hitting for about 7500 damage
 class mob_coilfang_elite : public CreatureScript
 {
 public:

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp

@@ -96,7 +96,7 @@ public:
         }
         void JustDied(Unit * /*victim*/)
         {
-            Unit* pUnit = Unit::GetUnit((*me),victimGUID);
+            Unit* pUnit = Unit::GetUnit((*me), victimGUID);
             if (pUnit && pUnit->HasAura(SPELL_INSIDIOUS_WHISPER))
                 pUnit->RemoveAurasDueToSpell(SPELL_INSIDIOUS_WHISPER);
         }
@@ -124,10 +124,10 @@ public:
             if (me->getVictim()->GetGUID() != victimGUID)
             {
                 DoModifyThreatPercent(me->getVictim(), -100);
-                Unit* owner = Unit::GetUnit((*me),victimGUID);
+                Unit* owner = Unit::GetUnit((*me), victimGUID);
                 if (owner && owner->isAlive())
                 {
-                    me->AddThreat(owner,999999);
+                    me->AddThreat(owner, 999999);
                     AttackStart(owner);
                 } else if (owner && owner->isDead())
                 {
@@ -172,7 +172,7 @@ public:
     {
         boss_leotheras_the_blindAI(Creature *c) : ScriptedAI(c)
         {
-            c->GetPosition(x,y,z);
+            c->GetPosition(x, y, z);
             pInstance = c->GetInstanceScript();
             Demon = 0;
 
@@ -195,7 +195,7 @@ public:
         bool DemonForm;
         bool IsFinalForm;
         bool EnrageUsed;
-        float x,y,z;
+        float x, y, z;
 
         uint64 InnderDemon[5];
         uint32 InnerDemon_Count;
@@ -233,7 +233,7 @@ public:
         {
             for (uint8 i = 0; i < 3; ++i)
             {
-                if (Creature *add = Unit::GetCreature(*me,SpellBinderGUID[i]))
+                if (Creature *add = Unit::GetCreature(*me, SpellBinderGUID[i]))
                     add->DisappearAndDie();
 
                 float nx = x;
@@ -242,7 +242,7 @@ public:
                 if (i == 0) {nx += 10; ny -= 5; o=2.5f;}
                 if (i == 1) {nx -= 8; ny -= 7; o=0.9f;}
                 if (i == 2) {nx -= 3; ny += 9; o=5.0f;}
-                Creature* binder = me->SummonCreature(MOB_SPELLBINDER,nx,ny,z,o,TEMPSUMMON_DEAD_DESPAWN,0);
+                Creature* binder = me->SummonCreature(MOB_SPELLBINDER, nx, ny, z, o, TEMPSUMMON_DEAD_DESPAWN, 0);
                 if (binder)
                     SpellBinderGUID[i] = binder->GetGUID();
 
@@ -282,7 +282,7 @@ public:
             uint8 AliveChannelers = 0;
             for (uint8 i = 0; i < 3; ++i)
             {
-                Unit *add = Unit::GetUnit(*me,SpellBinderGUID[i]);
+                Unit *add = Unit::GetUnit(*me, SpellBinderGUID[i]);
                 if (add && add->isAlive())
                     ++AliveChannelers;
             }
@@ -374,11 +374,11 @@ public:
 
             if (DemonForm)
             {
-                DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me);
+                DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
             }
             else
             {
-                DoScriptText(RAND(SAY_NIGHTELF_SLAY1,SAY_NIGHTELF_SLAY2,SAY_NIGHTELF_SLAY3), me);
+                DoScriptText(RAND(SAY_NIGHTELF_SLAY1, SAY_NIGHTELF_SLAY2, SAY_NIGHTELF_SLAY3), me);
             }
         }
 
@@ -425,7 +425,7 @@ public:
                     {
                         DoResetThreat();
                         me->GetMotionMaster()->Clear();
-                        me->GetMotionMaster()->MovePoint(0,newTarget->GetPositionX(),newTarget->GetPositionY(),newTarget->GetPositionZ());
+                        me->GetMotionMaster()->MovePoint(0, newTarget->GetPositionX(), newTarget->GetPositionY(), newTarget->GetPositionZ());
                     }
                     Whirlwind_Timer = 2000;
                 } else Whirlwind_Timer -= diff;
@@ -474,7 +474,7 @@ public:
                     if (SwitchToDemon_Timer <= diff)
                     {
                         //switch to demon form
-                        me->RemoveAurasDueToSpell(SPELL_WHIRLWIND,0);
+                        me->RemoveAurasDueToSpell(SPELL_WHIRLWIND, 0);
                         me->SetDisplayId(MODEL_DEMON);
                         DoScriptText(SAY_SWITCH_TO_DEMON, me);
                         me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID  , 0);
@@ -621,7 +621,7 @@ public:
             if (victim->GetTypeId() != TYPEID_PLAYER)
                 return;
 
-            DoScriptText(RAND(SAY_DEMON_SLAY1,SAY_DEMON_SLAY2,SAY_DEMON_SLAY3), me);
+            DoScriptText(RAND(SAY_DEMON_SLAY1, SAY_DEMON_SLAY2, SAY_DEMON_SLAY3), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -760,7 +760,7 @@ public:
             if (Mindblast_Timer <= diff)
             {
                 Unit *pTarget = NULL;
-                pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
+                pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
 
                 if (pTarget)DoCast(pTarget, SPELL_MINDBLAST);
 

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp

@@ -239,7 +239,7 @@ public:
 
                 if (SpoutTimer <= diff)
                 {
-                    me->MonsterTextEmote(EMOTE_SPOUT,0,true);
+                    me->MonsterTextEmote(EMOTE_SPOUT, 0, true);
                     me->SetReactState(REACT_PASSIVE);
                     me->GetMotionMaster()->MoveRotate(20000, rand()%2 ? ROTATE_DIRECTION_LEFT : ROTATE_DIRECTION_RIGHT);
                     SpoutTimer = 45000;
@@ -279,7 +279,7 @@ public:
                         Map::PlayerList const &PlayerList = pMap->GetPlayers();
                         for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
                         {
-                            if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2),i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater())
+                            if (i->getSource() && i->getSource()->isAlive() && me->HasInArc(float(diff/20000*M_PI*2), i->getSource()) && me->IsWithinDist(i->getSource(), SPOUT_DIST) && !i->getSource()->IsInWater())
                                 DoCast(i->getSource(), SPELL_SPOUT, true);//only knock back palyers in arc, in 100yards, not in water
                         }
                     }
@@ -299,7 +299,7 @@ public:
 
                 if (GeyserTimer <= diff)
                 {
-                    Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
+                    Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
                     if (!pTarget && me->getVictim())
                         pTarget = me->getVictim();
                     if (pTarget)
@@ -311,7 +311,7 @@ public:
                 {
                     if (WaterboltTimer <= diff)
                     {
-                        Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
+                        Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
                         if (!pTarget && me->getVictim())
                             pTarget = me->getVictim();
                         if (pTarget)
@@ -333,7 +333,7 @@ public:
                     me->InterruptNonMeleeSpells(false);//shouldn't be any
                     me->RemoveAllAuras();
                     me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
-                    me->RemoveFlag(UNIT_NPC_EMOTESTATE,EMOTE_STATE_SUBMERGED);
+                    me->RemoveFlag(UNIT_NPC_EMOTESTATE, EMOTE_STATE_SUBMERGED);
                     DoCast(me, SPELL_EMERGE, true);
                     Spawned = false;
                     SpoutTimer = 3000; // directly cast Spout after emerging!
@@ -357,8 +357,8 @@ public:
                     {
                         Creature* Summoned;
                         if (i < 6)
-                            Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
-                        else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN,AddPos[i][0],AddPos[i][1],AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                            Summoned = me->SummonCreature(MOB_COILFANG_AMBUSHER, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
+                        else Summoned = me->SummonCreature(MOB_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
 
                         if (Summoned)
                             Summons.Summon(Summoned);
@@ -457,7 +457,7 @@ public:
                 pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
                 int bp0 = 1100;
                 if (pTarget)
-                    me->CastCustomSpell(pTarget,SPELL_SHOOT,&bp0,NULL,NULL,true);
+                    me->CastCustomSpell(pTarget, SPELL_SHOOT, &bp0, NULL, NULL, true);
                 ShootBowTimer = 4000+rand()%5000;
                 MultiShotTimer += 1500;//add global cooldown
             } else ShootBowTimer -= diff;

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp

@@ -137,7 +137,7 @@ public:
 
         void KilledUnit(Unit * /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
         }
 
         void JustDied(Unit * /*victim*/)
@@ -183,7 +183,7 @@ public:
                 }
                 else
                 {
-                    DoScriptText(RAND(SAY_SUMMON1,SAY_SUMMON2), me);
+                    DoScriptText(RAND(SAY_SUMMON1, SAY_SUMMON2), me);
 
                     for (uint8 i = 0; i < 10; ++i)
                     {
@@ -234,7 +234,7 @@ public:
                         }
                     }
 
-                    DoScriptText(RAND(SAY_SUMMON_BUBL1,SAY_SUMMON_BUBL2), me);
+                    DoScriptText(RAND(SAY_SUMMON_BUBL1, SAY_SUMMON_BUBL2), me);
 
                     DoScriptText(EMOTE_WATERY_GRAVE, me);
                     WateryGrave_Timer = 30000;

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp

@@ -143,16 +143,16 @@ class instance_serpent_shrine : public InstanceMapScript
 
                                     if (!pPlayer->HasAura(SPELL_SCALDINGWATER))
                                     {
-                                        pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER,true);
+                                        pPlayer->CastSpell(pPlayer, SPELL_SCALDINGWATER, true);
                                     }
                                 } else if (Water == WATERSTATE_FRENZY)
                                 {
                                     //spawn frenzy
                                     if (DoSpawnFrenzy)
                                     {
-                                        if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY,pPlayer->GetPositionX(),pPlayer->GetPositionY(),pPlayer->GetPositionZ(),pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,2000))
+                                        if (Creature* frenzy = pPlayer->SummonCreature(MOB_COILFANG_FRENZY, pPlayer->GetPositionX(), pPlayer->GetPositionY(), pPlayer->GetPositionZ(), pPlayer->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 2000))
                                         {
-                                            frenzy->Attack(pPlayer,false);
+                                            frenzy->Attack(pPlayer, false);
                                             frenzy->AddUnitMovementFlag(MOVEMENTFLAG_SWIMMING | MOVEMENTFLAG_LEVITATING);
                                         }
                                         DoSpawnFrenzy = false;

src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp

@@ -89,12 +89,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
         }
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
 
             if (pInstance)
                 pInstance->SetData(TYPE_HYDROMANCER_THESPIA, IN_PROGRESS);
@@ -108,12 +108,12 @@ public:
             //LightningCloud_Timer
             if (LightningCloud_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_LIGHTNING_CLOUD);
 
                 //cast twice in Heroic mode
                 if (IsHeroic())
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pTarget, SPELL_LIGHTNING_CLOUD);
 
                 LightningCloud_Timer = 15000+rand()%10000;
@@ -122,7 +122,7 @@ public:
             //LungBurst_Timer
             if (LungBurst_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_LUNG_BURST);
                 LungBurst_Timer = 7000+rand()%5000;
             } else LungBurst_Timer -=diff;
@@ -130,12 +130,12 @@ public:
             //EnvelopingWinds_Timer
             if (EnvelopingWinds_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_ENVELOPING_WINDS);
 
                 //cast twice in Heroic mode
                 if (IsHeroic())
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pTarget, SPELL_ENVELOPING_WINDS);
                 EnvelopingWinds_Timer = 10000+rand()%5000;
             } else EnvelopingWinds_Timer -=diff;

src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp

@@ -98,12 +98,12 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
         }
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+            DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
 
             if (pInstance)
                 pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, IN_PROGRESS);
@@ -114,14 +114,14 @@ public:
         {
             DoScriptText(SAY_MECHANICS, me);
 
-            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
-            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
-            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,-5,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
+            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
+            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
+            DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, -5, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
 
             if (rand()%2)
-                DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,5,-7,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
+                DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 5, -7, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
             if (rand()%2)
-                DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC,7,-5,0,0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
+                DoSpawnCreature(ENTRY_STREAMRIGGER_MECHANIC, 7, -5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 240000);
         }
 
         void UpdateAI(const uint32 diff)
@@ -137,7 +137,7 @@ public:
 
             if (Saw_Blade_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                     DoCast(pTarget, SPELL_SAW_BLADE);
                 else
                     DoCast(me->getVictim(), SPELL_SAW_BLADE);
@@ -248,7 +248,7 @@ public:
                         else
                         {
                             //me->GetMotionMaster()->MovementExpired();
-                            //me->GetMotionMaster()->MoveFollow(pMekgineer,0,0);
+                            //me->GetMotionMaster()->MoveFollow(pMekgineer, 0, 0);
                         }
                     }
                 } else Repair_Timer = 5000;

src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp

@@ -87,14 +87,14 @@ public:
             DoCast(me, SPELL_WARLORDS_RAGE_NAGA, true);
 
             if (pInstance)
-                pInstance->SetData(TYPE_DISTILLER,IN_PROGRESS);
+                pInstance->SetData(TYPE_DISTILLER, IN_PROGRESS);
         }
 
         void DamageTaken(Unit * /*done_by*/, uint32 &damage)
         {
             if (me->GetHealth() <= damage)
                 if (pInstance)
-                    pInstance->SetData(TYPE_DISTILLER,DONE);
+                    pInstance->SetData(TYPE_DISTILLER, DONE);
         }
     };
 
@@ -137,7 +137,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
 
             if (pInstance)
                 pInstance->SetData(TYPE_WARLORD_KALITHRESH, IN_PROGRESS);
@@ -145,7 +145,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
         }
 
         void SpellHit(Unit * /*caster*/, const SpellEntry *spell)
@@ -191,7 +191,7 @@ public:
             //Impale_Timer
             if (Impale_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_IMPALE);
 
                 Impale_Timer = 7500+rand()%5000;

src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp

@@ -51,10 +51,10 @@ public:
             return false;
 
         if (go->GetEntry() == ACCESS_PANEL_HYDRO && (pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == DONE || pInstance->GetData(TYPE_HYDROMANCER_THESPIA) == SPECIAL))
-            pInstance->SetData(TYPE_HYDROMANCER_THESPIA,SPECIAL);
+            pInstance->SetData(TYPE_HYDROMANCER_THESPIA, SPECIAL);
 
         if (go->GetEntry() == ACCESS_PANEL_MEK && (pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == DONE || pInstance->GetData(TYPE_MEKGINEER_STEAMRIGGER) == SPECIAL))
-            pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER,SPECIAL);
+            pInstance->SetData(TYPE_MEKGINEER_STEAMRIGGER, SPECIAL);
 
         return true;
     }

src/server/scripts/Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp

@@ -75,7 +75,7 @@ public:
 
             if (Mushroom_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     me->SummonCreature(17990, pTarget->GetPositionX()+(rand()%8), pTarget->GetPositionY()+(rand()%8), pTarget->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
                 else
                     me->SummonCreature(17990, me->GetPositionX()+(rand()%8), me->GetPositionY()+(rand()%8), me->GetPositionZ(), float(rand()%5), TEMPSUMMON_TIMED_DESPAWN, 22000);
@@ -85,7 +85,7 @@ public:
 
             if (AcidGeyser_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_ACID_GEYSER);
                 AcidGeyser_Timer = 10000+rand()%7500;
             } else AcidGeyser_Timer -= diff;

src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp

@@ -80,7 +80,7 @@ public:
             if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER)
             {
                 Striders.push_back(summon->GetGUID());
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                     summon->AI()->AttackStart(pTarget);
                 else
                     if (me->getVictim())
@@ -103,9 +103,9 @@ public:
             // Evade if too far
             if (check_Timer <= diff)
             {
-                float x,y,z,o;
-                me->GetHomePosition(x,y,z,o);
-                if (!me->IsWithinDist3d(x,y,z, 60))
+                float x, y, z, o;
+                me->GetHomePosition(x, y, z, o);
+                if (!me->IsWithinDist3d(x, y, z, 60))
                 {
                     EnterEvadeMode();
                     return;
@@ -150,7 +150,7 @@ public:
             }
             if (Levitate_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                 {
                     DoCast(pTarget, SPELL_LEVITATE);
                     LevitatedTarget = pTarget->GetGUID();
@@ -163,7 +163,7 @@ public:
             // Chain Lightning
             if (ChainLightning_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
                 ChainLightning_Timer = 7000;
             } else ChainLightning_Timer -= diff;
@@ -171,7 +171,7 @@ public:
             // Static Charge
             if (StaticCharge_Timer <= diff)
             {
-                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true))
+                if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true))
                     DoCast(pTarget, SPELL_STATIC_CHARGE);
                 StaticCharge_Timer = 10000;
             } else StaticCharge_Timer -= diff;

src/server/scripts/Outland/GruulsLair/boss_gruul.cpp

@@ -106,7 +106,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -128,7 +128,7 @@ public:
             {
                 if (pTarget->GetTypeId() == TYPEID_PLAYER)
                 {
-                    switch (urand(0,1))
+                    switch (urand(0, 1))
                     {
                         case 0: pTarget->CastSpell(pTarget, SPELL_MAGNETIC_PULL, true, NULL, NULL, me->GetGUID()); break;
                         case 1: pTarget->CastSpell(pTarget, SPELL_KNOCK_BACK, true, NULL, NULL, me->GetGUID()); break;
@@ -197,7 +197,7 @@ public:
                 // Hurtful Strike
                 if (m_uiHurtfulStrike_Timer <= uiDiff)
                 {
-                    Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1);
+                    Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1);
 
                     if (pTarget && me->IsWithinMeleeRange(me->getVictim()))
                         DoCast(pTarget, SPELL_HURTFUL_STRIKE);
@@ -221,7 +221,7 @@ public:
                 // Cave In
                 if (m_uiCaveIn_Timer <= uiDiff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pTarget, SPELL_CAVE_IN);
 
                     if (m_uiCaveIn_StaticTimer >= 4000)

src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp

@@ -170,7 +170,7 @@ public:
 
         void KilledUnit(Unit* /*victim*/)
         {
-            DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+            DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -183,7 +183,7 @@ public:
 
            void AddDeath()
            {
-                DoScriptText(RAND(SAY_OGRE_DEATH1,SAY_OGRE_DEATH2,SAY_OGRE_DEATH3,SAY_OGRE_DEATH4), me);
+                DoScriptText(RAND(SAY_OGRE_DEATH1, SAY_OGRE_DEATH2, SAY_OGRE_DEATH3, SAY_OGRE_DEATH4), me);
            }
 
         void EnterCombat(Unit *who)
@@ -772,7 +772,7 @@ public:
                 {
                     pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid());
                                                                 //15 yard radius minimum
-                    if (pTarget && pTarget->IsWithinDist(me, 15,false))
+                    if (pTarget && pTarget->IsWithinDist(me, 15, false))
                         target_list.push_back(pTarget);
                     pTarget = NULL;
                 }

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp

@@ -86,7 +86,7 @@ class boss_broggok : public CreatureScript
                 summoned->setFaction(16);
                 summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                summoned->CastSpell(summoned,SPELL_POISON,false,0,0,me->GetGUID());
+                summoned->CastSpell(summoned, SPELL_POISON, false, 0, 0, me->GetGUID());
             }
 
             void UpdateAI(const uint32 diff)

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp

@@ -60,11 +60,11 @@ enum eKelidan
 
 const float ShadowmoonChannelers[5][4]=
 {
-    {302.0f,-87.0f,-24.4f,0.157f},
-    {321.0f,-63.5f,-24.6f,4.887f},
-    {346.0f,-74.5f,-24.6f,3.595f},
-    {344.0f,-103.5f,-24.5f,2.356f},
-    {316.0f,-109.0f,-24.6f,1.257f}
+    {302.0f, -87.0f, -24.4f, 0.157f},
+    {321.0f, -63.5f, -24.6f, 4.887f},
+    {346.0f, -74.5f, -24.6f, 3.595f},
+    {344.0f, -103.5f, -24.5f, 2.356f},
+    {316.0f, -109.0f, -24.6f, 1.257f}
 };
 
 class boss_kelidan_the_breaker : public CreatureScript
@@ -124,7 +124,7 @@ class boss_kelidan_the_breaker : public CreatureScript
                 if (rand()%2)
                     return;
 
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void ChannelerEngaged(Unit* who)
@@ -132,7 +132,7 @@ class boss_kelidan_the_breaker : public CreatureScript
                 if (who && !addYell)
                 {
                     addYell = true;
-                    DoScriptText(RAND(SAY_ADD_AGGRO_1,SAY_ADD_AGGRO_2,SAY_ADD_AGGRO_3), me);
+                    DoScriptText(RAND(SAY_ADD_AGGRO_1, SAY_ADD_AGGRO_2, SAY_ADD_AGGRO_3), me);
                 }
                 for (uint8 i=0; i<5; ++i)
                 {
@@ -175,7 +175,7 @@ class boss_kelidan_the_breaker : public CreatureScript
                 {
                     Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
                     if (!channeler || channeler->isDead())
-                        channeler = me->SummonCreature(ENTRY_CHANNELER,ShadowmoonChannelers[i][0],ShadowmoonChannelers[i][1],ShadowmoonChannelers[i][2],ShadowmoonChannelers[i][3],TEMPSUMMON_CORPSE_TIMED_DESPAWN,300000);
+                        channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
                     if (channeler)
                         Channelers[i] = channeler->GetGUID();
                     else
@@ -254,7 +254,7 @@ class boss_kelidan_the_breaker : public CreatureScript
                     }
 
                     if (IsHeroic())
-                        DoTeleportAll(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation());
+                        DoTeleportAll(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
 
                     BurningNova_Timer = 20000+rand()%8000;
                     Firenova_Timer= 5000;

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp

@@ -80,7 +80,7 @@ class boss_the_maker : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
 
                 if (!pInstance)
                     return;
@@ -91,7 +91,7 @@ class boss_the_maker : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript
 
                 if (ExplodingBreaker_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pTarget, SPELL_EXPLODING_BREAKER);
                     ExplodingBreaker_Timer = 4000+rand()%8000;
                 }
@@ -133,7 +133,7 @@ class boss_the_maker : public CreatureScript
                 if (domination_timer_timer <= diff)
                 {
                 Unit *pTarget;
-                pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
+                pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
 
                 DoCast(pTarget, SPELL_DOMINATION);
 

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp

@@ -92,7 +92,7 @@ class boss_omor_the_unscarred : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
             }
 
             void KilledUnit(Unit* /*victim*/)
@@ -107,7 +107,7 @@ class boss_omor_the_unscarred : public CreatureScript
             {
                 DoScriptText(SAY_SUMMON, me);
 
-                if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM,0))
+                if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     summoned->AI()->AttackStart(random);
 
                 ++SummonedCount;
@@ -162,7 +162,7 @@ class boss_omor_the_unscarred : public CreatureScript
                         Unit* temp = NULL;
                         if (me->IsWithinMeleeRange(me->getVictim()))
                             temp = me->getVictim();
-                        else temp = SelectTarget(SELECT_TARGET_RANDOM,0);
+                        else temp = SelectTarget(SELECT_TARGET_RANDOM, 0);
 
                         if (temp && temp->GetTypeId() == TYPEID_PLAYER)
                         {
@@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript
                 {
                     DoScriptText(SAY_CURSE, me);
 
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     {
                         DoCast(pTarget, SPELL_TREACHEROUS_AURA);
                         Aura_Timer = 8000+rand()%8000;
@@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript
 
                 if (Shadowbolt_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     {
                         if (pTarget)
                             pTarget = me->getVictim();

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp

@@ -112,15 +112,15 @@ class boss_nazan : public CreatureScript
                 {
                     summoned->SetLevel(me->getLevel());
                     summoned->setFaction(me->getFaction());
-                    summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE,SPELL_SUMMON_LIQUID_FIRE_H),true);
-                    summoned->CastSpell(summoned,SPELL_FIRE_NOVA_VISUAL,true);
+                    summoned->CastSpell(summoned, DUNGEON_MODE(SPELL_SUMMON_LIQUID_FIRE, SPELL_SUMMON_LIQUID_FIRE_H), true);
+                    summoned->CastSpell(summoned, SPELL_FIRE_NOVA_VISUAL, true);
                 }
             }
 
             void SpellHitTarget(Unit *pTarget, const SpellEntry* entry)
             {
                 if (pTarget && entry->Id == uint32(SPELL_FIREBALL))
-                    me->SummonCreature(ENTRY_LIQUID_FIRE,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),pTarget->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,30000);
+                    me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
             }
 
             void UpdateAI(const uint32 diff)
@@ -130,16 +130,16 @@ class boss_nazan : public CreatureScript
 
                 if (Fireball_Timer <= diff)
                 {
-                    if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true);
-                    Fireball_Timer = urand(4000,7000);
+                    Fireball_Timer = urand(4000, 7000);
                 }
                 else
                     Fireball_Timer -= diff;
 
                 if (flight) // phase 1 - the flight
                 {
-                    Creature *Vazruden = Unit::GetCreature(*me,VazrudenGUID);
+                    Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
                     if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20)))
                     {
                         flight = false;
@@ -148,7 +148,7 @@ class boss_nazan : public CreatureScript
                         me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
                         me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
                         me->GetMotionMaster()->Clear();
-                        if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST,0))
+                        if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST, 0))
                             me->AI()->AttackStart(pVictim);
                         DoStartMovement(me->getVictim());
                         DoScriptText(EMOTE, me);
@@ -160,8 +160,8 @@ class boss_nazan : public CreatureScript
                     if (Turn_Timer <= diff)
                     {
                         uint32 waypoint = (Fly_Timer/10000)%2;
-                        if (!me->IsWithinDist3d(VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2], 5))
-                            me->GetMotionMaster()->MovePoint(0,VazrudenRing[waypoint][0],VazrudenRing[waypoint][1],VazrudenRing[waypoint][2]);
+                        if (!me->IsWithinDist3d(VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2], 5))
+                            me->GetMotionMaster()->MovePoint(0, VazrudenRing[waypoint][0], VazrudenRing[waypoint][1], VazrudenRing[waypoint][2]);
                         Turn_Timer = 10000;
                     }
                     else
@@ -227,13 +227,13 @@ class boss_vazruden : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
             }
 
             void KilledUnit(Unit* who)
             {
                 if (who && who->GetEntry() != ENTRY_VAZRUDEN)
-                    DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                    DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void JustDied(Unit* who)
@@ -263,7 +263,7 @@ class boss_vazruden : public CreatureScript
                 if (Revenge_Timer <= diff)
                 {
                     if (Unit *victim = me->getVictim())
-                        DoCast(victim, DUNGEON_MODE(SPELL_REVENGE,SPELL_REVENGE_H));
+                        DoCast(victim, DUNGEON_MODE(SPELL_REVENGE, SPELL_REVENGE_H));
                     Revenge_Timer = 5000;
                 }
                 else
@@ -346,9 +346,9 @@ class boss_vazruden_the_herald : public CreatureScript
             {
                 if (!summoned)
                 {
-                    if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
+                    if (Creature* Vazruden = me->SummonCreature(ENTRY_VAZRUDEN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
                         VazrudenGUID = Vazruden->GetGUID();
-                    if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,6000000))
+                    if (Creature* Nazan = me->SummonCreature(ENTRY_NAZAN, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000000))
                         NazanGUID = Nazan->GetGUID();
                     summoned = true;
                     me->SetVisible(false);
@@ -405,10 +405,10 @@ class boss_vazruden_the_herald : public CreatureScript
                 case 1: // go to the middle and begin the fight
                     if (check <= diff)
                     {
-                        if (!me->IsWithinDist3d(VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],5))
+                        if (!me->IsWithinDist3d(VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 5))
                         {
                             me->GetMotionMaster()->Clear();
-                            me->GetMotionMaster()->MovePoint(0,VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2]);
+                            me->GetMotionMaster()->MovePoint(0, VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2]);
                             check = 1000;
                         }
                         else
@@ -439,7 +439,7 @@ class boss_vazruden_the_herald : public CreatureScript
                         }
                         else if (!lootSpawned)
                         {
-                            me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H),VazrudenMiddle[0],VazrudenMiddle[1],VazrudenMiddle[2],0,0,0,0,0,0);
+                            me->SummonGameObject(DUNGEON_MODE(ENTRY_REINFORCED_FEL_IRON_CHEST, ENTRY_REINFORCED_FEL_IRON_CHEST_H), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0);
                             me->SetLootRecipient(NULL); // don't think this is necessary..
                             //me->Kill(me);
                             lootSpawned = true;
@@ -475,14 +475,14 @@ class mob_hellfire_sentry : public CreatureScript
 
             void Reset()
             {
-                KidneyShot_Timer = urand(3000,7000);
+                KidneyShot_Timer = urand(3000, 7000);
             }
 
             void EnterCombat(Unit* /*who*/) {}
 
             void JustDied(Unit* who)
             {
-                if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD,150))
+                if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150))
                     CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who);
             }
 

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp

@@ -80,7 +80,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
             }
 
             void MoveInLineOfSight(Unit* who)
@@ -106,7 +106,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
                 {
                     DoScriptText(SAY_SURGE, me);
 
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                         DoCast(pTarget, SPELL_SURGE);
 
                     Surge_Timer = 5000+rand()%8000;

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp

@@ -66,7 +66,7 @@ class instance_ramparts : public InstanceMapScript
 
             void SetData(uint32 uiType, uint32 uiData)
             {
-                sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u",uiType,uiData);
+                sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Ramparts: SetData received for type %u with data %u", uiType, uiData);
 
                 switch(uiType)
                 {

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp

@@ -158,7 +158,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
 
             void DoTauntPeons()
             {
-                DoScriptText(RAND(SAY_TAUNT_1,SAY_TAUNT_2,SAY_TAUNT_3), me);
+                DoScriptText(RAND(SAY_TAUNT_1, SAY_TAUNT_2, SAY_TAUNT_3), me);
 
                 //TODO: kill the peons first
                 IsIntroEvent = false;
@@ -194,7 +194,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                         IsIntroEvent = true;
 
                         if (pInstance)
-                            pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS);
+                            pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
                     }
 
                     if (IsIntroEvent || !IsMainEvent)
@@ -205,7 +205,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me);
+                DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
             }
 
             void JustSummoned(Creature *summoned)
@@ -215,13 +215,13 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                 summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 
                 //triggered spell of consumption does not properly show it's SpellVisual, wrong spellid?
-                summoned->CastSpell(summoned,SPELL_TEMPORARY_VISUAL,true);
-                summoned->CastSpell(summoned,SPELL_CONSUMPTION,false,0,0,me->GetGUID());
+                summoned->CastSpell(summoned, SPELL_TEMPORARY_VISUAL, true);
+                summoned->CastSpell(summoned, SPELL_CONSUMPTION, false, 0, 0, me->GetGUID());
             }
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+                DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -231,7 +231,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                 if (!pInstance)
                     return;
 
-                pInstance->SetData(TYPE_NETHEKURSE,DONE);
+                pInstance->SetData(TYPE_NETHEKURSE, DONE);
                 pInstance->HandleGameObject(pInstance->GetData64(DATA_NETHEKURSE_DOOR), true);
             }
 
@@ -277,18 +277,18 @@ class boss_grand_warlock_nethekurse : public CreatureScript
                 {
                     if (ShadowFissure_Timer <= diff)
                     {
-                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(pTarget, SPELL_SHADOW_FISSURE);
-                        ShadowFissure_Timer = urand(7500,15000);
+                        ShadowFissure_Timer = urand(7500, 15000);
                     }
                     else
                         ShadowFissure_Timer -= diff;
 
                     if (DeathCoil_Timer <= diff)
                     {
-                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             DoCast(pTarget, SPELL_DEATH_COIL);
-                        DeathCoil_Timer = urand(15000,20000);
+                        DeathCoil_Timer = urand(15000, 20000);
                     }
                     else
                         DeathCoil_Timer -= diff;
@@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript
                 {
                     if (pInstance->GetData64(DATA_NETHEKURSE))
                     {
-                        Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE));
+                        Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE));
                         if (pKurse && me->IsWithinDist(pKurse, 45.0f))
                         {
                             CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro();
@@ -350,7 +350,7 @@ class mob_fel_orc_convert : public CreatureScript
                             if (pInstance->GetData(TYPE_NETHEKURSE) == IN_PROGRESS)
                                 return;
                             else
-                                pInstance->SetData(TYPE_NETHEKURSE,IN_PROGRESS);
+                                pInstance->SetData(TYPE_NETHEKURSE, IN_PROGRESS);
                         }
                     }
                 }
@@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript
                     if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
                         return;
                     if (pInstance->GetData64(DATA_NETHEKURSE))
-                        if (Creature *pKurse = Unit::GetCreature(*me,pInstance->GetData64(DATA_NETHEKURSE)))
+                        if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)))
                             CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath();
                 }
             }

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp

@@ -190,13 +190,13 @@ class boss_warbringer_omrogg : public CreatureScript
 
             void Reset()
             {
-                if (Unit* pLeftHead  = Unit::GetUnit(*me,LeftHeadGUID))
+                if (Unit* pLeftHead  = Unit::GetUnit(*me, LeftHeadGUID))
                 {
                     pLeftHead->setDeathState(JUST_DIED);
                     LeftHeadGUID = 0;
                 }
 
-                if (Unit* pRightHead  = Unit::GetUnit(*me,RightHeadGUID))
+                if (Unit* pRightHead  = Unit::GetUnit(*me, RightHeadGUID))
                 {
                     pRightHead->setDeathState(JUST_DIED);
                     RightHeadGUID = 0;
@@ -221,8 +221,8 @@ class boss_warbringer_omrogg : public CreatureScript
 
             void DoYellForThreat()
             {
-                Unit *pLeftHead  = Unit::GetUnit(*me,LeftHeadGUID);
-                Unit *pRightHead = Unit::GetUnit(*me,RightHeadGUID);
+                Unit *pLeftHead  = Unit::GetUnit(*me, LeftHeadGUID);
+                Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID);
 
                 if (!pLeftHead || !pRightHead)
                     return;
@@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript
                 me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
                 me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
 
-                if (Unit *pLeftHead = Unit::GetUnit(*me,LeftHeadGUID))
+                if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID))
                 {
                     iaggro = rand()%3;
 
@@ -271,8 +271,8 @@ class boss_warbringer_omrogg : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                Unit* pLeftHead  = Unit::GetUnit(*me,LeftHeadGUID);
-                Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
+                Unit* pLeftHead  = Unit::GetUnit(*me, LeftHeadGUID);
+                Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
 
                 if (!pLeftHead || !pRightHead)
                     return;
@@ -297,8 +297,8 @@ class boss_warbringer_omrogg : public CreatureScript
 
             void JustDied(Unit* /*Killer*/)
             {
-                Unit* pLeftHead  = Unit::GetUnit(*me,LeftHeadGUID);
-                Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
+                Unit* pLeftHead  = Unit::GetUnit(*me, LeftHeadGUID);
+                Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
 
                 if (!pLeftHead || !pRightHead)
                     return;
@@ -317,8 +317,8 @@ class boss_warbringer_omrogg : public CreatureScript
                 {
                     Delay_Timer = 3500;
 
-                    Unit* pLeftHead  = Unit::GetUnit(*me,LeftHeadGUID);
-                    Unit* pRightHead = Unit::GetUnit(*me,RightHeadGUID);
+                    Unit* pLeftHead  = Unit::GetUnit(*me, LeftHeadGUID);
+                    Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
 
                     if (!pLeftHead || !pRightHead)
                         return;
@@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript
 
                 if (ResetThreat_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     {
                         DoYellForThreat();
                         DoResetThreat();

src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp

@@ -55,9 +55,9 @@ enum eCreatures
 
 #define TARGET_NUM                      5
 
-float AssassEntrance[3] = {275.136f,-84.29f,2.3f}; // y -8
-float AssassExit[3] = {184.233f,-84.29f,2.3f}; // y -8
-float AddsEntrance[3] = {306.036f,-84.29f,1.93f};
+float AssassEntrance[3] = {275.136f, -84.29f, 2.3f}; // y -8
+float AssassExit[3] = {184.233f, -84.29f, 2.3f}; // y -8
+float AddsEntrance[3] = {306.036f, -84.29f, 1.93f};
 
 class boss_warchief_kargath_bladefist : public CreatureScript
 {
@@ -94,7 +94,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             {
                 removeAdds();
 
-                me->SetSpeed(MOVE_RUN,2);
+                me->SetSpeed(MOVE_RUN, 2);
                 me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING);
 
                 summoned = 2;
@@ -110,7 +110,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
 
             void EnterCombat(Unit * /*who*/)
             {
-                DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me);
+                DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
             }
 
             void JustSummoned(Creature *summoned)
@@ -120,7 +120,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                     case MOB_HEARTHEN_GUARD:
                     case MOB_SHARPSHOOTER_GUARD:
                     case MOB_REAVER_GUARD:
-                        summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0));
+                        summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
                         adds.push_back(summoned->GetGUID());
                         break;
                     case MOB_SHATTERED_ASSASSIN:
@@ -133,7 +133,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             {
                 if (victim->GetTypeId() == TYPEID_PLAYER)
                 {
-                    DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+                    DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
                 }
             }
 
@@ -166,11 +166,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             {
                 for (std::vector<uint64>::const_iterator itr = adds.begin(); itr!= adds.end(); ++itr)
                 {
-                    Unit* temp = Unit::GetUnit((*me),*itr);
+                    Unit* temp = Unit::GetUnit((*me), *itr);
                     if (temp && temp->isAlive())
                     {
                         (*temp).GetMotionMaster()->Clear(true);
-                        me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         CAST_CRE(temp)->RemoveCorpse();
                     }
                 }
@@ -178,11 +178,11 @@ class boss_warchief_kargath_bladefist : public CreatureScript
 
                 for (std::vector<uint64>::const_iterator itr = assassins.begin(); itr!= assassins.end(); ++itr)
                 {
-                    Unit* temp = Unit::GetUnit((*me),*itr);
+                    Unit* temp = Unit::GetUnit((*me), *itr);
                     if (temp && temp->isAlive())
                     {
                         (*temp).GetMotionMaster()->Clear(true);
-                        me->DealDamage(temp,temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
+                        me->DealDamage(temp, temp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                         CAST_CRE(temp)->RemoveCorpse();
                     }
                 }
@@ -190,10 +190,10 @@ class boss_warchief_kargath_bladefist : public CreatureScript
             }
             void SpawnAssassin()
             {
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]+8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassEntrance[0],AssassEntrance[1]-8, AssassEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]+8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
-                me->SummonCreature(MOB_SHATTERED_ASSASSIN,AssassExit[0],AssassExit[1]-8, AssassExit[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
+                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]+8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassEntrance[0], AssassEntrance[1]-8, AssassEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]+8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
+                me->SummonCreature(MOB_SHATTERED_ASSASSIN, AssassExit[0], AssassExit[1]-8, AssassExit[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
             }
 
             void UpdateAI(const uint32 diff)
@@ -223,7 +223,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                             {
                                 // stop bladedance
                                 InBlade = false;
-                                me->SetSpeed(MOVE_RUN,2);
+                                me->SetSpeed(MOVE_RUN, 2);
                                 me->GetMotionMaster()->MoveChase(me->getVictim());
                                 Blade_Dance_Timer = 30000;
                                 Wait_Timer = 0;
@@ -233,12 +233,12 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                             else
                             {
                                 //move in bladedance
-                                float x,y,randx,randy;
+                                float x, y, randx, randy;
                                 randx = 0.0f + rand()%40;
                                 randy = 0.0f + rand()%40;
                                 x = 210+ randx ;
                                 y = -60- randy ;
-                                me->GetMotionMaster()->MovePoint(1,x,y,me->GetPositionZ());
+                                me->GetMotionMaster()->MovePoint(1, x, y, me->GetPositionZ());
                                 Wait_Timer = 0;
                             }
                         }
@@ -256,7 +256,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                             Wait_Timer = 1;
                             InBlade = true;
                             Blade_Dance_Timer = 0;
-                            me->SetSpeed(MOVE_RUN,4);
+                            me->SetSpeed(MOVE_RUN, 4);
                             return;
                         }
                         else
@@ -278,22 +278,22 @@ class boss_warchief_kargath_bladefist : public CreatureScript
                     {
                         for (uint8 i = 0; i < summoned; ++i)
                         {
-                            switch (urand(0,2))
+                            switch (urand(0, 2))
                             {
                                 case 0:
-                                    me->SummonCreature(MOB_HEARTHEN_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
+                                    me->SummonCreature(MOB_HEARTHEN_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                                 case 1:
-                                    me->SummonCreature(MOB_SHARPSHOOTER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
+                                    me->SummonCreature(MOB_SHARPSHOOTER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                                 case 2:
-                                    me->SummonCreature(MOB_REAVER_GUARD,AddsEntrance[0],AddsEntrance[1], AddsEntrance[2], 0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000);
+                                    me->SummonCreature(MOB_REAVER_GUARD, AddsEntrance[0], AddsEntrance[1], AddsEntrance[2], 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000);
                                     break;
                             }
                         }
-                        if (urand(0,9) < 2)
+                        if (urand(0, 9) < 2)
                             ++summoned;
-                        Summon_Assistant_Timer = urand(25000,35000);
+                        Summon_Assistant_Timer = urand(25000, 35000);
                     }
                     else
                         Summon_Assistant_Timer -= diff;
@@ -303,7 +303,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
 
                 if (resetcheck_timer <= diff)
                 {
-                    uint32 tempx,tempy;
+                    uint32 tempx, tempy;
                     tempx = uint32(me->GetPositionX());
                     tempy = uint32(me->GetPositionY());
                     if (tempx > 255 || tempx < 205)

src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp

@@ -28,7 +28,7 @@ EndScriptData */
 
 enum eSpells
 {
-    SPELL_FLAME_BUFFET           = 34121, // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
+    SPELL_FLAME_BUFFET           = 34121, // Flame Buffet - every 1, 5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
     SPELL_FLAME_QUILLS           = 34229, // Randomly after changing position in phase after watching tons of movies, set probability 20%
     SPELL_REBIRTH                = 34342, // Rebirth - beginning of second phase(after losing all health in phase 1)
     SPELL_REBIRTH_2              = 35369, // Rebirth(another, without healing to full HP) - after Dive Bomb in phase 2
@@ -291,7 +291,7 @@ class boss_alar : public CreatureScript
                                     if (me->IsWithinDist3d(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 5.0f))
                                         dist = 5.0f;
                                     WaitTimer = 1000 + uint32(floor(dist / 80 * 1000.0f));
-                                    me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(),0.0f);
+                                    me->GetMap()->CreatureRelocation(me, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f);
                                     me->StopMoving();
                                     WaitEvent = WE_LAND;
                                 }
@@ -343,7 +343,7 @@ class boss_alar : public CreatureScript
                         }
                         else
                         {
-                            if (urand(0,4)) // next platform
+                            if (urand(0, 4)) // next platform
                             {
                                 DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
                                 if (cur_wp == 3)

src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp

@@ -145,7 +145,7 @@ class boss_high_astromancer_solarian : public CreatureScript
 
             void KilledUnit(Unit * /*victim*/)
             {
-                DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me);
+                DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me);
             }
 
             void JustDied(Unit * /*victim*/)
@@ -180,7 +180,7 @@ class boss_high_astromancer_solarian : public CreatureScript
 
             float Portal_X(float radius)
             {
-                if (urand(0,1))
+                if (urand(0, 1))
                     radius = -radius;
 
                 return radius * (float)(rand()%100)/100.0f + CENTER_X;
@@ -447,7 +447,7 @@ class mob_solarium_priest : public CreatureScript
                 if (healTimer <= diff)
                 {
                     Unit *pTarget = NULL;
-                    switch (urand(0,1))
+                    switch (urand(0, 1))
                     {
                         case 0:
                             if (pInstance)

src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp

@@ -236,7 +236,7 @@ struct advisorbase_ai : public ScriptedAI
             me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
             me->ClearAllReactives();
-            me->SetUInt64Value(UNIT_FIELD_TARGET,0);
+            me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
             me->GetMotionMaster()->Clear();
             me->GetMotionMaster()->MoveIdle();
             me->SetStandState(UNIT_STAND_STATE_DEAD);
@@ -431,7 +431,7 @@ class boss_kaelthas : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+                DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
             }
 
             void JustSummoned(Creature* pSummoned)
@@ -798,7 +798,7 @@ class boss_kaelthas : public CreatureScript
                         if (Phoenix_Timer <= diff)
                         {
                             DoCast(me, SPELL_PHOENIX_ANIMATION);
-                            DoScriptText(RAND(SAY_SUMMON_PHOENIX1,SAY_SUMMON_PHOENIX2), me);
+                            DoScriptText(RAND(SAY_SUMMON_PHOENIX1, SAY_SUMMON_PHOENIX2), me);
 
                             Phoenix_Timer = 60000;
                         }
@@ -909,7 +909,7 @@ class boss_kaelthas : public CreatureScript
                                         break;
 
                                     case 1:
-                                        DoScriptText(RAND(SAY_GRAVITYLAPSE1,SAY_GRAVITYLAPSE2), me);
+                                        DoScriptText(RAND(SAY_GRAVITYLAPSE1, SAY_GRAVITYLAPSE2), me);
 
                                         // 2) At that point he will put a Gravity Lapse debuff on everyone
                                         for (i = me->getThreatManager().getThreatList().begin(); i != me->getThreatManager().getThreatList().end(); ++i)
@@ -1487,7 +1487,7 @@ class mob_phoenix_tk : public CreatureScript
             {
                 //is this spell in use anylonger?
                 //DoCast(me, SPELL_EMBER_BLAST, true);
-                me->SummonCreature(NPC_PHOENIX_EGG,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,16000);
+                me->SummonCreature(NPC_PHOENIX_EGG, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 16000);
             }
 
             void UpdateAI(const uint32 diff)
@@ -1498,7 +1498,7 @@ class mob_phoenix_tk : public CreatureScript
                 if (Cycle_Timer <= diff)
                 {
                     //spell Burn should possible do this, but it doesn't, so do this for now.
-                    uint32 dmg = urand(4500,5500);
+                    uint32 dmg = urand(4500, 5500);
                     if (me->GetHealth() > dmg)
                         me->ModifyHealth(-int32(dmg));
                     Cycle_Timer = 2000;
@@ -1553,7 +1553,7 @@ class mob_phoenix_egg_tk : public CreatureScript
             void JustSummoned(Creature* summoned)
             {
                 summoned->AddThreat(me->getVictim(), 0.0f);
-                summoned->CastSpell(summoned,SPELL_REBIRTH,false);
+                summoned->CastSpell(summoned, SPELL_REBIRTH, false);
             }
 
             void UpdateAI(const uint32 diff)
@@ -1563,7 +1563,7 @@ class mob_phoenix_egg_tk : public CreatureScript
 
                 if (Rebirth_Timer <= diff)
                 {
-                    me->SummonCreature(NPC_PHOENIX,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,5000);
+                    me->SummonCreature(NPC_PHOENIX, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 5000);
                     Rebirth_Timer = 0;
                 }
                 else

src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp

@@ -82,7 +82,7 @@ class boss_void_reaver : public CreatureScript
 
             void KilledUnit(Unit * /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me);
+                DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me);
             }
 
             void JustDied(Unit * /*victim*/)
@@ -110,7 +110,7 @@ class boss_void_reaver : public CreatureScript
                 if (Pounding_Timer <= diff)
                 {
                     DoCast(me->getVictim(), SPELL_POUNDING);
-                    DoScriptText(RAND(SAY_POUNDING1,SAY_POUNDING2), me);
+                    DoScriptText(RAND(SAY_POUNDING1, SAY_POUNDING2), me);
                     Pounding_Timer = 15000; //cast time(3000) + cooldown time(12000)
                 }
                 else
@@ -141,7 +141,7 @@ class boss_void_reaver : public CreatureScript
                         pTarget = me->getVictim();
 
                     if (pTarget)
-                        me->CastSpell(pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget);
+                        me->CastSpell(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), SPELL_ARCANE_ORB, false, NULL, NULL, 0, pTarget);
                     ArcaneOrb_Timer = 3000;
                 }
                 else
@@ -152,7 +152,7 @@ class boss_void_reaver : public CreatureScript
                     DoCast(me->getVictim(), SPELL_KNOCK_AWAY);
                     //Drop 25% aggro
                     if (DoGetThreat(me->getVictim()))
-                        DoModifyThreatPercent(me->getVictim(),-25);
+                        DoModifyThreatPercent(me->getVictim(), -25);
                     KnockAway_Timer = 30000;
                 }
                 else

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

@@ -83,7 +83,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                     if (rand()%2)
                         return;
 
-                    DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+                    DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
                 }
 
                 void JustDied(Unit* /*Killer*/)
@@ -118,7 +118,7 @@ class boss_gatewatcher_iron_hand : public CreatureScript
                         if (rand()%2)
                                             return;
 
-                        DoScriptText(RAND(SAY_HAMMER_1,SAY_HAMMER_2), me);
+                        DoScriptText(RAND(SAY_HAMMER_1, SAY_HAMMER_2), me);
                         Jackhammer_Timer = 30000;
                     }
                     else

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

@@ -98,7 +98,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me);
+                DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -139,7 +139,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
                     {
                         if (rand()%2)
                             return;
-                        DoScriptText(RAND(SAY_DRAGONS_BREATH_1,SAY_DRAGONS_BREATH_2), me);
+                        DoScriptText(RAND(SAY_DRAGONS_BREATH_1, SAY_DRAGONS_BREATH_2), me);
                     }
                     dragons_breath_Timer = 12000 + rand()%10000;
                 }
@@ -233,7 +233,7 @@ class mob_ragin_flames : public CreatureScript
 
                     if (!onlyonce)
                     {
-                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                             me->GetMotionMaster()->MoveChase(pTarget);
                         onlyonce = true;
                     }

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

@@ -100,7 +100,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+                DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -129,8 +129,8 @@ class boss_pathaleon_the_calculator : public CreatureScript
                 {
                     for (uint8 i = 0; i < 3; ++i)
                     {
-                        Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
-                        Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                        Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
+                        Creature* Wraith = me->SummonCreature(21062, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                         if (pTarget && Wraith)
                             Wraith->AI()->AttackStart(pTarget);
                     }
@@ -158,9 +158,9 @@ class boss_pathaleon_the_calculator : public CreatureScript
 
                 if (Domination_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                     {
-                        DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me);
+                        DoScriptText(RAND(SAY_DOMINATION_1, SAY_DOMINATION_2), me);
                         DoCast(pTarget, SPELL_DOMINATION);
                     }
                     Domination_Timer = 25000 + rand()%5000;
@@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript
 
                 if (ArcaneMissiles_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(pTarget, SPELL_ARCANE_MISSILES);
                     else
                         DoCast(me->getVictim(), SPELL_ARCANE_MISSILES);

src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp

@@ -126,7 +126,7 @@ class npc_millhouse_manastorm : public CreatureScript
 
             void KilledUnit(Unit * /*victim*/)
             {
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void JustDied(Unit * /*victim*/)
@@ -177,7 +177,7 @@ class npc_millhouse_manastorm : public CreatureScript
                                 break;
                             case 7:
                                 if (pInstance)
-                                    pInstance->SetData(TYPE_WARDEN_2,DONE);
+                                    pInstance->SetData(TYPE_WARDEN_2, DONE);
                                 Init = true;
                                 break;
                             }
@@ -301,11 +301,11 @@ class npc_warden_mellichar : public CreatureScript
                 EventProgress_Timer = 22000;
                 Phase = 1;
 
-                me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE);
+                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                 DoCast(me, SPELL_TARGET_OMEGA);
 
                 if (pInstance)
-                    pInstance->SetData(TYPE_HARBINGERSKYRISS,NOT_STARTED);
+                    pInstance->SetData(TYPE_HARBINGERSKYRISS, NOT_STARTED);
             }
 
             void AttackStart(Unit* /*who*/) {}
@@ -335,7 +335,7 @@ class npc_warden_mellichar : public CreatureScript
 
                 if (pInstance)
                 {
-                    pInstance->SetData(TYPE_HARBINGERSKYRISS,IN_PROGRESS);
+                    pInstance->SetData(TYPE_HARBINGERSKYRISS, IN_PROGRESS);
                     pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false);
                     IsRunning = true;
                 }
@@ -375,23 +375,23 @@ class npc_warden_mellichar : public CreatureScript
                     {
                     case 2:
                         DoCast(me, SPELL_TARGET_ALPHA);
-                        pInstance->SetData(TYPE_WARDEN_1,IN_PROGRESS);
+                        pInstance->SetData(TYPE_WARDEN_1, IN_PROGRESS);
                         pInstance->HandleGameObject(pInstance->GetData64(DATA_SPHERE_SHIELD), false);
                         break;
                     case 3:
                         DoCast(me, SPELL_TARGET_BETA);
-                        pInstance->SetData(TYPE_WARDEN_2,IN_PROGRESS);
+                        pInstance->SetData(TYPE_WARDEN_2, IN_PROGRESS);
                         break;
                     case 5:
                         DoCast(me, SPELL_TARGET_DELTA);
-                        pInstance->SetData(TYPE_WARDEN_3,IN_PROGRESS);
+                        pInstance->SetData(TYPE_WARDEN_3, IN_PROGRESS);
                         break;
                     case 6:
                         DoCast(me, SPELL_TARGET_GAMMA);
-                        pInstance->SetData(TYPE_WARDEN_4,IN_PROGRESS);
+                        pInstance->SetData(TYPE_WARDEN_4, IN_PROGRESS);
                         break;
                     case 7:
-                        pInstance->SetData(TYPE_WARDEN_5,IN_PROGRESS);
+                        pInstance->SetData(TYPE_WARDEN_5, IN_PROGRESS);
                         break;
                     }
                     CanSpawn = true;
@@ -423,46 +423,46 @@ class npc_warden_mellichar : public CreatureScript
                         switch(Phase)
                         {
                         case 2:
-                            switch (urand(0,1))
+                            switch (urand(0, 1))
                             {
                             case 0:
-                                me->SummonCreature(ENTRY_TRICKSTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_TRICKSTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             case 1:
-                                me->SummonCreature(ENTRY_PH_HUNTER,478.326f,-148.505f,42.56f,3.19f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_PH_HUNTER, 478.326f, -148.505f, 42.56f, 3.19f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             }
                             break;
                         case 3:
-                            me->SummonCreature(ENTRY_MILLHOUSE,413.292f,-148.378f,42.56f,6.27f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                            me->SummonCreature(ENTRY_MILLHOUSE, 413.292f, -148.378f, 42.56f, 6.27f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                             break;
                         case 4:
                             DoScriptText(YELL_RELEASE2B, me);
                             break;
                         case 5:
-                            switch (urand(0,1))
+                            switch (urand(0, 1))
                             {
                             case 0:
-                                me->SummonCreature(ENTRY_AKKIRIS,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_AKKIRIS, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             case 1:
-                                me->SummonCreature(ENTRY_SULFURON,420.179f,-174.396f,42.58f,0.02f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_SULFURON, 420.179f, -174.396f, 42.58f, 0.02f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             }
                             break;
                         case 6:
-                            switch (urand(0,1))
+                            switch (urand(0, 1))
                             {
                             case 0:
-                                me->SummonCreature(ENTRY_TW_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_TW_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             case 1:
-                                me->SummonCreature(ENTRY_BL_DRAK,471.795f,-174.58f,42.58f,3.06f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                                me->SummonCreature(ENTRY_BL_DRAK, 471.795f, -174.58f, 42.58f, 3.06f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                                 break;
                             }
                             break;
                         case 7:
-                            me->SummonCreature(ENTRY_SKYRISS,445.763f,-191.639f,44.64f,1.60f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,600000);
+                            me->SummonCreature(ENTRY_SKYRISS, 445.763f, -191.639f, 44.64f, 1.60f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 600000);
                             DoScriptText(YELL_WELCOME, me);
                             break;
                         }
@@ -540,7 +540,7 @@ class mob_zerekethvoidzone : public CreatureScript
 
             void Reset()
             {
-                me->SetUInt32Value(UNIT_NPC_FLAGS,0);
+                me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
                 me->setFaction(16);
                 me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
 

src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp

@@ -89,7 +89,7 @@ class boss_harbinger_skyriss : public CreatureScript
             void Reset()
             {
                 if (!Intro)
-                    me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
 
                 IsImage33 = false;
                 IsImage66 = false;
@@ -116,7 +116,7 @@ class boss_harbinger_skyriss : public CreatureScript
             {
                 DoScriptText(SAY_DEATH, me);
                 if (pInstance)
-                    pInstance->SetData(TYPE_HARBINGERSKYRISS,DONE);
+                    pInstance->SetData(TYPE_HARBINGERSKYRISS, DONE);
             }
 
             void JustSummoned(Creature *summon)
@@ -138,7 +138,7 @@ class boss_harbinger_skyriss : public CreatureScript
                 if (victim->GetEntry() == 21436)
                     return;
 
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void DoSplit(uint32 val)
@@ -173,18 +173,18 @@ class boss_harbinger_skyriss : public CreatureScript
                             break;
                         case 2:
                             DoScriptText(SAY_AGGRO, me);
-                            if (Unit *mellic = Unit::GetUnit(*me,pInstance->GetData64(DATA_MELLICHAR)))
+                            if (Unit *mellic = Unit::GetUnit(*me, pInstance->GetData64(DATA_MELLICHAR)))
                             {
                                 //should have a better way to do this. possibly spell exist.
                                 mellic->setDeathState(JUST_DIED);
                                 mellic->SetHealth(0);
-                                pInstance->SetData(TYPE_SHIELD_OPEN,IN_PROGRESS);
+                                pInstance->SetData(TYPE_SHIELD_OPEN, IN_PROGRESS);
                             }
                             ++Intro_Phase;
                             Intro_Timer = 3000;
                             break;
                         case 3:
-                            me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE);
+                            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
                             Intro = true;
                             break;
                         }
@@ -208,7 +208,7 @@ class boss_harbinger_skyriss : public CreatureScript
 
                 if (MindRend_Timer <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(pTarget, SPELL_MIND_REND);
                     else
                         DoCast(me->getVictim(), SPELL_MIND_REND);
@@ -223,9 +223,9 @@ class boss_harbinger_skyriss : public CreatureScript
                     if (me->IsNonMeleeSpellCasted(false))
                         return;
 
-                    DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), me);
+                    DoScriptText(RAND(SAY_FEAR_1, SAY_FEAR_2), me);
 
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(pTarget, SPELL_FEAR);
                     else
                         DoCast(me->getVictim(), SPELL_FEAR);
@@ -240,9 +240,9 @@ class boss_harbinger_skyriss : public CreatureScript
                     if (me->IsNonMeleeSpellCasted(false))
                         return;
 
-                    DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), me);
+                    DoScriptText(RAND(SAY_MIND_1, SAY_MIND_2), me);
 
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                         DoCast(pTarget, SPELL_DOMINATION);
                     else
                         DoCast(me->getVictim(), SPELL_DOMINATION);
@@ -259,7 +259,7 @@ class boss_harbinger_skyriss : public CreatureScript
                         if (me->IsNonMeleeSpellCasted(false))
                             return;
 
-                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
+                        if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
                             DoCast(pTarget, H_SPELL_MANA_BURN);
 
                         ManaBurn_Timer = 16000+rand()%16000;

src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp

@@ -30,17 +30,17 @@ EndScriptData */
 
 enum eUnits
 {
-    CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318,//door opened when Wrath-Scryer Soccothrates dies
-    CONTAINMENT_CORE_SECURITY_FIELD_BETA  = 184319,//door opened when Dalliah the Doomsayer dies
-    POD_ALPHA                             = 183961,//pod first boss wave
-    POD_BETA                              = 183963,//pod second boss wave
-    POD_DELTA                             = 183964,//pod third boss wave
-    POD_GAMMA                             = 183962,//pod fourth boss wave
-    POD_OMEGA                             = 183965,//pod fifth boss wave
-    WARDENS_SHIELD                        = 184802,// warden shield
-    SEAL_SPHERE                           = 184802,//shield 'protecting' mellichar
+    CONTAINMENT_CORE_SECURITY_FIELD_ALPHA = 184318, //door opened when Wrath-Scryer Soccothrates dies
+    CONTAINMENT_CORE_SECURITY_FIELD_BETA  = 184319, //door opened when Dalliah the Doomsayer dies
+    POD_ALPHA                             = 183961, //pod first boss wave
+    POD_BETA                              = 183963, //pod second boss wave
+    POD_DELTA                             = 183964, //pod third boss wave
+    POD_GAMMA                             = 183962, //pod fourth boss wave
+    POD_OMEGA                             = 183965, //pod fifth boss wave
+    WARDENS_SHIELD                        = 184802, // warden shield
+    SEAL_SPHERE                           = 184802, //shield 'protecting' mellichar
 
-    MELLICHAR                             = 20904,//skyriss will kill this unit
+    MELLICHAR                             = 20904, //skyriss will kill this unit
 };
 
 /* Arcatraz encounters:

src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp

@@ -104,7 +104,7 @@ class boss_high_botanist_freywinn : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me);
+                DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -119,7 +119,7 @@ class boss_high_botanist_freywinn : public CreatureScript
 
                 if (TreeForm_Timer <= diff)
                 {
-                    DoScriptText(RAND(SAY_TREE_1,SAY_TREE_2), me);
+                    DoScriptText(RAND(SAY_TREE_1, SAY_TREE_2), me);
 
                     if (me->IsNonMeleeSpellCasted(false))
                         me->InterruptNonMeleeSpells(true);
@@ -146,7 +146,7 @@ class boss_high_botanist_freywinn : public CreatureScript
                         {
                             for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
                             {
-                                if (Unit *temp = Unit::GetUnit(*me,*itr))
+                                if (Unit *temp = Unit::GetUnit(*me, *itr))
                                 {
                                     if (!temp->isAlive())
                                     {
@@ -179,7 +179,7 @@ class boss_high_botanist_freywinn : public CreatureScript
                     return;
                 }
 
-                /*if (me->HasAura(SPELL_TREE_FORM,0) || me->HasAura(SPELL_TRANQUILITY,0))
+                /*if (me->HasAura(SPELL_TREE_FORM, 0) || me->HasAura(SPELL_TRANQUILITY, 0))
                     return;*/
 
                 //one random seedling every 5 secs, but not in tree form

src/server/scripts/Outland/TempestKeep/botanica/boss_warp_splinter.cpp

@@ -98,14 +98,14 @@ class mob_warp_splinter_treant : public CreatureScript
                     {
                         if (Unit *Warp = Unit::GetUnit(*me, WarpGuid))
                         {
-                            if (me->IsWithinMeleeRange(Warp,2.5f))
+                            if (me->IsWithinMeleeRange(Warp, 2.5f))
                             {
                                 int32 CurrentHP_Treant = (int32)me->GetHealth();
-                                Warp->CastCustomSpell(Warp,SPELL_HEAL_FATHER,&CurrentHP_Treant, 0, 0, true,0 ,0, me->GetGUID());
+                                Warp->CastCustomSpell(Warp, SPELL_HEAL_FATHER, &CurrentHP_Treant, 0, 0, true, 0 , 0, me->GetGUID());
                                 me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
                                 return;
                             }
-                            me->GetMotionMaster()->MoveFollow(Warp,0,0);
+                            me->GetMotionMaster()->MoveFollow(Warp, 0, 0);
                         }
                         check_Timer = 1000;
                     }
@@ -166,7 +166,7 @@ class boss_warp_splinter : public CreatureScript
 
             void KilledUnit(Unit* /*victim*/)
             {
-                DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me);
+                DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
             }
 
             void JustDied(Unit* /*Killer*/)
@@ -182,12 +182,12 @@ class boss_warp_splinter : public CreatureScript
 
                     float X = Treant_Spawn_Pos_X + TREANT_SPAWN_DIST * cos(angle);
                     float Y = Treant_Spawn_Pos_Y + TREANT_SPAWN_DIST * sin(angle);
-                    float O = - me->GetAngle(X,Y);
+                    float O = - me->GetAngle(X, Y);
 
-                    if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT,treant_pos[i][0],treant_pos[i][1],treant_pos[i][2],O,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,25000))
+                    if (Creature *pTreant = me->SummonCreature(CREATURE_TREANT, treant_pos[i][0], treant_pos[i][1], treant_pos[i][2], O, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 25000))
                         CAST_AI(mob_warp_splinter_treant::mob_warp_splinter_treantAI, pTreant->AI())->WarpGuid = me->GetGUID();
                 }
-                DoScriptText(RAND(SAY_SUMMON_1,SAY_SUMMON_2), me);
+                DoScriptText(RAND(SAY_SUMMON_1, SAY_SUMMON_2), me);
             }
 
             void UpdateAI(const uint32 diff)
@@ -207,7 +207,7 @@ class boss_warp_splinter : public CreatureScript
                 //Check for Arcane Volley
                 if (Arcane_Volley_Timer <= diff)
                 {
-                    DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY,ARCANE_VOLLEY_H));
+                    DoCast(me->getVictim(), DUNGEON_MODE(ARCANE_VOLLEY, ARCANE_VOLLEY_H));
                     Arcane_Volley_Timer = 20000 + rand()%15000;
                 }
                 else

src/server/scripts/Outland/blades_edge_mountains.cpp

@@ -84,8 +84,8 @@ enum eNetherdrake
     SAY_NIHIL_1                 = -1000169, //signed for 5955
     SAY_NIHIL_2                 = -1000170, //signed for 5955
     SAY_NIHIL_3                 = -1000171, //signed for 5955
-    SAY_NIHIL_4                 = -1000172, //signed for 20021, used by 20021,21817,21820,21821,21823
-    SAY_NIHIL_INTERRUPT         = -1000173, //signed for 20021, used by 20021,21817,21820,21821,21823
+    SAY_NIHIL_4                 = -1000172, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823
+    SAY_NIHIL_INTERRUPT         = -1000173, //signed for 20021, used by 20021, 21817, 21820, 21821, 21823
 
     ENTRY_WHELP                 = 20021,
     ENTRY_PROTO                 = 21821,
@@ -410,7 +410,7 @@ public:
 
             if (obelisk_one == true && obelisk_two == true && obelisk_three == true && obelisk_four == true && obelisk_five == true)
             {
-                pGo->SummonCreature(19963,2943.40f,4778.20f,284.49f,0.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,120000);
+                pGo->SummonCreature(19963, 2943.40f, 4778.20f, 284.49f, 0.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
                 //reset global var
                 obelisk_one = false;
                 obelisk_two = false;

src/server/scripts/Outland/boss_doomlord_kazzak.cpp

@@ -87,7 +87,7 @@ public:
 
         void EnterCombat(Unit * /*who*/)
         {
-            DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me);
+            DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me);
         }
 
         void KilledUnit(Unit* victim)
@@ -98,7 +98,7 @@ public:
 
                 DoCast(me, SPELL_CAPTURESOUL);
 
-                DoScriptText(RAND(SAY_KILL1,SAY_KILL2,SAY_KILL3), me);
+                DoScriptText(RAND(SAY_KILL1, SAY_KILL2, SAY_KILL3), me);
         }
 
         void JustDied(Unit * /*victim*/)

src/server/scripts/Outland/boss_doomwalker.cpp

@@ -78,12 +78,12 @@ public:
 
         void KilledUnit(Unit* Victim)
         {
-            Victim->CastSpell(Victim,SPELL_MARK_DEATH,0);
+            Victim->CastSpell(Victim, SPELL_MARK_DEATH, 0);
 
             if (rand()%5)
                 return;
 
-            DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3), me);
+            DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me);
         }
 
         void JustDied(Unit* /*Killer*/)
@@ -100,9 +100,9 @@ public:
         {
             if (who && who->GetTypeId() == TYPEID_PLAYER && me->IsHostileTo(who))
             {
-                if (who->HasAura(SPELL_MARK_DEATH,0))
+                if (who->HasAura(SPELL_MARK_DEATH, 0))
                 {
-                    who->CastSpell(who,SPELL_AURA_DEATH,1);
+                    who->CastSpell(who, SPELL_AURA_DEATH, 1);
                 }
             }
         }
@@ -126,7 +126,7 @@ public:
             //Spell Overrun
             if (Overrun_Timer <= diff)
             {
-                DoScriptText(RAND(SAY_OVERRUN_1,SAY_OVERRUN_2), me);
+                DoScriptText(RAND(SAY_OVERRUN_1, SAY_OVERRUN_2), me);
 
                 DoCast(me->getVictim(), SPELL_OVERRUN);
                 Overrun_Timer = 25000 + rand()%15000;
@@ -138,7 +138,7 @@ public:
                 if (rand()%2)
                     return;
 
-                DoScriptText(RAND(SAY_EARTHQUAKE_1,SAY_EARTHQUAKE_2), me);
+                DoScriptText(RAND(SAY_EARTHQUAKE_1, SAY_EARTHQUAKE_2), me);
 
                 //remove enrage before casting earthquake because enrage + earthquake = 16000dmg over 8sec and all dead
                 if (InEnrage)
@@ -152,7 +152,7 @@ public:
             if (Chain_Timer <= diff)
             {
                 Unit *pTarget = NULL;
-                pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
+                pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
 
                 if (!pTarget)
                     pTarget = me->getVictim();

src/server/scripts/Outland/hellfire_peninsula.cpp

@@ -212,7 +212,7 @@ public:
 
     bool OnGossipHello(Player* /*pPlayer*/, GameObject* pGo)
     {
-        pGo->SummonCreature(C_AERANAS,-1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000);
+        pGo->SummonCreature(C_AERANAS, -1321.79f, 4043.80f, 116.24f, 1.25f, TEMPSUMMON_TIMED_DESPAWN, 180000);
         return false;
     }
 
@@ -438,7 +438,7 @@ public:
             case 27:
                 DoScriptText(SAY_ELF_COMPLETE, me, pPlayer);
                 // Award quest credit
-                pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH,me);
+                pPlayer->GroupEventHappens(QUEST_ROAD_TO_FALCON_WATCH, me);
                 break;
             }
         }
@@ -498,13 +498,13 @@ public:
             if (uiType != POINT_MOTION_TYPE || uiId != 1)
                 return;
 
-            if (Creature* pHelboar = me->GetCreature(*me,uiHelboarGUID))
+            if (Creature* pHelboar = me->GetCreature(*me, uiHelboarGUID))
             {
                 pHelboar->RemoveCorpse();
                 DoCast(SPELL_SUMMON_POO);
 
                 if (Player* pOwner = me->GetCharmerOrOwnerPlayerOrPlayerItself())
-                    me->GetMotionMaster()->MoveFollow(pOwner,0.0f,0.0f);
+                    me->GetMotionMaster()->MoveFollow(pOwner, 0.0f, 0.0f);
             }
         }
 
@@ -517,7 +517,7 @@ public:
                     if (pHelboar->GetGUID() != uiHelboarGUID && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE && !me->FindCurrentSpellBySpellId(SPELL_SUMMON_POO))
                     {
                         uiHelboarGUID = pHelboar->GetGUID();
-                        me->GetMotionMaster()->MovePoint(1,pHelboar->GetPositionX(),pHelboar->GetPositionY(),pHelboar->GetPositionZ());
+                        me->GetMotionMaster()->MovePoint(1, pHelboar->GetPositionX(), pHelboar->GetPositionY(), pHelboar->GetPositionZ());
                     }
                 }
                 uiCheckTimer = 5000;

src/server/scripts/Outland/nagrand.cpp

@@ -73,9 +73,9 @@ public:
                 float y = me->GetPositionY();
                 float z = me->GetPositionZ();
 
-                Hitter->SummonCreature(18181,x+(0.7f * (rand()%30)),y+(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
-                Hitter->SummonCreature(18181,x+(rand()%5),y-(rand()%5),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
-                Hitter->SummonCreature(18181,x-(rand()%5),y+(0.5f *(rand()%60)),z,0,TEMPSUMMON_CORPSE_TIMED_DESPAWN,60000);
+                Hitter->SummonCreature(18181, x+(0.7f * (rand()%30)), y+(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+                Hitter->SummonCreature(18181, x+(rand()%5), y-(rand()%5), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
+                Hitter->SummonCreature(18181, x-(rand()%5), y+(0.5f *(rand()%60)), z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 60000);
                 me->setDeathState(CORPSE);
                 Spawn = true;
             }
@@ -208,7 +208,7 @@ public:
             if (!me->IsStandState())
                  me->SetStandState(UNIT_STAND_STATE_STAND);
 
-            DoScriptText(RAND(LUMP_SAY0,LUMP_SAY1), me);
+            DoScriptText(RAND(LUMP_SAY0, LUMP_SAY1), me);
         }
 
         void UpdateAI(const uint32 diff)

src/server/scripts/Outland/netherstorm.cpp

@@ -19,7 +19,7 @@
 /* ScriptData
 SDName: Netherstorm
 SD%Complete: 80
-SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299,10321,10322,10323,10329,10330,10338,10365(Shutting Down Manaforge), 10198, 10191
+SDComment: Quest support: 10337, 10438, 10652 (special flight paths), 10299, 10321, 10322, 10323, 10329, 10330, 10338, 10365(Shutting Down Manaforge), 10198, 10191
 SDCategory: Netherstorm
 EndScriptData */
 
@@ -38,7 +38,7 @@ EndContentData */
 ## npc_manaforge_control_console
 ######*/
 
-//used by 20209,20417,20418,20440, signed for 20209
+//used by 20209, 20417, 20418, 20440, signed for 20209
 enum eManaforgeConsoleData
 {
     EMOTE_START                 = -1000211,
@@ -105,7 +105,7 @@ public:
             //we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds
             //then no way for the mobs to actually stop the shutdown as intended.
             if (spell->Id == SPELL_INTERRUPT_1)
-                DoSay("Silence! I kill you!",LANG_UNIVERSAL, NULL);
+                DoSay("Silence! I kill you!", LANG_UNIVERSAL, NULL);
         }*/
 
         void JustDied(Unit* /*killer*/)
@@ -114,7 +114,7 @@ public:
 
             if (someplayer)
             {
-                Unit* p = Unit::GetUnit((*me),someplayer);
+                Unit* p = Unit::GetUnit((*me), someplayer);
                 if (p && p->GetTypeId() == TYPEID_PLAYER)
                 {
                     switch(me->GetEntry())
@@ -141,7 +141,7 @@ public:
 
             if (goConsole)
             {
-                if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole))
+                if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole))
                     pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
             }
         }
@@ -153,48 +153,48 @@ public:
                 case ENTRY_BNAAR_C_CONSOLE:
                     if (rand()%2)
                     {
-                        add = me->SummonCreature(ENTRY_SUNFURY_TECH,2933.68f,4162.55f,164.00f,1.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,2927.36f,4212.97f,164.00f);
+                        add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2933.68f, 4162.55f, 164.00f, 1.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 2927.36f, 4212.97f, 164.00f);
                     }
                     else
                     {
-                        add = me->SummonCreature(ENTRY_SUNFURY_TECH,2927.36f,4212.97f,164.00f,4.94f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,2933.68f,4162.55f,164.00f);
+                        add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2927.36f, 4212.97f, 164.00f, 4.94f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 2933.68f, 4162.55f, 164.00f);
                     }
                     Wave_Timer = 30000;
                     break;
                 case ENTRY_CORUU_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2445.21f,2765.26f,134.49f,3.93f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2424.21f,2740.15f,133.81f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2429.86f,2731.85f,134.53f,1.31f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2435.37f,2766.04f,133.81f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2445.21f, 2765.26f, 134.49f, 3.93f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2424.21f, 2740.15f, 133.81f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2429.86f, 2731.85f, 134.53f, 1.31f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2435.37f, 2766.04f, 133.81f);
                     Wave_Timer = 20000;
                     break;
                 case ENTRY_DURO_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2986.80f,2205.36f,165.37f,3.74f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2985.15f,2197.32f,164.79f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2952.91f,2191.20f,165.32f,0.22f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2060.01f,2185.27f,164.67f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2986.80f, 2205.36f, 165.37f, 3.74f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2985.15f, 2197.32f, 164.79f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2952.91f, 2191.20f, 165.32f, 0.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2060.01f, 2185.27f, 164.67f);
                     Wave_Timer = 15000;
                     break;
                 case ENTRY_ARA_C_CONSOLE:
                     if (rand()%2)
                     {
-                        add = me->SummonCreature(ENTRY_ARA_TECH,4035.11f,4038.97f,194.27f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
-                        add = me->SummonCreature(ENTRY_ARA_TECH,4033.66f,4036.79f,194.28f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
-                        add = me->SummonCreature(ENTRY_ARA_TECH,4037.13f,4037.30f,194.23f,2.57f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4003.42f,4040.19f,193.49f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 4035.11f, 4038.97f, 194.27f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 4033.66f, 4036.79f, 194.28f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 4037.13f, 4037.30f, 194.23f, 2.57f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4003.42f, 4040.19f, 193.49f);
                     }
                     else
                     {
-                        add = me->SummonCreature(ENTRY_ARA_TECH,3099.59f,4049.30f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
-                        add = me->SummonCreature(ENTRY_ARA_TECH,3999.72f,4046.75f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
-                        add = me->SummonCreature(ENTRY_ARA_TECH,3996.81f,4048.26f,194.22f,0.05f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                        if (add) add->GetMotionMaster()->MovePoint(0,4028.01f,4035.17f,193.59f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 3099.59f, 4049.30f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 3999.72f, 4046.75f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
+                        add = me->SummonCreature(ENTRY_ARA_TECH, 3996.81f, 4048.26f, 194.22f, 0.05f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                        if (add) add->GetMotionMaster()->MovePoint(0, 4028.01f, 4035.17f, 193.59f);
                     }
                     Wave_Timer = 15000;
                     break;
@@ -205,30 +205,30 @@ public:
             switch(pCreature->GetEntry())
             {
                 case ENTRY_BNAAR_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2946.52f,4201.42f,163.47f,3.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2927.49f,4192.81f,163.00f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2946.52f, 4201.42f, 163.47f, 3.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2927.49f, 4192.81f, 163.00f);
                     break;
                 case ENTRY_CORUU_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2453.88f,2737.85f,133.27f,2.59f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2441.62f,2735.32f,134.49f,1.97f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2450.73f,2754.50f,134.49f,3.29f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2433.96f,2751.53f,133.85f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2453.88f, 2737.85f, 133.27f, 2.59f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2441.62f, 2735.32f, 134.49f, 1.97f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2450.73f, 2754.50f, 134.49f, 3.29f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2433.96f, 2751.53f, 133.85f);
                     break;
                 case ENTRY_DURO_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2956.18f,2202.85f,165.32f,5.45f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_TECH,2975.30f,2211.50f,165.32f,4.55f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
-                    add = me->SummonCreature(ENTRY_SUNFURY_PROT,2965.02f,2217.45f,164.16f,4.96f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,2972.27f,2193.22f,164.48f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2956.18f, 2202.85f, 165.32f, 5.45f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_TECH, 2975.30f, 2211.50f, 165.32f, 4.55f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
+                    add = me->SummonCreature(ENTRY_SUNFURY_PROT, 2965.02f, 2217.45f, 164.16f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 2972.27f, 2193.22f, 164.48f);
                     break;
                 case ENTRY_ARA_C_CONSOLE:
-                    add = me->SummonCreature(ENTRY_ARA_ENGI,3994.51f,4020.46f,192.18f,0.91f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,4008.35f,4035.04f,192.70f);
-                    add = me->SummonCreature(ENTRY_ARA_GORKLONN,4021.56f,4059.35f,193.59f,4.44f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
-                    if (add) add->GetMotionMaster()->MovePoint(0,4016.62f,4039.89f,193.46f);
+                    add = me->SummonCreature(ENTRY_ARA_ENGI, 3994.51f, 4020.46f, 192.18f, 0.91f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 4008.35f, 4035.04f, 192.70f);
+                    add = me->SummonCreature(ENTRY_ARA_GORKLONN, 4021.56f, 4059.35f, 193.59f, 4.44f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000);
+                    if (add) add->GetMotionMaster()->MovePoint(0, 4016.62f, 4039.89f, 193.46f);
                     break;
             }
         }
@@ -270,14 +270,14 @@ public:
                         DoScriptText(EMOTE_COMPLETE, me);
                         if (someplayer)
                         {
-                            Unit* u = Unit::GetUnit((*me),someplayer);
+                            Unit* u = Unit::GetUnit((*me), someplayer);
                             if (u && u->GetTypeId() == TYPEID_PLAYER)
-                                CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(),me->GetGUID());
+                                CAST_PLR(u)->KilledMonsterCredit(me->GetEntry(), me->GetGUID());
                             DoCast(me, SPELL_DISABLE_VISUAL);
                         }
                         if (goConsole)
                         {
-                            if (GameObject* pGo = GameObject::GetGameObject((*me),goConsole))
+                            if (GameObject* pGo = GameObject::GetGameObject((*me), goConsole))
                                 pGo->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_IN_USE);
                         }
                         ++Phase;
@@ -321,23 +321,23 @@ public:
         {
             case 3726:                                          //b'naar
                 if ((pPlayer->GetQuestStatus(10299) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10329) == QUEST_STATUS_INCOMPLETE) &&
-                    pPlayer->HasItemCount(29366,1))
-                    manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE,2918.95f,4189.98f,161.88f,0.34f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+                    pPlayer->HasItemCount(29366, 1))
+                    manaforge = pPlayer->SummonCreature(ENTRY_BNAAR_C_CONSOLE, 2918.95f, 4189.98f, 161.88f, 0.34f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000);
                 break;
             case 3730:                                          //coruu
                 if ((pPlayer->GetQuestStatus(10321) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10330) == QUEST_STATUS_INCOMPLETE) &&
-                    pPlayer->HasItemCount(29396,1))
-                    manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE,2426.77f,2750.38f,133.24f,2.14f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+                    pPlayer->HasItemCount(29396, 1))
+                    manaforge = pPlayer->SummonCreature(ENTRY_CORUU_C_CONSOLE, 2426.77f, 2750.38f, 133.24f, 2.14f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000);
                 break;
             case 3734:                                          //duro
                 if ((pPlayer->GetQuestStatus(10322) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10338) == QUEST_STATUS_INCOMPLETE) &&
-                    pPlayer->HasItemCount(29397,1))
-                    manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE,2976.48f,2183.29f,163.20f,1.85f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+                    pPlayer->HasItemCount(29397, 1))
+                    manaforge = pPlayer->SummonCreature(ENTRY_DURO_C_CONSOLE, 2976.48f, 2183.29f, 163.20f, 1.85f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000);
                 break;
             case 3722:                                          //ara
                 if ((pPlayer->GetQuestStatus(10323) == QUEST_STATUS_INCOMPLETE || pPlayer->GetQuestStatus(10365) == QUEST_STATUS_INCOMPLETE) &&
-                    pPlayer->HasItemCount(29411,1))
-                    manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE,4013.71f,4028.76f,192.10f,1.25f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,125000);
+                    pPlayer->HasItemCount(29411, 1))
+                    manaforge = pPlayer->SummonCreature(ENTRY_ARA_C_CONSOLE, 4013.71f, 4028.76f, 192.10f, 1.25f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 125000);
                 break;
         }
 
@@ -431,8 +431,8 @@ public:
         // Emote Ardonis and Pathaleon
         void Turn_to_Pathaleons_Image()
         {
-            Creature *ardonis = Unit::GetCreature(*me,ardonisGUID);
-            Creature *pathaleon = Unit::GetCreature(*me,pathaleonGUID);
+            Creature *ardonis = Unit::GetCreature(*me, ardonisGUID);
+            Creature *pathaleon = Unit::GetCreature(*me, pathaleonGUID);
             Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
             if (!ardonis || !pathaleon || !pPlayer)
@@ -457,7 +457,7 @@ public:
         //Set them back to each other
         void Turn_to_eachother()
         {
-            if (Unit *ardonis = Unit::GetUnit(*me,ardonisGUID))
+            if (Unit *ardonis = Unit::GetUnit(*me, ardonisGUID))
             {
                 Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
@@ -514,8 +514,8 @@ public:
                 return;
             }
 
-            Unit *ardonis = Unit::GetUnit(*me,ardonisGUID);
-            Unit *pathaleon = Unit::GetUnit(*me,pathaleonGUID);
+            Unit *ardonis = Unit::GetUnit(*me, ardonisGUID);
+            Unit *pathaleon = Unit::GetUnit(*me, pathaleonGUID);
             Player* pPlayer = Unit::GetPlayer(*me, PlayerGUID);
 
             if (!ardonis || !pPlayer)
@@ -988,7 +988,7 @@ public:
                 case 17:
                 case 29:
                     //Find Object and "work"
-                    if (GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE))
+                    if (GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE))
                     {
                         // take the GO -> animation
                         me->HandleEmoteCommand(EMOTE_STATE_LOOT);
@@ -1019,7 +1019,7 @@ public:
                 if (uiTakeTimer < uiDiff)
                 {
                     me->HandleEmoteCommand(EMOTE_STATE_NONE);
-                    if (GameObject* pGO = GetClosestGameObjectWithEntry(me,GO_DRAENEI_MACHINE,INTERACTION_DISTANCE))
+                    if (GameObject* pGO = GetClosestGameObjectWithEntry(me, GO_DRAENEI_MACHINE, INTERACTION_DISTANCE))
                     {
                         SetEscortPaused(false);
                         bTake=false;
@@ -1041,7 +1041,7 @@ public:
             if (npc_maxx_a_million_escortAI* pEscortAI = CAST_AI(npc_maxx_a_million_escort::npc_maxx_a_million_escortAI, pCreature->AI()))
             {
                 pCreature->setFaction(113);
-                pEscortAI->Start(false,false,pPlayer->GetGUID());
+                pEscortAI->Start(false, false, pPlayer->GetGUID());
             }
         }
         return true;

src/server/scripts/Outland/shadowmoon_valley.cpp

@@ -293,10 +293,10 @@ public:
                             {
                                 DoCast(plr, SPELL_FORCE_OF_NELTHARAKU, true);
                                 /*
-                                float x,y,z;
-                                me->GetPosition(x,y,z);
+                                float x, y, z;
+                                me->GetPosition(x, y, z);
 
-                                float dx,dy,dz;
+                                float dx, dy, dz;
                                 me->GetRandomPoint(x, y, z, 20, dx, dy, dz);
                                 dz += 20; // so it's in the air, not ground*/
 
@@ -474,9 +474,9 @@ public:
 
     bool OnGossipHello(Player* pPlayer, Creature* pCreature)
     {
-        if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658,1,true))
+        if (pPlayer->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30658, 1, true))
             pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659,1,true))
+        if (pPlayer->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(30659, 1, true))
             pPlayer->ADD_GOSSIP_ITEM(0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
 
         pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(pCreature), pCreature->GetGUID());
@@ -537,7 +537,7 @@ public:
             case GOSSIP_ACTION_INFO_DEF+6:
                                                                 //correct id not known
                 pPlayer->SEND_GOSSIP_MENU(10940, pCreature->GetGUID());
-                pCreature->CastSpell(pPlayer,41121,false);
+                pCreature->CastSpell(pPlayer, 41121, false);
                 pPlayer->AreaExploredOrEventHappens(QUEST_11082);
                 break;
         }
@@ -741,7 +741,7 @@ public:
         void StartEvent()
         {
             me->SetUInt32Value(UNIT_NPC_FLAGS, 0);
-            me->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
+            me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
             Unit* Illidan = me->SummonCreature(C_ILLIDAN, -5107.83f, 602.584f, 85.2393f, 4.92598f, TEMPSUMMON_CORPSE_DESPAWN, 0);
             if (Illidan)
             {
@@ -817,7 +817,7 @@ public:
                 Illi->SetVisible(false);
                 Illi->setDeathState(JUST_DIED);
                 return 1000; break;
-            case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1,0); return 2000; break;
+            case 23: me->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); return 2000; break;
             case 24: me->SetUInt64Value(UNIT_FIELD_TARGET, PlayerGUID); return 5000; break;
             case 25: DoScriptText(OVERLORD_SAY_6, me); return 2000; break;
             case 26:
@@ -1013,7 +1013,7 @@ public:
         //this is very unclear, random say without no real relevance to script/event
         void DoRandomSay()
         {
-            DoScriptText(RAND(SAY_WIL_PROGRESS2,SAY_WIL_PROGRESS4,SAY_WIL_PROGRESS5), me);
+            DoScriptText(RAND(SAY_WIL_PROGRESS2, SAY_WIL_PROGRESS4, SAY_WIL_PROGRESS5), me);
         }
 
         void DoSpawnAssassin()
@@ -1032,7 +1032,7 @@ public:
             if (pWho->GetTypeId() != TYPEID_PLAYER)
             {
                 //appears to be random
-                if (urand(0,1))
+                if (urand(0, 1))
                     DoScriptText(RAND(SAY_WIL_AGGRO1, SAY_WIL_AGGRO2), pWho);
             }
         }
@@ -1105,28 +1105,28 @@ struct Location
 static Location SpawnLocation[]=
 {
     //Cords used for:
-    {-4615.8556f, 1342.2532f, 139.9f, 1.612f},//Illidari Soldier
-    {-4598.9365f, 1377.3182f, 139.9f, 3.917f},//Illidari Soldier
-    {-4598.4697f, 1360.8999f, 139.9f, 2.427f},//Illidari Soldier
-    {-4589.3599f, 1369.1061f, 139.9f, 3.165f},//Illidari Soldier
-    {-4608.3477f, 1386.0076f, 139.9f, 4.108f},//Illidari Soldier
-    {-4633.1889f, 1359.8033f, 139.9f, 0.949f},//Illidari Soldier
-    {-4623.5791f, 1351.4574f, 139.9f, 0.971f},//Illidari Soldier
-    {-4607.2988f, 1351.6099f, 139.9f, 2.416f},//Illidari Soldier
-    {-4633.7764f, 1376.0417f, 139.9f, 5.608f},//Illidari Soldier
-    {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Mind Breaker
-    {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Mind Breaker
-    {-4600.2461f, 1369.1240f, 139.9f, 3.056f},//Illidari Highlord
-    {-4631.7808f, 1367.9459f, 139.9f, 0.020f},//Illidari Highlord
-    {-4615.5586f, 1353.0031f, 139.9f, 1.540f},//Illidari Highlord
-    {-4616.4736f, 1384.2170f, 139.9f, 4.971f},//Illidari Highlord
+    {-4615.8556f, 1342.2532f, 139.9f, 1.612f}, //Illidari Soldier
+    {-4598.9365f, 1377.3182f, 139.9f, 3.917f}, //Illidari Soldier
+    {-4598.4697f, 1360.8999f, 139.9f, 2.427f}, //Illidari Soldier
+    {-4589.3599f, 1369.1061f, 139.9f, 3.165f}, //Illidari Soldier
+    {-4608.3477f, 1386.0076f, 139.9f, 4.108f}, //Illidari Soldier
+    {-4633.1889f, 1359.8033f, 139.9f, 0.949f}, //Illidari Soldier
+    {-4623.5791f, 1351.4574f, 139.9f, 0.971f}, //Illidari Soldier
+    {-4607.2988f, 1351.6099f, 139.9f, 2.416f}, //Illidari Soldier
+    {-4633.7764f, 1376.0417f, 139.9f, 5.608f}, //Illidari Soldier
+    {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Mind Breaker
+    {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Mind Breaker
+    {-4600.2461f, 1369.1240f, 139.9f, 3.056f}, //Illidari Highlord
+    {-4631.7808f, 1367.9459f, 139.9f, 0.020f}, //Illidari Highlord
+    {-4615.5586f, 1353.0031f, 139.9f, 1.540f}, //Illidari Highlord
+    {-4616.4736f, 1384.2170f, 139.9f, 4.971f}, //Illidari Highlord
     {-4627.1240f, 1378.8752f, 139.9f, 2.544f} //Torloth The Magnificent
 };
 
 struct WaveData
 {
     uint8 SpawnCount, UsedSpawnPoint;
-    uint32 CreatureId, SpawnTimer,YellTimer;
+    uint32 CreatureId, SpawnTimer, YellTimer;
     int32 WaveTextId;
 };
 
@@ -1218,10 +1218,10 @@ public:
             switch(AnimationCount)
             {
             case 0:
-                me->SetUInt32Value(UNIT_FIELD_BYTES_1,8);
+                me->SetUInt32Value(UNIT_FIELD_BYTES_1, 8);
                 break;
             case 3:
-                me->RemoveFlag(UNIT_FIELD_BYTES_1,8);
+                me->RemoveFlag(UNIT_FIELD_BYTES_1, 8);
                 break;
             case 5:
                 if (Player* AggroTarget = (Unit::GetPlayer(*me, AggroTargetGUID)))
@@ -1238,8 +1238,8 @@ public:
                     me->ClearUnitState(UNIT_STAT_ROOT);
 
                     float x, y, z;
-                    AggroTarget->GetPosition(x,y,z);
-                    me->GetMotionMaster()->MovePoint(0,x,y,z);
+                    AggroTarget->GetPosition(x, y, z);
+                    me->GetMotionMaster()->MovePoint(0, x, y, z);
                 }
                 break;
             }
@@ -1541,7 +1541,7 @@ public:
             {
                 if (SpellTimer1 <= diff)
                 {
-                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
+                    if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
                     {
                         if (pTarget->GetTypeId() == TYPEID_PLAYER)
                         {
@@ -1632,8 +1632,8 @@ void npc_lord_illidan_stormrage::npc_lord_illidan_stormrageAI::SummonNextWave()
                     if (Player* pTarget = Unit::GetPlayer(*me, PlayerGUID))
                     {
                         float x, y, z;
-                        pTarget->GetPosition(x,y,z);
-                        Spawn->GetMotionMaster()->MovePoint(0,x, y, z);
+                        pTarget->GetPosition(x, y, z);
+                        Spawn->GetMotionMaster()->MovePoint(0, x, y, z);
                     }
                 }
                 CAST_AI(mob_illidari_spawn::mob_illidari_spawnAI, Spawn->AI())->LordIllidanGUID = me->GetGUID();
@@ -1786,7 +1786,7 @@ public:
                  if (totemOspirits)
                  {
                      Summoned->setFaction(ENRAGED_SOUL_FRIENDLY);
-                     Summoned->GetMotionMaster()->MovePoint(0,totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ());
+                     Summoned->GetMotionMaster()->MovePoint(0, totemOspirits->GetPositionX(), totemOspirits->GetPositionY(), Summoned->GetPositionZ());
 
                      Unit* Owner = totemOspirits->GetOwner();
                      if (Owner && Owner->GetTypeId() == TYPEID_PLAYER)

src/server/scripts/Outland/shattrath_city.cpp

@@ -167,7 +167,7 @@ public:
             if (done_by->GetTypeId() == TYPEID_PLAYER)
                 if (me->HealthBelowPctDamaged(20, damage))
             {
-                CAST_PLR(done_by)->GroupEventHappens(QUEST_10004,me);
+                CAST_PLR(done_by)->GroupEventHappens(QUEST_10004, me);
                 damage = 0;
                 EnterEvadeMode();
             }
@@ -265,7 +265,7 @@ public:
     {
         pPlayer->PlayerTalkClass->ClearMenus();
         if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
-            pPlayer->CastSpell(pPlayer,37778,false);
+            pPlayer->CastSpell(pPlayer, 37778, false);
 
         return true;
     }
@@ -355,7 +355,7 @@ public:
                 case 55: DoScriptText(WHISP20, me, pPlayer); break;
                 case 56: DoScriptText(WHISP21, me, pPlayer);
                     if (pPlayer)
-                        pPlayer->GroupEventHappens(10211,me);
+                        pPlayer->GroupEventHappens(10211, me);
                     break;
             }
         }

src/server/scripts/Outland/terokkar_forest.cpp

@@ -325,7 +325,7 @@ public:
                         me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
 
                     if (rand()%100 < 75)
-                        me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f,0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
+                        me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
                     me->SummonCreature(netherwebVictims[rand()%6], 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
                 }
             }
@@ -577,16 +577,16 @@ public:
         switch(uiAction)
         {
             case GOSSIP_ACTION_INFO_DEF + 1:
-                  pPlayer->CastSpell(pPlayer,40642,false);
+                  pPlayer->CastSpell(pPlayer, 40642, false);
                 break;
             case GOSSIP_ACTION_INFO_DEF + 2:
-                  pPlayer->CastSpell(pPlayer,40640,false);
+                  pPlayer->CastSpell(pPlayer, 40640, false);
                 break;
             case GOSSIP_ACTION_INFO_DEF + 3:
-                  pPlayer->CastSpell(pPlayer,40632,false);
+                  pPlayer->CastSpell(pPlayer, 40632, false);
                 break;
             case GOSSIP_ACTION_INFO_DEF + 4:
-                  pPlayer->CastSpell(pPlayer,40644,false);
+                  pPlayer->CastSpell(pPlayer, 40644, false);
                 break;
         }
     }
@@ -679,12 +679,12 @@ public:
             switch(i)
             {
                 case 3:
-                    me->SummonCreature(NPC_CABAL_SKRIMISHER,-2795.99f,5420.33f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-                    me->SummonCreature(NPC_CABAL_SKRIMISHER,-2793.55f,5412.79f,-34.53f,0.0f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                    me->SummonCreature(NPC_CABAL_SKRIMISHER, -2795.99f, 5420.33f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
+                    me->SummonCreature(NPC_CABAL_SKRIMISHER, -2793.55f, 5412.79f, -34.53f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                     break;
                 case 11:
                     if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER)
-                        pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB,me);
+                        pPlayer->GroupEventHappens(QUEST_ESCAPING_THE_TOMB, me);
                     break;
             }
         }

src/server/scripts/Outland/zangarmarsh.cpp

@@ -41,7 +41,7 @@ EndContentData */
 
 #define GOSSIP_ITEM_BLESS_ASH     "Grant me your mark, wise ancient."
 #define GOSSIP_ITEM_BLESS_KEL     "Grant me your mark, mighty ancient."
-//signed for 17900 but used by 17900,17901
+//signed for 17900 but used by 17900, 17901
 #define GOSSIP_REWARD_BLESS       -1000359
 //#define TEXT_BLESSINGS        "<You need higher standing with Cenarion Expedition to recive a blessing.>"
 
@@ -70,8 +70,8 @@ public:
         if (uiAction == GOSSIP_ACTION_INFO_DEF+1)
         {
             pCreature->setPowerType(POWER_MANA);
-            pCreature->SetMaxPower(POWER_MANA,200);             //set a "fake" mana value, we can't depend on database doing it in this case
-            pCreature->SetPower(POWER_MANA,200);
+            pCreature->SetMaxPower(POWER_MANA, 200);             //set a "fake" mana value, we can't depend on database doing it in this case
+            pCreature->SetPower(POWER_MANA, 200);
 
             if (pCreature->GetEntry() == 17900)                //check which Creature we are dealing with
             {
@@ -246,7 +246,7 @@ public:
                 break;
             case GOSSIP_ACTION_INFO_DEF + 2:
             {
-                if (!pPlayer->HasItemCount(24573,1))
+                if (!pPlayer->HasItemCount(24573, 1))
                 {
                     ItemPosCountVec dest;
                     uint32 itemId = 24573;