diff options
| author | leak <leakzx@googlemail.com> | 2011-04-29 20:47:02 +0200 |
|---|---|---|
| committer | leak <leakzx@googlemail.com> | 2011-04-29 20:47:02 +0200 |
| commit | 1003f30448f1f431ef091551ba5851cf7cd2b31a (patch) | |
| tree | 9bebedb5b8bd6b4d6cf6d9daa83df90a86b1a786 /src/server/scripts/Northrend | |
| parent | 01a79947d56eae6ed9f47dc2b41897d77cc91f41 (diff) | |
Add spaces after commas
Diffstat (limited to 'src/server/scripts/Northrend')
116 files changed, 1312 insertions, 1312 deletions
diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index fa9a0d77fad..4e751419303 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -212,7 +212,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN,SpawnPointGuardian[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Guardian = me->SummonCreature(CREATURE_GUARDIAN, SpawnPointGuardian[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Guardian->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Guardian); @@ -229,7 +229,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Venomancer = me->SummonCreature(CREATURE_VENOMANCER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Venomancer->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Venomancer); @@ -248,7 +248,7 @@ public: { for (uint8 i = 0; i < 2; ++i) { - if (Creature *Datter = me->SummonCreature(CREATURE_DATTER,SpawnPoint[i],TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Creature *Datter = me->SummonCreature(CREATURE_DATTER, SpawnPoint[i], TEMPSUMMON_CORPSE_DESPAWN, 0)) { Datter->AddThreat(me->getVictim(), 0.0f); DoZoneInCombat(Datter); @@ -337,7 +337,7 @@ public: { if (pVictim == me) 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 JustSummoned(Creature* summon) diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 8b572323e16..0d2ef4c87be 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -76,11 +76,11 @@ public: me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 9.0f); me->SetFloatValue(UNIT_FIELD_COMBATREACH, 9.0f); - uiAcidTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiLeechTimer = urand(3*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiPierceTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); - uiGrabTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); - uiDoorsTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiLeechTimer = urand(3*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiPierceTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); + uiDoorsTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiCheckDistanceTimer = 2*IN_MILLISECONDS; if (pInstance && (pInstance->GetData(DATA_HADRONOX_EVENT) != DONE && !bFirstTime)) @@ -118,7 +118,7 @@ public: return; float x=0.0f, y=0.0f, z=0.0f; - me->GetRespawnCoord(x,y,z); + me->GetRespawnCoord(x, y, z); if (uiCheckDistanceTimer <= uiDiff) uiCheckDistanceTimer = 5*IN_MILLISECONDS; @@ -129,7 +129,7 @@ public: } if (me->IsInEvadeMode() || !me->getVictim()) return; - if (me->GetDistance(x,y,z) > dist) + if (me->GetDistance(x, y, z) > dist) EnterEvadeMode(); } @@ -160,7 +160,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ACID_CLOUD); - uiAcidTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiAcidTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiAcidTimer -= diff; if (uiLeechTimer <= diff) @@ -168,7 +168,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LEECH_POISON); - uiLeechTimer = urand(11*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiLeechTimer = urand(11*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiLeechTimer -= diff; if (uiGrabTimer <= diff) @@ -176,12 +176,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself. DoCast(pTarget, SPELL_WEB_GRAB); - uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiGrabTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiGrabTimer -= diff; if (uiDoorsTimer <= diff) { - uiDoorsTimer = urand(30*IN_MILLISECONDS,60*IN_MILLISECONDS); + uiDoorsTimer = urand(30*IN_MILLISECONDS, 60*IN_MILLISECONDS); } else uiDoorsTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index b935cc243de..9048d2cfae8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_SUMMON_SKITTERING_SWARMER_1 = 52439, //Summon 3x 28735 H_SPELL_ACID_SPLASH = 59363, SPELL_ACID_SPLASH = 52446, - SPELL_CHARGE = 16979,//maybe is another spell + SPELL_CHARGE = 16979, //maybe is another spell SPELL_BACKSTAB = 52540, SPELL_SHADOW_BOLT = 52534, H_SPELL_SHADOW_BOLT = 59357, @@ -44,7 +44,7 @@ enum Spells SPELL_ENRAGE = 52470, SPELL_INFECTED_BITE = 52469, H_SPELL_INFECTED_BITE = 59364, - SPELL_WEB_WRAP = 52086,//the spell is not working properly + SPELL_WEB_WRAP = 52086, //the spell is not working properly SPELL_BLINDING_WEBS = 52524, H_SPELL_BLINDING_WEBS = 59365, SPELL_POSION_SPRAY = 52493, @@ -131,22 +131,22 @@ public: void Summon() { - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[0],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[1],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[2],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[3],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[4],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[5],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_INFECTIOR,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[6],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); - me->SummonCreature(MOB_SKITTERING_SWARMER,SpawnPoint[7],TEMPSUMMON_TIMED_DESPAWN,25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[0], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[1], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[2], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[3], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[4], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[5], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_INFECTIOR, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[6], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); + me->SummonCreature(MOB_SKITTERING_SWARMER, SpawnPoint[7], TEMPSUMMON_TIMED_DESPAWN, 25*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -212,12 +212,12 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); } }; @@ -239,7 +239,7 @@ public: void JustDied(Unit* /*killer*/) { //The spell is not working propperly - DoCast(me->getVictim(),SPELL_ACID_SPLASH, true); + DoCast(me->getVictim(), SPELL_ACID_SPLASH, true); } }; @@ -277,7 +277,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { DoResetThreat(); - me->AddThreat(pTarget,1.0f); + me->AddThreat(pTarget, 1.0f); DoCast(pTarget, SPELL_CHARGE, true); } uiChargeTimer = 15*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp index 1b9e978ac01..383689b3ec8 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp @@ -89,7 +89,7 @@ public: case 192395: uiKrikthirDoor = go->GetGUID(); if (auiEncounter[0] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192396: uiAnubarakDoor[0] = go->GetGUID(); @@ -125,7 +125,7 @@ public: case DATA_KRIKTHIR_THE_GATEWATCHER_EVENT: auiEncounter[0] = data; if (data == DONE) - HandleGameObject(uiKrikthirDoor,true); + HandleGameObject(uiKrikthirDoor, true); break; case DATA_HADRONOX_EVENT: auiEncounter[1] = data; @@ -182,7 +182,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2; + uint16 data0, data1, data2; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 7eb49ca7763..73ab6501ffa 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -65,9 +65,9 @@ public: void Reset() { - uiRootTimer = urand(5*IN_MILLISECONDS,9*IN_MILLISECONDS); - uiBashTimer = urand(10*IN_MILLISECONDS,14*IN_MILLISECONDS); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(5*IN_MILLISECONDS, 9*IN_MILLISECONDS); + uiBashTimer = urand(10*IN_MILLISECONDS, 14*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); uiSpawnTimer = 0; me->SetMeleeDamageSchool(SPELL_SCHOOL_NATURE); @@ -110,9 +110,9 @@ public: { Position pos; victim->GetPosition(&pos); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_POISONOUS_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); - me->GetRandomNearPosition(pos, float(urand(5,80))); + me->GetRandomNearPosition(pos, float(urand(5, 80))); me->SummonCreature(NPC_HEALTHY_MUSHROOM, pos, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30*IN_MILLISECONDS); } } @@ -127,27 +127,27 @@ public: if (uiSpawnTimer <= diff) { SpawnAdds(); - uiSpawnTimer = urand(35*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(35*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiRootTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_ENTANGLING_ROOTS); - uiRootTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiRootTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiRootTimer -= diff; if (uiBashTimer <= diff) { DoCastVictim(SPELL_BASH); - uiBashTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBashTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBashTimer -= diff; if (uiBoltTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp index 3cfcd8b4f97..4ab8519ac4a 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_elder_nadox.cpp @@ -97,7 +97,7 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) pInstance->SetData(DATA_ELDER_NADOX_EVENT, IN_PROGRESS); @@ -105,12 +105,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 JustDied(Unit* /*killer*/) { - DoScriptText(SAY_SLAY_3,me); //SAY_SLAY_3 on death? + DoScriptText(SAY_SLAY_3, me); //SAY_SLAY_3 on death? if (pInstance) { @@ -147,22 +147,22 @@ public: { DoCast(me, SPELL_SUMMON_SWARMERS, true); DoCast(me, SPELL_SUMMON_SWARMERS); - if (urand(1,3) == 3) // 33% chance of dialog - DoScriptText(RAND(SAY_EGG_SAC_1,SAY_EGG_SAC_2), me); + if (urand(1, 3) == 3) // 33% chance of dialog + DoScriptText(RAND(SAY_EGG_SAC_1, SAY_EGG_SAC_2), me); uiSwarmerSpawnTimer = 10*IN_MILLISECONDS; } else uiSwarmerSpawnTimer -= diff; if (!bGuardSpawned && uiGuardSpawnTimer <= diff) { - me->MonsterTextEmote(EMOTE_HATCHES,me->GetGUID(),true); + me->MonsterTextEmote(EMOTE_HATCHES, me->GetGUID(), true); DoCast(me, SPELL_SUMMON_SWARM_GUARD); bGuardSpawned = true; } else uiGuardSpawnTimer -= diff; if (uiEnragueTimer <= diff) { - if (me->HasAura(SPELL_ENRAGE,0)) + if (me->HasAura(SPELL_ENRAGE, 0)) return; float x, y, z, o; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 48f4ed1d980..da3eff81e6e 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -67,7 +67,7 @@ public: struct boss_volazjAI : public ScriptedAI { - boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature),Summons(me) + boss_volazjAI(Creature* pCreature) : ScriptedAI(pCreature), Summons(me) { pInstance = pCreature->GetInstanceScript(); } @@ -127,12 +127,12 @@ public: if (!plr || !plr->isAlive()) continue; // Summon clone - if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(),TEMPSUMMON_CORPSE_DESPAWN,0)) + if (Unit *summon = me->SummonCreature(MOB_TWISTED_VISAGE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_CORPSE_DESPAWN, 0)) { // clone plr->CastSpell(summon, SPELL_CLONE_PLAYER, true); // set phase - summon->SetPhaseMask((1<<(4+insanityHandled)),true); + summon->SetPhaseMask((1<<(4+insanityHandled)), true); } } ++insanityHandled; @@ -162,7 +162,7 @@ public: } // Visible for all players in insanity - me->SetPhaseMask((1|16|32|64|128|256),true); + me->SetPhaseMask((1|16|32|64|128|256), true); // Used for Insanity handling insanityHandled = 0; @@ -309,7 +309,7 @@ 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); } }; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 5cea487eb81..68d1272750c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -94,7 +94,7 @@ public: void Reset() { - uiOpFerTimer = urand(15*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiCycloneTimer = 3*IN_MILLISECONDS; uiBoltTimer = 7*IN_MILLISECONDS; @@ -239,7 +239,7 @@ public: if (pInstance->GetData(DATA_JEDOGA_SHADOWSEEKER_EVENT) == IN_PROGRESS) OpferRufen(); bOnGround = false; - uiOpFerTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiOpFerTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } void OpferRufen() @@ -295,7 +295,7 @@ public: if (uiCycloneTimer <= diff) { DoCast(me, SPELL_CYCLONE_STRIKE, false); - uiCycloneTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCycloneTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCycloneTimer -= diff; if (uiBoltTimer <= diff) @@ -303,7 +303,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); - uiBoltTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiBoltTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiBoltTimer -= diff; if (uiThunderTimer <= diff) @@ -311,7 +311,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); - uiThunderTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiThunderTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiThunderTimer -= diff; if (uiOpFerTimer <= diff) diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 053b3ff8b51..5bcddf61bbc 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -22,9 +22,9 @@ enum Spells { SPELL_BLOODTHIRST = 55968, //Trigger Spell + add aura SPELL_CONJURE_FLAME_SPHERE = 55931, - SPELL_FLAME_SPHERE_SUMMON_1 = 55895,// 1x 30106 - H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511,// 1x 31686 - H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512,// 1x 31687 + SPELL_FLAME_SPHERE_SUMMON_1 = 55895, // 1x 30106 + H_SPELL_FLAME_SPHERE_SUMMON_1 = 59511, // 1x 31686 + H_SPELL_FLAME_SPHERE_SUMMON_2 = 59512, // 1x 31687 SPELL_FLAME_SPHERE_SPAWN_EFFECT = 55891, SPELL_FLAME_SPHERE_VISUAL = 55928, SPELL_FLAME_SPHERE_PERIODIC = 55926, @@ -103,7 +103,7 @@ public: void Reset() { uiBloodthirstTimer = 10*IN_MILLISECONDS; - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); uiEmbraceTimer = 20*IN_MILLISECONDS; uiFlamesphereTimer = 5*IN_MILLISECONDS; uiEmbraceTakenDamage = 0; @@ -138,7 +138,7 @@ public: Unit *pSphereTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pSphereTarget && pSpheres[0]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[0]->GetAngle(pSphereTarget); x = pSpheres[0]->GetPositionX() + DATA_SPHERE_DISTANCE * cos(angle); y = pSpheres[0]->GetPositionY() + DATA_SPHERE_DISTANCE * sin(angle); @@ -152,7 +152,7 @@ public: pSpheres[2] = DoSpawnCreature(H_CREATURE_FLAME_SPHERE_2, 0, 0, 5, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 10*IN_MILLISECONDS); if (pSphereTarget && pSpheres[1] && pSpheres[2]) { - float angle,x,y; + float angle, x, y; angle = pSpheres[1]->GetAngle(pSphereTarget) + DATA_SPHERE_ANGLE_OFFSET; x = pSpheres[1]->GetPositionX() + DATA_SPHERE_DISTANCE/2 * cos(angle); y = pSpheres[1]->GetPositionY() + DATA_SPHERE_DISTANCE/2 * sin(angle); @@ -224,7 +224,7 @@ public: //He only vanishes if there are 3 or more alive players if (target_list.size() > 2) { - DoScriptText(RAND(SAY_VANISH_1,SAY_VANISH_2), me); + DoScriptText(RAND(SAY_VANISH_1, SAY_VANISH_2), me); DoCast(me, SPELL_VANISH); Phase = JUST_VANISHED; uiPhaseTimer = 500; @@ -232,7 +232,7 @@ public: uiEmbraceTarget = pEmbraceTarget->GetGUID(); } - uiVanishTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiVanishTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiVanishTimer -= diff; DoMeleeAttackIfReady(); @@ -278,7 +278,7 @@ public: uiPhaseTimer = 0; uiEmbraceTarget = 0; } - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } bool CheckSpheres() @@ -320,7 +320,7 @@ public: me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), DATA_GROUND_POSITION_Z, me->GetOrientation()); uint64 prison_GUID = pInstance->GetData64(DATA_PRINCE_TALDARAM_PLATFORM); - pInstance->HandleGameObject(prison_GUID,true); + pInstance->HandleGameObject(prison_GUID, true); } }; @@ -398,8 +398,8 @@ public: switch(pGO->GetEntry()) { - case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT,IN_PROGRESS); break; - case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT,IN_PROGRESS); break; + case GO_SPHERE1: pInstance->SetData(DATA_SPHERE1_EVENT, IN_PROGRESS); break; + case GO_SPHERE2: pInstance->SetData(DATA_SPHERE2_EVENT, IN_PROGRESS); break; } CAST_AI(boss_taldaram::boss_taldaramAI, pPrinceTaldaram->AI())->CheckSpheres(); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index f693c7aad16..55346cd8197 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -112,7 +112,7 @@ public: switch(go->GetEntry()) { case 193564: Prince_TaldaramPlatform = go->GetGUID(); - if (m_auiEncounter[1] == DONE) HandleGameObject(0,true,go); break; + if (m_auiEncounter[1] == DONE) HandleGameObject(0, true, go); break; case 193093: Prince_TaldaramSpheres[0] = go->GetGUID(); if (spheres[0] == IN_PROGRESS) { @@ -130,7 +130,7 @@ public: else go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 192236: Prince_TaldaramGate = go->GetGUID(); // Web gate past Prince Taldaram - if (m_auiEncounter[1] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[1] == DONE)HandleGameObject(0, true, go);break; } } @@ -167,7 +167,7 @@ public: } if (vInitiands.empty()) return 0; - uint8 j = urand(0,vInitiands.size() -1); + uint8 j = urand(0, vInitiands.size() -1); return vInitiands[j]; } case DATA_ADD_JEDOGA_OPFER: return JedogaSacrifices; @@ -183,7 +183,7 @@ public: case DATA_ELDER_NADOX_EVENT: m_auiEncounter[0] = data; break; case DATA_PRINCE_TALDARAM_EVENT: if (data == DONE) - HandleGameObject(Prince_TaldaramGate,true); + HandleGameObject(Prince_TaldaramGate, true); m_auiEncounter[1] = data; break; case DATA_JEDOGA_SHADOWSEEKER_EVENT: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 72fe60846b8..d21b57298cf 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -104,7 +104,7 @@ public: { pInstance = pCreature->GetInstanceScript(); pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); } InstanceScript* pInstance; @@ -152,7 +152,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -176,7 +176,7 @@ public: if (uiVenganceTimer <= uiDiff) { - DoCast(me,SPELL_VENGEANCE); + DoCast(me, SPELL_VENGEANCE); uiVenganceTimer = 10000; } else uiVenganceTimer -= uiDiff; @@ -211,7 +211,7 @@ public: MemoryGUID = 0; pCreature->SetReactState(REACT_PASSIVE); - pCreature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pCreature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pCreature->RestoreFaction(); } @@ -232,9 +232,9 @@ public: { me->RemoveAllAuras(); - uiHolyFireTimer = urand(9000,12000); - uiHolySmiteTimer = urand(5000,7000); - uiRenewTimer = urand(2000,5000); + uiHolyFireTimer = urand(9000, 12000); + uiHolySmiteTimer = urand(5000, 7000); + uiRenewTimer = urand(2000, 5000); uiResetTimer = 7000; @@ -278,7 +278,7 @@ public: { if (bDone && uiResetTimer <= uiDiff) { - me->GetMotionMaster()->MovePoint(0,746.87f,665.87f,411.75f); + me->GetMotionMaster()->MovePoint(0, 746.87f, 665.87f, 411.75f); bDone = false; } else uiResetTimer -= uiDiff; @@ -290,12 +290,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_HOLY_FIRE); + DoCast(pTarget, SPELL_HOLY_FIRE); } if (me->HasAura(SPELL_SHIELD)) uiHolyFireTimer = 13000; else - uiHolyFireTimer = urand(9000,12000); + uiHolyFireTimer = urand(9000, 12000); } else uiHolyFireTimer -= uiDiff; if (uiHolySmiteTimer <= uiDiff) @@ -303,12 +303,12 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SMITE); + DoCast(pTarget, SPELL_SMITE); } if (me->HasAura(SPELL_SHIELD)) uiHolySmiteTimer = 9000; else - uiHolySmiteTimer = urand(5000,7000); + uiHolySmiteTimer = urand(5000, 7000); } else uiHolySmiteTimer -= uiDiff; if (me->HasAura(SPELL_SHIELD)) @@ -316,11 +316,11 @@ public: if (uiRenewTimer <= uiDiff) { me->InterruptNonMeleeSpells(true); - uint8 uiTarget = urand(0,1); + uint8 uiTarget = urand(0, 1); switch(uiTarget) { case 0: - DoCast(me,SPELL_RENEW); + DoCast(me, SPELL_RENEW); break; case 1: if (Creature *pMemory = Unit::GetCreature(*me, MemoryGUID)) @@ -328,17 +328,17 @@ public: DoCast(pMemory, SPELL_RENEW); break; } - uiRenewTimer = urand(15000,17000); + uiRenewTimer = urand(15000, 17000); } else uiRenewTimer -= uiDiff; } if (!bHealth && !HealthAbovePct(25)) { me->InterruptNonMeleeSpells(true); - DoCastAOE(SPELL_HOLY_NOVA,false); + DoCastAOE(SPELL_HOLY_NOVA, false); DoCast(me, SPELL_SHIELD); - DoCastAOE(SPELL_SUMMON_MEMORY,false); - DoCastAOE(SPELL_CONFESS,false); + DoCastAOE(SPELL_SUMMON_MEMORY, false); + DoCastAOE(SPELL_CONFESS, false); bHealth = true; } @@ -385,7 +385,7 @@ public: if (uiOldWoundsTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget && pTarget->isAlive()) DoCast(pTarget, SPELL_OLD_WOUNDS); @@ -401,10 +401,10 @@ public: if (uiShadowPastTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_SHADOWS_PAST); + DoCast(pTarget, SPELL_SHADOWS_PAST); } uiShadowPastTimer = 5000; }else uiShadowPastTimer -= uiDiff; @@ -419,7 +419,7 @@ public: if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) { if (pSummoner && pSummoner->isAlive()) - CAST_CRE(pSummoner)->AI()->SetData(1,0); + CAST_CRE(pSummoner)->AI()->SetData(1, 0); } } } @@ -480,13 +480,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,712.14f,628.42f,411.88f); + AddWaypoint(0, 712.14f, 628.42f, 411.88f); break; case 1: - AddWaypoint(0,742.44f,650.29f,411.79f); + AddWaypoint(0, 742.44f, 650.29f, 411.79f); break; case 2: - AddWaypoint(0,783.33f,615.29f,411.84f); + AddWaypoint(0, 783.33f, 615.29f, 411.84f); break; } break; @@ -494,13 +494,13 @@ public: switch(uiType) { case 0: - AddWaypoint(0,713.12f,632.97f,411.90f); + AddWaypoint(0, 713.12f, 632.97f, 411.90f); break; case 1: - AddWaypoint(0,746.73f,650.24f,411.56f); + AddWaypoint(0, 746.73f, 650.24f, 411.56f); break; case 2: - AddWaypoint(0,781.32f,610.54f,411.82f); + AddWaypoint(0, 781.32f, 610.54f, 411.82f); break; } break; @@ -508,19 +508,19 @@ public: switch(uiType) { case 0: - AddWaypoint(0,715.06f,637.07f,411.91f); + AddWaypoint(0, 715.06f, 637.07f, 411.91f); break; case 1: - AddWaypoint(0,750.72f,650.20f,411.77f); + AddWaypoint(0, 750.72f, 650.20f, 411.77f); break; case 2: - AddWaypoint(0,779.77f,607.03f,411.81f); + AddWaypoint(0, 779.77f, 607.03f, 411.81f); break; } break; } - Start(false,true,0); + Start(false, true, 0); uiWaypoint = uiType; } @@ -537,7 +537,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED,pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); + pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, pInstance->GetData(DATA_ARGENT_SOLDIER_DEFEATED) + 1); } }; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 223fda6cde2..5157a602a21 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -118,16 +118,16 @@ public: uiPhase = PHASE_UNDEAD; - uiIcyTouchTimer = urand(5000,9000); - uiPlagueStrikeTimer = urand(10000,13000); - uiDeathRespiteTimer = urand(15000,16000); - uiObliterateTimer = urand(17000,19000); - uiDesecration = urand(15000,16000); + uiIcyTouchTimer = urand(5000, 9000); + uiPlagueStrikeTimer = urand(10000, 13000); + uiDeathRespiteTimer = urand(15000, 16000); + uiObliterateTimer = urand(17000, 19000); + uiDesecration = urand(15000, 16000); uiDeathArmyCheckTimer = 7000; uiResurrectTimer = 4000; uiGhoulExplodeTimer = 8000; - uiDeathBiteTimer = urand (2000,4000); - uiMarkedDeathTimer = urand (5000,7000); + uiDeathBiteTimer = urand (2000, 4000); + uiMarkedDeathTimer = urand (5000, 7000); } void RemoveSummons() @@ -161,7 +161,7 @@ public: if (uiResurrectTimer <= uiDiff) { me->SetFullHealth(); - DoCast(me,SPELL_BLACK_KNIGHT_RES,true); + DoCast(me, SPELL_BLACK_KNIGHT_RES, true); uiPhase++; uiResurrectTimer = 4000; bEventInProgress = false; @@ -177,17 +177,17 @@ public: if (uiIcyTouchTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiIcyTouchTimer = urand(5000,7000); + uiIcyTouchTimer = urand(5000, 7000); } else uiIcyTouchTimer -= uiDiff; if (uiPlagueStrikeTimer <= uiDiff) { DoCastVictim(SPELL_ICY_TOUCH); - uiPlagueStrikeTimer = urand(12000,15000); + uiPlagueStrikeTimer = urand(12000, 15000); } else uiPlagueStrikeTimer -= uiDiff; if (uiObliterateTimer <= uiDiff) { DoCastVictim(SPELL_OBLITERATE); - uiObliterateTimer = urand(17000,19000); + uiObliterateTimer = urand(17000, 19000); } else uiObliterateTimer -= uiDiff; switch(uiPhase) { @@ -198,9 +198,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DEATH_RESPITE); + DoCast(pTarget, SPELL_DEATH_RESPITE); } - uiDeathRespiteTimer = urand(15000,16000); + uiDeathRespiteTimer = urand(15000, 16000); } else uiDeathRespiteTimer -= uiDiff; break; } @@ -226,9 +226,9 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_DESECRATION); + DoCast(pTarget, SPELL_DESECRATION); } - uiDesecration = urand(15000,16000); + uiDesecration = urand(15000, 16000); } else uiDesecration -= uiDiff; if (uiGhoulExplodeTimer <= uiDiff) { @@ -253,7 +253,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { if (pTarget && pTarget->isAlive()) - DoCast(pTarget,SPELL_MARKED_DEATH); + DoCast(pTarget, SPELL_MARKED_DEATH); } uiMarkedDeathTimer = urand (5000, 7000); } else uiMarkedDeathTimer -= uiDiff; @@ -289,7 +289,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(BOSS_BLACK_KNIGHT,DONE); + pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); } }; @@ -349,7 +349,7 @@ public: { npc_black_knight_skeletal_gryphonAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 /*i*/) diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index d5254a0b706..e1e92b1cdd9 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -81,14 +81,14 @@ enum eSeat /* struct Point { - float x,y,z; + float x, y, z; }; const Point MovementPoint[] = { - {746.84f,623.15f,411.41f}, - {747.96f,620.29f,411.09f}, - {750.23f,618.35f,411.09f} + {746.84f, 623.15f, 411.41f}, + {747.96f, 620.29f, 411.09f}, + {750.23f, 618.35f, 411.09f} }; */ void AggroAllPlayers(Creature* pTemp) @@ -107,7 +107,7 @@ void AggroAllPlayers(Creature* pTemp) if (pPlayer->isAlive()) { - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -171,7 +171,7 @@ public: { uiChargeTimer = 5000; uiShieldBreakerTimer = 8000; - uiBuffTimer = urand(30000,60000); + uiBuffTimer = urand(30000, 60000); } void SetData(uint32 uiType, uint32 /*uiData*/) @@ -179,28 +179,28 @@ public: switch(uiType) { case 1: - AddWaypoint(0,747.36f,634.07f,411.572f); - AddWaypoint(1,780.43f,607.15f,411.82f); - AddWaypoint(2,785.99f,599.41f,411.92f); - AddWaypoint(3,778.44f,601.64f,411.79f); + AddWaypoint(0, 747.36f, 634.07f, 411.572f); + AddWaypoint(1, 780.43f, 607.15f, 411.82f); + AddWaypoint(2, 785.99f, 599.41f, 411.92f); + AddWaypoint(3, 778.44f, 601.64f, 411.79f); uiWaypointPath = 1; break; case 2: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,768.72f,581.01f,411.92f); - AddWaypoint(2,763.55f,590.52f,411.71f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 768.72f, 581.01f, 411.92f); + AddWaypoint(2, 763.55f, 590.52f, 411.71f); uiWaypointPath = 2; break; case 3: - AddWaypoint(0,747.35f,634.07f,411.57f); - AddWaypoint(1,784.02f,645.33f,412.39f); - AddWaypoint(2,775.67f,641.91f,411.91f); + AddWaypoint(0, 747.35f, 634.07f, 411.57f); + AddWaypoint(1, 784.02f, 645.33f, 412.39f); + AddWaypoint(2, 775.67f, 641.91f, 411.91f); uiWaypointPath = 3; break; } if (uiType <= 3) - Start(false,true,0,NULL); + Start(false, true, 0, NULL); } void WaypointReached(uint32 i) @@ -226,7 +226,7 @@ public: void DoCastSpellShield() { for (uint8 i = 0; i < 3; ++i) - DoCast(me,SPELL_SHIELD,true); + DoCast(me, SPELL_SHIELD, true); } void UpdateAI(const uint32 uiDiff) @@ -241,7 +241,7 @@ public: if (!me->HasAura(SPELL_SHIELD)) DoCastSpellShield(); - uiBuffTimer = urand(30000,45000); + uiBuffTimer = urand(30000, 45000); }else uiBuffTimer -= uiDiff; if (uiChargeTimer <= uiDiff) @@ -252,10 +252,10 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,1.0f); + me->AddThreat(pPlayer, 1.0f); DoCast(pPlayer, SPELL_CHARGE); break; } @@ -279,9 +279,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,10.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 10.0f, 30.0f, false)) { - pPassenger->CastSpell(pPlayer,SPELL_SHIELD_BREAKER,true); + pPassenger->CastSpell(pPlayer, SPELL_SHIELD_BREAKER, true); break; } } @@ -320,7 +320,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -338,9 +338,9 @@ public: void Reset() { - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); uiInterceptTimer = 7000; - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } void JustReachedHome() @@ -363,11 +363,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); EnterEvadeMode(); bHome = true; @@ -393,11 +393,11 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,8.0f,25.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 8.0f, 25.0f, false)) { DoResetThreat(); - me->AddThreat(pPlayer,5.0f); - DoCast(pPlayer,SPELL_INTERCEPT); + me->AddThreat(pPlayer, 5.0f); + DoCast(pPlayer, SPELL_INTERCEPT); break; } } @@ -408,13 +408,13 @@ public: if (uiBladeStormTimer <= uiDiff) { DoCastVictim(SPELL_BLADESTORM); - uiBladeStormTimer = urand(15000,20000); + uiBladeStormTimer = urand(15000, 20000); } else uiBladeStormTimer -= uiDiff; if (uiMortalStrikeTimer <= uiDiff) { DoCastVictim(SPELL_MORTAL_STRIKE); - uiMortalStrikeTimer = urand(8000,12000); + uiMortalStrikeTimer = urand(8000, 12000); } else uiMortalStrikeTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -453,7 +453,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -497,11 +497,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -537,14 +537,14 @@ public: if (uiPolymorphTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; if (uiBlastWaveTimer <= uiDiff) { - DoCastAOE(SPELL_BLAST_WAVE,false); + DoCastAOE(SPELL_BLAST_WAVE, false); uiBlastWaveTimer = 13000; } else uiBlastWaveTimer -= uiDiff; @@ -552,7 +552,7 @@ public: { me->InterruptNonMeleeSpells(true); - DoCast(me,SPELL_HASTE); + DoCast(me, SPELL_HASTE); uiHasteTimer = 22000; } else uiHasteTimer -= uiDiff; @@ -592,7 +592,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -612,14 +612,14 @@ public: { uiChainLightningTimer = 16000; uiHealingWaveTimer = 12000; - uiEartShieldTimer = urand(30000,35000); - uiHexMendingTimer = urand(20000,25000); + uiEartShieldTimer = urand(30000, 35000); + uiHexMendingTimer = urand(20000, 25000); } void EnterCombat(Unit* pWho) { - DoCast(me,SPELL_EARTH_SHIELD); - DoCast(pWho,SPELL_HEX_OF_MENDING); + DoCast(me, SPELL_EARTH_SHIELD); + DoCast(pWho, SPELL_HEX_OF_MENDING); }; void JustReachedHome() @@ -642,11 +642,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -669,38 +669,38 @@ public: if (uiChainLightningTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_CHAIN_LIGHTNING); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; } else uiChainLightningTimer -= uiDiff; if (uiHealingWaveTimer <= uiDiff) { - bool bChance = urand(0,1); + bool bChance = urand(0, 1); if (!bChance) { if (Unit* pFriend = DoSelectLowestHpFriendly(40)) - DoCast(pFriend,SPELL_HEALING_WAVE); + DoCast(pFriend, SPELL_HEALING_WAVE); } else - DoCast(me,SPELL_HEALING_WAVE); + DoCast(me, SPELL_HEALING_WAVE); uiHealingWaveTimer = 12000; } else uiHealingWaveTimer -= uiDiff; if (uiEartShieldTimer <= uiDiff) { - DoCast(me,SPELL_EARTH_SHIELD); + DoCast(me, SPELL_EARTH_SHIELD); - uiEartShieldTimer = urand(30000,35000); + uiEartShieldTimer = urand(30000, 35000); } else uiEartShieldTimer -= uiDiff; if (uiHexMendingTimer <= uiDiff) { - DoCastVictim(SPELL_HEX_OF_MENDING,true); + DoCastVictim(SPELL_HEX_OF_MENDING, true); - uiHexMendingTimer = urand(20000,25000); + uiHexMendingTimer = urand(20000, 25000); } else uiHexMendingTimer -= uiDiff; DoMeleeAttackIfReady(); @@ -739,7 +739,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -788,11 +788,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -815,13 +815,13 @@ public: if (uiLightningArrowsTimer <= uiDiff) { - DoCastAOE(SPELL_LIGHTNING_ARROWS,false); + DoCastAOE(SPELL_LIGHTNING_ARROWS, false); uiLightningArrowsTimer = 7000; } else uiLightningArrowsTimer -= uiDiff; if (uiShootTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST,0,30.0f)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f)) { uiTargetGUID = pTarget->GetGUID(); DoCast(pTarget, SPELL_SHOOT); @@ -836,9 +836,9 @@ public: me->InterruptNonMeleeSpells(true); Unit* pTarget = Unit::GetUnit(*me, uiTargetGUID); - if (pTarget && me->IsInRange(pTarget,5.0f,30.0f,false)) + if (pTarget && me->IsInRange(pTarget, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); } else { Map::PlayerList const& players = me->GetMap()->GetPlayers(); @@ -847,9 +847,9 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { Player* pPlayer = itr->getSource(); - if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer,5.0f,30.0f,false)) + if (pPlayer && !pPlayer->isGameMaster() && me->IsInRange(pPlayer, 5.0f, 30.0f, false)) { - DoCast(pTarget,SPELL_MULTI_SHOT); + DoCast(pTarget, SPELL_MULTI_SHOT); break; } } @@ -894,7 +894,7 @@ public: me->SetReactState(REACT_PASSIVE); // THIS IS A HACK, SHOULD BE REMOVED WHEN THE EVENT IS FULL SCRIPTED - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); } InstanceScript* pInstance; @@ -935,11 +935,11 @@ public: bDone = true; if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_1)) - me->SetHomePosition(739.678f,662.541f,412.393f,4.49f); + me->SetHomePosition(739.678f, 662.541f, 412.393f, 4.49f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_2)) - me->SetHomePosition(746.71f,661.02f,411.69f,4.6f); + me->SetHomePosition(746.71f, 661.02f, 411.69f, 4.6f); else if (pInstance && me->GetGUID() == pInstance->GetData64(DATA_GRAND_CHAMPION_3)) - me->SetHomePosition(754.34f,660.70f,412.39f,4.79f); + me->SetHomePosition(754.34f, 660.70f, 412.39f, 4.79f); if (pInstance) pInstance->SetData(BOSS_GRAND_CHAMPIONS, IN_PROGRESS); @@ -962,20 +962,20 @@ public: if (uiEviscerateTimer <= uiDiff) { - DoCast(me->getVictim(),SPELL_EVISCERATE); + DoCast(me->getVictim(), SPELL_EVISCERATE); uiEviscerateTimer = 8000; } else uiEviscerateTimer -= uiDiff; if (uiFanKivesTimer <= uiDiff) { - DoCastAOE(SPELL_FAN_OF_KNIVES,false); + DoCastAOE(SPELL_FAN_OF_KNIVES, false); uiFanKivesTimer = 14000; } else uiFanKivesTimer -= uiDiff; if (uiPosionBottleTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) - DoCast(pTarget,SPELL_POISON_BOTTLE); + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + DoCast(pTarget, SPELL_POISON_BOTTLE); uiPosionBottleTimer = 19000; } else uiPosionBottleTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 8ed67493825..29f5fcbfffd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -136,7 +136,7 @@ public: case NPC_JAEREN: uiAnnouncerGUID = creature->GetGUID(); if (TeamInInstance == ALLIANCE) - creature->UpdateEntry(NPC_ARELAS,ALLIANCE); + creature->UpdateEntry(NPC_ARELAS, ALLIANCE); break; case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_BATTLEWORG: @@ -172,7 +172,7 @@ public: if (uiMovementDone == 3) { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) - pAnnouncer->AI()->SetData(DATA_IN_POSITION,0); + pAnnouncer->AI()->SetData(DATA_IN_POSITION, 0); } break; case BOSS_GRAND_CHAMPIONS: @@ -189,9 +189,9 @@ public: { if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } } } @@ -202,8 +202,8 @@ public: { if (Creature* pBoss = instance->GetCreature(uiArgentChampionGUID)) { - pBoss->GetMotionMaster()->MovePoint(0,746.88f,618.74f,411.06f); - pBoss->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pBoss->GetMotionMaster()->MovePoint(0, 746.88f, 618.74f, 411.06f); + pBoss->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pBoss->SetReactState(REACT_AGGRESSIVE); } } @@ -212,18 +212,18 @@ public: m_auiEncounter[1] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_EADRIC_LOOT_H : GO_EADRIC_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; case BOSS_ARGENT_CHALLENGE_P: m_auiEncounter[2] = uiData; if (Creature* pAnnouncer = instance->GetCreature(uiAnnouncerGUID)) { - pAnnouncer->GetMotionMaster()->MovePoint(0,748.309f,619.487f,411.171f); + pAnnouncer->GetMotionMaster()->MovePoint(0, 748.309f, 619.487f, 411.171f); pAnnouncer->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT,746.59f,618.49f,411.09f,1.42f,0, 0, 0, 0,90000000); + pAnnouncer->SummonGameObject(instance->IsHeroic()? GO_PALETRESS_LOOT_H : GO_PALETRESS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); } break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index bf4d8f2ef4f..44dd6efe712 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -39,7 +39,7 @@ EndContentData */ ## npc_announcer_toc5 ######*/ -const Position SpawnPosition = {746.261f,657.401f,411.681f,4.65f}; +const Position SpawnPosition = {746.261f, 657.401f, 411.681f, 4.65f}; class npc_announcer_toc5 : public CreatureScript { @@ -74,7 +74,7 @@ public: Champion3List.clear(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetGrandChampionsForEncounter(); @@ -106,7 +106,7 @@ public: std::list<uint64> Champion2List; std::list<uint64> Champion3List; - void NextStep(uint32 uiTimerStep,bool bNextStep = true,uint8 uiPhaseStep = 0) + void NextStep(uint32 uiTimerStep, bool bNextStep = true, uint8 uiPhaseStep = 0) { uiTimer = uiTimerStep; if (bNextStep) @@ -121,13 +121,13 @@ public: { case DATA_START: DoSummonGrandChampion(uiFirstBoss); - NextStep(10000,false,1); + NextStep(10000, false, 1); break; case DATA_IN_POSITION: //movement done. - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); if (GameObject* pGO = GameObject::GetGameObject(*me, pInstance->GetData64(DATA_MAIN_GATE))) - pInstance->HandleGameObject(pGO->GetGUID(),false); - NextStep(10000,false,3); + pInstance->HandleGameObject(pGO->GetGUID(), false); + NextStep(10000, false, 3); break; case DATA_LESSER_CHAMPIONS_DEFEATED: { @@ -213,7 +213,7 @@ public: return; } - if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1,SpawnPosition)) + if (Creature* pBoss = me->SummonCreature(VEHICLE_TO_SUMMON1, SpawnPosition)) { switch(uiSummonTimes) { @@ -227,10 +227,10 @@ public: uiGrandChampionBoss1 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1,uiVehicle1GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_1,uiGrandChampionBoss1); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_1, uiVehicle1GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_1, uiGrandChampionBoss1); } - pBoss->AI()->SetData(1,0); + pBoss->AI()->SetData(1, 0); break; } case 2: @@ -243,10 +243,10 @@ public: uiGrandChampionBoss2 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2,uiVehicle2GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_2,uiGrandChampionBoss2); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_2, uiVehicle2GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_2, uiGrandChampionBoss2); } - pBoss->AI()->SetData(2,0); + pBoss->AI()->SetData(2, 0); break; } case 3: @@ -259,10 +259,10 @@ public: uiGrandChampionBoss3 = pUnit->GetGUID(); if (pInstance) { - pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3,uiVehicle3GUID); - pInstance->SetData64(DATA_GRAND_CHAMPION_3,uiGrandChampionBoss3); + pInstance->SetData64(DATA_GRAND_CHAMPION_VEHICLE_3, uiVehicle3GUID); + pInstance->SetData64(DATA_GRAND_CHAMPION_3, uiGrandChampionBoss3); } - pBoss->AI()->SetData(3,0); + pBoss->AI()->SetData(3, 0); break; } default: @@ -271,7 +271,7 @@ public: for (uint8 i = 0; i < 3; ++i) { - if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2,SpawnPosition,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pAdd = me->SummonCreature(VEHICLE_TO_SUMMON2, SpawnPosition, TEMPSUMMON_CORPSE_DESPAWN)) { switch(uiSummonTimes) { @@ -289,13 +289,13 @@ public: switch(i) { case 0: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI); break; case 1: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2); break; case 2: - pAdd->GetMotionMaster()->MoveFollow(pBoss,2.0f,M_PI / 2 + M_PI); + pAdd->GetMotionMaster()->MoveFollow(pBoss, 2.0f, M_PI / 2 + M_PI); break; } } @@ -306,36 +306,36 @@ public: void DoStartArgentChampionEncounter() { - me->GetMotionMaster()->MovePoint(1,735.81f,661.92f,412.39f); + me->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); - if (me->SummonCreature(uiArgentChampion,SpawnPosition)) + if (me->SummonCreature(uiArgentChampion, SpawnPosition)) { for (uint8 i = 0; i < 3; ++i) { - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK,SpawnPosition)) - pTrash->AI()->SetData(i,0); - if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS,SpawnPosition)) - pTrash->AI()->SetData(i,0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_LIGHWIELDER, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_ARGENT_MONK, SpawnPosition)) + pTrash->AI()->SetData(i, 0); + if (Creature* pTrash = me->SummonCreature(NPC_PRIESTESS, SpawnPosition)) + pTrash->AI()->SetData(i, 0); } } } void SetGrandChampionsForEncounter() { - uiFirstBoss = urand(0,4); + uiFirstBoss = urand(0, 4); while (uiSecondBoss == uiFirstBoss || uiThirdBoss == uiFirstBoss || uiThirdBoss == uiSecondBoss) { - uiSecondBoss = urand(0,4); - uiThirdBoss = urand(0,4); + uiSecondBoss = urand(0, 4); + uiThirdBoss = urand(0, 4); } } void SetArgentChampion() { - uint8 uiTempBoss = urand(0,1); + uint8 uiTempBoss = urand(0, 1); switch(uiTempBoss) { @@ -360,7 +360,7 @@ public: if (pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == NOT_STARTED && pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == NOT_STARTED) { if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) - me->AI()->SetData(DATA_START,0); + me->AI()->SetData(DATA_START, 0); if (pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE) DoStartArgentChampionEncounter(); @@ -369,7 +369,7 @@ public: if ((pInstance->GetData(BOSS_GRAND_CHAMPIONS) == DONE && pInstance->GetData(BOSS_ARGENT_CHALLENGE_E) == DONE) || pInstance->GetData(BOSS_ARGENT_CHALLENGE_P) == DONE) - me->SummonCreature(VEHICLE_BLACK_KNIGHT,769.834f,651.915f,447.035f,0); + me->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0); } } @@ -389,8 +389,8 @@ public: if (pPlayer->isAlive()) { - pTemp->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - pTemp->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pTemp->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + pTemp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTemp->SetReactState(REACT_AGGRESSIVE); pTemp->SetInCombatWith(pPlayer); pPlayer->SetInCombatWith(pTemp); @@ -410,11 +410,11 @@ public: { case 1: DoSummonGrandChampion(uiSecondBoss); - NextStep(10000,true); + NextStep(10000, true); break; case 2: DoSummonGrandChampion(uiThirdBoss); - NextStep(0,false); + NextStep(0, false); break; case 3: if (!Champion1List.empty()) @@ -422,7 +422,7 @@ public: for (std::list<uint64>::const_iterator itr = Champion1List.begin(); itr != Champion1List.end(); ++itr) if (Creature* pSummon = Unit::GetCreature(*me, *itr)) AggroAllPlayers(pSummon); - NextStep(0,false); + NextStep(0, false); } break; } @@ -436,7 +436,7 @@ public: { if (pInstance && pInstance->GetData(BOSS_GRAND_CHAMPIONS) == NOT_STARTED) { - pSummon->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + pSummon->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pSummon->SetReactState(REACT_PASSIVE); } } @@ -455,7 +455,7 @@ public: case VEHICLE_ORGRIMMAR_WOLF: case VEHICLE_SILVERMOON_HAWKSTRIDER: case VEHICLE_DARKSPEAR_RAPTOR: - me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED,0); + me->AI()->SetData(DATA_LESSER_CHAMPIONS_DEFEATED, 0); break; } } diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp index 26ab0cc31c7..55d93f6997d 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_dred.cpp @@ -71,22 +71,22 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,NOT_STARTED); + pInstance->SetData(DATA_DRED_EVENT, NOT_STARTED); pInstance->SetData(DATA_KING_DRED_ACHIEV, 0); } uiBellowingRoarTimer = 33*IN_MILLISECONDS; uiGrievousBiteTimer = 20*IN_MILLISECONDS; uiManglingSlashTimer = 18500; - uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS,20*IN_MILLISECONDS); + uiFearsomeRoarTimer = urand(10*IN_MILLISECONDS, 20*IN_MILLISECONDS); uiPiercingSlashTimer = 17*IN_MILLISECONDS; - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } void EnterCombat(Unit* /*who*/) { if (pInstance) - pInstance->SetData(DATA_DRED_EVENT,IN_PROGRESS); + pInstance->SetData(DATA_DRED_EVENT, IN_PROGRESS); } void UpdateAI(const uint32 diff) @@ -103,38 +103,38 @@ public: if (uiGrievousBiteTimer < diff) { - DoCastVictim(SPELL_GRIEVOUS_BITE ,false); + DoCastVictim(SPELL_GRIEVOUS_BITE , false); uiGrievousBiteTimer = 20*IN_MILLISECONDS; } else uiGrievousBiteTimer -=diff; if (uiManglingSlashTimer < diff) { - DoCastVictim(SPELL_MANGLING_SLASH,false); + DoCastVictim(SPELL_MANGLING_SLASH, false); uiManglingSlashTimer = 20*IN_MILLISECONDS; } else uiManglingSlashTimer -=diff; if (uiFearsomeRoarTimer < diff) { - DoCastAOE(SPELL_FEARSOME_ROAR,false); - uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS,18*IN_MILLISECONDS); + DoCastAOE(SPELL_FEARSOME_ROAR, false); + uiFearsomeRoarTimer = urand(16*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiFearsomeRoarTimer -=diff; if (uiPiercingSlashTimer < diff) { - DoCastVictim(SPELL_PIERCING_SLASH,false); + DoCastVictim(SPELL_PIERCING_SLASH, false); uiPiercingSlashTimer = 20*IN_MILLISECONDS; } else uiPiercingSlashTimer -=diff; if (uiRaptorCallTimer < diff) { - DoCastVictim(SPELL_RAPTOR_CALL,false); + DoCastVictim(SPELL_RAPTOR_CALL, false); - float x,y,z; + float x, y, z; - me->GetClosePoint(x,y,z,me->GetObjectSize()/3,10.0f); - me->SummonCreature(RAND(NPC_RAPTOR_1,NPC_RAPTOR_2),x,y,z,0,TEMPSUMMON_DEAD_DESPAWN,1*IN_MILLISECONDS); + me->GetClosePoint(x, y, z, me->GetObjectSize()/3, 10.0f); + me->SummonCreature(RAND(NPC_RAPTOR_1, NPC_RAPTOR_2), x, y, z, 0, TEMPSUMMON_DEAD_DESPAWN, 1*IN_MILLISECONDS); - uiRaptorCallTimer = urand(20*IN_MILLISECONDS,25*IN_MILLISECONDS); + uiRaptorCallTimer = urand(20*IN_MILLISECONDS, 25*IN_MILLISECONDS); } else uiRaptorCallTimer -=diff; DoMeleeAttackIfReady(); @@ -144,7 +144,7 @@ public: { if (pInstance) { - pInstance->SetData(DATA_DRED_EVENT,DONE); + pInstance->SetData(DATA_DRED_EVENT, DONE); if (IsHeroic() && pInstance->GetData(DATA_KING_DRED_ACHIEV) == 6) pInstance->DoCompleteAchievement(ACHIEV_BETTER_OFF_DRED); @@ -176,7 +176,7 @@ public: void Reset() { - GutRipTimer = urand(10000,15000); + GutRipTimer = urand(10000, 15000); } void UpdateAI(const uint32 diff) @@ -187,8 +187,8 @@ public: if (GutRipTimer < diff) { - DoCastVictim(SPELL_GUT_RIP,false); - GutRipTimer = urand(10000,15000); + DoCastVictim(SPELL_GUT_RIP, false); + GutRipTimer = urand(10000, 15000); }else GutRipTimer -=diff; DoMeleeAttackIfReady(); @@ -230,7 +230,7 @@ public: void Reset() { - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } void UpdateAI(const uint32 diff) @@ -241,8 +241,8 @@ public: if (uiRendTimer < diff) { - DoCastVictim(SPELL_REND,false); - uiRendTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + DoCastVictim(SPELL_REND, false); + uiRendTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); }else uiRendTimer -=diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 87b4a080cb8..45ce90ffa4a 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -148,7 +148,7 @@ public: case PHASE_1: if (uiTimer <= diff) { - Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE,CREATURE_HULKING_CORPSE,CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pSummon = me->SummonCreature(RAND(CREATURE_FETID_TROLL_CORPSE, CREATURE_HULKING_CORPSE, CREATURE_RISEN_SHADOWCASTER), AddSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pSummon->GetMotionMaster()->MovePoint(0, AddDestinyPoint); //If spell is casted stops casting arcane field so no spell casting //DoCast(me, SPELL_SUMMON_MINIONS); @@ -159,9 +159,9 @@ public: if (uiCrystalHandlerTimer <= diff) { DoScriptText(SAY_NECRO_ADD, me); - Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + Creature *pCrystalHandler = me->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint); - uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS,30*IN_MILLISECONDS); + uiCrystalHandlerTimer = urand(20*IN_MILLISECONDS, 30*IN_MILLISECONDS); } else uiCrystalHandlerTimer -= diff; } break; @@ -169,9 +169,9 @@ public: if (uiTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST,SPELL_BLIZZARD,SPELL_FROSTBOLT,SPELL_WRATH_OF_MISERY), - RAND(H_SPELL_ARCANE_BLAST,H_SPELL_BLIZZARD,H_SPELL_FROSTBOLT,H_SPELL_WRATH_OF_MISERY))); - uiTimer = urand(1*IN_MILLISECONDS,3*IN_MILLISECONDS); + DoCast(pTarget, DUNGEON_MODE(RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY), + RAND(H_SPELL_ARCANE_BLAST, H_SPELL_BLIZZARD, H_SPELL_FROSTBOLT, H_SPELL_WRATH_OF_MISERY))); + uiTimer = urand(1*IN_MILLISECONDS, 3*IN_MILLISECONDS); } else uiTimer -= diff; break; default: @@ -268,7 +268,7 @@ public: void JustDied(Unit* /*killer*/) { if (Creature* pNovos = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_NOVOS) : 0)) - CAST_AI(boss_novos::boss_novosAI,pNovos->AI())->RemoveCrystal(); + CAST_AI(boss_novos::boss_novosAI, pNovos->AI())->RemoveCrystal(); } void UpdateAI(const uint32 diff) @@ -278,7 +278,7 @@ public: if (uiFlashOfDarknessTimer <= diff) { - DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS,H_SPELL_FLASH_OF_DARKNESS)); + DoCast(me->getVictim(), DUNGEON_MODE(SPELL_FLASH_OF_DARKNESS, H_SPELL_FLASH_OF_DARKNESS)); uiFlashOfDarknessTimer = 5*IN_MILLISECONDS; } else uiFlashOfDarknessTimer -= diff; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 11ebbb6199b..0f3725dce21 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -92,8 +92,8 @@ public: { uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); Phase = SKELETAL; me->SetDisplayId(me->GetNativeDisplayId()); if (pInstance) @@ -121,19 +121,19 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CURSE_OF_LIFE); - uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCurseOfLifeTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCurseOfLifeTimer -= diff; if (uiShadowVolleyTimer < diff) { DoCastVictim(SPELL_SHADOW_VOLLEY); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); } else uiShadowVolleyTimer -= diff; if (uiRainOfFireTimer < diff) { DoCastAOE(SPELL_RAIN_OF_FIRE); - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); } else uiRainOfFireTimer -= diff; if (uiPhaseTimer < diff) @@ -148,7 +148,7 @@ public: case GOING_FLESH: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_FLESH_1,SAY_FLESH_2),me); + DoScriptText(RAND(SAY_FLESH_1, SAY_FLESH_2), me); me->SetDisplayId(MODEL_FLESH); std::list<Unit *> playerList; @@ -156,13 +156,13 @@ public: for (std::list<Unit*>::const_iterator itr = playerList.begin(); itr != playerList.end(); ++itr) { Unit *pTemp = (*itr); - me->AddAura(SPELL_GIFT_OF_THARON_JA,pTemp); + me->AddAura(SPELL_GIFT_OF_THARON_JA, pTemp); pTemp->SetDisplayId(MODEL_SKELETON); } uiPhaseTimer = 20*IN_MILLISECONDS; - uiLightningBreathTimer = urand(3*IN_MILLISECONDS,4*IN_MILLISECONDS); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,8*IN_MILLISECONDS); - uiPoisonCloudTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(3*IN_MILLISECONDS, 4*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 8*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); Phase = FLESH; } else uiPhaseTimer -= diff; break; @@ -171,20 +171,20 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BREATH); - uiLightningBreathTimer = urand(6*IN_MILLISECONDS,7*IN_MILLISECONDS); + uiLightningBreathTimer = urand(6*IN_MILLISECONDS, 7*IN_MILLISECONDS); } else uiLightningBreathTimer -= diff; if (uiEyeBeamTimer < diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_EYE_BEAM); - uiEyeBeamTimer = urand(4*IN_MILLISECONDS,6*IN_MILLISECONDS); + uiEyeBeamTimer = urand(4*IN_MILLISECONDS, 6*IN_MILLISECONDS); } else uiEyeBeamTimer -= diff; if (uiPoisonCloudTimer < diff) { DoCastAOE(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(10*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiPoisonCloudTimer = urand(10*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiPoisonCloudTimer -= diff; if (uiPhaseTimer < diff) @@ -198,13 +198,13 @@ public: case GOING_SKELETAL: if (uiPhaseTimer < diff) { - DoScriptText(RAND(SAY_SKELETON_1,SAY_SKELETON_2), me); + DoScriptText(RAND(SAY_SKELETON_1, SAY_SKELETON_2), me); me->DeMorph(); Phase = SKELETAL; uiPhaseTimer = 20*IN_MILLISECONDS; uiCurseOfLifeTimer = 1*IN_MILLISECONDS; - uiRainOfFireTimer = urand(14*IN_MILLISECONDS,18*IN_MILLISECONDS); - uiShadowVolleyTimer = urand(8*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiRainOfFireTimer = urand(14*IN_MILLISECONDS, 18*IN_MILLISECONDS); + uiShadowVolleyTimer = urand(8*IN_MILLISECONDS, 10*IN_MILLISECONDS); std::list<Unit *> playerList; SelectTargetList(playerList, 5, SELECT_TARGET_TOPAGGRO, 0, true); @@ -222,12 +222,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 JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH,me); + DoScriptText(SAY_DEATH, me); if (pInstance) { diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index eb2fc36d3c9..7c605d6d6ca 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -83,16 +83,16 @@ public: { uiConsumeTimer = 15*IN_MILLISECONDS; uiAuraCountTimer = 15500; - uiCrushTimer = urand(1*IN_MILLISECONDS,5*IN_MILLISECONDS); - uiInfectedWoundTimer = urand(60*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiCrushTimer = urand(1*IN_MILLISECONDS, 5*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(60*IN_MILLISECONDS, 10*IN_MILLISECONDS); uiExplodeCorpseTimer = 3*IN_MILLISECONDS; - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); bAchiev = IsHeroic(); lSummons.DespawnAll(); - me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + me->RemoveAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pInstance) pInstance->SetData(DATA_TROLLGORE_EVENT, NOT_STARTED); @@ -114,10 +114,10 @@ public: if (uiSpawnTimer <= diff) { - uint32 spawnNumber = urand(2,DUNGEON_MODE(3,5)); + uint32 spawnNumber = urand(2, DUNGEON_MODE(3, 5)); for (uint8 i = 0; i < spawnNumber; ++i) - DoSummon(RAND(NPC_DRAKKARI_INVADER_1,NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); - uiSpawnTimer = urand(30*IN_MILLISECONDS,40*IN_MILLISECONDS); + DoSummon(RAND(NPC_DRAKKARI_INVADER_1, NPC_DRAKKARI_INVADER_2), AddSpawnPoint, 0, TEMPSUMMON_DEAD_DESPAWN); + uiSpawnTimer = urand(30*IN_MILLISECONDS, 40*IN_MILLISECONDS); } else uiSpawnTimer -= diff; if (uiConsumeTimer <= diff) @@ -129,7 +129,7 @@ public: if (bAchiev) { - Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA,H_SPELL_CONSUME_AURA)); + Aura *pConsumeAura = me->GetAura(DUNGEON_MODE(SPELL_CONSUME_AURA, H_SPELL_CONSUME_AURA)); if (pConsumeAura && pConsumeAura->GetStackAmount() > 9) bAchiev = false; } @@ -137,20 +137,20 @@ public: if (uiCrushTimer <= diff) { DoCastVictim(SPELL_CRUSH); - uiCrushTimer = urand(10*IN_MILLISECONDS,15*IN_MILLISECONDS); + uiCrushTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS); } else uiCrushTimer -= diff; if (uiInfectedWoundTimer <= diff) { DoCastVictim(SPELL_INFECTED_WOUND); - uiInfectedWoundTimer = urand(25*IN_MILLISECONDS,35*IN_MILLISECONDS); + uiInfectedWoundTimer = urand(25*IN_MILLISECONDS, 35*IN_MILLISECONDS); } else uiInfectedWoundTimer -= diff; if (uiExplodeCorpseTimer <= diff) { DoCast(SPELL_CORPSE_EXPLODE); DoScriptText(SAY_EXPLODE, me); - uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS,19*IN_MILLISECONDS); + uiExplodeCorpseTimer = urand(15*IN_MILLISECONDS, 19*IN_MILLISECONDS); } else uiExplodeCorpseTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp index fb992f0ca8a..8be1d4b7538 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp @@ -211,7 +211,7 @@ public: OUT_LOAD_INST_DATA(in); char dataHead1, dataHead2; - uint16 data0,data1,data2,data3; + uint16 data0, data1, data2, data3; std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 00c674907db..63c8cbe85b2 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -61,7 +61,7 @@ enum Spells SPELL_WAILING_SOULS_BEAM = 68875, // the beam visual SPELL_WAILING_SOULS = 68873, // the actual spell H_SPELL_WAILING_SOULS = 70324, -// 68871,68873,68875,68876,68899,68912,70324, +// 68871, 68873, 68875, 68876, 68899, 68912, 70324, // 68899 trigger 68871 }; @@ -288,7 +288,7 @@ class boss_devourer_of_souls : public CreatureScript case EVENT_WAILING_SOULS: me->SetDisplayId(DISPLAY_DESIRE); - DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me); + DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL, SAY_FACE_DESIRE_WAILING_SOUL), me); DoScriptText(EMOTE_WAILING_SOUL, me); DoCast(me, SPELL_WAILING_SOULS_STARTING); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) @@ -332,7 +332,7 @@ class boss_devourer_of_souls : public CreatureScript me->SetDisplayId(DISPLAY_ANGER); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE); me->GetMotionMaster()->MoveChase(me->getVictim()); - events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000,70000)); + events.ScheduleEvent(EVENT_WAILING_SOULS, urand(60000, 70000)); } break; } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index d0e1794be95..28d9e406e92 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -79,7 +79,7 @@ public: events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 23000); events.ScheduleEvent(EVENT_IMPENDING_DESPAIR, 9000); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. } void JustDied(Unit* /*killer*/) @@ -92,7 +92,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) @@ -122,7 +122,7 @@ public: break; case EVENT_DEFILING_HORROR: DoCast(SPELL_DEFILING_HORROR); - events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000,45000)); // TODO adjust timer. + events.ScheduleEvent(EVENT_DEFILING_HORROR, urand(25000, 45000)); // TODO adjust timer. break; } @@ -131,7 +131,7 @@ public: || (uiHopelessnessCount < 3 && HealthBelowPct(10))) { uiHopelessnessCount++; - DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS,H_SPELL_HOPELESSNESS)); + DoCast(DUNGEON_MODE(SPELL_HOPELESSNESS, H_SPELL_HOPELESSNESS)); } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index c8c512e8d98..6574846831e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -89,7 +89,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) @@ -114,7 +114,7 @@ public: events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13000); break; case EVENT_CORRUPTED_FLESH: - DoScriptText(RAND(SAY_CORRUPTED_FLESH_1,SAY_CORRUPTED_FLESH_2), me); + DoScriptText(RAND(SAY_CORRUPTED_FLESH_1, SAY_CORRUPTED_FLESH_2), me); DoCast(SPELL_CORRUPTED_FLESH); events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 0cc1633ce58..a6307f3c796 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -683,7 +683,7 @@ public: return; case EVENT_DARK_MENDING: // find an ally with missing HP - if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000,50000))) + if (Unit *pTarget = DoSelectLowestHpFriendly(40, DUNGEON_MODE(30000, 50000))) { DoCast(pTarget, SPELL_DARK_MENDING); events.ScheduleEvent(EVENT_DARK_MENDING, 20000); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index 373ad249f9b..b82ac92bd9f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -44,56 +44,56 @@ enum Events static Position PriestSpawnPos[ENCOUNTER_WAVE_PRIEST] = { - {5277.74f,2016.88f,707.778f,5.96903f}, - {5295.88f,2040.34f,707.778f,5.07891f}, - {5320.37f,1980.13f,707.778f,2.00713f}, - {5280.51f,1997.84f,707.778f,0.296706f}, - {5302.45f,2042.22f,707.778f,4.90438f}, - {5306.57f,1977.47f,707.778f,1.50098f}, + {5277.74f, 2016.88f, 707.778f, 5.96903f}, + {5295.88f, 2040.34f, 707.778f, 5.07891f}, + {5320.37f, 1980.13f, 707.778f, 2.00713f}, + {5280.51f, 1997.84f, 707.778f, 0.296706f}, + {5302.45f, 2042.22f, 707.778f, 4.90438f}, + {5306.57f, 1977.47f, 707.778f, 1.50098f}, }; static Position MageSpawnPos[ENCOUNTER_WAVE_MAGE] = { - {5312.75f,2037.12f,707.778f,4.59022f}, - {5309.58f,2042.67f,707.778f,4.69494f}, - {5275.08f,2008.72f,707.778f,6.21337f}, - {5279.65f,2004.66f,707.778f,0.069813f}, - {5275.48f,2001.14f,707.778f,0.174533f}, - {5316.7f,2041.55f,707.778f,4.50295f}, + {5312.75f, 2037.12f, 707.778f, 4.59022f}, + {5309.58f, 2042.67f, 707.778f, 4.69494f}, + {5275.08f, 2008.72f, 707.778f, 6.21337f}, + {5279.65f, 2004.66f, 707.778f, 0.069813f}, + {5275.48f, 2001.14f, 707.778f, 0.174533f}, + {5316.7f, 2041.55f, 707.778f, 4.50295f}, }; static Position MercenarySpawnPos[ENCOUNTER_WAVE_MERCENARY] = { - {5302.25f,1972.41f,707.778f,1.37881f}, - {5311.03f,1972.23f,707.778f,1.64061f}, - {5277.36f,1993.23f,707.778f,0.401426f}, - {5318.7f,2036.11f,707.778f,4.2237f}, - {5335.72f,1996.86f,707.778f,2.74017f}, - {5299.43f,1979.01f,707.778f,1.23918f}, + {5302.25f, 1972.41f, 707.778f, 1.37881f}, + {5311.03f, 1972.23f, 707.778f, 1.64061f}, + {5277.36f, 1993.23f, 707.778f, 0.401426f}, + {5318.7f, 2036.11f, 707.778f, 4.2237f}, + {5335.72f, 1996.86f, 707.778f, 2.74017f}, + {5299.43f, 1979.01f, 707.778f, 1.23918f}, }; static Position FootmenSpawnPos[ENCOUNTER_WAVE_FOOTMAN] = { - {5306.06f,2037,707.778f,4.81711f}, - {5344.15f,2007.17f,707.778f,3.15905f}, - {5337.83f,2010.06f,707.778f,3.22886f}, - {5343.29f,1999.38f,707.778f,2.9147f}, - {5340.84f,1992.46f,707.778f,2.75762f}, - {5325.07f,1977.6f,707.778f,2.07694f}, - {5336.6f,2017.28f,707.778f,3.47321f}, - {5313.82f,1978.15f,707.778f,1.74533f}, - {5280.63f,2012.16f,707.778f,6.05629f}, - {5322.96f,2040.29f,707.778f,4.34587f}, + {5306.06f, 2037, 707.778f, 4.81711f}, + {5344.15f, 2007.17f, 707.778f, 3.15905f}, + {5337.83f, 2010.06f, 707.778f, 3.22886f}, + {5343.29f, 1999.38f, 707.778f, 2.9147f}, + {5340.84f, 1992.46f, 707.778f, 2.75762f}, + {5325.07f, 1977.6f, 707.778f, 2.07694f}, + {5336.6f, 2017.28f, 707.778f, 3.47321f}, + {5313.82f, 1978.15f, 707.778f, 1.74533f}, + {5280.63f, 2012.16f, 707.778f, 6.05629f}, + {5322.96f, 2040.29f, 707.778f, 4.34587f}, }; static Position RiflemanSpawnPos[ENCOUNTER_WAVE_RIFLEMAN] = { - {5343.47f,2015.95f,707.778f,3.49066f}, - {5337.86f,2003.4f,707.778f,2.98451f}, - {5319.16f,1974,707.778f,1.91986f}, - {5299.25f,2036,707.778f,5.02655f}, - {5295.64f,1973.76f,707.778f,1.18682f}, - {5282.9f,2019.6f,707.778f,5.88176f}, + {5343.47f, 2015.95f, 707.778f, 3.49066f}, + {5337.86f, 2003.4f, 707.778f, 2.98451f}, + {5319.16f, 1974, 707.778f, 1.91986f}, + {5299.25f, 2036, 707.778f, 5.02655f}, + {5295.64f, 1973.76f, 707.778f, 1.18682f}, + {5282.9f, 2019.6f, 707.778f, 5.88176f}, }; class instance_halls_of_reflection : public InstanceMapScript @@ -184,22 +184,22 @@ public: { case GO_FROSTMOURNE: uiFrostmourne = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, false, go); break; case GO_FROSTMOURNE_ALTAR: uiFrostmourneAltar = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_FRONT_DOOR: uiFrontDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); HandleGameObject(0, true, go); break; case GO_ARTHAS_DOOR: uiArthasDoor = go->GetGUID(); - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); if (uiEncounter[1] == DONE) HandleGameObject(0, true, go); @@ -384,19 +384,19 @@ public: // TODO: do composition at random. # of spawn also depends on uiWaveCount // As of now, it is just one of each. - index = urand(0,ENCOUNTER_WAVE_MERCENARY-1); + index = urand(0, ENCOUNTER_WAVE_MERCENARY-1); pSummoner->SummonCreature(NPC_WAVE_MERCENARY, MercenarySpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_FOOTMAN-1); + index = urand(0, ENCOUNTER_WAVE_FOOTMAN-1); pSummoner->SummonCreature(NPC_WAVE_FOOTMAN, FootmenSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_RIFLEMAN-1); + index = urand(0, ENCOUNTER_WAVE_RIFLEMAN-1); pSummoner->SummonCreature(NPC_WAVE_RIFLEMAN, RiflemanSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_PRIEST-1); + index = urand(0, ENCOUNTER_WAVE_PRIEST-1); pSummoner->SummonCreature(NPC_WAVE_PRIEST, PriestSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); - index = urand(0,ENCOUNTER_WAVE_MAGE-1); + index = urand(0, ENCOUNTER_WAVE_MAGE-1); pSummoner->SummonCreature(NPC_WAVE_MAGE, MageSpawnPos[index], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 403feb7cf3e..a906fe03d12 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -97,12 +97,12 @@ class boss_drakkari_colossus : public CreatureScript if (GetData(DATA_INTRO_DONE)) { me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); } //events.Reset(); -> done in _Reset(); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000,30000)); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(10000, 30000)); phase = COLOSSUS_PHASE_NORMAL; @@ -149,8 +149,8 @@ class boss_drakkari_colossus : public CreatureScript me->GetMotionMaster()->MoveIdle(); me->SetReactState(REACT_PASSIVE); - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); - DoCast(me,SPELL_FREEZE_ANIM); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); + DoCast(me, SPELL_FREEZE_ANIM); break; case ACTION_UNFREEZE_COLOSSUS: @@ -158,13 +158,13 @@ class boss_drakkari_colossus : public CreatureScript return; me->SetReactState(REACT_AGGRESSIVE); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->RemoveAura(SPELL_FREEZE_ANIM); me->SetInCombatWithZone(); if (me->getVictim()) - me->GetMotionMaster()->MoveChase(me->getVictim(), 0,0); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); break; } @@ -172,7 +172,7 @@ class boss_drakkari_colossus : public CreatureScript void DamageTaken(Unit* /*attacker*/, uint32& damage) { - if (me->HasFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE)) + if (me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE)) damage = 0; if (phase == COLOSSUS_PHASE_NORMAL || @@ -220,8 +220,8 @@ class boss_drakkari_colossus : public CreatureScript switch (eventId) { case EVENT_MIGHTY_BLOW: - DoCast(me->getVictim(),SPELL_MIGHTY_BLOW); - events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000,15000)); + DoCast(me->getVictim(), SPELL_MIGHTY_BLOW); + events.ScheduleEvent(EVENT_MIGHTY_BLOW, urand(5000, 15000)); break; } } @@ -258,16 +258,16 @@ class boss_drakkari_elemental : public CreatureScript { boss_drakkari_elementalAI(Creature* creature) : ScriptedAI(creature) { - DoCast(me,SPELL_ELEMENTAL_SPAWN_EFFECT); + DoCast(me, SPELL_ELEMENTAL_SPAWN_EFFECT); instance = creature->GetInstanceScript(); } void Reset() { events.Reset(); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); - me->AddAura(SPELL_MOJO_VOLLEY,me); + me->AddAura(SPELL_MOJO_VOLLEY, me); } void JustDied(Unit* killer) @@ -299,8 +299,8 @@ class boss_drakkari_elemental : public CreatureScript case EVENT_SURGE: DoCast(SPELL_SURGE_VISUAL); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) - DoCast(target,SPELL_SURGE); - events.ScheduleEvent(EVENT_SURGE,urand(5000,15000)); + DoCast(target, SPELL_SURGE); + events.ScheduleEvent(EVENT_SURGE, urand(5000, 15000)); break; } } @@ -318,7 +318,7 @@ class boss_drakkari_elemental : public CreatureScript { if (Creature* colossus = Unit::GetCreature(*me, instance->GetData64(DATA_DRAKKARI_COLOSSUS))) // what if the elemental is more than 80 yards from drakkari colossus ? - DoCast(colossus,SPELL_MERGE,true); + DoCast(colossus, SPELL_MERGE, true); } break; } @@ -345,7 +345,7 @@ class boss_drakkari_elemental : public CreatureScript if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() == POINT_MOTION_TYPE) return; - me->GetMotionMaster()->MovePoint(0,colossus->GetPositionX(),colossus->GetPositionY(),colossus->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, colossus->GetPositionX(), colossus->GetPositionY(), colossus->GetPositionZ()); return; }*/ DoAction(ACTION_RETURN_TO_COLOSSUS); @@ -408,13 +408,13 @@ public: void MoveMojos(Creature* boss) { std::list<Creature*> mojosList; - boss->GetCreatureListWithEntryInGrid(mojosList,me->GetEntry(),12.0f); + boss->GetCreatureListWithEntryInGrid(mojosList, me->GetEntry(), 12.0f); if (!mojosList.empty()) { for (std::list<Creature*>::const_iterator itr = mojosList.begin(); itr != mojosList.end(); ++itr) { if (Creature* mojo = *itr) - mojo->GetMotionMaster()->MovePoint(1,boss->GetHomePosition().GetPositionX(),boss->GetHomePosition().GetPositionY(),boss->GetHomePosition().GetPositionZ()); + mojo->GetMotionMaster()->MovePoint(1, boss->GetHomePosition().GetPositionX(), boss->GetHomePosition().GetPositionY(), boss->GetHomePosition().GetPositionZ()); } } } @@ -430,7 +430,7 @@ public: { colossus->AI()->DoAction(ACTION_UNFREEZE_COLOSSUS); if (!colossus->AI()->GetData(DATA_INTRO_DONE)) - colossus->AI()->SetData(DATA_INTRO_DONE,true); + colossus->AI()->SetData(DATA_INTRO_DONE, true); colossus->SetInCombatWithZone(); me->DespawnOrUnsummon(); } @@ -451,7 +451,7 @@ public: Position colossusHomePosition; colossus->GetHomePosition().GetPosition(&colossusHomePosition); - float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(),colossusHomePosition.GetPositionY(),colossusHomePosition.GetPositionZ()); + float distance = homePosition.GetExactDist(colossusHomePosition.GetPositionX(), colossusHomePosition.GetPositionY(), colossusHomePosition.GetPositionZ()); if (distance < 12.0f) { diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 64a32fbfcec..d0825f79af0 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -57,7 +57,7 @@ public: void Reset() { - uiBerserkTimer = urand(60*IN_MILLISECONDS,90*IN_MILLISECONDS); //60-90 secs according to wowwiki + uiBerserkTimer = urand(60*IN_MILLISECONDS, 90*IN_MILLISECONDS); //60-90 secs according to wowwiki uiBiteTimer = 5*IN_MILLISECONDS; uiSpitTimer = 10*IN_MILLISECONDS; uiSpringTimer = 8*IN_MILLISECONDS; @@ -83,22 +83,22 @@ public: if (uiBiteTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_BITE); - uiBiteTimer = urand(8*IN_MILLISECONDS,12*IN_MILLISECONDS); + uiBiteTimer = urand(8*IN_MILLISECONDS, 12*IN_MILLISECONDS); } else uiBiteTimer -= diff; if (uiSpitTimer <= diff) { DoCast(me->getVictim(), SPELL_ECK_SPIT); - uiSpitTimer = urand(6*IN_MILLISECONDS,14*IN_MILLISECONDS); + uiSpitTimer = urand(6*IN_MILLISECONDS, 14*IN_MILLISECONDS); } else uiSpitTimer -= diff; if (uiSpringTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); - uiSpringTimer = urand(5*IN_MILLISECONDS,10*IN_MILLISECONDS); + uiSpringTimer = urand(5*IN_MILLISECONDS, 10*IN_MILLISECONDS); } } else uiSpringTimer -= diff; @@ -156,7 +156,7 @@ public: { if (pInstance) { - pInstance->SetData64(DATA_RUIN_DWELLER_DIED,me->GetGUID()); + pInstance->SetData64(DATA_RUIN_DWELLER_DIED, me->GetGUID()); if (pInstance->GetData(DATA_ALIVE_RUIN_DWELLERS) == 0) me->SummonCreature(CREATURE_ECK, EckSpawnPoint, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300*IN_MILLISECONDS); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index d5f6bcf5a4b..968be40223b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -172,7 +172,7 @@ public: if (uiStampedeTimer <= diff) { DoCast(me, SPELL_STAMPEDE); - DoScriptText(RAND(SAY_SUMMON_RHINO_1,SAY_SUMMON_RHINO_2,SAY_SUMMON_RHINO_3),me); + DoScriptText(RAND(SAY_SUMMON_RHINO_1, SAY_SUMMON_RHINO_2, SAY_SUMMON_RHINO_3), me); uiStampedeTimer = 15*IN_MILLISECONDS; } else uiStampedeTimer -= diff; @@ -277,7 +277,7 @@ public: if (victim == me) 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); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index e39151551a7..d02a906b79b 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -164,7 +164,7 @@ public: if (pVictim == me) return; - DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_3), me); + DoScriptText(RAND(SAY_SLAY_2, SAY_SLAY_3), me); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp index e6498c889ac..2d1a6b4a5ea 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_slad_ran.cpp @@ -145,23 +145,23 @@ public: { if (uiPhase == 1) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_SNAKE, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); if (uiPhase == 2) for (uint8 i = 0; i < DUNGEON_MODE(3, 5); ++i) - me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN,20*IN_MILLISECONDS); + me->SummonCreature(CREATURE_CONSTRICTORS, SpawnLoc[i], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20*IN_MILLISECONDS); uiSpawnTimer = 5*IN_MILLISECONDS; } else uiSpawnTimer -= diff; } if (uiPhase == 0 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON_SNAKES,me); + DoScriptText(SAY_SUMMON_SNAKES, me); uiPhase = 1; } if (uiPhase == 1 && HealthBelowPct(25)) { - DoScriptText(SAY_SUMMON_CONSTRICTORS,me); + DoScriptText(SAY_SUMMON_CONSTRICTORS, me); uiPhase = 2; } @@ -178,12 +178,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 JustSummoned(Creature* summoned) { - summoned->GetMotionMaster()->MovePoint(0,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ()); + summoned->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); lSummons.Summon(summoned); } }; diff --git a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp index e25f9b900a4..a0fdb4cce7b 100644 --- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp +++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp @@ -159,11 +159,11 @@ public: case 192518: uiSladRanAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiSladRanStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -174,11 +174,11 @@ public: case 192519: uiMoorabiAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiMoorabiStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -189,11 +189,11 @@ public: case 192520: uiDrakkariColossusAltar = go->GetGUID(); // Make sure that they start out as unusuable - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (m_auiEncounter[0] == DONE) { if (uiDrakkariColossusStatueState == GO_STATE_ACTIVE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); else { ++phase; @@ -220,21 +220,21 @@ public: case 192632: uiEckTheFerociousDoor = go->GetGUID(); if (bHeroicMode && m_auiEncounter[1] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 192569: uiEckTheFerociousDoorBehind = go->GetGUID(); if (bHeroicMode && m_auiEncounter[4] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); case 193208: uiGalDarahDoor1 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193209: uiGalDarahDoor2 = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); break; case 193188: uiBridge = go->GetGUID(); @@ -261,7 +261,7 @@ public: { GameObject* go = instance->GetGameObject(uiSladRanAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_MOORABI_EVENT: @@ -270,9 +270,9 @@ public: { GameObject* go = instance->GetGameObject(uiMoorabiAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); if (bHeroicMode) - HandleGameObject(uiEckTheFerociousDoor,true); + HandleGameObject(uiEckTheFerociousDoor, true); } break; case DATA_DRAKKARI_COLOSSUS_EVENT: @@ -281,21 +281,21 @@ public: { GameObject* go = instance->GetGameObject(uiDrakkariColossusAltar); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); } break; case DATA_GAL_DARAH_EVENT: m_auiEncounter[3] = data; if (data == DONE) { - HandleGameObject(uiGalDarahDoor1,true); - HandleGameObject(uiGalDarahDoor2,true); + HandleGameObject(uiGalDarahDoor1, true); + HandleGameObject(uiGalDarahDoor2, true); } break; case DATA_ECK_THE_FEROCIOUS_EVENT: m_auiEncounter[4] = data; if (bHeroicMode && data == DONE) - HandleGameObject(uiEckTheFerociousDoorBehind,true); + HandleGameObject(uiEckTheFerociousDoorBehind, true); break; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 101ecf10adb..3a5b289acb0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -619,7 +619,7 @@ class boss_prince_taldaram_icc : public CreatureScript DoZoneInCombat(controller); events.ScheduleEvent(EVENT_BERSERK, 600000); - events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000,15000)); + events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000, 15000)); events.ScheduleEvent(EVENT_CONJURE_FLAME, 20000); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index b38448d9f19..05f620db168 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -78,9 +78,9 @@ static const uint32 vampireAuras[3][MAX_DIFFICULTY] = {70877, 71474, 70877, 71474}, }; -#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867,71473,71532,71533) -#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879,71525,71530,71531) -#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877,71474,70877,71474) +#define ESSENCE_OF_BLOOD_QUEEN RAID_MODE<uint32>(70867, 71473, 71532, 71533) +#define ESSENCE_OF_BLOOD_QUEEN_PLR RAID_MODE<uint32>(70879, 71525, 71530, 71531) +#define FRENZIED_BLOODTHIRST RAID_MODE<uint32>(70877, 71474, 70877, 71474) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 66d3755ec6f..3f73184248a 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -114,7 +114,7 @@ enum Spells }; // Helper to get id of the aura on different modes (HasAura(baseId) wont work) -#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385,72441,72442,72443) +#define BOILING_BLOOD_HELPER RAID_MODE<int32>(72385, 72441, 72442, 72443) enum Events { @@ -710,7 +710,7 @@ class npc_high_overlord_saurfang_icc : public CreatureScript float x, y, z; deathbringer->GetClosePoint(x, y, z, deathbringer->GetObjectSize()); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(POINT_CORPSE ,x, y, z); + me->GetMotionMaster()->MovePoint(POINT_CORPSE , x, y, z); } break; case EVENT_OUTRO_HORDE_5: // move diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 3a0de0d7fc4..e7dfe62184e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -53,8 +53,8 @@ enum Spells }; // Used for HasAura checks -#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195,71219,73031,73032) -#define INOCULATED_HELPER RAID_MODE<uint32>(69291,72101,72102,72103) +#define PUNGENT_BLIGHT_HELPER RAID_MODE<uint32>(69195, 71219, 73031, 73032) +#define INOCULATED_HELPER RAID_MODE<uint32>(69291, 72101, 72102, 72103) static const uint32 gaseousBlight[3] = {69157, 69162, 69164}; static const uint32 gaseousBlightVisual[3] = {69126, 69152, 69154}; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 6b5ab146e4b..f7b9fdf350e 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -176,9 +176,9 @@ enum DeprogrammingData POINT_DESPAWN = 384721, }; -#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10,NPC_DARNAVAN_25,NPC_DARNAVAN_10,NPC_DARNAVAN_25) -#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25,NPC_DARNAVAN_CREDIT_10,NPC_DARNAVAN_CREDIT_25) -#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25,QUEST_DEPROGRAMMING_10,QUEST_DEPROGRAMMING_25) +#define NPC_DARNAVAN RAID_MODE<uint32>(NPC_DARNAVAN_10, NPC_DARNAVAN_25, NPC_DARNAVAN_10, NPC_DARNAVAN_25) +#define NPC_DARNAVAN_CREDIT RAID_MODE<uint32>(NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25, NPC_DARNAVAN_CREDIT_10, NPC_DARNAVAN_CREDIT_25) +#define QUEST_DEPROGRAMMING RAID_MODE<uint32>(QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25, QUEST_DEPROGRAMMING_10, QUEST_DEPROGRAMMING_25) static const uint32 addEntries[2] = {NPC_CULT_FANATIC, NPC_CULT_ADHERENT}; @@ -521,7 +521,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3]); _SummonAdd(addEntries[addIndex], addSpawnPos[addIndexOther*3+1]); _SummonAdd(addEntries[addIndexOther], addSpawnPos[addIndexOther*3+2]); - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); } ++addWaveCounter; } @@ -537,7 +537,7 @@ class boss_lady_deathwhisper : public CreatureScript _SummonAdd(addEntries[addIndex], addSpawnPos[addIndex*3+2]); } else - _SummonAdd(addEntries[urand(0,1)], addSpawnPos[6]); + _SummonAdd(addEntries[urand(0, 1)], addSpawnPos[6]); ++addWaveCounter; } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index ef6e78f13d2..7ef59bb9565 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -101,7 +101,7 @@ enum Spells SPELL_MUTATED_TRANSFORMATION_NAME = 72401, }; -#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672,72455,72832,72833) +#define SPELL_GASEOUS_BLOAT_HELPER RAID_MODE<uint32>(70672, 72455, 72832, 72833) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 809c6cecbf7..e506e5300fc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -61,7 +61,7 @@ enum Spells SPELL_DECIMATE = 71123, }; -#define MUTATED_INFECTION RAID_MODE<int32>(69674,71224,73022,73023) +#define MUTATED_INFECTION RAID_MODE<int32>(69674, 71224, 73022, 73023) enum Events { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 922957cd106..5708771d83c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -34,7 +34,7 @@ enum Texts SAY_KILL = 8, // Perish! // A flaw of mortality... SAY_BERSERK = 9, // Enough! I tire of these games! - SAY_DEATH = 10,// Free...at last... + SAY_DEATH = 10, // Free...at last... }; enum Spells diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 5b8d0e66206..999676d736d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -18,8 +18,8 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_GREET RAND(-1533000,-1533004,-1533005,-1533006,-1533007) -#define SAY_AGGRO RAND(-1533001,-1533002,-1533003) +#define SAY_GREET RAND(-1533000, -1533004, -1533005, -1533006, -1533007) +#define SAY_AGGRO RAND(-1533001, -1533002, -1533003) #define SAY_SLAY -1533008 #define MOB_CRYPT_GUARD 16573 @@ -116,7 +116,7 @@ public: events.ScheduleEvent(EVENT_BERSERK, 600000); if (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL) - events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000,20000)); + events.ScheduleEvent(EVENT_SPAWN_GUARDIAN_NORMAL, urand(15000, 20000)); } void MoveInLineOfSight(Unit *who) @@ -154,14 +154,14 @@ public: case EVENT_IMPALE: //Cast Impale on a random target //Do NOT cast it when we are afflicted by locust swarm - if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25))) + if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25))) if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10,SPELL_IMPALE_25)); - events.ScheduleEvent(EVENT_IMPALE, urand(10000,20000)); + DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25)); + events.ScheduleEvent(EVENT_IMPALE, urand(10000, 20000)); break; case EVENT_LOCUST: // TODO : Add Text - DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25)); + DoCast(me, RAID_MODE(SPELL_LOCUST_SWARM_10, SPELL_LOCUST_SWARM_25)); DoSummon(MOB_CRYPT_GUARD, GuardSummonPos, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_LOCUST, 90000); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 7a1c1863937..629fc42dcd6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -78,10 +78,10 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4), me); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4), me); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); } void Reset() @@ -104,7 +104,7 @@ public: void KilledUnit(Unit* /*victim*/) { if (!(rand()%3)) - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void JustDied(Unit* /*Killer*/) @@ -113,7 +113,7 @@ public: DoScriptText(SAY_DEATH, me); if (instance && bAchievement) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10,ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_10, ACHIEVEMENT_MOMMA_SAID_KNOCK_YOU_OUT_25)); } void UpdateAI(const uint32 diff) @@ -137,23 +137,23 @@ public: switch(eventId) { case EVENT_POISON: - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) - DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY,H_SPELL_POISON_BOLT_VOLLEY)); - events.ScheduleEvent(EVENT_POISON, urand(8000,15000)); + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) + DoCastAOE(RAID_MODE(SPELL_POISON_BOLT_VOLLEY, H_SPELL_POISON_BOLT_VOLLEY)); + events.ScheduleEvent(EVENT_POISON, urand(8000, 15000)); break; case EVENT_FIRE: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE)); - events.ScheduleEvent(EVENT_FIRE, urand(6000,18000)); + events.ScheduleEvent(EVENT_FIRE, urand(6000, 18000)); break; case EVENT_FRENZY: // TODO : Add Text - if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE,H_SPELL_WIDOWS_EMBRACE))) + if (!me->HasAura(RAID_MODE(SPELL_WIDOWS_EMBRACE, H_SPELL_WIDOWS_EMBRACE))) DoCast(me, RAID_MODE(SPELL_FRENZY, H_SPELL_FRENZY)); else doDelayFrenzy = true; - events.ScheduleEvent(EVENT_FRENZY, urand(60000,80000)); + events.ScheduleEvent(EVENT_FRENZY, urand(60000, 80000)); break; } } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 91f15bcf6ba..fe0e94c76e1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -56,26 +56,26 @@ const Position WaypointPositions[12] = const uint32 MOB_HORSEMEN[] = {16064, 16065, 30549, 16063}; const uint32 SPELL_MARK[] = {28832, 28833, 28834, 28835}; -#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i],SPELL_PRIMARY_H[i]) +#define SPELL_PRIMARY(i) RAID_MODE(SPELL_PRIMARY_N[i], SPELL_PRIMARY_H[i]) const uint32 SPELL_PRIMARY_N[] = {28884, 28863, 28882, 28883}; const uint32 SPELL_PRIMARY_H[] = {57467, 57463, 57369, 57466}; -#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i],SPELL_SECONDARY_H[i]) +#define SPELL_SECONDARY(i) RAID_MODE(SPELL_SECONDARY_N[i], SPELL_SECONDARY_H[i]) const uint32 SPELL_SECONDARY_N[]= {0, 57374, 0, 57376}; const uint32 SPELL_SECONDARY_H[]= {0, 57464, 0, 57465}; const uint32 SPELL_PUNISH[] = {0, 57381, 0, 57377}; #define SPELL_BERSERK 26662 -// used by 16063,16064,16065,30549, but signed for 16063 +// used by 16063, 16064, 16065, 30549, but signed for 16063 const int32 SAY_AGGRO[] = {-1533051, -1533044, -1533065, -1533058}; const int32 SAY_TAUNT[3][4] ={ {-1533052, -1533045, -1533071, -1533059}, {-1533053, -1533046, -1533072, -1533060}, - {-1533054, -1533047, -1533073, -1533061},}; + {-1533054, -1533047, -1533073, -1533061}, }; const int32 SAY_SPECIAL[] = {-1533055, -1533048, -1533070, -1533062}; const int32 SAY_SLAY[] = {-1533056, -1533049, -1533068, -1533063}; const int32 SAY_DEATH[] = {-1533057, -1533050, -1533074, -1533064}; -#define SAY_BARON_AGGRO RAND(-1533065,-1533066,-1533067) -#define SAY_BARON_SLAY RAND(-1533068,-1533069) +#define SAY_BARON_AGGRO RAND(-1533065, -1533066, -1533067) +#define SAY_BARON_SLAY RAND(-1533068, -1533069) class boss_four_horsemen : public CreatureScript { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 505938f1be9..dccce84818b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -19,8 +19,8 @@ #include "naxxramas.h" #define SPELL_MORTAL_WOUND 25646 -#define SPELL_ENRAGE RAID_MODE(28371,54427) -#define SPELL_DECIMATE RAID_MODE(28374,54426) +#define SPELL_ENRAGE RAID_MODE(28371, 54427) +#define SPELL_DECIMATE RAID_MODE(28374, 54426) #define SPELL_BERSERK 26662 #define SPELL_INFECTED_WOUND 29306 @@ -123,7 +123,7 @@ public: break; case EVENT_SUMMON: for (int32 i = 0; i < RAID_MODE(1, 2); ++i) - DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1,3)]); + DoSummon(MOB_ZOMBIE, PosSummon[rand() % RAID_MODE(1, 3)]); events.ScheduleEvent(EVENT_SUMMON, 10000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index bf37f218adc..1d5e3192c61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -427,11 +427,11 @@ public: } if (waves[waveCount].mode == 1) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 2) && (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else if ((waves[waveCount].mode == 0) && (GetDifficulty() == RAID_DIFFICULTY_10MAN_NORMAL)) - events.ScheduleEvent(EVENT_SUMMON,waves[waveCount].time); + events.ScheduleEvent(EVENT_SUMMON, waves[waveCount].time); else events.ScheduleEvent(EVENT_SUMMON, 0); @@ -447,7 +447,7 @@ public: summons.DoAction(0, 0); summons.DoZoneInCombat(); events.ScheduleEvent(EVENT_BOLT, 1000); - events.ScheduleEvent(EVENT_HARVEST, urand(3000,15000)); + events.ScheduleEvent(EVENT_HARVEST, urand(3000, 15000)); events.ScheduleEvent(EVENT_TELEPORT, 20000); } break; @@ -457,7 +457,7 @@ public: break; case EVENT_HARVEST: DoCast(me->getVictim(), SPELL_HARVEST_SOUL, true); - events.ScheduleEvent(EVENT_HARVEST, urand(20000,25000)); + events.ScheduleEvent(EVENT_HARVEST, urand(20000, 25000)); break; case EVENT_TELEPORT: if (!thirtyPercentReached) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index cb4e4b9f782..098b22e30ac 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -22,7 +22,7 @@ #define SPELL_POISON_CLOUD 28240 #define SPELL_MUTATING_INJECTION 28169 -#define SPELL_SLIME_SPRAY RAID_MODE(28157,54364) +#define SPELL_SLIME_SPRAY RAID_MODE(28157, 54364) #define SPELL_BERSERK 26662 #define SPELL_POISON_CLOUD_ADD 59116 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 27d9f9757a6..5bf864d8ed3 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -18,13 +18,13 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533109,-1533110,-1533111) +#define SAY_AGGRO RAND(-1533109, -1533110, -1533111) #define SAY_SLAY -1533112 -#define SAY_TAUNT RAND(-1533113,-1533114,-1533115,-1533116,-1533117) +#define SAY_TAUNT RAND(-1533113, -1533114, -1533115, -1533116, -1533117) #define SAY_DEATH -1533118 #define SPELL_SPELL_DISRUPTION 29310 -#define SPELL_DECREPIT_FEVER RAID_MODE(29998,55011) +#define SPELL_DECREPIT_FEVER RAID_MODE(29998, 55011) #define SPELL_PLAGUE_CLOUD 29350 enum Events diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 9d034723299..fff19b5cbb4 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -325,7 +325,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*/) @@ -389,13 +389,13 @@ public: switch(eventId) { case EVENT_WASTE: - DoSummon(NPC_WASTE, Pos[RAND(0,3,6,9)]); - events.RepeatEvent(urand(2000,5000)); + DoSummon(NPC_WASTE, Pos[RAND(0, 3, 6, 9)]); + events.RepeatEvent(urand(2000, 5000)); break; case EVENT_ABOMIN: if (nAbomination < 8) { - DoSummon(NPC_ABOMINATION, Pos[RAND(1,4,7,10)]); + DoSummon(NPC_ABOMINATION, Pos[RAND(1, 4, 7, 10)]); nAbomination++; events.RepeatEvent(20000); } @@ -405,7 +405,7 @@ public: case EVENT_WEAVER: if (nWeaver < 8) { - DoSummon(NPC_WEAVER, Pos[RAND(0,3,6,9)]); + DoSummon(NPC_WEAVER, Pos[RAND(0, 3, 6, 9)]); nWeaver++; events.RepeatEvent(25000); } @@ -419,19 +419,19 @@ public: break; case EVENT_PHASE: events.Reset(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); spawns.DespawnAll(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_NOT_SELECTABLE); me->CastStop(); DoStartMovement(me->getVictim()); - events.ScheduleEvent(EVENT_BOLT, urand(5000,10000)); + events.ScheduleEvent(EVENT_BOLT, urand(5000, 10000)); events.ScheduleEvent(EVENT_NOVA, 15000); - events.ScheduleEvent(EVENT_DETONATE, urand(30000,40000)); - events.ScheduleEvent(EVENT_FISSURE, urand(10000,30000)); - events.ScheduleEvent(EVENT_BLAST, urand(60000,120000)); + events.ScheduleEvent(EVENT_DETONATE, urand(30000, 40000)); + events.ScheduleEvent(EVENT_FISSURE, urand(10000, 30000)); + events.ScheduleEvent(EVENT_BLAST, urand(60000, 120000)); if (GetDifficulty() == RAID_DIFFICULTY_25MAN_NORMAL) - events.ScheduleEvent(EVENT_CHAIN, urand(30000,60000)); + events.ScheduleEvent(EVENT_CHAIN, urand(30000, 60000)); Phase = 2; break; default: @@ -463,12 +463,12 @@ public: } } } - else if (nGuardiansOfIcecrownCount < RAID_MODE(2,4)) + else if (nGuardiansOfIcecrownCount < RAID_MODE(2, 4)) { if (uiGuardiansOfIcecrownTimer <= diff) { // TODO : Add missing text - if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2,5,8,11)])) + if (Creature* pGuardian = DoSummon(NPC_ICECROWN, Pos[RAND(2, 5, 8, 11)])) pGuardian->SetFloatValue(UNIT_FIELD_COMBATREACH, 2); ++nGuardiansOfIcecrownCount; uiGuardiansOfIcecrownTimer = 5000; @@ -484,16 +484,16 @@ public: switch(eventId) { case EVENT_BOLT: - DoCastVictim(RAID_MODE(SPELL_FROST_BOLT,H_SPELL_FROST_BOLT)); - events.RepeatEvent(urand(5000,10000)); + DoCastVictim(RAID_MODE(SPELL_FROST_BOLT, H_SPELL_FROST_BOLT)); + events.RepeatEvent(urand(5000, 10000)); break; case EVENT_NOVA: - DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE,H_SPELL_FROST_BOLT_AOE)); - events.RepeatEvent(urand(15000,30000)); + DoCastAOE(RAID_MODE(SPELL_FROST_BOLT_AOE, H_SPELL_FROST_BOLT_AOE)); + events.RepeatEvent(urand(15000, 30000)); break; case EVENT_CHAIN: { - uint32 count = urand(1,3); + uint32 count = urand(1, 3); for (uint8 i = 1; i <= count; i++) { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true); @@ -507,8 +507,8 @@ public: } } if (!chained.empty()) - DoScriptText(RAND(SAY_CHAIN_1,SAY_CHAIN_2), me); - events.RepeatEvent(urand(100000,180000)); + DoScriptText(RAND(SAY_CHAIN_1, SAY_CHAIN_2), me); + events.RepeatEvent(urand(100000, 180000)); break; } case EVENT_CHAINED_SPELL: @@ -533,7 +533,7 @@ public: switch(player->getClass()) { case CLASS_DRUID: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_MOONFIRE, false); else player->CastSpell(me, SPELL_LIFEBLOOM, false); @@ -551,19 +551,19 @@ public: player->CastSpell(pTarget, RAND(SPELL_BLADESTORM, SPELL_CLEAVE), false); break; case CLASS_PALADIN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_HAMMER_OF_JUSTICE, false); else player->CastSpell(me, SPELL_HOLY_SHOCK, false); break; case CLASS_PRIEST: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_VAMPIRIC_TOUCH, false); else player->CastSpell(me, SPELL_RENEW, false); break; case CLASS_SHAMAN: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_EARTH_SHOCK, false); else player->CastSpell(me, SPELL_HEALING_WAVE, false); @@ -572,7 +572,7 @@ public: player->CastSpell(pTarget, RAND(SPELL_HEMORRHAGE, SPELL_MUTILATE), false); break; case CLASS_DEATH_KNIGHT: - if (urand(0,1)) + if (urand(0, 1)) player->CastSpell(pTarget, SPELL_PLAGUE_STRIKE, true); else player->CastSpell(pTarget, SPELL_HOWLING_BLAST, true); @@ -607,23 +607,23 @@ public: std::vector<Unit*>::const_iterator itr = unitList.begin(); advance(itr, rand()%unitList.size()); DoCast(*itr, SPELL_MANA_DETONATION); - DoScriptText(RAND(SAY_SPECIAL_1,SAY_SPECIAL_2,SAY_SPECIAL_3), me); + DoScriptText(RAND(SAY_SPECIAL_1, SAY_SPECIAL_2, SAY_SPECIAL_3), me); } - events.RepeatEvent(urand(20000,50000)); + events.RepeatEvent(urand(20000, 50000)); break; } case EVENT_FISSURE: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_FISURE); - events.RepeatEvent(urand(10000,45000)); + events.RepeatEvent(urand(10000, 45000)); break; case EVENT_BLAST: - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1,0), 0, true)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) DoCast(pTarget, SPELL_FROST_BLAST); if (rand()%2) DoScriptText(SAY_FROST_BLAST, me); - events.RepeatEvent(urand(30000,90000)); + events.RepeatEvent(urand(30000, 90000)); break; default: events.PopEvent(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 292d3f16d2b..63a7d69baa8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -76,11 +76,11 @@ public: case EVENT_BLOOM: // TODO : Add missing text DoCastAOE(SPELL_SUMMON_SPORE, true); - DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM,H_SPELL_DEATHBLOOM)); + DoCastAOE(RAID_MODE(SPELL_DEATHBLOOM, H_SPELL_DEATHBLOOM)); events.ScheduleEvent(EVENT_BLOOM, 30000); break; case EVENT_DOOM: - DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM,H_SPELL_INEVITABLE_DOOM)); + DoCastAOE(RAID_MODE(SPELL_INEVITABLE_DOOM, H_SPELL_INEVITABLE_DOOM)); events.ScheduleEvent(EVENT_DOOM, events.GetTimer() < 5*60000 ? 30000 : 15000); break; } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index f47b806e865..50ee49203d5 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -78,8 +78,8 @@ public: enraged = false; events.ScheduleEvent(EVENT_WRAP, 20000); events.ScheduleEvent(EVENT_SPRAY, 40000); - events.ScheduleEvent(EVENT_SHOCK, urand(5000,10000)); - events.ScheduleEvent(EVENT_POISON, urand(10000,15000)); + events.ScheduleEvent(EVENT_SHOCK, urand(5000, 10000)); + events.ScheduleEvent(EVENT_POISON, urand(10000, 15000)); events.ScheduleEvent(EVENT_SUMMON, 30000); } @@ -102,11 +102,11 @@ public: { case EVENT_WRAP: // TODO : Add missing text - for (uint8 i = 0; i < RAID_MODE(1,2); ++i) + for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) { - pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + pTarget->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = rand()%MAX_POS_WRAP; pTarget->GetMotionMaster()->MoveJump(PosWrap[pos].GetPositionX(), PosWrap[pos].GetPositionY(), PosWrap[pos].GetPositionZ(), 20, 20); if (Creature *wrap = DoSummon(MOB_WEB_WRAP, PosWrap[pos], 0, TEMPSUMMON_CORPSE_DESPAWN)) @@ -116,24 +116,24 @@ public: events.ScheduleEvent(EVENT_WRAP, 40000); break; case EVENT_SPRAY: - DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10,SPELL_WEB_SPRAY_25)); + DoCastAOE(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); events.ScheduleEvent(EVENT_SPRAY, 40000); break; case EVENT_SHOCK: - DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10,SPELL_POISON_SHOCK_25)); - events.ScheduleEvent(EVENT_SHOCK, urand(10000,20000)); + DoCastAOE(RAID_MODE(SPELL_POISON_SHOCK_10, SPELL_POISON_SHOCK_25)); + events.ScheduleEvent(EVENT_SHOCK, urand(10000, 20000)); break; case EVENT_POISON: - DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10,SPELL_NECROTIC_POISON_25)); + DoCast(me->getVictim(), RAID_MODE(SPELL_NECROTIC_POISON_10, SPELL_NECROTIC_POISON_25)); events.ScheduleEvent(EVENT_POISON, urand(10000, 20000)); break; case EVENT_FRENZY: - DoCast(me, RAID_MODE(SPELL_FRENZY_10,SPELL_FRENZY_25), true); + DoCast(me, RAID_MODE(SPELL_FRENZY_10, SPELL_FRENZY_25), true); events.ScheduleEvent(EVENT_FRENZY, 600000); break; case EVENT_SUMMON: // TODO : Add missing text - uint8 amount = urand(8,10); + uint8 amount = urand(8, 10); for (uint8 i = 0; i < amount; ++i) DoSummon(MOB_SPIDERLING, me, 0, TEMPSUMMON_CORPSE_DESPAWN); events.ScheduleEvent(EVENT_SUMMON, 40000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp index 1cd130556e9..80174a610ee 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp @@ -18,16 +18,16 @@ #include "ScriptPCH.h" #include "naxxramas.h" -#define SAY_AGGRO RAND(-1533075,-1533076,-1533077) +#define SAY_AGGRO RAND(-1533075, -1533076, -1533077) #define SAY_SUMMON -1533078 -#define SAY_SLAY RAND(-1533079,-1533080) +#define SAY_SLAY RAND(-1533079, -1533080) #define SAY_DEATH -1533081 #define SOUND_DEATH 8848 -#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213,54835) -#define SPELL_BLINK RAND(29208,29209,29210,29211) -#define SPELL_CRIPPLE RAID_MODE(29212,54814) +#define SPELL_CURSE_PLAGUEBRINGER RAID_MODE(29213, 54835) +#define SPELL_BLINK RAND(29208, 29209, 29210, 29211) +#define SPELL_CRIPPLE RAID_MODE(29212, 54814) #define SPELL_TELEPORT 29216 #define MOB_WARRIOR 16984 @@ -157,7 +157,7 @@ public: return; case EVENT_WARRIOR: DoScriptText(SAY_SUMMON, me); - SummonUndead(MOB_WARRIOR, RAID_MODE(2,3)); + SummonUndead(MOB_WARRIOR, RAID_MODE(2, 3)); events.ScheduleEvent(EVENT_WARRIOR, 30000); return; case EVENT_BLINK: @@ -180,12 +180,12 @@ public: DoScriptText(SAY_SUMMON, me); switch(balconyCount) { - case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2,4)); break; - case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1,2)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(1,2)); break; - case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2,4)); break; - default:SummonUndead(MOB_CHAMPION, RAID_MODE(5,10)); - SummonUndead(MOB_GUARDIAN, RAID_MODE(5,10));break; + case 0: SummonUndead(MOB_CHAMPION, RAID_MODE(2, 4)); break; + case 1: SummonUndead(MOB_CHAMPION, RAID_MODE(1, 2)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(1, 2)); break; + case 2: SummonUndead(MOB_GUARDIAN, RAID_MODE(2, 4)); break; + default:SummonUndead(MOB_CHAMPION, RAID_MODE(5, 10)); + SummonUndead(MOB_GUARDIAN, RAID_MODE(5, 10));break; } ++waveCount; events.ScheduleEvent(waveCount < 2 ? EVENT_WAVE : EVENT_GROUND, 30000 + rand()%15000); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp index 42afc0e57a0..e2fe4135996 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_patchwerk.cpp @@ -90,7 +90,7 @@ public: { _EnterCombat(); Enraged = false; - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); events.ScheduleEvent(EVENT_HATEFUL, 1200); events.ScheduleEvent(EVENT_BERSERK, 360000); @@ -129,7 +129,7 @@ public: if (!pMostHPTarget) pMostHPTarget = me->getVictim(); - DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE,H_SPELL_HATEFUL_STRIKE), true); + DoCast(pMostHPTarget, RAID_MODE(SPELL_HATEFUL_STRIKE, H_SPELL_HATEFUL_STRIKE), true); events.ScheduleEvent(EVENT_HATEFUL, 1200); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 479fda3c875..7056eb0ea33 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -32,14 +32,14 @@ //8860 death - An honorable... death... //8947 - Aggro Mixed? - ? -#define SOUND_AGGRO RAND(8852,8853,8854) -#define SOUND_SLAY RAND(8861,8863) -#define SOUND_COMMND RAND(8855,8856,8858,8859,8861) +#define SOUND_AGGRO RAND(8852, 8853, 8854) +#define SOUND_SLAY RAND(8861, 8863) +#define SOUND_COMMND RAND(8855, 8856, 8858, 8859, 8861) #define SOUND_DEATH 8860 #define SOUND_AGGROMIX 8847 #define SPELL_UNBALANCING_STRIKE 26613 -#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107,55543) +#define SPELL_DISRUPTING_SHOUT RAID_MODE(29107, 55543) #define SPELL_JAGGED_KNIFE 55550 #define SPELL_HOPELESS 29125 diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 0ce6f5e0829..9bd06669d5c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -21,11 +21,11 @@ #define EMOTE_BREATH -1533082 #define EMOTE_ENRAGE -1533083 -#define SPELL_FROST_AURA RAID_MODE(28531,55799) +#define SPELL_FROST_AURA RAID_MODE(28531, 55799) #define SPELL_CLEAVE 19983 -#define SPELL_TAIL_SWEEP RAID_MODE(55697,55696) +#define SPELL_TAIL_SWEEP RAID_MODE(55697, 55696) #define SPELL_SUMMON_BLIZZARD 28560 -#define SPELL_LIFE_DRAIN RAID_MODE(28542,55665) +#define SPELL_LIFE_DRAIN RAID_MODE(28542, 55665) #define SPELL_ICEBOLT 28522 #define SPELL_FROST_BREATH 29318 #define SPELL_FROST_EXPLOSION 28524 @@ -33,7 +33,7 @@ #define SPELL_BERSERK 26662 #define SPELL_DIES 29357 -#define SPELL_CHILL RAID_MODE(28547,55699) +#define SPELL_CHILL RAID_MODE(28547, 55699) #define MOB_BLIZZARD 16474 #define GO_ICEBLOCK 181247 @@ -265,9 +265,9 @@ public: case EVENT_BLIZZARD: { //DoCastAOE(SPELL_SUMMON_BLIZZARD); - if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000,30000), TEMPSUMMON_TIMED_DESPAWN)) + if (Creature *pSummon = DoSummon(MOB_BLIZZARD, me, 0.0f, urand(25000, 30000), TEMPSUMMON_TIMED_DESPAWN)) pSummon->GetMotionMaster()->MoveRandom(40); - events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000,7000), 0, PHASE_GROUND); + events.ScheduleEvent(EVENT_BLIZZARD, RAID_MODE(20000, 7000), 0, PHASE_GROUND); break; } case EVENT_FLIGHT: @@ -295,7 +295,7 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->SendMovementFlagUpdate(); events.ScheduleEvent(EVENT_ICEBOLT, 1500); - iceboltCount = RAID_MODE(2,3); + iceboltCount = RAID_MODE(2, 3); return; case EVENT_ICEBOLT: { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 9aabf5b315c..c61f5bddc7d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -183,9 +183,9 @@ public: void EnterCombat(Unit * /*who*/) { _EnterCombat(); - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me); events.ScheduleEvent(EVENT_SHIFT, 30000); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); events.ScheduleEvent(EVENT_BERSERK, 360000); } @@ -237,7 +237,7 @@ public: return; case EVENT_CHAIN: DoCast(me->getVictim(), RAID_MODE(SPELL_CHAIN_LIGHTNING, H_SPELL_CHAIN_LIGHTNING)); - events.ScheduleEvent(EVENT_CHAIN, urand(10000,20000)); + events.ScheduleEvent(EVENT_CHAIN, urand(10000, 20000)); return; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK); @@ -282,7 +282,7 @@ public: if (Creature *pThaddius = me->GetCreature(*me, pInstance->GetData64(DATA_THADDIUS))) if (pThaddius->AI()) pThaddius->AI()->DoAction(ACTION_STALAGG_RESET); - powerSurgeTimer = urand(20000,25000); + powerSurgeTimer = urand(20000, 25000); magneticPullTimer = 20000; } @@ -331,7 +331,7 @@ public: if (powerSurgeTimer <= uiDiff) { DoCast(me, RAID_MODE(SPELL_POWERSURGE, H_SPELL_POWERSURGE)); - powerSurgeTimer = urand(15000,20000); + powerSurgeTimer = urand(15000, 20000); } else powerSurgeTimer -= uiDiff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index ee13dc23c43..c49ac5b67bf 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -20,8 +20,8 @@ const DoorData doorData[] = { - {181126, BOSS_ANUBREKHAN,DOOR_TYPE_ROOM, BOUNDARY_S}, - {181195, BOSS_ANUBREKHAN,DOOR_TYPE_PASSAGE, 0}, + {181126, BOSS_ANUBREKHAN, DOOR_TYPE_ROOM, BOUNDARY_S}, + {181195, BOSS_ANUBREKHAN, DOOR_TYPE_PASSAGE, 0}, {194022, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_FAERLINA, DOOR_TYPE_PASSAGE, 0}, {181209, BOSS_MAEXXNA, DOOR_TYPE_ROOM, BOUNDARY_SW}, @@ -56,7 +56,7 @@ const MinionData minionData[] = {16064, BOSS_HORSEMEN}, {16065, BOSS_HORSEMEN}, {30549, BOSS_HORSEMEN}, - {0, 0,} + {0, 0, } }; enum eEnums diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index c2a9afc3788..3111361a46e 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -153,24 +153,24 @@ enum MalygosSays // Sniffed data const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = { - {782.9821f,1296.652f,282.1114f}, - {779.5459f,1287.228f,282.1393f}, - {773.0028f,1279.52f,282.4164f}, - {764.3626f,1274.476f,282.4731f}, - {754.3961f,1272.639f,282.4171f}, - {744.4422f,1274.412f,282.222f}, - {735.575f,1279.742f,281.9674f}, - {729.2788f,1287.187f,281.9943f}, - {726.1191f,1296.688f,282.2997f}, - {725.9396f,1306.531f,282.2448f}, - {729.3045f,1316.122f,281.9108f}, - {735.8322f,1323.633f,282.1887f}, - {744.4616f,1328.999f,281.9948f}, - {754.4739f,1330.666f,282.049f}, - {764.074f,1329.053f,281.9949f}, - {772.8409f,1323.951f,282.077f}, - {779.5085f,1316.412f,281.9145f}, - {782.8365f,1306.778f,282.3035f}, + {782.9821f, 1296.652f, 282.1114f}, + {779.5459f, 1287.228f, 282.1393f}, + {773.0028f, 1279.52f, 282.4164f}, + {764.3626f, 1274.476f, 282.4731f}, + {754.3961f, 1272.639f, 282.4171f}, + {744.4422f, 1274.412f, 282.222f}, + {735.575f, 1279.742f, 281.9674f}, + {729.2788f, 1287.187f, 281.9943f}, + {726.1191f, 1296.688f, 282.2997f}, + {725.9396f, 1306.531f, 282.2448f}, + {729.3045f, 1316.122f, 281.9108f}, + {735.8322f, 1323.633f, 282.1887f}, + {744.4616f, 1328.999f, 281.9948f}, + {754.4739f, 1330.666f, 282.049f}, + {764.074f, 1329.053f, 281.9949f}, + {772.8409f, 1323.951f, 282.077f}, + {779.5085f, 1316.412f, 281.9145f}, + {782.8365f, 1306.778f, 282.3035f}, }; #define GROUND_Z 268 @@ -179,22 +179,22 @@ const Position HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS] = #define MALYGOS_MAX_WAYPOINTS 16 const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = { - {812.7299f,1391.672f,283.2763f}, - {848.2912f,1358.61f,283.2763f}, - {853.9227f,1307.911f,283.2763f}, - {847.1437f,1265.538f,283.2763f}, - {839.9229f,1245.245f,283.2763f}, - {827.3463f,1221.818f,283.2763f}, - {803.2727f,1203.851f,283.2763f}, - {772.9372f,1197.981f,283.2763f}, - {732.1138f,1200.647f,283.2763f}, - {693.8761f,1217.995f,283.2763f}, - {664.5038f,1256.539f,283.2763f}, - {650.1497f,1303.485f,283.2763f}, - {662.9109f,1350.291f,283.2763f}, - {677.6391f,1377.607f,283.2763f}, - {704.8198f,1401.162f,283.2763f}, - {755.2642f,1417.1f,283.2763f}, + {812.7299f, 1391.672f, 283.2763f}, + {848.2912f, 1358.61f, 283.2763f}, + {853.9227f, 1307.911f, 283.2763f}, + {847.1437f, 1265.538f, 283.2763f}, + {839.9229f, 1245.245f, 283.2763f}, + {827.3463f, 1221.818f, 283.2763f}, + {803.2727f, 1203.851f, 283.2763f}, + {772.9372f, 1197.981f, 283.2763f}, + {732.1138f, 1200.647f, 283.2763f}, + {693.8761f, 1217.995f, 283.2763f}, + {664.5038f, 1256.539f, 283.2763f}, + {650.1497f, 1303.485f, 283.2763f}, + {662.9109f, 1350.291f, 283.2763f}, + {677.6391f, 1377.607f, 283.2763f}, + {704.8198f, 1401.162f, 283.2763f}, + {755.2642f, 1417.1f, 283.2763f}, }; #define MAX_SUMMONS_PHASE_TWO 4 @@ -202,7 +202,7 @@ const Position MalygosPhaseTwoWaypoints[MALYGOS_MAX_WAYPOINTS] = #define MAX_MALYGOS_POS 2 const Position MalygosPositions[MAX_MALYGOS_POS] = { - {754.544f,1301.71f,320.0f}, + {754.544f, 1301.71f, 320.0f}, {754.39f, 1301.27f, 292.91f} }; @@ -232,14 +232,14 @@ public: bersekerTimer = 0; currentPos = 0; - SetPhase(PHASE_ONE,true); + SetPhase(PHASE_ONE, true); delayedMovementTimer = 8000; delayedMovement = false; summonDeaths = 0; - me->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); cannotMove = true; } @@ -293,7 +293,7 @@ public: if (!instance) return; - SetPhase(PHASE_THREE,true); + SetPhase(PHASE_THREE, true); // this despawns Hover Disks summons.DespawnAll(); @@ -308,16 +308,16 @@ public: continue; // The rest is handled in the AI of the vehicle. - target->CastSpell(target,SPELL_SUMMOM_RED_DRAGON,true); + target->CastSpell(target, SPELL_SUMMOM_RED_DRAGON, true); } } - if (GameObject* go = GameObject::GetGameObject(*me,instance->GetData64(DATA_PLATFORM))) + if (GameObject* go = GameObject::GetGameObject(*me, instance->GetData64(DATA_PLATFORM))) go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); // In sniffs it has this flag, but i don't know how is applied. // pos sniffed me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } void SetPhaseEvents(uint8 _phase) @@ -325,23 +325,23 @@ public: switch (_phase) { case PHASE_ONE: - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(15,20)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_VORTEX,urand(30,40)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(15, 20)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_VORTEX, urand(30, 40)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, _phase); break; case PHASE_TWO: - events.ScheduleEvent(EVENT_YELL_0,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_1,24*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(2,5)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_0, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_1, 24*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(2, 5)*IN_MILLISECONDS, 0, _phase); break; case PHASE_THREE: - events.ScheduleEvent(EVENT_YELL_2,0,0,_phase); - events.ScheduleEvent(EVENT_YELL_3,8*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_YELL_4,16*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,_phase); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,_phase); + events.ScheduleEvent(EVENT_YELL_2, 0, 0, _phase); + events.ScheduleEvent(EVENT_YELL_3, 8*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_YELL_4, 16*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, _phase); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, _phase); break; default: break; @@ -353,7 +353,7 @@ public: _EnterCombat(); me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Talk(SAY_AGGRO_P_ONE); @@ -409,17 +409,17 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_VORTEX,MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_VORTEX, MalygosPositions[1].GetPositionX(), MalygosPositions[1].GetPositionY(), MalygosPositions[1].GetPositionZ()); // continues in MovementInform function. } void ExecuteVortex() { - DoCast(me,SPELL_VORTEX_1,true); - DoCast(me,SPELL_VORTEX_2,true); + DoCast(me, SPELL_VORTEX_1, true); + DoCast(me, SPELL_VORTEX_2, true); // the vortex execution continues in the dummy effect of this spell (see its script) - DoCast(me,SPELL_VORTEX_3,true); + DoCast(me, SPELL_VORTEX_3, true); } void MovementInform(uint32 type, uint32 id) @@ -436,7 +436,7 @@ public: case MOVE_DEEP_BREATH_ROTATION: currentPos = currentPos == MALYGOS_MAX_WAYPOINTS - 1 ? 0 : currentPos+1; me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); break; case MOVE_INIT_PHASE_ONE: me->SetInCombatWithZone(); @@ -451,24 +451,24 @@ public: void StartPhaseTwo() { - SetPhase(PHASE_TWO,true); + SetPhase(PHASE_TWO, true); me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); me->GetMotionMaster()->MoveIdle(); - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[0]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[0]); - Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); + Creature* summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[MAX_HOVER_DISK_WAYPOINTS-1]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_2); - summon = me->SummonCreature(NPC_HOVER_DISK_CASTER,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_CASTER, HoverDiskWaypoints[0]); if (summon && summon->IsAIEnabled) summon->AI()->DoAction(ACTION_HOVER_DISK_START_WP_1); for (uint8 i = 0; i < 2; i++) { // not sure about its position. - summon = me->SummonCreature(NPC_HOVER_DISK_MELEE,HoverDiskWaypoints[0]); + summon = me->SummonCreature(NPC_HOVER_DISK_MELEE, HoverDiskWaypoints[0]); if (summon) summon->SetInCombatWithZone(); } @@ -496,7 +496,7 @@ public: if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE) { me->GetMotionMaster()->MovementExpired(); - me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM,MalygosPositions[0].GetPositionX(),MalygosPositions[0].GetPositionY(),MalygosPositions[0].GetPositionZ()); + me->GetMotionMaster()->MovePoint(MOVE_CENTER_PLATFORM, MalygosPositions[0].GetPositionX(), MalygosPositions[0].GetPositionY(), MalygosPositions[0].GetPositionZ()); } } } @@ -506,7 +506,7 @@ public: { if (delayedMovementTimer <= diff) { - me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION,MalygosPhaseTwoWaypoints[currentPos]); + me->GetMotionMaster()->MovePoint(MOVE_DEEP_BREATH_ROTATION, MalygosPhaseTwoWaypoints[currentPos]); delayedMovementTimer = 8000; delayedMovement = false; } delayedMovementTimer -= diff; @@ -544,38 +544,38 @@ public: Talk(SAY_AGGRO_P_TWO); break; case EVENT_ARCANE_BREATH: - DoCast(me->getVictim(),SPELL_ARCANE_BREATH); - events.ScheduleEvent(EVENT_ARCANE_BREATH,urand(35,60)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_BREATH); + events.ScheduleEvent(EVENT_ARCANE_BREATH, urand(35, 60)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_ARCANE_STORM: - DoCast(me->getVictim(),SPELL_ARCANE_STORM); - events.ScheduleEvent(EVENT_ARCANE_STORM,urand(5,10)*IN_MILLISECONDS,0,PHASE_ONE); + DoCast(me->getVictim(), SPELL_ARCANE_STORM); + events.ScheduleEvent(EVENT_ARCANE_STORM, urand(5, 10)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_VORTEX: PrepareForVortex(); - events.ScheduleEvent(EVENT_VORTEX,urand(60,80)*IN_MILLISECONDS,0,PHASE_ONE); + events.ScheduleEvent(EVENT_VORTEX, urand(60, 80)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_POWER_SPARKS: - instance->SetData(DATA_POWER_SPARKS_HANDLING,0); - events.ScheduleEvent(EVENT_POWER_SPARKS,urand(30,35)*IN_MILLISECONDS,0,PHASE_ONE); + instance->SetData(DATA_POWER_SPARKS_HANDLING, 0); + events.ScheduleEvent(EVENT_POWER_SPARKS, urand(30, 35)*IN_MILLISECONDS, 0, PHASE_ONE); break; case EVENT_SURGE_POWER: me->GetMotionMaster()->MoveIdle(); delayedMovement = true; DoCast(SPELL_SURGE_POWER); - events.ScheduleEvent(EVENT_SURGE_POWER,urand(60,70)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SURGE_POWER, urand(60, 70)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SUMMON_ARCANE: DoCast(SPELL_SUMMON_ARCANE_BOMB); - events.ScheduleEvent(EVENT_SUMMON_ARCANE,urand(12,15)*IN_MILLISECONDS,0,PHASE_TWO); + events.ScheduleEvent(EVENT_SUMMON_ARCANE, urand(12, 15)*IN_MILLISECONDS, 0, PHASE_TWO); break; case EVENT_SURGE_POWER_PHASE_3: - DoCast(GetTargetPhaseThree(),SPELL_SURGE_POWER_PHASE_3); - events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3,(7,16)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_SURGE_POWER_PHASE_3); + events.ScheduleEvent(EVENT_SURGE_POWER_PHASE_3, (7, 16)*IN_MILLISECONDS, 0, PHASE_THREE); break; case EVENT_STATIC_FIELD: - DoCast(GetTargetPhaseThree(),SPELL_STATIC_FIELD); - events.ScheduleEvent(EVENT_STATIC_FIELD,(20,30)*IN_MILLISECONDS,0,PHASE_THREE); + DoCast(GetTargetPhaseThree(), SPELL_STATIC_FIELD); + events.ScheduleEvent(EVENT_STATIC_FIELD, (20, 30)*IN_MILLISECONDS, 0, PHASE_THREE); break; default: break; @@ -587,7 +587,7 @@ public: Unit* GetTargetPhaseThree() { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); // we are a drake if (target->GetVehicleKit()) @@ -643,7 +643,7 @@ public: // each player will enter to the trigger vehicle (entry 30090) already spawned (each one can hold up to 5 players, it has 5 seats) // the players enter to the vehicles casting SPELL_VORTEX_4 OR SPELL_VORTEX_5 if (InstanceScript* instance = caster->GetInstanceScript()) - instance->SetData(DATA_VORTEX_HANDLING,0); + instance->SetData(DATA_VORTEX_HANDLING, 0); // the rest of the vortex execution continues when SPELL_VORTEX_2 is removed. } @@ -735,23 +735,23 @@ public: void Reset() { - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } void UpdateAI(const uint32 diff) { if (!me->HasAura(SPELL_PORTAL_VISUAL_CLOSED) && !me->HasAura(SPELL_PORTAL_OPENED)) - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { me->RemoveAura(SPELL_PORTAL_OPENED); - DoCast(me,SPELL_PORTAL_VISUAL_CLOSED,true); + DoCast(me, SPELL_PORTAL_VISUAL_CLOSED, true); } } } @@ -762,7 +762,7 @@ public: if (summonTimer <= diff) { DoCast(SPELL_SUMMON_POWER_PARK); - summonTimer = urand(5,7)*IN_MILLISECONDS; + summonTimer = urand(5, 7)*IN_MILLISECONDS; } else summonTimer -= diff; } @@ -808,8 +808,8 @@ public: if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -818,7 +818,7 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (malygos->AI()->GetData(DATA_PHASE) != PHASE_ONE) { @@ -833,7 +833,7 @@ public: } if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != TARGETED_MOTION_TYPE) - me->GetMotionMaster()->MoveFollow(malygos,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(malygos, 0.0f, 0.0f); } } @@ -842,7 +842,7 @@ public: if (damage > me->GetMaxHealth()) { damage = 0; - DoCast(me,SPELL_POWER_SPARK_DEATH,true); + DoCast(me, SPELL_POWER_SPARK_DEATH, true); me->DespawnOrUnsummon(1000); } } @@ -893,11 +893,11 @@ public: // This will only be called if the passenger dies if (instance) { - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) - malygos->AI()->SetData(DATA_SUMMON_DEATHS,malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) + malygos->AI()->SetData(DATA_SUMMON_DEATHS, malygos->AI()->GetData(DATA_SUMMON_DEATHS)+1); } - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } me->GetMotionMaster()->MoveIdle(); @@ -906,8 +906,8 @@ public: { // Hack: Fall ground function can fail (remember the platform is a gameobject), we will teleport the disk to the ground if (me->GetPositionZ() > GROUND_Z) - me->NearTeleportTo(me->GetPositionX(),me->GetPositionY(),GROUND_Z,0); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), GROUND_Z, 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); me->setFaction(FACTION_FRIENDLY); me->AI()->EnterEvadeMode(); } @@ -928,14 +928,14 @@ public: { case ACTION_HOVER_DISK_START_WP_1: for (uint8 i = 0; i < MAX_HOVER_DISK_WAYPOINTS; i++) - AddWaypoint(i,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(i, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); break; case ACTION_HOVER_DISK_START_WP_2: { uint8 count = 0; for (uint8 i = MAX_HOVER_DISK_WAYPOINTS-1; i > 0; i--) { - AddWaypoint(count,HoverDiskWaypoints[i].GetPositionX(),HoverDiskWaypoints[i].GetPositionY(),HoverDiskWaypoints[i].GetPositionZ()); + AddWaypoint(count, HoverDiskWaypoints[i].GetPositionX(), HoverDiskWaypoints[i].GetPositionY(), HoverDiskWaypoints[i].GetPositionZ()); count++; } break; @@ -944,7 +944,7 @@ public: return; } - Start(true,false,0,0,false,true); + Start(true, false, 0, 0, false, true); } void UpdateEscortAI(const uint32 /*diff*/) @@ -985,7 +985,7 @@ public: void Reset() { - DoCast(me,SPELL_ARCANE_OVERLOAD,false); + DoCast(me, SPELL_ARCANE_OVERLOAD, false); } void UpdateAI(const uint32 diff) @@ -1023,12 +1023,12 @@ public: if (!instance) return; - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { if (Unit* summoner = me->ToTempSummon()->GetSummoner()) { - summoner->CastSpell(me,SPELL_RIDE_RED_DRAGON,true); - if (Creature* malygos = Unit::GetCreature(*me,instance->GetData64(DATA_MALYGOS))) + summoner->CastSpell(me, SPELL_RIDE_RED_DRAGON, true); + if (Creature* malygos = Unit::GetCreature(*me, instance->GetData64(DATA_MALYGOS))) { float victim_threat = malygos->getThreatManager().getThreat(summoner); malygos->getThreatManager().resetAllAggro(); @@ -1084,7 +1084,7 @@ public: { events.Reset(); - events.ScheduleEvent(EVENT_YELL_1,0); + events.ScheduleEvent(EVENT_YELL_1, 0); } void UpdateAI(const uint32 diff) @@ -1095,15 +1095,15 @@ public: { case EVENT_YELL_1: Talk(SAY_ONE); - events.ScheduleEvent(EVENT_YELL_2,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_2, 4*IN_MILLISECONDS); break; case EVENT_YELL_2: Talk(SAY_TWO); - events.ScheduleEvent(EVENT_YELL_3,4*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_3, 4*IN_MILLISECONDS); break; case EVENT_YELL_3: Talk(SAY_THREE); - events.ScheduleEvent(EVENT_YELL_4,7*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_YELL_4, 7*IN_MILLISECONDS); break; case EVENT_YELL_4: Talk(SAY_FOUR); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index a28b5258e4b..c2a9978d1d3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -62,17 +62,17 @@ public: } } - SpawnGameObject(GO_FOCUSING_IRIS,focusingIrisPosition); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_FOCUSING_IRIS, focusingIrisPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); if (GameObject* platform = instance->GetGameObject(platformGUID)) platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED); } else if (state == DONE) { if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->SummonCreature(NPC_ALEXSTRASZA,829.0679f,1244.77f,279.7453f,2.32f); + malygos->SummonCreature(NPC_ALEXSTRASZA, 829.0679f, 1244.77f, 279.7453f, 2.32f); - SpawnGameObject(GO_EXIT_PORTAL,exitPortalPosition); + SpawnGameObject(GO_EXIT_PORTAL, exitPortalPosition); // we make the platform appear again because at the moment we don't support looting using a vehicle if (GameObject* platform = instance->GetGameObject(platformGUID)) @@ -89,9 +89,9 @@ public: void SpawnGameObject(uint32 entry, Position& pos) { GameObject* go = new GameObject; - if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT),entry, instance, - PHASEMASK_NORMAL, pos.GetPositionX(),pos.GetPositionY(),pos.GetPositionZ(),pos.GetOrientation(), - 0,0,0,0,120,GO_STATE_READY)) + if (!go->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_GAMEOBJECT), entry, instance, + PHASEMASK_NORMAL, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation(), + 0, 0, 0, 0, 120, GO_STATE_READY)) { delete go; return; @@ -143,7 +143,7 @@ public: { go->Delete(); // this is not the best way. if (Creature* malygos = instance->GetCreature(malygosGUID)) - malygos->GetMotionMaster()->MovePoint(4,770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE + malygos->GetMotionMaster()->MovePoint(4, 770.10f, 1275.33f, 267.23f); // MOVE_INIT_PHASE_ONE if (GameObject* exitPortal = instance->GetGameObject(exitPortalGUID)) exitPortal->Delete(); @@ -176,7 +176,7 @@ public: if (!player || player->isGameMaster() || player->HasAura(SPELL_VORTEX_4)) continue; - player->CastSpell(trigger,SPELL_VORTEX_4,true); + player->CastSpell(trigger, SPELL_VORTEX_4, true); counter++; } } @@ -196,7 +196,7 @@ public: if (Creature* trigger = instance->GetCreature(*itr_trigger)) { lastPortalGUID = trigger->GetGUID(); - trigger->CastSpell(trigger,SPELL_PORTAL_OPENED,true); + trigger->CastSpell(trigger, SPELL_PORTAL_OPENED, true); return; } } @@ -206,7 +206,7 @@ public: } } - void SetData(uint32 data,uint32 /*value*/) + void SetData(uint32 data, uint32 /*value*/) { switch (data) { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index ffdd038ace3..001547379a3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -149,7 +149,7 @@ public: Phase = 1; DoScriptText(SAY_SHIELD, me); DoCast(me, SPELL_RIFT_SHIELD); - Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0,5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); + Creature* Rift = me->SummonCreature(MOB_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS); if (Rift) { //DoCast(Rift, SPELL_CHARGE_RIFT); @@ -215,7 +215,7 @@ public: void JustDied(Unit * /*killer*/) { if (Creature* pAnomalus = Unit::GetCreature(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0)) - CAST_AI(boss_anomalus::boss_anomalusAI,pAnomalus->AI())->bDeadChaoticRift = true; + CAST_AI(boss_anomalus::boss_anomalusAI, pAnomalus->AI())->bDeadChaoticRift = true; } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 07a943a0234..c7fa97899a1 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -82,7 +82,7 @@ public: void Reset() { uiCrystalfireBreathTimer = 14*IN_MILLISECONDS; - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); uiTailSweepTimer = 5*IN_MILLISECONDS; bEnrage = false; @@ -214,7 +214,7 @@ public: DoCast(me, SPELL_CRYSTALIZE); else if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CRYSTAL_CHAINS); - uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS,11*IN_MILLISECONDS); + uiCrystalChainsCrystalizeTimer = DUNGEON_MODE(30*IN_MILLISECONDS, 11*IN_MILLISECONDS); } else uiCrystalChainsCrystalizeTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index eaca718d419..1fd13bc1619 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -256,7 +256,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } @@ -273,7 +273,7 @@ public: bFireMagusDead = false; bFrostMagusDead = false; bArcaneMagusDead = false; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); return; } diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 431740b8e08..360e003c0ca 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -195,7 +195,7 @@ public: std::list<HostileReference*>::const_iterator i = me->getThreatManager().getThreatList().begin(); for (; i != me->getThreatManager().getThreatList().end(); ++i) { - Unit* pTemp = Unit::GetUnit((*me),(*i)->getUnitGuid()); + Unit* pTemp = Unit::GetUnit((*me), (*i)->getUnitGuid()); if (pTemp && pTemp->GetTypeId() == TYPEID_PLAYER && pTemp->getClass() == Healer) { pTarget = pTemp; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 9853b98487e..58203f95a40 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -75,9 +75,9 @@ public: { _Reset(); - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); - events.ScheduleEvent(EVENT_STOMP,17000); - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); + events.ScheduleEvent(EVENT_STOMP, 17000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); postPull = false; } @@ -110,21 +110,21 @@ public: for (uint8 i = 0; i <= (postPull ? 3 : 0); i++) { - me->GetRandomNearPosition(pPosition, float(urand(0,10))); + me->GetRandomNearPosition(pPosition, float(urand(0, 10))); me->SummonCreature(NPC_UNSTABLE_SPHERE, pPosition); } } - events.ScheduleEvent(EVENT_BOMB_SUMMON,2000); + events.ScheduleEvent(EVENT_BOMB_SUMMON, 2000); break; case EVENT_MAGIC_PULL: DoCast(SPELL_MAGIC_PULL); postPull = true; - events.ScheduleEvent(EVENT_MAGIC_PULL,15000); + events.ScheduleEvent(EVENT_MAGIC_PULL, 15000); break; case EVENT_STOMP: - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2,SAY_STOMP_3), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2, SAY_STOMP_3), me); DoCast(SPELL_THUNDERING_STOMP); - events.ScheduleEvent(EVENT_STOMP,17000); + events.ScheduleEvent(EVENT_STOMP, 17000); break; } } @@ -144,7 +144,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2,SAY_KILL_3), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2, SAY_KILL_3), me); } private: bool postPull; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 51b75f19f7e..e6520806a68 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -92,7 +92,7 @@ enum AmberDrake SPELL_AMBER_SHOCK_LANCE = 49840, //(60 yds) - Instant - Deals 4822 to 5602 Arcane damage and detonates all Shock Charges on an enemy dragon. Damage is increased by 6525 for each detonated. // SPELL_AMBER_STOP_TIME //Instant - 1 min cooldown - Halts the passage of time, freezing all enemy dragons in place for 10 sec. This attack applies 5 Shock Charges to each affected target. //you do not have access to until you kill the Mage-Lord Urom. - SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15,000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. + SPELL_AMBER_TEMPORAL_RIFT = 49592 //(60 yds) - Channeled - Channels a temporal rift on an enemy dragon for 10 sec. While trapped in the rift, all damage done to the target is increased by 100%. In addition, for every 15, 000 damage done to a target affected by Temporal Rift, 1 Shock Charge is generated. }; /*Emerald Drake, @@ -105,7 +105,7 @@ enum EmeraldDrake SPELL_RIDE_EMERALD_DRAKE_QUE = 49427, //Apply Aura: Periodic Trigger, Interval: 3 seconds ---> 49346 SPELL_EMERALD_DRAKE_SADDLE = 49346, //Allows you to ride on the back of an Amber Drake. ---> Dummy SPELL_EMERALD_LEECHING_POISON = 50328, //(60 yds) - Instant - Poisons the enemy dragon, leeching 1300 to the caster every 2 sec. for 12 sec. Stacks up to 3 times. - SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25,000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. + SPELL_EMERALD_TOUCH_THE_NIGHTMARE = 50341, //(60 yds) - Instant - Consumes 30% of the caster's max health to inflict 25, 000 nature damage to an enemy dragon and reduce the damage it deals by 25% for 30 sec. // you do not have access to until you kill the Mage-Lord Urom SPELL_EMERALD_DREAM_FUNNEL = 50344 //(60 yds) - Channeled - Transfers 5% of the caster's max health to a friendly drake every second for 10 seconds as long as the caster channels. }; @@ -145,10 +145,10 @@ public: if (action != ACTION_SET_NORMAL_EVENTS) return; - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); } void JustSummoned(Creature* summon) @@ -169,7 +169,7 @@ public: return; // TO-DO: See why the spell is not casted - summon->CastSpell(summon,SPELL_PLANAR_BLAST,true); + summon->CastSpell(summon, SPELL_PLANAR_BLAST, true); } void DamageTaken(Unit* /*attacker*/, uint32& /*damage*/) @@ -208,22 +208,22 @@ public: switch (eventId) { case EVENT_ARCANE_BARRAGE: - DoCast(me->getVictim(),SPELL_ARCANE_BARRAGE); - events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3,10) * IN_MILLISECONDS, 0, PHASE_NORMAL); + DoCast(me->getVictim(), SPELL_ARCANE_BARRAGE); + events.ScheduleEvent(EVENT_ARCANE_BARRAGE, urand(3, 10) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ARCANE_VOLLEY: DoCastAOE(SPELL_ARCANE_VOLLEY); - events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10,25) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ARCANE_VOLLEY, urand(10, 25) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_ENRAGED_ASSAULT: Talk(SAY_ENRAGE); DoCast(SPELL_ENRAGED_ASSAULT); - events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35,50) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_ENRAGED_ASSAULT, urand(35, 50) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; case EVENT_SUMMON_LEY_WHELP: for (uint8 i = 0; i < 3; i++) DoCast(SPELL_SUMMON_LEY_WHELP); - events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15,30) * IN_MILLISECONDS, 0, PHASE_NORMAL); + events.ScheduleEvent(EVENT_SUMMON_LEY_WHELP, urand(15, 30) * IN_MILLISECONDS, 0, PHASE_NORMAL); break; } } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index a5bcd92b8ee..07188b1a08b 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -78,12 +78,12 @@ static Summons Group[]= static uint32 TeleportSpells[]= { - SPELL_SUMMON_MENAGERIE,SPELL_SUMMON_MENAGERIE_2,SPELL_SUMMON_MENAGERIE_3 + SPELL_SUMMON_MENAGERIE, SPELL_SUMMON_MENAGERIE_2, SPELL_SUMMON_MENAGERIE_3 }; static int32 SayAggro[]= { - SAY_AGGRO_1,SAY_AGGRO_2,SAY_AGGRO_3,SAY_AGGRO_4 + SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3, SAY_AGGRO_4 }; class boss_urom : public CreatureScript @@ -98,7 +98,7 @@ public: struct boss_uromAI : public BossAI { - boss_uromAI(Creature* creature) : BossAI(creature,DATA_UROM_EVENT) {} + boss_uromAI(Creature* creature) : BossAI(creature, DATA_UROM_EVENT) {} void Reset() { @@ -120,11 +120,11 @@ public: me->GetMotionMaster()->MoveIdle(); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); arcaneExplosionTimer = 9000; castArcaneExplosionTimer = 2000; - frostBombTimer = urand(5000,8000); - timeBombTimer = urand(20000,25000); + frostBombTimer = urand(5000, 8000); + timeBombTimer = urand(20000, 25000); } void EnterCombat(Unit* /*pWho*/) @@ -136,7 +136,7 @@ public: CastTeleport(); if (instance->GetData(DATA_UROM_PLATAFORM) != 3) - instance->SetData(DATA_UROM_PLATAFORM,instance->GetData(DATA_UROM_PLATAFORM)+1); + instance->SetData(DATA_UROM_PLATAFORM, instance->GetData(DATA_UROM_PLATAFORM)+1); } void AttackStart(Unit* pWho) @@ -151,12 +151,12 @@ public: { if (me->Attack(pWho, true)) { - DoScriptText(SayAggro[3],me); + DoScriptText(SayAggro[3], me); me->SetInCombatWith(pWho); pWho->SetInCombatWith(me); - me->GetMotionMaster()->MoveChase(pWho, 0,0); + me->GetMotionMaster()->MoveChase(pWho, 0, 0); } } } @@ -169,7 +169,7 @@ public: while (group[0] == group[1] || group[0] == group[2] || group[1] == group[2]) { for (uint8 i = 0; i < 3; i++) - group[i] = urand(0,2); + group[i] = urand(0, 2); } } @@ -206,7 +206,7 @@ public: for (uint8 i = 0; i < 4 ; i++) { SetPosition(i); - me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i],x,y,me->GetPositionZ(),me->GetOrientation()); + me->SummonCreature(Group[group[instance->GetData(DATA_UROM_PLATAFORM)]].entry[i], x, y, me->GetPositionZ(), me->GetOrientation()); } } @@ -215,7 +215,7 @@ public: if (!instance || instance->GetData(DATA_UROM_PLATAFORM) > 2) return; - DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)],me); + DoScriptText(SayAggro[instance->GetData(DATA_UROM_PLATAFORM)], me); DoCast(TeleportSpells[instance->GetData(DATA_UROM_PLATAFORM)]); } @@ -231,10 +231,10 @@ public: if (teleportTimer <= uiDiff) { me->InterruptNonMeleeSpells(false); - DoScriptText(SAY_TELEPORT,me); + DoScriptText(SAY_TELEPORT, me); me->GetMotionMaster()->MoveIdle(); DoCast(SPELL_TELEPORT); - teleportTimer = urand(30000,35000); + teleportTimer = urand(30000, 35000); } else teleportTimer -= uiDiff; @@ -256,8 +256,8 @@ public: Position pPos; me->getVictim()->GetPosition(&pPos); - me->NearTeleportTo(pPos.GetPositionX(),pPos.GetPositionY(),pPos.GetPositionZ(),pPos.GetOrientation()); - me->GetMotionMaster()->MoveChase(me->getVictim(),0,0); + me->NearTeleportTo(pPos.GetPositionX(), pPos.GetPositionY(), pPos.GetPositionZ(), pPos.GetOrientation()); + me->GetMotionMaster()->MoveChase(me->getVictim(), 0, 0); me->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); canCast = false; @@ -271,15 +271,15 @@ public: if (frostBombTimer <= uiDiff) { DoCastVictim(SPELL_FROSTBOMB); - frostBombTimer = urand(5000,8000); + frostBombTimer = urand(5000, 8000); } else frostBombTimer -= uiDiff; if (timeBombTimer <= uiDiff) { if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM)) - DoCast(pUnit,SPELL_TIME_BOMB); + DoCast(pUnit, SPELL_TIME_BOMB); - timeBombTimer = urand(20000,25000); + timeBombTimer = urand(20000, 25000); } else timeBombTimer -= uiDiff; } @@ -303,15 +303,15 @@ public: switch(pSpell->Id) { case SPELL_SUMMON_MENAGERIE: - me->SetHomePosition(968.66f,1042.53f,527.32f,0.077f); + me->SetHomePosition(968.66f, 1042.53f, 527.32f, 0.077f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_2: - me->SetHomePosition(1164.02f,1170.85f,527.321f,3.66f); + me->SetHomePosition(1164.02f, 1170.85f, 527.321f, 3.66f); LeaveCombat(); break; case SPELL_SUMMON_MENAGERIE_3: - me->SetHomePosition(1118.31f,1080.377f,508.361f,4.25f); + me->SetHomePosition(1118.31f, 1080.377f, 508.361f, 4.25f); LeaveCombat(); break; case SPELL_TELEPORT: @@ -323,7 +323,7 @@ public: } } private: - float x,y; + float x, y; bool canCast; bool canGoBack; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 273fa33414f..d7025897eb8 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -65,17 +65,17 @@ public: boss_varosAI(Creature* creature) : BossAI(creature, DATA_VAROS_EVENT) { if (instance->GetBossState(DATA_DRAKOS_EVENT) != DONE) - DoCast(me,SPELL_CENTRIFUGE_SHIELD); + DoCast(me, SPELL_CENTRIFUGE_SHIELD); } void Reset() { _Reset(); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(20, 25) * IN_MILLISECONDS); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); // not sure if this is handled by a timer or hp percentage - events.ScheduleEvent(EVENT_CALL_AZURE, urand(15,30) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(15, 30) * IN_MILLISECONDS); firstCoreEnergize = false; coreEnergizeOrientation = 0.0f; @@ -109,7 +109,7 @@ public: switch (eventId) { case EVENT_ENERGIZE_CORES: - DoCast(me,SPELL_ENERGIZE_CORES); + DoCast(me, SPELL_ENERGIZE_CORES); events.CancelEvent(EVENT_ENERGIZE_CORES); break; case EVENT_ENERGIZE_CORES_VISUAL: @@ -120,20 +120,20 @@ public: } else coreEnergizeOrientation = MapManager::NormalizeOrientation(coreEnergizeOrientation - 2.0f); - DoCast(me,SPELL_ENERGIZE_CORES_VISUAL); + DoCast(me, SPELL_ENERGIZE_CORES_VISUAL); events.ScheduleEvent(EVENT_ENERGIZE_CORES_VISUAL, 5000); events.ScheduleEvent(EVENT_ENERGIZE_CORES, 4000); break; case EVENT_CALL_AZURE: // not sure how blizz handles this, i cant see any pattern between the differnt spells - DoCast(me,SPELL_CALL_AZURE_RING_CAPTAIN); + DoCast(me, SPELL_CALL_AZURE_RING_CAPTAIN); Talk(SAY_AZURE); Talk(SAY_AZURE_EMOTE); - events.ScheduleEvent(EVENT_CALL_AZURE, urand(20,25) * IN_MILLISECONDS); + events.ScheduleEvent(EVENT_CALL_AZURE, urand(20, 25) * IN_MILLISECONDS); break; case EVENT_AMPLIFY_MAGIC: - DoCast(me->getVictim(),SPELL_CALL_AMPLIFY_MAGIC); - events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17,20) * IN_MILLISECONDS); + DoCast(me->getVictim(), SPELL_CALL_AMPLIFY_MAGIC); + events.ScheduleEvent(EVENT_AMPLIFY_MAGIC, urand(17, 20) * IN_MILLISECONDS); break; } } @@ -177,7 +177,7 @@ class npc_azure_ring_captain : public CreatureScript { if (spell->Id == SPELL_ICE_BEAM) { - target->CastSpell(target,SPELL_SUMMON_ARCANE_BEAM,true); + target->CastSpell(target, SPELL_SUMMON_ARCANE_BEAM, true); me->DespawnOrUnsummon(); } } @@ -198,8 +198,8 @@ class npc_azure_ring_captain : public CreatureScript me->GetMotionMaster()->MoveIdle(); - if (Unit* target = ObjectAccessor::GetUnit(*me,targetGUID)) - DoCast(target,SPELL_ICE_BEAM); + if (Unit* target = ObjectAccessor::GetUnit(*me, targetGUID)) + DoCast(target, SPELL_ICE_BEAM); } void DoAction(const int32 action) @@ -209,13 +209,13 @@ class npc_azure_ring_captain : public CreatureScript case ACTION_CALL_DRAGON_EVENT: if (instance) { - if (Creature* varos = ObjectAccessor::GetCreature(*me,instance->GetData64(DATA_VAROS))) + if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_VAROS))) { - if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->SetReactState(REACT_PASSIVE); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT,victim->GetPositionX(),victim->GetPositionY(),victim->GetPositionZ() + 20.0f); + me->GetMotionMaster()->MovePoint(ACTION_CALL_DRAGON_EVENT, victim->GetPositionX(), victim->GetPositionY(), victim->GetPositionZ() + 20.0f); targetGUID = victim->GetGUID(); } } @@ -269,7 +269,7 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void Register() { - OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0,SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -298,14 +298,14 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) @@ -345,14 +345,14 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader if (varos->GetEntry() != NPC_VAROS) return; - float orientation = CAST_AI(boss_varos::boss_varosAI,varos->AI())->GetCoreEnergizeOrientation(); + float orientation = CAST_AI(boss_varos::boss_varosAI, varos->AI())->GetCoreEnergizeOrientation(); for (std::list<Unit*>::iterator itr = targetList.begin() ; itr != targetList.end();) { Position pos; (*itr)->GetPosition(&pos); - float angle = varos->GetAngle((*itr)->GetPositionX(),(*itr)->GetPositionY()); + float angle = varos->GetAngle((*itr)->GetPositionX(), (*itr)->GetPositionY()); float diff = fabs(orientation - angle); if (diff > 1.0f) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index a4576f2aa82..41aa988583d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -61,7 +61,7 @@ public: if (creature->GetEntry() != NPC_CENTRIFUGE_CONSTRUCT) return; - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,--centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, --centrifugueConstructCounter); if (!centrifugueConstructCounter) if (Creature* varos = instance->GetCreature(varosGUID)) @@ -72,12 +72,12 @@ public: { if (GetBossState(DATA_DRAKOS_EVENT) == DONE && GetBossState(DATA_VAROS_EVENT) != DONE) { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); } else { - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); - player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); + player->SendUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 0); } } @@ -95,7 +95,7 @@ public: if (!varos) return; - if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN,varos->GetPositionX(),varos->GetPositionY(),varos->GetPositionZ()+40)) + if (Creature* drake = varos->SummonCreature(NPC_AZURE_RING_GUARDIAN, varos->GetPositionX(), varos->GetPositionY(), varos->GetPositionZ()+40)) drake->AI()->DoAction(ACTION_CALL_DRAGON_EVENT); } @@ -117,7 +117,7 @@ public: break; case NPC_CENTRIFUGE_CONSTRUCT: if (creature->isAlive()) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,++centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, ++centrifugueConstructCounter); break; } } @@ -145,14 +145,14 @@ public: case DATA_DRAKOS_EVENT: if (state == DONE) { - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,1); - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT,centrifugueConstructCounter); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, centrifugueConstructCounter); OpenCageDoors(); } break; case DATA_VAROS_EVENT: if (state == DONE) - DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW,0); + DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); break; } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 71313f54d59..d6c2942d16a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -26,7 +26,7 @@ #define GOSSIP_ITEM_ETERNOS1 "I want to fly on the wings of the Bronze Flight" #define GOSSIP_ITEM_ETERNOS2 "What abilities do Amber Drakes have?" -#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE,1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE,1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE,1)) +#define HAS_ESSENCE(a) ((a)->HasItemCount(ITEM_EMERALD_ESSENCE, 1) || (a)->HasItemCount(ITEM_AMBER_ESSENCE, 1) || (a)->HasItemCount(ITEM_RUBY_ESSENCE, 1)) enum Drakes { diff --git a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp index fd75d1d28ce..bc844698fdb 100644 --- a/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp @@ -141,11 +141,11 @@ struct Waypoint struct Location { - float x,y,z; + float x, y, z; }; struct Locations { - float x,y,z; + float x, y, z; }; //each dragons special points. First where fly to before connect to connon, second where land point is. @@ -307,7 +307,7 @@ public: { pTenebron->Respawn(); pTenebron->GetMotionMaster()->MoveTargetedHome(); - pTenebron->AI()->SetData(DATA_CAN_LOOT,0); + pTenebron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -325,7 +325,7 @@ public: { pShadron->Respawn(); pShadron->GetMotionMaster()->MoveTargetedHome(); - pShadron->AI()->SetData(DATA_CAN_LOOT,0); + pShadron->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -343,7 +343,7 @@ public: { pVesperon->Respawn(); pVesperon->GetMotionMaster()->MoveTargetedHome(); - pVesperon->AI()->SetData(DATA_CAN_LOOT,0); + pVesperon->AI()->SetData(DATA_CAN_LOOT, 0); } } } @@ -358,7 +358,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SARTHARION_AGGRO,me); + DoScriptText(SAY_SARTHARION_AGGRO, me); DoZoneInCombat(); if (pInstance) @@ -370,7 +370,7 @@ public: void JustDied(Unit* /*pKiller*/) { - DoScriptText(SAY_SARTHARION_DEATH,me); + DoScriptText(SAY_SARTHARION_DEATH, me); if (pInstance) { @@ -385,17 +385,17 @@ public: pVesperon->DisappearAndDie(); if (achievProgress == 1) - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); else if (achievProgress == 2) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); } else if (achievProgress == 3) { - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST,H_ACHIEV_TWILIGHT_ASSIST)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO,H_ACHIEV_TWILIGHT_DUO)); - pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE,H_ACHIEV_TWILIGHT_ZONE)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ASSIST, H_ACHIEV_TWILIGHT_ASSIST)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_DUO, H_ACHIEV_TWILIGHT_DUO)); + pInstance->DoCompleteAchievement(RAID_MODE(ACHIEV_TWILIGHT_ZONE, H_ACHIEV_TWILIGHT_ZONE)); } pInstance->SetData(TYPE_SARTHARION_EVENT, DONE); @@ -404,7 +404,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SARTHARION_SLAY_1,SAY_SARTHARION_SLAY_2,SAY_SARTHARION_SLAY_3), me); + DoScriptText(RAND(SAY_SARTHARION_SLAY_1, SAY_SARTHARION_SLAY_2, SAY_SARTHARION_SLAY_3), me); } // me->ResetLootMode() is called from Reset() @@ -484,7 +484,7 @@ public: { if (pInstance) { - if (Creature *pTemp = Unit::GetCreature(*me,pInstance->GetData64(uiDataId))) + if (Creature *pTemp = Unit::GetCreature(*me, pInstance->GetData64(uiDataId))) { if (pTemp->isAlive() && !pTemp->getVictim()) { @@ -598,13 +598,13 @@ public: if (m_uiFlameTsunamiTimer <= uiDiff) { SendFlameTsunami(); - switch(urand(0,1)) + switch(urand(0, 1)) { case 0: { - Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); + Creature *Right1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight1Spawn.x, FlameRight1Spawn.y , FlameRight1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Right2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight2Spawn.x, FlameRight2Spawn.y , FlameRight2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Right3 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameRight3Spawn.x, FlameRight3Spawn.y , FlameRight3Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Right1->GetMotionMaster()->MovePoint(0, FlameRight1Direction.x, FlameRight1Direction.y, FlameRight1Direction.z); Right2->GetMotionMaster()->MovePoint(0, FlameRight2Direction.x, FlameRight2Direction.y, FlameRight2Direction.z); Right3->GetMotionMaster()->MovePoint(0, FlameRight3Direction.x, FlameRight3Direction.y, FlameRight3Direction.z); @@ -612,8 +612,8 @@ public: } case 1: { - Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); - Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN,12000); + Creature *Left1 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft1Spawn.x, FlameLeft1Spawn.y , FlameLeft1Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); + Creature *Left2 = me->SummonCreature(NPC_FLAME_TSUNAMI, FlameLeft2Spawn.x, FlameLeft2Spawn.y , FlameLeft2Spawn.z, 0, TEMPSUMMON_TIMED_DESPAWN, 12000); Left1->GetMotionMaster()->MovePoint(0, FlameLeft1Direction.x, FlameLeft1Direction.y, FlameLeft1Direction.z); Left2->GetMotionMaster()->MovePoint(0, FlameLeft2Direction.x, FlameLeft2Direction.y, FlameLeft2Direction.z); break; @@ -630,7 +630,7 @@ public: { DoScriptText(SAY_SARTHARION_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_FLAME_BREATH, SPELL_FLAME_BREATH_H)); - m_uiFlameBreathTimer = urand(25000,35000); + m_uiFlameBreathTimer = urand(25000, 35000); } else m_uiFlameBreathTimer -= uiDiff; @@ -639,7 +639,7 @@ public: if (m_uiTailSweepTimer <= uiDiff) { DoCast(me->getVictim(), RAID_MODE(SPELL_TAIL_LASH, SPELL_TAIL_LASH_H)); - m_uiTailSweepTimer = urand(15000,20000); + m_uiTailSweepTimer = urand(15000, 20000); } else m_uiTailSweepTimer -= uiDiff; @@ -648,7 +648,7 @@ public: if (m_uiCleaveTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CLEAVE); - m_uiCleaveTimer = urand(7000,10000); + m_uiCleaveTimer = urand(7000, 10000); } else m_uiCleaveTimer -= uiDiff; @@ -660,10 +660,10 @@ public: { CastLavaStrikeOnTarget(pTarget); - if(urand(0,5) == 0) - DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1,SAY_SARTHARION_SPECIAL_2,SAY_SARTHARION_SPECIAL_3), me); + if(urand(0, 5) == 0) + DoScriptText(RAND(SAY_SARTHARION_SPECIAL_1, SAY_SARTHARION_SPECIAL_2, SAY_SARTHARION_SPECIAL_3), me); } - m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000,20000)); + m_uiLavaStrikeTimer = (m_bIsSoftEnraged ? urand(1400, 2000) : urand(5000, 20000)); } else m_uiLavaStrikeTimer -= uiDiff; @@ -847,7 +847,7 @@ struct dummy_dragonAI : public ScriptedAI //using a grid search here seem to be more efficient than caching all four guids //in instance script and calculate range to each. - GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL,50.0f); + GameObject* pPortal = me->FindNearestGameObject(GO_TWILIGHT_PORTAL, 50.0f); switch(me->GetEntry()) { @@ -857,12 +857,12 @@ struct dummy_dragonAI : public ScriptedAI if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { for(uint32 i = 0; i < 6; ++i) - me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_TWILIGHT_EGG, TwilightEggs[i].x, TwilightEggs[i].y, TwilightEggs[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } else { for(uint32 i = 0; i < 6; ++i) - me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); + me->SummonCreature(NPC_SARTHARION_TWILIGHT_EGG, TwilightEggsSarth[i].x, TwilightEggsSarth[i].y, TwilightEggsSarth[i].z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); } break; } @@ -881,7 +881,7 @@ struct dummy_dragonAI : public ScriptedAI iTextId = WHISPER_OPEN_PORTAL; if (pInstance && !pInstance->GetData(TYPE_SARTHARION_EVENT) == IN_PROGRESS) { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000)) + if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon.x, AcolyteofVesperon.y , AcolyteofVesperon.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -890,7 +890,7 @@ struct dummy_dragonAI : public ScriptedAI } else { - if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000)) + if(Creature* Acolyte = me->SummonCreature(NPC_ACOLYTE_OF_VESPERON, AcolyteofVesperon2.x, AcolyteofVesperon2.y , AcolyteofVesperon2.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) { me->InterruptNonMeleeSpells(true); Acolyte->InterruptNonMeleeSpells(true); @@ -1034,7 +1034,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_TENEBRON_SLAY_1,SAY_TENEBRON_SLAY_2), me); + DoScriptText(RAND(SAY_TENEBRON_SLAY_1, SAY_TENEBRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1052,7 +1052,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1071,7 +1071,7 @@ public: { DoScriptText(SAY_TENEBRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1123,14 +1123,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_SHADRON_AGGRO,me); + DoScriptText(SAY_SHADRON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_SHADRON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_SHADRON_SLAY_1,SAY_SHADRON_SLAY_2), me); + DoScriptText(RAND(SAY_SHADRON_SLAY_1, SAY_SHADRON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1148,7 +1148,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1165,7 +1165,7 @@ public: OpenPortal(); m_bHasPortalOpen = true; - m_uiAcolyteShadronTimer = urand(60000,65000); + m_uiAcolyteShadronTimer = urand(60000, 65000); } } else @@ -1176,7 +1176,7 @@ public: { DoScriptText(SAY_SHADRON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1222,14 +1222,14 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(SAY_VESPERON_AGGRO,me); + DoScriptText(SAY_VESPERON_AGGRO, me); DoZoneInCombat(); DoCast(me, SPELL_POWER_OF_VESPERON); } void KilledUnit(Unit* /*pVictim*/) { - DoScriptText(RAND(SAY_VESPERON_SLAY_1,SAY_VESPERON_SLAY_2), me); + DoScriptText(RAND(SAY_VESPERON_SLAY_1, SAY_VESPERON_SLAY_2), me); } void UpdateAI(const uint32 uiDiff) @@ -1247,7 +1247,7 @@ public: if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H)); - m_uiShadowFissureTimer = urand(15000,20000); + m_uiShadowFissureTimer = urand(15000, 20000); } else m_uiShadowFissureTimer -= uiDiff; @@ -1261,7 +1261,7 @@ public: { OpenPortal(); DoCast(me->getVictim(), SPELL_TWILIGHT_TORMENT_VESP); - m_uiAcolyteVesperonTimer = urand(60000,70000); + m_uiAcolyteVesperonTimer = urand(60000, 70000); } } else @@ -1272,7 +1272,7 @@ public: { DoScriptText(SAY_VESPERON_BREATH, me); DoCast(me->getVictim(), RAID_MODE(SPELL_SHADOW_BREATH, SPELL_SHADOW_BREATH_H)); - m_uiShadowBreathTimer = urand(20000,25000); + m_uiShadowBreathTimer = urand(20000, 25000); } else m_uiShadowBreathTimer -= uiDiff; @@ -1328,7 +1328,7 @@ public: } } - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } void JustDied(Unit* /*killer*/) @@ -1338,7 +1338,7 @@ public: Creature* Shadron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_SHADRON)); if(Shadron) { - (CAST_AI(mob_shadron::mob_shadronAI,Shadron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_shadron::mob_shadronAI, Shadron->AI()))->m_bHasPortalOpen = false; } Creature* pDebuffTarget = NULL; @@ -1352,10 +1352,10 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } @@ -1422,7 +1422,7 @@ public: uiDespawnTimer = 28000; if (pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } DoCast(me, SPELL_TWILIGHT_TORMENT_VESP_ACO); } @@ -1436,7 +1436,7 @@ public: { Creature* pVesperon = pInstance->instance->GetCreature(pInstance->GetData64(DATA_VESPERON)); if (pVesperon) - (CAST_AI(mob_vesperon::mob_vesperonAI,pVesperon->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_vesperon::mob_vesperonAI, pVesperon->AI()))->m_bHasPortalOpen = false; if (pVesperon && pVesperon->isAlive() && pVesperon->HasAura(SPELL_TWILIGHT_TORMENT_VESP)) pVesperon->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); @@ -1451,14 +1451,14 @@ public: for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i) { - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_SHIFT, 0) && !i->getSource()->getVictim()) { - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_SHIFT_REMOVAL_ALL,true); - i->getSource()->CastSpell(i->getSource(),SPELL_TWILIGHT_RESIDUE,true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_SHIFT_REMOVAL_ALL, true); + i->getSource()->CastSpell(i->getSource(), SPELL_TWILIGHT_RESIDUE, true); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT); i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_SHIFT_ENTER); } - if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP,0) && !i->getSource()->getVictim()) + if (i->getSource()->isAlive() && i->getSource()->HasAura(SPELL_TWILIGHT_TORMENT_VESP, 0) && !i->getSource()->getVictim()) i->getSource()->RemoveAurasDueToSpell(SPELL_TWILIGHT_TORMENT_VESP); } } @@ -1518,7 +1518,7 @@ public: { if(pInstance) { - me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER,me); + me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me); } m_uiFadeArmorTimer = 1000; m_uiHatchEggTimer = 20000; @@ -1546,7 +1546,7 @@ public: { Creature* Tenebron = pInstance->instance->GetCreature(pInstance->GetData64(DATA_TENEBRON)); if(Tenebron) - (CAST_AI(mob_tenebron::mob_tenebronAI,Tenebron->AI()))->m_bHasPortalOpen = false; + (CAST_AI(mob_tenebron::mob_tenebronAI, Tenebron->AI()))->m_bHasPortalOpen = false; SpawnWhelps(); } else @@ -1598,13 +1598,13 @@ public: { if (Tsunami_Timer <= diff) { - DoCast(me,SPELL_FLAME_TSUNAMI_DMG_AURA); + DoCast(me, SPELL_FLAME_TSUNAMI_DMG_AURA); Tsunami_Timer = 500; }else Tsunami_Timer -= diff; if(TsunamiBuff_timer <= diff) { - if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me,NPC_LAVA_BLAZE, 10.0f, true)) + if (Unit* LavaBlaze = GetClosestCreatureWithEntry(me, NPC_LAVA_BLAZE, 10.0f, true)) LavaBlaze->CastSpell(LavaBlaze, SPELL_FLAME_TSUNAMI_BUFF, true); TsunamiBuff_timer = 1000; }else TsunamiBuff_timer -= diff; @@ -1699,7 +1699,7 @@ public: if (m_uiFadeArmorTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_FADE_ARMOR); - m_uiFadeArmorTimer = urand(5000,10000); + m_uiFadeArmorTimer = urand(5000, 10000); } else m_uiFadeArmorTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index f2d972bb051..54cdc46245b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -180,7 +180,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - 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* /*pKiller*/) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 9b9d7a38489..3a14946dfc0 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -109,7 +109,7 @@ public: uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS); uiBallLightningTimer = urand(10*IN_MILLISECONDS, 11*IN_MILLISECONDS); - uiDisperseHealth = 45 + urand(0,10); + uiDisperseHealth = 45 + urand(0, 10); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE|UNIT_FLAG_DISABLE_MOVE); @@ -140,7 +140,7 @@ 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 SpellHit(Unit* /*caster*/, const SpellEntry* spell) @@ -197,7 +197,7 @@ public: { lSparkList.Summon(pSummoned); - pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true); + pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER, H_SPELL_SPARK_VISUAL_TRIGGER), true); Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) @@ -278,7 +278,7 @@ public: { bHasDispersed = true; - DoScriptText(RAND(SAY_SPLIT_1,SAY_SPLIT_2), me); + DoScriptText(RAND(SAY_SPLIT_1, SAY_SPLIT_2), me); if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 1b314ee3c9d..011c4c589b5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -125,7 +125,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - 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 UpdateAI(const uint32 uiDiff) @@ -190,7 +190,7 @@ public: if (m_uiLightningNova_Timer <= uiDiff) { - DoScriptText(RAND(SAY_NOVA_1,SAY_NOVA_2,SAY_NOVA_3), me); + DoScriptText(RAND(SAY_NOVA_1, SAY_NOVA_2, SAY_NOVA_3), me); DoScriptText(EMOTE_NOVA, me); DoCast(me, SPELL_LIGHTNING_NOVA_N); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 1161ffac5eb..700df86881f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -172,7 +172,7 @@ public: void KilledUnit(Unit* /*pVictim*/) { - 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 DespawnGolem() @@ -263,7 +263,7 @@ public: if (m_uiShatteringStomp_Timer <= uiDiff) { // Should he stomp even if he has no brittle golem to shatter? - DoScriptText(RAND(SAY_STOMP_1,SAY_STOMP_2), me); + DoScriptText(RAND(SAY_STOMP_1, SAY_STOMP_2), me); DoCast(me, SPELL_SHATTERING_STOMP_N); @@ -297,7 +297,7 @@ public: if (me->IsNonMeleeSpellCasted(false)) me->InterruptNonMeleeSpells(false); - DoScriptText(RAND(SAY_FORGE_1,SAY_FORGE_2), me); + DoScriptText(RAND(SAY_FORGE_1, SAY_FORGE_2), me); m_bHasTemper = true; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 5468837a711..7cf99900672 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -170,7 +170,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2,SAY_SLAY_3,SAY_SLAY_4), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index f286dd23f58..92ec5db126e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -186,7 +186,7 @@ public: { uint32 uiSummonPipe = rand()%2; me->SummonCreature(uiEncounterTimer > DATA_TIME_BEFORE_OOZE ? CREATURE_MALFORMED_OOZE : - RAND(CREATURE_FORGED_IRON_DWARF,CREATURE_FORGED_IRON_TROGG), + RAND(CREATURE_FORGED_IRON_DWARF, CREATURE_FORGED_IRON_TROGG), PipeLocations[uiSummonPipe].x, PipeLocations[uiSummonPipe].y, PipeLocations[uiSummonPipe].z, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); uiSummonTimer = 20000; @@ -231,7 +231,7 @@ public: { if (victim == me) 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 KilledIronSludge() diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index 9fc0cc599d9..f237871ef90 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -174,10 +174,10 @@ public: if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } KaddrakGUIDList.clear(); @@ -369,7 +369,7 @@ public: case 17: DoScriptText(SAY_EVENT_INTRO_2, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_TRIBUNAL_CONSOLE), true); me->SetStandState(UNIT_STAND_STATE_KNEEL); SetEscortPaused(true); JumpToNextStep(8500); @@ -386,7 +386,7 @@ public: { case 1: { - uint32 uiSpawnNumber = DUNGEON_MODE(2,3); + uint32 uiSpawnNumber = DUNGEON_MODE(2, 3); for (uint8 i = 0; i < uiSpawnNumber; ++i) me->SummonCreature(CREATURE_DARK_RUNE_PROTECTOR, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); me->SummonCreature(CREATURE_DARK_RUNE_STORMCALLER, SpawnLocations[0], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); @@ -470,7 +470,7 @@ public: case 8: DoScriptText(SAY_EVENT_A_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bKaddrakActivated = true; JumpToNextStep(5000); @@ -494,7 +494,7 @@ public: case 12: DoScriptText(SAY_EVENT_B_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bMarnakActivated = true; JumpToNextStep(10000); @@ -526,7 +526,7 @@ public: case 18: DoScriptText(SAY_EVENT_C_3, me); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) CAST_AI(mob_tribuna_controller::mob_tribuna_controllerAI, pTemp->AI())->bAbedneumActivated = true; JumpToNextStep(5000); @@ -580,7 +580,7 @@ public: DoScriptText(SAY_EVENT_END_01, me); me->SetStandState(UNIT_STAND_STATE_STAND); if (pInstance) - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),true); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), true); if (Creature* pTemp = Unit::GetCreature(*me, uiControllerGUID)) pTemp->DealDamage(pTemp, pTemp->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); bIsBattle = true; @@ -703,10 +703,10 @@ public: { if (pInstance) { - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM),false); - pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR),false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_KADDRAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_MARNAK), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_ABEDNEUM), false); + pInstance->HandleGameObject(pInstance->GetData64(DATA_GO_SKY_FLOOR), false); } Player* pPlayer = GetPlayerForEscort(); if (pPlayer) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index afeb8a23e88..e28d082062f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -144,7 +144,7 @@ public: case GO_TRIBUNAL_CHEST_HERO: uiTribunalChest = go->GetGUID(); if (m_auiEncounter[2] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; case 191527: uiTribunalSkyFloor = go->GetGUID(); @@ -159,12 +159,12 @@ public: case DATA_MAIDEN_OF_GRIEF_EVENT: m_auiEncounter[1] = data; if (m_auiEncounter[1] == DONE) - HandleGameObject(uiBrannDoor,true); + HandleGameObject(uiBrannDoor, true); break; case DATA_KRYSTALLUS_EVENT: m_auiEncounter[0] = data; if (m_auiEncounter[0] == DONE) - HandleGameObject(uiMaidenOfGriefDoor,true); + HandleGameObject(uiMaidenOfGriefDoor, true); break; case DATA_SJONNIR_EVENT: m_auiEncounter[3] = data; @@ -173,10 +173,10 @@ public: m_auiEncounter[2] = data; if (m_auiEncounter[2] == DONE) { - HandleGameObject(uiSjonnirDoor,true); + HandleGameObject(uiSjonnirDoor, true); GameObject* go = instance->GetGameObject(uiTribunalChest); if (go) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); } break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp index 608685830ab..854624727db 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_algalon.cpp @@ -127,7 +127,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 Reset() @@ -187,8 +187,8 @@ public: void SummonCollapsingStar(Unit* target) { DoScriptText(SAY_SUMMON_COLLAPSING_STAR, me); - me->SummonCreature(CREATURE_COLLAPSING_STAR,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 100000); - me->SummonCreature(CREATURE_BLACK_HOLE,target->GetPositionX()+15.0f,target->GetPositionY()+15.0f,target->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN, 27000); + me->SummonCreature(CREATURE_COLLAPSING_STAR, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 100000); + me->SummonCreature(CREATURE_BLACK_HOLE, target->GetPositionX()+15.0f, target->GetPositionY()+15.0f, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } void UpdateAI(const uint32 diff) @@ -205,7 +205,7 @@ public: if (HealthBelowPct(2)) { - me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f,417.321381f,0,0,0,0,0,0); + me->SummonGameObject(GAMEOBJECT_GIVE_OF_THE_OBSERVER, 1634.258667f, -295.101166f, 417.321381f, 0, 0, 0, 0, 0, 0); // All of them. or random? DoScriptText(SAY_DEATH_1, me); @@ -259,36 +259,36 @@ public: if (QuantumStrike_Timer <= diff) { - DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE,H_SPELL_QUANTUM_STRIKE), true); + DoCast(me->getVictim(), RAID_MODE(SPELL_QUANTUM_STRIKE, H_SPELL_QUANTUM_STRIKE), true); QuantumStrike_Timer = urand(4000, 14000); } else QuantumStrike_Timer -= diff; if (BigBang_Timer <= diff) { - DoScriptText(RAND(SAY_BIG_BANG_1,SAY_BIG_BANG_2), me); - DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG,H_SPELL_BIG_BANG), true); + DoScriptText(RAND(SAY_BIG_BANG_1, SAY_BIG_BANG_2), me); + DoCast(me->getVictim(), RAID_MODE(SPELL_BIG_BANG, H_SPELL_BIG_BANG), true); BigBang_Timer = 90000; } else BigBang_Timer -= diff; if (Ascend_Timer <= diff) { - DoCast(me->getVictim(),SPELL_ASCEND, true); + DoCast(me->getVictim(), SPELL_ASCEND, true); Ascend_Timer = 480000; } else Ascend_Timer -= diff; if (PhasePunch_Timer <= diff) { - DoCast(me->getVictim(),SPELL_PHASE_PUNCH, true); + DoCast(me->getVictim(), SPELL_PHASE_PUNCH, true); PhasePunch_Timer = 8000; } else PhasePunch_Timer -= diff; if (CosmicSmash_Timer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH,H_SPELL_COSMIC_SMASH), true); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), RAID_MODE(SPELL_COSMIC_SMASH, H_SPELL_COSMIC_SMASH), true); CosmicSmash_Timer = urand(30000, 60000); } else CosmicSmash_Timer -= diff; @@ -296,7 +296,7 @@ public: if (Berserk_Timer <= diff) { DoScriptText(SAY_BERSERK, me); - DoCast(me->getVictim(),SPELL_BERSERK, true); + DoCast(me->getVictim(), SPELL_BERSERK, true); Berserk_Timer = 360000; } else Berserk_Timer -= diff; @@ -314,7 +314,7 @@ public: { DoCast(me, SPELL_ASCEND); DoScriptText(SAY_BERSERK, me); - Ascend_Timer = urand(360000,365000); + Ascend_Timer = urand(360000, 365000); Enrage = false; } else Ascend_Timer -= diff; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp index 6b63563d73c..ddf6858ff6d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_assembly_of_iron.cpp @@ -281,14 +281,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1,SAY_STEELBREAKER_DEATH_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_DEATH_1, SAY_STEELBREAKER_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1,SAY_STEELBREAKER_SLAY_2), me); + DoScriptText(RAND(SAY_STEELBREAKER_SLAY_1, SAY_STEELBREAKER_SLAY_2), me); if (phase == 3) DoCast(me, SPELL_ELECTRICAL_CHARGE); @@ -392,7 +392,7 @@ public: if (phase >= 2) events.RescheduleEvent(EVENT_RUNE_OF_DEATH, 30000); if (phase >= 3) - events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.RescheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -428,14 +428,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_MOLGEIM_DEATH_1,SAY_MOLGEIM_DEATH_2), me); + DoScriptText(RAND(SAY_MOLGEIM_DEATH_1, SAY_MOLGEIM_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_MOLGEIM_SLAY_1,SAY_MOLGEIM_SLAY_2), me); + DoScriptText(RAND(SAY_MOLGEIM_SLAY_1, SAY_MOLGEIM_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -470,19 +470,19 @@ public: } case EVENT_SHIELD_OF_RUNES: DoCast(me, RAID_MODE(SPELL_SHIELD_OF_RUNES, SPELL_SHIELD_OF_RUNES_H)); - events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000,34000)); + events.ScheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000)); break; case EVENT_RUNE_OF_DEATH: DoScriptText(SAY_MOLGEIM_RUNE_DEATH, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_DEATH); - events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000,40000)); + events.ScheduleEvent(EVENT_RUNE_OF_DEATH, urand(30000, 40000)); break; case EVENT_RUNE_OF_SUMMONING: DoScriptText(SAY_MOLGEIM_SUMMON, me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM)) DoCast(pTarget, SPELL_RUNE_OF_SUMMONING); - events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000,30000)); + events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, urand(20000, 30000)); break; } } @@ -628,14 +628,14 @@ public: { case EVENT_UPDATEPHASE: events.SetPhase(++phase); - events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); - events.RescheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.RescheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); + events.RescheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); if (phase >= 2) - events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.RescheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); if (phase >= 3) { DoCast(me, SPELL_STORMSHIELD); - events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000,80000)); + events.RescheduleEvent(EVENT_LIGHTNING_TENDRILS, urand(40000, 80000)); } break; @@ -673,14 +673,14 @@ public: void JustDied(Unit* /*Killer*/) { - DoScriptText(RAND(SAY_BRUNDIR_DEATH_1,SAY_BRUNDIR_DEATH_2), me); + DoScriptText(RAND(SAY_BRUNDIR_DEATH_1, SAY_BRUNDIR_DEATH_2), me); if (IsEncounterComplete(pInstance, me) && pInstance) pInstance->SetData(TYPE_ASSEMBLY, DONE); } void KilledUnit(Unit * /*who*/) { - DoScriptText(RAND(SAY_BRUNDIR_SLAY_1,SAY_BRUNDIR_SLAY_2), me); + DoScriptText(RAND(SAY_BRUNDIR_SLAY_1, SAY_BRUNDIR_SLAY_2), me); } void SpellHit(Unit * /*from*/, const SpellEntry *spell) @@ -705,17 +705,17 @@ public: DoCast(SPELL_BERSERK); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, RAID_MODE(SPELL_CHAIN_LIGHTNING_N , SPELL_CHAIN_LIGHTNING_H)); - events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000,17000)); + events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, urand(9000, 17000)); break; case EVENT_OVERLOAD: DoCast(RAID_MODE(SPELL_OVERLOAD , SPELL_OVERLOAD_H)); - events.ScheduleEvent(EVENT_OVERLOAD, urand(60000,125000)); + events.ScheduleEvent(EVENT_OVERLOAD, urand(60000, 125000)); break; case EVENT_LIGHTNING_WHIRL: DoCast(RAID_MODE(SPELL_LIGHTNING_WHIRL , SPELL_LIGHTNING_WHIRL_H)); - events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000,40000)); + events.ScheduleEvent(EVENT_LIGHTNING_WHIRL, urand(20000, 40000)); break; case EVENT_LIGHTNING_TENDRILS: DoCast(RAID_MODE(SPELL_LIGHTNING_TENDRILS, SPELL_LIGHTNING_TENDRILS_H)); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp index 0485e22b9ae..cee7b17ec64 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_auriaya.cpp @@ -62,12 +62,12 @@ public: void EnterCombat(Unit* /*who*/) { _EnterCombat(); - DoScriptText(SAY_AGGRO,me); + DoScriptText(SAY_AGGRO, me); } 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 * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp index 352af769f59..d6f582e7b37 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_flame_leviathan.cpp @@ -182,29 +182,29 @@ Position const Center[]= Position const PosSiege[5] = { - {-814.59f,-64.54f,429.92f,5.969f}, - {-784.37f,-33.31f,429.92f,5.096f}, - {-808.99f,-52.10f,429.92f,5.668f}, - {-798.59f,-44.00f,429.92f,5.663f}, - {-812.83f,-77.71f,429.92f,0.046f}, + {-814.59f, -64.54f, 429.92f, 5.969f}, + {-784.37f, -33.31f, 429.92f, 5.096f}, + {-808.99f, -52.10f, 429.92f, 5.668f}, + {-798.59f, -44.00f, 429.92f, 5.663f}, + {-812.83f, -77.71f, 429.92f, 0.046f}, }; Position const PosChopper[5] = { - {-717.83f,-106.56f,430.02f,0.122f}, - {-717.83f,-114.23f,430.44f,0.122f}, - {-717.83f,-109.70f,430.22f,0.122f}, - {-718.45f,-118.24f,430.26f,0.052f}, - {-718.45f,-123.58f,430.41f,0.085f}, + {-717.83f, -106.56f, 430.02f, 0.122f}, + {-717.83f, -114.23f, 430.44f, 0.122f}, + {-717.83f, -109.70f, 430.22f, 0.122f}, + {-718.45f, -118.24f, 430.26f, 0.052f}, + {-718.45f, -123.58f, 430.41f, 0.085f}, }; Position const PosDemolisher[5] = { - {-724.12f,-176.64f,430.03f,2.543f}, - {-766.70f,-225.03f,430.50f,1.710f}, - {-729.54f,-186.26f,430.12f,1.902f}, - {-756.01f,-219.23f,430.50f,2.369f}, - {-798.01f,-227.24f,429.84f,1.446f}, + {-724.12f, -176.64f, 430.03f, 2.543f}, + {-766.70f, -225.03f, 430.50f, 1.710f}, + {-729.54f, -186.26f, 430.12f, 1.902f}, + {-756.01f, -219.23f, 430.50f, 2.369f}, + {-798.01f, -227.24f, 429.84f, 1.446f}, }; class boss_flame_leviathan : public CreatureScript @@ -284,7 +284,7 @@ class boss_flame_leviathan : public CreatureScript if (towerOfFlames) { me->AddAura(SPELL_BUFF_TOWER_OF_FLAMES, me); - events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO,70*IN_MILLISECONDS); + events.ScheduleEvent(EVENT_MIMIRON_S_INFERNO, 70*IN_MILLISECONDS); } if (towerOfFrost) @@ -376,7 +376,7 @@ class boss_flame_leviathan : public CreatureScript events.Update(diff); - if (Shutdown == RAID_MODE(2,4)) + if (Shutdown == RAID_MODE(2, 4)) { Shutdown = 0; events.ScheduleEvent(EVENT_SHUTDOWN, 4000); @@ -411,7 +411,7 @@ class boss_flame_leviathan : public CreatureScript break; // this is a must case EVENT_PURSUE: DoScriptText(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3), me); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0,75,true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 75, true)) { me->AddAura(SPELL_PURSUED, target); me->MonsterTextEmote(EMOTE_PURSUE, target->GetGUID(), true); @@ -454,7 +454,7 @@ class boss_flame_leviathan : public CreatureScript case EVENT_THORIM_S_HAMMER: // Tower of Storms for (uint8 i = 0; i < 7; ++i) { - if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20,60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) + if (Creature* thorim = DoSummon(NPC_THORIM_BEACON, me, float(urand(20, 60)), 20000, TEMPSUMMON_TIMED_DESPAWN)) thorim->GetMotionMaster()->MoveRandom(100); } DoScriptText(SAY_TOWER_STORM, me); @@ -661,7 +661,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) if(CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); @@ -763,7 +763,7 @@ class boss_flame_leviathan_safety_container : public CreatureScript void JustDied(Unit* /*killer*/) { - float x,y,z; + float x, y, z; me->GetPosition(x, y, z); z = me->GetMap()->GetHeight(x, y, z); me->GetMotionMaster()->MovePoint(0, x, y, z); @@ -1020,7 +1020,7 @@ class npc_hodirs_fury : public CreatureScript void MoveInLineOfSight(Unit* who) { - if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who,0,5,false)) + if (who->GetTypeId() == TYPEID_PLAYER && who->IsVehicle() && me->IsInRange(who, 0, 5, false)) { if (Creature* trigger = DoSummonFlyer(NPC_HODIR_TARGET_BEACON, me, 20, 0, 1000, TEMPSUMMON_TIMED_DESPAWN)) trigger->CastSpell(who, SPELL_HODIR_S_FURY, true); @@ -1170,9 +1170,9 @@ class npc_lorekeeper : public CreatureScript if (player) { player->PrepareGossipMenu(creature); - instance->instance->LoadGrid(364,-16); //make sure leviathan is loaded + instance->instance->LoadGrid(364, -16); //make sure leviathan is loaded - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } break; @@ -1207,7 +1207,7 @@ class npc_lorekeeper : public CreatureScript { player->PrepareGossipMenu(creature); - player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(player->GetGossipTextId(creature), creature->GetGUID()); } return true; @@ -1240,7 +1240,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_2,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // break; @@ -1260,7 +1260,7 @@ public: // { // pPlayer->PrepareGossipMenu(creature); // - // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + // pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); // pPlayer->SEND_GOSSIP_MENU(pPlayer->GetGossipTextId(creature), creature->GetGUID()); // } // return true; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp index 0076ed9f55f..817fcfcd4cc 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp @@ -87,7 +87,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 * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index c27625fcf60..ed8fe571241 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -158,7 +158,7 @@ public: However, if there are not at least 9 people outside of 15 yards he will start casting it on players inside 15 yards melee and tank included. */ - Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4,9), 15.0f, 50.f); + Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4, 9), 15.0f, 50.f); if (!target) target = SelectTarget(SELECT_TARGET_RANDOM); DoCast(target, SPELL_MARK_OF_THE_FACELESS); diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp index 382b88be6c8..293d6fd3bdf 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp @@ -54,7 +54,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 * /*victim*/) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp index 6fc96c8dd7f..ba0e77cbee3 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_ignis.cpp @@ -86,26 +86,26 @@ enum eAchievementData const Position Pos[20] = { - {630.366f,216.772f,360.891f,3.001970f}, - {630.594f,231.846f,360.891f,3.124140f}, - {630.435f,337.246f,360.886f,3.211410f}, - {630.493f,313.349f,360.886f,3.054330f}, - {630.444f,321.406f,360.886f,3.124140f}, - {630.366f,247.307f,360.888f,3.211410f}, - {630.698f,305.311f,360.886f,3.001970f}, - {630.500f,224.559f,360.891f,3.054330f}, - {630.668f,239.840f,360.890f,3.159050f}, - {630.384f,329.585f,360.886f,3.159050f}, - {543.220f,313.451f,360.886f,0.104720f}, - {543.356f,329.408f,360.886f,6.248280f}, - {543.076f,247.458f,360.888f,6.213370f}, - {543.117f,232.082f,360.891f,0.069813f}, - {543.161f,305.956f,360.886f,0.157080f}, - {543.277f,321.482f,360.886f,0.052360f}, - {543.316f,337.468f,360.886f,6.195920f}, - {543.280f,239.674f,360.890f,6.265730f}, - {543.265f,217.147f,360.891f,0.174533f}, - {543.256f,224.831f,360.891f,0.122173f} + {630.366f, 216.772f, 360.891f, 3.001970f}, + {630.594f, 231.846f, 360.891f, 3.124140f}, + {630.435f, 337.246f, 360.886f, 3.211410f}, + {630.493f, 313.349f, 360.886f, 3.054330f}, + {630.444f, 321.406f, 360.886f, 3.124140f}, + {630.366f, 247.307f, 360.888f, 3.211410f}, + {630.698f, 305.311f, 360.886f, 3.001970f}, + {630.500f, 224.559f, 360.891f, 3.054330f}, + {630.668f, 239.840f, 360.890f, 3.159050f}, + {630.384f, 329.585f, 360.886f, 3.159050f}, + {543.220f, 313.451f, 360.886f, 0.104720f}, + {543.356f, 329.408f, 360.886f, 6.248280f}, + {543.076f, 247.458f, 360.888f, 6.213370f}, + {543.117f, 232.082f, 360.891f, 0.069813f}, + {543.161f, 305.956f, 360.886f, 0.157080f}, + {543.277f, 321.482f, 360.886f, 0.052360f}, + {543.316f, 337.468f, 360.886f, 6.195920f}, + {543.280f, 239.674f, 360.890f, 6.265730f}, + {543.265f, 217.147f, 360.891f, 0.174533f}, + {543.256f, 224.831f, 360.891f, 0.122173f} }; class boss_ignis : public CreatureScript @@ -169,10 +169,10 @@ public: { // Shattered if (Shattered) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10,ACHIEVEMENT_SHATTERED_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_SHATTERED_10, ACHIEVEMENT_SHATTERED_25)); // Stokin' the Furnace if (EncounterTime <= MAX_ENCOUNTER_TIME) - instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10,ACHIEVEMENT_STOKIN_THE_FURNACE_25)); + instance->DoCompleteAchievement(RAID_MODE(ACHIEVEMENT_STOKIN_THE_FURNACE_10, ACHIEVEMENT_STOKIN_THE_FURNACE_25)); } } @@ -196,7 +196,7 @@ public: case EVENT_JET: me->MonsterTextEmote(EMOTE_JETS, 0, true); DoCastAOE(SPELL_FLAME_JETS); - events.RescheduleEvent(EVENT_JET,urand(35000,40000)); + events.RescheduleEvent(EVENT_JET, urand(35000, 40000)); break; case EVENT_SLAG_POT: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) @@ -207,7 +207,7 @@ public: events.DelayEvents(3000); events.ScheduleEvent(EVENT_GRAB_POT, 500); } - events.RescheduleEvent(EVENT_SLAG_POT,RAID_MODE(30000, 15000)); + events.RescheduleEvent(EVENT_SLAG_POT, RAID_MODE(30000, 15000)); break; case EVENT_GRAB_POT: if (Unit* SlagPotTarget = Unit::GetUnit(*me, SlagPotGUID)) @@ -240,14 +240,14 @@ public: if (Unit *pTarget = me->getVictim()) me->SummonCreature(NPC_GROUND_SCORCH, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 45000); DoCast(SPELL_SCORCH); - events.RescheduleEvent(EVENT_SCORCH,25000); + events.RescheduleEvent(EVENT_SCORCH, 25000); break; case EVENT_CONSTRUCT: DoScriptText(SAY_SUMMON, me); DoSummon(NPC_IRON_CONSTRUCT, Pos[rand()%20], 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT); DoCast(SPELL_STRENGHT); DoCast(me, SPELL_ACTIVATE_CONSTRUCT); - events.RescheduleEvent(EVENT_CONSTRUCT,RAID_MODE(40000, 30000)); + events.RescheduleEvent(EVENT_CONSTRUCT, RAID_MODE(40000, 30000)); break; case EVENT_BERSERK: DoCast(me, SPELL_BERSERK, true); @@ -409,10 +409,10 @@ public: { if(HeatTimer <= uiDiff) { - Creature* Construct = me->GetCreature(*me ,ConstructGUID); + Creature* Construct = me->GetCreature(*me , ConstructGUID); if (Construct && !Construct->HasAura(SPELL_MOLTEN)) { - me->AddAura(SPELL_HEAT,Construct); + me->AddAura(SPELL_HEAT, Construct); HeatTimer=1000; } } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index a8f4d237306..ae416693f7d 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -26,13 +26,13 @@ SDComment: TODO: Achievements SDCategory: Ulduar EndScriptData */ -#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629,63979) -#define SPELL_TWO_ARM_SMASH RAID_MODE(63356,64003) -#define SPELL_ONE_ARM_SMASH RAID_MODE(63573,64006) -#define SPELL_ARM_SWEEP RAID_MODE(63766,63983) -#define SPELL_STONE_SHOUT RAID_MODE(63716,64005) -#define SPELL_PETRIFY_BREATH RAID_MODE(62030,63980) -#define SPELL_STONE_GRIP RAID_MODE(62166,63981) +#define SPELL_ARM_DEAD_DAMAGE RAID_MODE(63629, 63979) +#define SPELL_TWO_ARM_SMASH RAID_MODE(63356, 64003) +#define SPELL_ONE_ARM_SMASH RAID_MODE(63573, 64006) +#define SPELL_ARM_SWEEP RAID_MODE(63766, 63983) +#define SPELL_STONE_SHOUT RAID_MODE(63716, 64005) +#define SPELL_PETRIFY_BREATH RAID_MODE(62030, 63980) +#define SPELL_STONE_GRIP RAID_MODE(62166, 63981) #define SPELL_STONE_GRIP_CANCEL 65594 #define SPELL_SUMMON_RUBBLE 63633 #define SPELL_FALLING_RUBBLE 63821 @@ -40,7 +40,7 @@ EndScriptData */ #define SPELL_ARM_ENTER_VISUAL 64753 #define SPELL_SUMMON_FOCUSED_EYEBEAM 63342 -#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347,63977) +#define SPELL_FOCUSED_EYEBEAM_PERIODIC RAID_MODE(63347, 63977) #define SPELL_FOCUSED_EYEBEAM_VISUAL 63369 #define SPELL_FOCUSED_EYEBEAM_VISUAL_LEFT 63676 #define SPELL_FOCUSED_EYEBEAM_VISUAL_RIGHT 63702 @@ -153,7 +153,7 @@ class boss_kologarn : public CreatureScript void KilledUnit(Unit* /*who*/) { - DoScriptText(RAND(SAY_SLAY_1,SAY_SLAY_2), me); + DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); } void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp index 9e0b6ff5a35..d3e31eebbf1 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp @@ -218,7 +218,7 @@ class boss_razorscale_controller : public CreatureScript events.ScheduleEvent(EVENT_BUILD_HARPOON_3, 90000); break; case ACTION_PLACE_BROKEN_HARPOON: - for (uint8 n = 0; n < RAID_MODE(2,4); n++) + for (uint8 n = 0; n < RAID_MODE(2, 4); n++) me->SummonGameObject(GO_RAZOR_BROKEN_HARPOON, PosHarpoon[n].GetPositionX(), PosHarpoon[n].GetPositionY(), PosHarpoon[n].GetPositionZ(), 2.286f, 0, 0, 0, 0, 180000); break; } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp index a99927d5e50..fe66401a669 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_thorim.cpp @@ -69,7 +69,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 * /*victim*/) @@ -80,7 +80,7 @@ public: void EnterCombat(Unit* /*pWho*/) { - DoScriptText(RAND(SAY_AGGRO_1,SAY_AGGRO_2), me); + DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2), me); _EnterCombat(); } diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp index 2af069977b0..96d7168f468 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_xt002.cpp @@ -274,7 +274,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 * /*victim*/) @@ -314,7 +314,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { - DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + DoCast(pTarget, RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); uiGravityBombTarget = pTarget->GetGUID(); } uiGravityBombTimer = TIMER_GRAVITY_BOMB; @@ -425,7 +425,7 @@ public: { if (Unit *pGravityBombTarget = me->GetUnit(*me, uiGravityBombTarget)) { - pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10,SPELL_GRAVITY_BOMB_25)); + pGravityBombTarget->RemoveAurasDueToSpell(RAID_MODE(SPELL_GRAVITY_BOMB_10, SPELL_GRAVITY_BOMB_25)); if (hardMode) { //Remains spawned for 3 minutes diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index a32c68fdf3b..8977e4860b6 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -139,7 +139,7 @@ public: bEventInProgress = true; bIsUndead = true; - DoScriptText(YELL_DEAD_1,me); + DoScriptText(YELL_DEAD_1, me); } if (bEventInProgress) @@ -157,12 +157,12 @@ public: me->SetInCombatWith(me->getVictim()); me->GetMotionMaster()->MoveChase(me->getVictim()); - DoScriptText(YELL_AGGRO_2,me); + DoScriptText(YELL_AGGRO_2, me); } void EnterCombat(Unit * /*who*/) { - DoScriptText(YELL_AGGRO_1,me); + DoScriptText(YELL_AGGRO_1, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, IN_PROGRESS); @@ -170,7 +170,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(YELL_DEAD_2,me); + DoScriptText(YELL_DEAD_2, me); if (pInstance) pInstance->SetData(DATA_INGVAR_EVENT, DONE); @@ -179,9 +179,9 @@ public: void KilledUnit(Unit * /*victim*/) { if (bIsUndead) - DoScriptText(YELL_KILL_1,me); + DoScriptText(YELL_KILL_1, me); else - DoScriptText(YELL_KILL_2,me); + DoScriptText(YELL_KILL_2, me); } void UpdateAI(const uint32 diff) @@ -245,7 +245,7 @@ public: Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1); if (pTarget) { - me->SummonCreature(ENTRY_THROW_TARGET,pTarget->GetPositionX(),pTarget->GetPositionY(),pTarget->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,2000); + me->SummonCreature(ENTRY_THROW_TARGET, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 2000); DoCast(me, SPELL_SHADOW_AXE_SUMMON); } @@ -301,7 +301,7 @@ public: pInstance = c->GetInstanceScript(); } - float x,y,z; + float x, y, z; InstanceScript* pInstance; uint32 uiResurectTimer; uint32 uiResurectPhase; @@ -314,15 +314,15 @@ public: me->SetSpeed(MOVE_WALK , 1.0f); //me->SetSpeed(MOVE_FLIGHT , 1.0f); - me->GetPosition(x,y,z); - DoTeleportTo(x+1,y,z+30); + me->GetPosition(x, y, z); + DoTeleportTo(x+1, y, z+30); Unit* ingvar = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_INGVAR) : 0); if (ingvar) { - me->GetMotionMaster()->MovePoint(1,x,y,z+15); + me->GetMotionMaster()->MovePoint(1, x, y, z+15); - // DoScriptText(YELL_RESSURECT,me); + // DoScriptText(YELL_RESSURECT, me); } } @@ -337,14 +337,14 @@ public: { case 1: ingvar->RemoveAura(SPELL_SUMMON_BANSHEE); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_DUMMY,true); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_DUMMY, true); DoCast(ingvar, SPELL_SCOURG_RESURRECTION_BEAM); uiResurectTimer = 8000; uiResurectPhase = 1; break; case 2: me->SetVisible(false); - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); break; } @@ -366,7 +366,7 @@ public: if (ingvar) { ingvar->SetStandState(UNIT_STAND_STATE_STAND); - ingvar->CastSpell(ingvar,SPELL_SCOURG_RESURRECTION_HEAL,false); + ingvar->CastSpell(ingvar, SPELL_SCOURG_RESURRECTION_HEAL, false); } uiResurectTimer = 3000; uiResurectPhase = 2; @@ -380,7 +380,7 @@ public: if (boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI* pAI = CAST_AI(boss_ingvar_the_plunderer::boss_ingvar_the_plundererAI, ingvar->AI())) pAI->StartZombiePhase(); - me->GetMotionMaster()->MovePoint(2,x+1,y,z+30); + me->GetMotionMaster()->MovePoint(2, x+1, y, z+30); ++uiResurectPhase; uiResurectTimer = 0; } @@ -417,13 +417,13 @@ public: void Reset() { - Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET,50); + Unit *pTarget = me->FindNearestCreature(ENTRY_THROW_TARGET, 50); if (pTarget) { DoCast(me, SPELL_SHADOW_AXE_DAMAGE); - float x,y,z; - pTarget->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z); + float x, y, z; + pTarget->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z); } uiDespawnTimer = 7000; } @@ -434,7 +434,7 @@ public: { if (uiDespawnTimer <= diff) { - me->DealDamage(me,me->GetHealth()); + me->DealDamage(me, me->GetHealth()); me->RemoveCorpse(); uiDespawnTimer = 0; } else uiDespawnTimer -= diff; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 1e874b3d5ee..096ee335077 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -96,7 +96,7 @@ public: if (FrostTombGUID) { - Unit* FrostTomb = Unit::GetUnit((*me),FrostTombGUID); + Unit* FrostTomb = Unit::GetUnit((*me), FrostTombGUID); if (FrostTomb) FrostTomb->RemoveAurasDueToSpell(SPELL_FROST_TOMB); } @@ -104,7 +104,7 @@ public: void UpdateAI(const uint32 /*diff*/) { - Unit* temp = Unit::GetUnit((*me),FrostTombGUID); + Unit* temp = Unit::GetUnit((*me), FrostTombGUID); if ((temp && temp->isAlive() && !temp->HasAura(SPELL_FROST_TOMB)) || !temp) me->DealDamage(me, me->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } @@ -282,7 +282,7 @@ public: void Reset() { Respawn_Time = 12000; - Decrepify_Timer = urand(10000,20000); + Decrepify_Timer = urand(10000, 20000); isDead = false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index dd5fb2a6c82..6ff8e4d9ac8 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -27,14 +27,14 @@ EndScriptData */ enum eEnums { - //signed for 24200, but used by 24200,27390 + //signed for 24200, but used by 24200, 27390 YELL_SKARVALD_AGGRO = -1574011, YELL_SKARVALD_DAL_DIED = -1574012, YELL_SKARVALD_SKA_DIEDFIRST = -1574013, YELL_SKARVALD_KILL = -1574014, YELL_SKARVALD_DAL_DIEDFIRST = -1574015, - //signed for 24201, but used by 24201,27389 + //signed for 24201, but used by 24201, 27389 YELL_DALRONN_AGGRO = -1574016, YELL_DALRONN_SKA_DIED = -1574017, YELL_DALRONN_DAL_DIEDFIRST = -1574018, @@ -93,7 +93,7 @@ public: ghost = (me->GetEntry() == MOB_SKARVALD_GHOST); if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isDead()) CAST_CRE(dalronn)->Respawn(); @@ -105,11 +105,11 @@ public: { if (!ghost && pInstance) { - DoScriptText(YELL_SKARVALD_AGGRO,me); + DoScriptText(YELL_SKARVALD_AGGRO, me); - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn && dalronn->isAlive() && !dalronn->getVictim()) - dalronn->getThreatManager().addThreat(who,0.0f); + dalronn->getThreatManager().addThreat(who, 0.0f); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, IN_PROGRESS); } @@ -119,25 +119,25 @@ public: { if (!ghost && pInstance) { - Unit* dalronn = Unit::GetUnit((*me),pInstance->GetData64(DATA_DALRONN)); + Unit* dalronn = Unit::GetUnit((*me), pInstance->GetData64(DATA_DALRONN)); if (dalronn) { if (dalronn->isDead()) { - DoScriptText(YELL_SKARVALD_DAL_DIED,me); + DoScriptText(YELL_SKARVALD_DAL_DIED, me); pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_SKA_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_SKARVALD_GHOST, true); - Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_SKARVALD_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -149,7 +149,7 @@ public: { if (!ghost) { - DoScriptText(YELL_SKARVALD_KILL,me); + DoScriptText(YELL_SKARVALD_KILL, me); } } @@ -184,7 +184,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST,me); + DoScriptText(YELL_SKARVALD_DAL_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; @@ -250,7 +250,7 @@ public: ghost = me->GetEntry() == MOB_DALRONN_GHOST; if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isDead()) CAST_CRE(skarvald)->Respawn(); @@ -262,9 +262,9 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald && skarvald->isAlive() && !skarvald->getVictim()) - skarvald->getThreatManager().addThreat(who,0.0f); + skarvald->getThreatManager().addThreat(who, 0.0f); AggroYell_Timer = 5000; @@ -277,26 +277,26 @@ public: { if (!ghost && pInstance) { - Unit* skarvald = Unit::GetUnit((*me),pInstance->GetData64(DATA_SKARVALD)); + Unit* skarvald = Unit::GetUnit((*me), pInstance->GetData64(DATA_SKARVALD)); if (skarvald) { if (skarvald->isDead()) { - DoScriptText(YELL_DALRONN_SKA_DIED,me); + DoScriptText(YELL_DALRONN_SKA_DIED, me); if (pInstance) pInstance->SetData(DATA_SKARVALD_DALRONN_EVENT, DONE); } else { - DoScriptText(YELL_DALRONN_DAL_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_DAL_DIEDFIRST, me); me->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); //DoCast(me, SPELL_SUMMON_DALRONN_GHOST, true); - Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST,me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); + Creature* temp = me->SummonCreature(MOB_DALRONN_GHOST, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_CORPSE_DESPAWN, 5000); if (temp) { - temp->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + temp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); temp->AI()->AttackStart(Killer); } } @@ -308,7 +308,7 @@ public: { if (!ghost) { - DoScriptText(YELL_DALRONN_KILL,me); + DoScriptText(YELL_DALRONN_KILL, me); } } @@ -327,7 +327,7 @@ public: { if (AggroYell_Timer <= diff) { - DoScriptText(YELL_DALRONN_AGGRO,me); + DoScriptText(YELL_DALRONN_AGGRO, me); AggroYell_Timer = 0; } else AggroYell_Timer -= diff; @@ -354,7 +354,7 @@ public: { if (Response_Timer <= diff) { - DoScriptText(YELL_DALRONN_SKA_DIEDFIRST,me); + DoScriptText(YELL_DALRONN_SKA_DIEDFIRST, me); Response_Timer = 0; } else Response_Timer -= diff; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index 92972d67469..443512d5986 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -139,27 +139,27 @@ public: { //door and object id case ENTRY_BELLOW_1: forge_bellow[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_2: forge_bellow[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_BELLOW_3: forge_bellow[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_1: forge_fire[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_2: forge_fire[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_FORGEFIRE_3: forge_fire[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_1: forge_anvil[0] = go->GetGUID(); - if (forge_event[0] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[0] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_2: forge_anvil[1] = go->GetGUID(); - if (forge_event[1] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[1] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GLOWING_ANVIL_3: forge_anvil[2] = go->GetGUID(); - if (forge_event[2] != NOT_STARTED)HandleGameObject(0,true,go);break; + if (forge_event[2] != NOT_STARTED)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_1: portcullis[0] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; case ENTRY_GIANT_PORTCULLIS_2: portcullis[1] = go->GetGUID(); - if (m_auiEncounter[2] == DONE)HandleGameObject(0,true,go);break; + if (m_auiEncounter[2] == DONE)HandleGameObject(0, true, go);break; } } @@ -197,42 +197,42 @@ public: case EVENT_FORGE_1: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[0],false); - HandleGameObject(forge_fire[0],false); - HandleGameObject(forge_anvil[0],false); + HandleGameObject(forge_bellow[0], false); + HandleGameObject(forge_fire[0], false); + HandleGameObject(forge_anvil[0], false); }else { - HandleGameObject(forge_bellow[0],true); - HandleGameObject(forge_fire[0],true); - HandleGameObject(forge_anvil[0],true); + HandleGameObject(forge_bellow[0], true); + HandleGameObject(forge_fire[0], true); + HandleGameObject(forge_anvil[0], true); } forge_event[0] = data; break; case EVENT_FORGE_2: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[1],false); - HandleGameObject(forge_fire[1],false); - HandleGameObject(forge_anvil[1],false); + HandleGameObject(forge_bellow[1], false); + HandleGameObject(forge_fire[1], false); + HandleGameObject(forge_anvil[1], false); }else { - HandleGameObject(forge_bellow[1],true); - HandleGameObject(forge_fire[1],true); - HandleGameObject(forge_anvil[1],true); + HandleGameObject(forge_bellow[1], true); + HandleGameObject(forge_fire[1], true); + HandleGameObject(forge_anvil[1], true); } forge_event[1] = data; break; case EVENT_FORGE_3: if (data == NOT_STARTED) { - HandleGameObject(forge_bellow[2],false); - HandleGameObject(forge_fire[2],false); - HandleGameObject(forge_anvil[2],false); + HandleGameObject(forge_bellow[2], false); + HandleGameObject(forge_fire[2], false); + HandleGameObject(forge_anvil[2], false); }else { - HandleGameObject(forge_bellow[2],true); - HandleGameObject(forge_fire[2],true); - HandleGameObject(forge_anvil[2],true); + HandleGameObject(forge_bellow[2], true); + HandleGameObject(forge_fire[2], true); + HandleGameObject(forge_anvil[2], true); } forge_event[2] = data; break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 5f3a93e0d57..0b9bd93e2ee 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -59,13 +59,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_1, me->isAlive() ? NOT_STARTED : DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_2, me->isAlive() ? NOT_STARTED : DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,me->isAlive() ? NOT_STARTED : DONE); + pInstance->SetData(EVENT_FORGE_3, me->isAlive() ? NOT_STARTED : DONE); break; } } @@ -79,13 +79,13 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,DONE); + pInstance->SetData(EVENT_FORGE_1, DONE); break; case 2: - pInstance->SetData(EVENT_FORGE_2,DONE); + pInstance->SetData(EVENT_FORGE_2, DONE); break; case 3: - pInstance->SetData(EVENT_FORGE_3,DONE); + pInstance->SetData(EVENT_FORGE_3, DONE); break; } } @@ -99,17 +99,17 @@ public: switch(fm_Type) { case 1: - pInstance->SetData(EVENT_FORGE_1,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_1, IN_PROGRESS); break; case 2: - pInstance->SetData(EVENT_FORGE_2,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_2, IN_PROGRESS); break; case 3: - pInstance->SetData(EVENT_FORGE_3,IN_PROGRESS); + pInstance->SetData(EVENT_FORGE_3, IN_PROGRESS); break; } } - me->SetUInt32Value(UNIT_NPC_EMOTESTATE ,EMOTE_ONESHOT_NONE); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE , EMOTE_ONESHOT_NONE); } uint8 GetForgeMasterType() @@ -120,10 +120,10 @@ public: for (uint8 i = 0; i < 3 ; ++i) { GameObject* temp; - temp = me->FindNearestGameObject(entry_search[i],30); + temp = me->FindNearestGameObject(entry_search[i], 30); if (temp) { - if (me->IsWithinDist(temp,diff,false)) + if (me->IsWithinDist(temp, diff, false)) { near_f = i + 1; diff = me->GetDistance2d(temp); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 04d7a38b4c0..7f0d4dbed5b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -64,12 +64,12 @@ struct Locations struct Locations moveLocs[]= { - {261.6f,-449.3f,109.5f}, - {263.3f,-454.0f,109.5f}, - {291.5f,-450.4f,109.5f}, - {291.5f,-454.0f,109.5f}, - {310.0f,-453.4f,109.5f}, - {238.6f,-460.7f,109.5f} + {261.6f, -449.3f, 109.5f}, + {263.3f, -454.0f, 109.5f}, + {291.5f, -450.4f, 109.5f}, + {291.5f, -454.0f, 109.5f}, + {310.0f, -453.4f, 109.5f}, + {238.6f, -460.7f, 109.5f} }; enum Phase @@ -190,20 +190,20 @@ public: if (uiArcingSmashTimer <= diff) { DoCast(me, SPELL_ARCING_SMASH); - uiArcingSmashTimer = urand(13000,17000); + uiArcingSmashTimer = urand(13000, 17000); } else uiArcingSmashTimer -= diff; if (uiImpaleTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_IMPALE); - uiImpaleTimer = urand(8000,12000); + uiImpaleTimer = urand(8000, 12000); } else uiImpaleTimer -= diff; if (uiWhiteringRoarTimer <= diff) { DoCast(me, SPELL_WITHERING_ROAR); - uiWhiteringRoarTimer = urand(8000,12000); + uiWhiteringRoarTimer = urand(8000, 12000); } else uiWhiteringRoarTimer -= diff; DoMeleeAttackIfReady(); @@ -726,7 +726,7 @@ public: { Creature *pPalehoof = Unit::GetCreature((*me), pInstance ? pInstance->GetData64(DATA_GORTOK_PALEHOOF) : 0); if (pPalehoof) - CAST_AI(boss_palehoof::boss_palehoofAI,pPalehoof->AI())->NextPhase(); + CAST_AI(boss_palehoof::boss_palehoofAI, pPalehoof->AI())->NextPhase(); } } @@ -796,7 +796,7 @@ public: pNext->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_ATTACKABLE_1 | UNIT_FLAG_OOC_NOT_ATTACKABLE); pNext->SetStandState(UNIT_STAND_STATE_STAND); pNext->SetInCombatWithZone(); - pNext->Attack(pNext->SelectNearestTarget(100),true); + pNext->Attack(pNext->SelectNearestTarget(100), true); } currentPhase = PHASE_NONE; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index b2f98b11475..9da89393f02 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -356,7 +356,7 @@ public: break; case 3: me->GetMotionMaster()->MovePoint(0, Location[69].GetPositionX(), Location[69].GetPositionY(), Location[69].GetPositionZ()); - DoScriptText(RAND(SAY_DRAKE_BREATH_1,SAY_DRAKE_BREATH_2), me); + DoScriptText(RAND(SAY_DRAKE_BREATH_1, SAY_DRAKE_BREATH_2), me); DoScriptText(EMOTE_BREATH, me); m_uiMovementTimer = 2500; break; @@ -417,14 +417,14 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), me); + DoScriptText(RAND(SAY_KILL_1, SAY_KILL_2), me); } void SpawnMobs() { - for (uint8 i = 0; i < DUNGEON_MODE(5,6); ++i) + for (uint8 i = 0; i < DUNGEON_MODE(5, 6); ++i) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: me->SummonCreature(CREATURE_YMIRJAR_WARRIOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 1: me->SummonCreature(CREATURE_YMIRJAR_WITCH_DOCTOR, SpawnLoc.GetPositionX()+rand()%5, SpawnLoc.GetPositionY()+rand()%5, SpawnLoc.GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; @@ -436,7 +436,7 @@ public: void SpawnTrigger() { uint8 iStart = 0, iEnd = 0; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: iStart = 8; @@ -466,9 +466,9 @@ public: InstanceScript* m_pInstance = pGO->GetInstanceScript(); if (!m_pInstance) return false; - if (Creature* pSkadi = Unit::GetCreature((*pGO),m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) + if (Creature* pSkadi = Unit::GetCreature((*pGO), m_pInstance->GetData64(DATA_SKADI_THE_RUTHLESS))) { - pPlayer->CastSpell(pSkadi,SPELL_RAPID_FIRE, true); + pPlayer->CastSpell(pSkadi, SPELL_RAPID_FIRE, true); } return false; } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c1970aaadb4..00cc67cd06f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -295,7 +295,7 @@ public: if (pInstance) { pInstance->SetData(DATA_SVALA_SORROWGRAVE_EVENT, NOT_STARTED); - pInstance->SetData64(DATA_SACRIFICED_PLAYER,0); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, 0); } } @@ -355,7 +355,7 @@ public: Phase = SACRIFICING; if (pInstance) { - pInstance->SetData64(DATA_SACRIFICED_PLAYER,pSacrificeTarget->GetGUID()); + pInstance->SetData64(DATA_SACRIFICED_PLAYER, pSacrificeTarget->GetGUID()); for (uint8 i = 0; i < 3; ++i) if (Creature* pSummon = me->SummonCreature(CREATURE_RITUAL_CHANNELER, RitualChannelerPos[i], TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 360000)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index 16caa1adadb..3c04d522c4c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -83,7 +83,7 @@ struct ActiveBoatStruct { uint32 npc; int32 say; - float MoveX,MoveY,MoveZ,SpawnX,SpawnY,SpawnZ,SpawnO; + float MoveX, MoveY, MoveZ, SpawnX, SpawnY, SpawnZ, SpawnO; }; static ActiveBoatStruct ActiveBot[4] = @@ -291,7 +291,7 @@ public: if (m_bIsActiveWithTORGYN && m_uiAbility_TORGYN_Timer <= diff) { - float x,y,z; + float x, y, z; x = me->GetPositionX()-5; y = me->GetPositionY()-5; z = me->GetPositionZ(); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 7e7cdc01d22..f2c59b63e86 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -22,14 +22,14 @@ //Spells Archavon #define SPELL_ROCK_SHARDS 58678 -#define SPELL_CRUSHING_LEAP RAID_MODE(58960,60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. -#define SPELL_STOMP RAID_MODE(58663,60880) -#define SPELL_IMPALE RAID_MODE(58666,60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. +#define SPELL_CRUSHING_LEAP RAID_MODE(58960, 60894)//Instant (10-80yr range) -- Leaps at an enemy, inflicting 8000 Physical damage, knocking all nearby enemies away, and creating a cloud of choking debris. +#define SPELL_STOMP RAID_MODE(58663, 60880) +#define SPELL_IMPALE RAID_MODE(58666, 60882) //Lifts an enemy off the ground with a spiked fist, inflicting 47125 to 52875 Physical damage and 9425 to 10575 additional damage each second for 8 sec. #define SPELL_BERSERK 47008 //Spells Archavon Warders -#define SPELL_ROCK_SHOWER RAID_MODE(60919,60923) -#define SPELL_SHIELD_CRUSH RAID_MODE(60897,60899) -#define SPELL_WHIRL RAID_MODE(60902,60916) +#define SPELL_ROCK_SHOWER RAID_MODE(60919, 60923) +#define SPELL_SHIELD_CRUSH RAID_MODE(60897, 60899) +#define SPELL_WHIRL RAID_MODE(60902, 60916) //4 Warders spawned #define ARCHAVON_WARDER 32353 //npc 32353 @@ -47,7 +47,7 @@ enum Events EVENT_BERSERK = 5, // 300s cd //mob - EVENT_ROCK_SHOWER = 6, // set = 20s cd,unkown cd + EVENT_ROCK_SHOWER = 6, // set = 20s cd, unkown cd EVENT_SHIELD_CRUSH = 7, // set = 30s cd EVENT_WHIRL = 8, // set= 10s cd }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 31ca69c11c3..5ddd2f02a17 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -153,7 +153,7 @@ public: { if (victim == me) 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); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 1e540c09220..c1f7aac1779 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -72,8 +72,8 @@ public: { uiBloodlustTimer = 15000; uiChainHealTimer = 0; - uiEarthShockTimer = urand(2000,8000); - uiLightningBoltTimer = urand(5000,10000); + uiEarthShockTimer = urand(2000, 8000); + uiLightningBoltTimer = urand(5000, 10000); uiEarthShieldTimer = 20000; if (pInstance) { @@ -187,20 +187,20 @@ public: if (uiBloodlustTimer <= diff) { DoCast(me, SPELL_BLOODLUST); - uiBloodlustTimer = urand(35000,45000); + uiBloodlustTimer = urand(35000, 45000); } else uiBloodlustTimer -= diff; if (uiEarthShockTimer <= diff) { DoCast(me->getVictim(), SPELL_EARTH_SHOCK); - uiEarthShockTimer = urand(8000,13000); + uiEarthShockTimer = urand(8000, 13000); } else uiEarthShockTimer -= diff; if (uiLightningBoltTimer <= diff) { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_LIGHTNING_BOLT); - uiLightningBoltTimer = urand(18000,24000); + uiLightningBoltTimer = urand(18000, 24000); } else uiLightningBoltTimer -= diff; DoMeleeAttackIfReady(); @@ -229,7 +229,7 @@ public: { if (victim == me) 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); } uint64 GetChainHealTargetGUID() @@ -283,9 +283,9 @@ public: void Reset() { - uiStrikeTimer = urand(4000,8000); - uiHowlingScreechTimer = urand(8000,13000); - uiGushingWoundTimer = urand(1000,3000); + uiStrikeTimer = urand(4000, 8000); + uiHowlingScreechTimer = urand(8000, 13000); + uiGushingWoundTimer = urand(1000, 3000); } void AttackStart(Unit* pWho) @@ -314,19 +314,19 @@ public: if (uiStrikeTimer <= diff) { DoCast(me->getVictim(), SPELL_STRIKE); - uiStrikeTimer = urand(4000,8000); + uiStrikeTimer = urand(4000, 8000); } else uiStrikeTimer -= diff; if (uiHowlingScreechTimer <= diff) { DoCast(me->getVictim(), SPELL_HOWLING_SCREECH); - uiHowlingScreechTimer = urand(8000,13000); + uiHowlingScreechTimer = urand(8000, 13000); } else uiHowlingScreechTimer -= diff; if (uiGushingWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_GUSHING_WOUND); - uiGushingWoundTimer = urand(7000,12000); + uiGushingWoundTimer = urand(7000, 12000); } else uiGushingWoundTimer -= diff; } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index b6db8eaf8f6..b82996bfc89 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -307,7 +307,7 @@ public: pSummoned->SetSpeed(MOVE_RUN, 0.3f); pSummoned->GetMotionMaster()->MoveFollow(me, 0, 0); m_waterElements.push_back(pSummoned->GetGUID()); - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } } @@ -316,7 +316,7 @@ public: if (pSummoned) { m_waterElements.remove(pSummoned->GetGUID()); - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } } @@ -324,7 +324,7 @@ public: { if (victim == me) 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); } }; @@ -354,7 +354,7 @@ public: void Reset() { uiRangeCheck_Timer = 1000; - DoCast(me,SPELL_WATER_GLOBULE); + DoCast(me, SPELL_WATER_GLOBULE); } void AttackStart(Unit* /*pWho*/) diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 65de6aef578..67153a0cf81 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -110,19 +110,19 @@ public: if (uiFireboltTimer <= diff) { DoCast(me->getVictim(), SPELL_FIREBOLT); - uiFireboltTimer = urand(5000,13000); + uiFireboltTimer = urand(5000, 13000); } else uiFireboltTimer -= diff; if (uiFlameBreathTimer <= diff) { DoCast(me->getVictim(), SPELL_FLAME_BREATH); - uiFlameBreathTimer = urand(10000,15000); + uiFlameBreathTimer = urand(10000, 15000); } else uiFlameBreathTimer -= diff; if (uiLavaBurnTimer <= diff) { DoCast(me->getVictim(), SPELL_LAVA_BURN); - uiLavaBurnTimer = urand(15000,23000); + uiLavaBurnTimer = urand(15000, 23000); } if (IsHeroic()) @@ -130,7 +130,7 @@ public: if (uiCauterizingFlamesTimer <= diff) { DoCast(me->getVictim(), SPELL_CAUTERIZING_FLAMES); - uiCauterizingFlamesTimer = urand(10000,16000); + uiCauterizingFlamesTimer = urand(10000, 16000); } else uiCauterizingFlamesTimer -= diff; } diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 2ef3a9b6df6..e2893a5445b 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -127,7 +127,7 @@ public: else if (pInstance->GetData(DATA_WAVE_COUNT) == 12) { pInstance->SetData(DATA_2ND_BOSS_EVENT, DONE); - pInstance->SetData(DATA_WAVE_COUNT,13); + pInstance->SetData(DATA_WAVE_COUNT, 13); } } } diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 19aea5f8769..bfaf971abce 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -99,7 +99,7 @@ public: void DespawnSphere() { std::list<Creature*> assistList; - GetCreatureListWithEntryInGrid(assistList,me, NPC_ETHEREAL_SPHERE ,150.0f); + GetCreatureListWithEntryInGrid(assistList, me, NPC_ETHEREAL_SPHERE , 150.0f); if (assistList.empty()) return; @@ -218,7 +218,7 @@ public: if (pVictim == me) 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); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index 9ed5d005321..9b6cb6c2964 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -171,14 +171,14 @@ public: if (victim == me) 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 JustSummoned(Creature* summon) { summon->AI()->AttackStart(me->getVictim()); summon->AI()->DoCastAOE(SPELL_ZURAMAT_ADD_2); - summon->SetPhaseMask(17,true); + summon->SetPhaseMask(17, true); } }; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index c21d1b491d1..93ef8256fef 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -200,7 +200,7 @@ public: uiDoorIntegrity = 100; uiWaveCount = 0; - uiLocation = urand(0,5); + uiLocation = urand(0, 5); uiFirstBoss = 0; uiSecondBoss = 0; uiCountErekemGuards = 0; @@ -469,9 +469,9 @@ public: void SpawnPortal() { - SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1,5))%6); + SetData(DATA_PORTAL_LOCATION, (GetData(DATA_PORTAL_LOCATION) + urand(1, 5))%6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) - if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL,PortalLocation[GetData(DATA_PORTAL_LOCATION)],TEMPSUMMON_CORPSE_DESPAWN)) + if(Creature* portal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, PortalLocation[GetData(DATA_PORTAL_LOCATION)], TEMPSUMMON_CORPSE_DESPAWN)) uiTeleportationPortal = portal->GetGUID(); } @@ -482,7 +482,7 @@ public: switch(uiBoss) { case BOSS_MORAGG: - HandleGameObject(uiMoraggCell,bForceRespawn); + HandleGameObject(uiMoraggCell, bForceRespawn); pBoss = instance->GetCreature(uiMoragg); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove1); @@ -516,25 +516,25 @@ public: } break; case BOSS_ICHORON: - HandleGameObject(uiIchoronCell,bForceRespawn); + HandleGameObject(uiIchoronCell, bForceRespawn); pBoss = instance->GetCreature(uiIchoron); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove3); break; case BOSS_LAVANTHOR: - HandleGameObject(uiLavanthorCell,bForceRespawn); + HandleGameObject(uiLavanthorCell, bForceRespawn); pBoss = instance->GetCreature(uiLavanthor); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove4); break; case BOSS_XEVOZZ: - HandleGameObject(uiXevozzCell,bForceRespawn); + HandleGameObject(uiXevozzCell, bForceRespawn); pBoss = instance->GetCreature(uiXevozz); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove5); break; case BOSS_ZURAMAT: - HandleGameObject(uiZuramatCell,bForceRespawn); + HandleGameObject(uiZuramatCell, bForceRespawn); pBoss = instance->GetCreature(uiZuramat); if (pBoss) pBoss->GetMotionMaster()->MovePoint(0, BossStartMove6); @@ -570,7 +570,7 @@ public: { case 6: if (uiFirstBoss == 0) - uiFirstBoss = urand(1,6); + uiFirstBoss = urand(1, 6); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { if(Creature* pPortal = pSinclari->SummonCreature(CREATURE_TELEPORTATION_PORTAL, MiddleRoomPortalSaboLocation, TEMPSUMMON_CORPSE_DESPAWN)) @@ -583,7 +583,7 @@ public: if (uiSecondBoss == 0) do { - uiSecondBoss = urand(1,6); + uiSecondBoss = urand(1, 6); } while (uiSecondBoss == uiFirstBoss); if (Creature* pSinclari = instance->GetCreature(uiSinclari)) { @@ -597,7 +597,7 @@ public: { Creature* pSinclari = instance->GetCreature(uiSinclari); if (pSinclari) - pSinclari->SummonCreature(CREATURE_CYANIGOSA,CyanigosasSpawnLocation,TEMPSUMMON_DEAD_DESPAWN); + pSinclari->SummonCreature(CREATURE_CYANIGOSA, CyanigosasSpawnLocation, TEMPSUMMON_DEAD_DESPAWN); break; } case 1: @@ -701,7 +701,7 @@ public: StartBossEncounter(uiFirstBoss, false); StartBossEncounter(uiSecondBoss, false); - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); SetData(DATA_WAVE_COUNT, 0); uiMainEventPhase = NOT_STARTED; @@ -719,12 +719,12 @@ public: { pGuard->SetVisible(true); pGuard->SetReactState(REACT_AGGRESSIVE); - pGuard->GetMotionMaster()->MovePoint(1,pGuard->GetHomePosition()); + pGuard->GetMotionMaster()->MovePoint(1, pGuard->GetHomePosition()); } } } - pSinclari->GetMotionMaster()->MovePoint(1,pSinclari->GetHomePosition()); - pSinclari->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_SELECTABLE); + pSinclari->GetMotionMaster()->MovePoint(1, pSinclari->GetHomePosition()); + pSinclari->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); } } @@ -771,14 +771,14 @@ public: { if(uiDoorSpellTimer < diff) { - SetData(DATA_DOOR_INTEGRITY,GetData(DATA_DOOR_INTEGRITY)-1); + SetData(DATA_DOOR_INTEGRITY, GetData(DATA_DOOR_INTEGRITY)-1); uiDoorSpellTimer =2000; } else uiDoorSpellTimer -= diff; } // else set door state to active (means door will open and group have failed to sustain mob invasion on the door) else { - SetData(DATA_MAIN_DOOR,GO_STATE_ACTIVE); + SetData(DATA_MAIN_DOOR, GO_STATE_ACTIVE); uiMainEventPhase = FAIL; } } @@ -792,7 +792,7 @@ public: { Creature* creature = instance->GetCreature(*itr); if (creature && creature->isAlive()) - creature->CastSpell(creature,SPELL_ARCANE_LIGHTNING,true); // Who should cast the spell? + creature->CastSpell(creature, SPELL_ARCANE_LIGHTNING, true); // Who should cast the spell? } } diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index cd6a0c66641..e03c69f4672 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -262,13 +262,13 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); CAST_AI(npc_sinclari_vh::npc_sinclariAI, (pCreature->AI()))->uiPhase = 1; if (InstanceScript *pInstance = pCreature->GetInstanceScript()) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,SPECIAL); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, SPECIAL); break; case GOSSIP_ACTION_INFO_DEF+2: pPlayer->SEND_GOSSIP_MENU(13854, pCreature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(),playerTeleportPosition.GetPositionY(),playerTeleportPosition.GetPositionZ(),playerTeleportPosition.GetOrientation(),true); + pPlayer->NearTeleportTo(playerTeleportPosition.GetPositionX(), playerTeleportPosition.GetPositionY(), playerTeleportPosition.GetPositionZ(), playerTeleportPosition.GetOrientation(), true); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -283,12 +283,12 @@ public: { case NOT_STARTED: case FAIL: // Allow to start event if not started or wiped - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_1,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+2); - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_START_EVENT,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_START_EVENT, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; case IN_PROGRESS: // Allow to teleport inside if event is in progress - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_I_WANT_IN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+3); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_I_WANT_IN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); pPlayer->SEND_GOSSIP_MENU(13853, pCreature->GetGUID()); break; default: @@ -395,7 +395,7 @@ public: break; case 5: if (pInstance) - pInstance->SetData(DATA_MAIN_EVENT_PHASE,IN_PROGRESS); + pInstance->SetData(DATA_MAIN_EVENT_PHASE, IN_PROGRESS); me->SetReactState(REACT_PASSIVE); uiTimer = 0; uiPhase = 0; @@ -492,36 +492,36 @@ public: { case 1: for(int i=0;i<3;i++) - AddWaypoint(i,SaboteurFinalPos1[i][0],SaboteurFinalPos1[i][1],SaboteurFinalPos1[i][2],0); - me->SetHomePosition(SaboteurFinalPos1[2][0],SaboteurFinalPos1[2][1],SaboteurFinalPos1[2][2],4.762346f); + AddWaypoint(i, SaboteurFinalPos1[i][0], SaboteurFinalPos1[i][1], SaboteurFinalPos1[i][2], 0); + me->SetHomePosition(SaboteurFinalPos1[2][0], SaboteurFinalPos1[2][1], SaboteurFinalPos1[2][2], 4.762346f); break; case 2: for(int i=0;i<3;i++) - AddWaypoint(i,SaboteurFinalPos2[i][0],SaboteurFinalPos2[i][1],SaboteurFinalPos2[i][2],0); - me->SetHomePosition(SaboteurFinalPos2[2][0],SaboteurFinalPos2[2][1],SaboteurFinalPos2[2][2],1.862674f); + AddWaypoint(i, SaboteurFinalPos2[i][0], SaboteurFinalPos2[i][1], SaboteurFinalPos2[i][2], 0); + me->SetHomePosition(SaboteurFinalPos2[2][0], SaboteurFinalPos2[2][1], SaboteurFinalPos2[2][2], 1.862674f); break; case 3: for(int i=0;i<2;i++) - AddWaypoint(i,SaboteurFinalPos3[i][0],SaboteurFinalPos3[i][1],SaboteurFinalPos3[i][2],0); - me->SetHomePosition(SaboteurFinalPos3[1][0],SaboteurFinalPos3[1][1],SaboteurFinalPos3[1][2],5.500638f); + AddWaypoint(i, SaboteurFinalPos3[i][0], SaboteurFinalPos3[i][1], SaboteurFinalPos3[i][2], 0); + me->SetHomePosition(SaboteurFinalPos3[1][0], SaboteurFinalPos3[1][1], SaboteurFinalPos3[1][2], 5.500638f); break; case 4: - AddWaypoint(0,SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],0); - me->SetHomePosition(SaboteurFinalPos4[0],SaboteurFinalPos4[1],SaboteurFinalPos4[2],3.991108f); + AddWaypoint(0, SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 0); + me->SetHomePosition(SaboteurFinalPos4[0], SaboteurFinalPos4[1], SaboteurFinalPos4[2], 3.991108f); break; case 5: - AddWaypoint(0,SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],0); - me->SetHomePosition(SaboteurFinalPos5[0],SaboteurFinalPos5[1],SaboteurFinalPos5[2],1.100841f); + AddWaypoint(0, SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 0); + me->SetHomePosition(SaboteurFinalPos5[0], SaboteurFinalPos5[1], SaboteurFinalPos5[2], 1.100841f); break; case 6: for(int i=0;i<5;i++) - AddWaypoint(i,SaboteurFinalPos6[i][0],SaboteurFinalPos6[i][1],SaboteurFinalPos6[i][2],0); - me->SetHomePosition(SaboteurFinalPos6[4][0],SaboteurFinalPos6[4][1],SaboteurFinalPos6[4][2],0.983031f); + AddWaypoint(i, SaboteurFinalPos6[i][0], SaboteurFinalPos6[i][1], SaboteurFinalPos6[i][2], 0); + me->SetHomePosition(SaboteurFinalPos6[4][0], SaboteurFinalPos6[4][1], SaboteurFinalPos6[4][2], 0.983031f); break; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } @@ -529,7 +529,7 @@ public: { me->CastSpell(me, SABOTEUR_SHIELD_DISRUPTION, false); me->DisappearAndDie(); - Creature* pSaboPort = Unit::GetCreature((*me),pInstance->GetData64(DATA_SABOTEUR_PORTAL)); + Creature* pSaboPort = Unit::GetCreature((*me), pInstance->GetData64(DATA_SABOTEUR_PORTAL)); if (pSaboPort) pSaboPort->DisappearAndDie(); pInstance->SetData(DATA_START_BOSS_ENCOUNTER, 1); @@ -553,7 +553,7 @@ public: npc_teleportation_portalAI(Creature *c) : ScriptedAI(c), listOfMobs(me) { pInstance = c->GetInstanceScript(); - uiTypeOfMobsPortal = urand(0,1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs + uiTypeOfMobsPortal = urand(0, 1); // 0 - elite mobs 1 - portal guardian or portal keeper with regular mobs bPortalGuardianOrKeeperOrEliteSpawn = false; } @@ -602,7 +602,7 @@ public: uint8 k = uiWaveCount < 12 ? 2 : 3; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_CAPTAIN,CREATURE_AZURE_RAIDER,CREATURE_AZURE_STALKER,CREATURE_AZURE_SORCEROR); + uint32 entry = RAND(CREATURE_AZURE_CAPTAIN, CREATURE_AZURE_RAIDER, CREATURE_AZURE_STALKER, CREATURE_AZURE_SORCEROR); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } me->SetVisible(false); @@ -627,7 +627,7 @@ public: uint8 k = pInstance->GetData(DATA_WAVE_COUNT) < 12 ? 3 : 4; for (uint8 i = 0; i < k; ++i) { - uint32 entry = RAND(CREATURE_AZURE_INVADER_1,CREATURE_AZURE_INVADER_2,CREATURE_AZURE_SPELLBREAKER_1,CREATURE_AZURE_SPELLBREAKER_2,CREATURE_AZURE_MAGE_SLAYER_1,CREATURE_AZURE_MAGE_SLAYER_2,CREATURE_AZURE_BINDER_1,CREATURE_AZURE_BINDER_2); + uint32 entry = RAND(CREATURE_AZURE_INVADER_1, CREATURE_AZURE_INVADER_2, CREATURE_AZURE_SPELLBREAKER_1, CREATURE_AZURE_SPELLBREAKER_2, CREATURE_AZURE_MAGE_SLAYER_1, CREATURE_AZURE_MAGE_SLAYER_2, CREATURE_AZURE_BINDER_1, CREATURE_AZURE_BINDER_2); DoSummon(entry, me, 2.0f, 20000, TEMPSUMMON_DEAD_DESPAWN); } } @@ -653,21 +653,21 @@ public: void JustDied(Unit* /*killer*/) { if (pInstance) - pInstance->SetData(DATA_WAVE_COUNT,pInstance->GetData(DATA_WAVE_COUNT)+1); + pInstance->SetData(DATA_WAVE_COUNT, pInstance->GetData(DATA_WAVE_COUNT)+1); } void JustSummoned(Creature *pSummoned) { listOfMobs.Summon(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_ADD_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_ADD_TRASH_MOB, pSummoned->GetGUID()); } void SummonedMobDied(Creature *pSummoned) { listOfMobs.Despawn(pSummoned); if (pSummoned) - pInstance->SetData64(DATA_DEL_TRASH_MOB,pSummoned->GetGUID()); + pInstance->SetData64(DATA_DEL_TRASH_MOB, pSummoned->GetGUID()); } }; @@ -733,57 +733,57 @@ struct violet_hold_trashAI : public npc_escortAI { case 0: for(int i=0;i<6;i++) - AddWaypoint(i,FirstPortalWPs[i][0]+irand(-1,1),FirstPortalWPs[i][1]+irand(-1,1),FirstPortalWPs[i][2]+irand(-1,1),0); - me->SetHomePosition(FirstPortalWPs[5][0],FirstPortalWPs[5][1],FirstPortalWPs[5][2],3.149439f); + AddWaypoint(i, FirstPortalWPs[i][0]+irand(-1, 1), FirstPortalWPs[i][1]+irand(-1, 1), FirstPortalWPs[i][2]+irand(-1, 1), 0); + me->SetHomePosition(FirstPortalWPs[5][0], FirstPortalWPs[5][1], FirstPortalWPs[5][2], 3.149439f); break; case 1: - secondPortalRouteID = urand(0,1); + secondPortalRouteID = urand(0, 1); switch(secondPortalRouteID) { case 0: for(int i=0;i<9;i++) - AddWaypoint(i,SecondPortalFirstWPs[i][0]+irand(-1,1),SecondPortalFirstWPs[i][1]+irand(-1,1),SecondPortalFirstWPs[i][2],0); - me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1,1),SecondPortalFirstWPs[8][1]+irand(-1,1),SecondPortalFirstWPs[8][2]+irand(-1,1),3.149439f); + AddWaypoint(i, SecondPortalFirstWPs[i][0]+irand(-1, 1), SecondPortalFirstWPs[i][1]+irand(-1, 1), SecondPortalFirstWPs[i][2], 0); + me->SetHomePosition(SecondPortalFirstWPs[8][0]+irand(-1, 1), SecondPortalFirstWPs[8][1]+irand(-1, 1), SecondPortalFirstWPs[8][2]+irand(-1, 1), 3.149439f); break; case 1: for(int i=0;i<8;i++) - AddWaypoint(i,SecondPortalSecondWPs[i][0]+irand(-1,1),SecondPortalSecondWPs[i][1]+irand(-1,1),SecondPortalSecondWPs[i][2],0); - me->SetHomePosition(SecondPortalSecondWPs[7][0],SecondPortalSecondWPs[7][1],SecondPortalSecondWPs[7][2],3.149439f); + AddWaypoint(i, SecondPortalSecondWPs[i][0]+irand(-1, 1), SecondPortalSecondWPs[i][1]+irand(-1, 1), SecondPortalSecondWPs[i][2], 0); + me->SetHomePosition(SecondPortalSecondWPs[7][0], SecondPortalSecondWPs[7][1], SecondPortalSecondWPs[7][2], 3.149439f); break; } break; case 2: for(int i=0;i<8;i++) - AddWaypoint(i,ThirdPortalWPs[i][0]+irand(-1,1),ThirdPortalWPs[i][1]+irand(-1,1),ThirdPortalWPs[i][2],0); - me->SetHomePosition(ThirdPortalWPs[7][0],ThirdPortalWPs[7][1],ThirdPortalWPs[7][2],3.149439f); + AddWaypoint(i, ThirdPortalWPs[i][0]+irand(-1, 1), ThirdPortalWPs[i][1]+irand(-1, 1), ThirdPortalWPs[i][2], 0); + me->SetHomePosition(ThirdPortalWPs[7][0], ThirdPortalWPs[7][1], ThirdPortalWPs[7][2], 3.149439f); break; case 3: for(int i=0;i<9;i++) - AddWaypoint(i,FourthPortalWPs[i][0]+irand(-1,1),FourthPortalWPs[i][1]+irand(-1,1),FourthPortalWPs[i][2],0); - me->SetHomePosition(FourthPortalWPs[8][0],FourthPortalWPs[8][1],FourthPortalWPs[8][2],3.149439f); + AddWaypoint(i, FourthPortalWPs[i][0]+irand(-1, 1), FourthPortalWPs[i][1]+irand(-1, 1), FourthPortalWPs[i][2], 0); + me->SetHomePosition(FourthPortalWPs[8][0], FourthPortalWPs[8][1], FourthPortalWPs[8][2], 3.149439f); break; case 4: for(int i=0;i<6;i++) - AddWaypoint(i,FifthPortalWPs[i][0]+irand(-1,1),FifthPortalWPs[i][1]+irand(-1,1),FifthPortalWPs[i][2],0); - me->SetHomePosition(FifthPortalWPs[5][0],FifthPortalWPs[5][1],FifthPortalWPs[5][2],3.149439f); + AddWaypoint(i, FifthPortalWPs[i][0]+irand(-1, 1), FifthPortalWPs[i][1]+irand(-1, 1), FifthPortalWPs[i][2], 0); + me->SetHomePosition(FifthPortalWPs[5][0], FifthPortalWPs[5][1], FifthPortalWPs[5][2], 3.149439f); break; case 5: for(int i=0;i<4;i++) - AddWaypoint(i,SixthPoralWPs[i][0]+irand(-1,1),SixthPoralWPs[i][1]+irand(-1,1),SixthPoralWPs[i][2],0); - me->SetHomePosition(SixthPoralWPs[3][0],SixthPoralWPs[3][1],SixthPoralWPs[3][2],3.149439f); + AddWaypoint(i, SixthPoralWPs[i][0]+irand(-1, 1), SixthPoralWPs[i][1]+irand(-1, 1), SixthPoralWPs[i][2], 0); + me->SetHomePosition(SixthPoralWPs[3][0], SixthPoralWPs[3][1], SixthPoralWPs[3][2], 3.149439f); break; } SetDespawnAtEnd(false); - Start(true,true); + Start(true, true); } } void JustDied(Unit * /*unit*/) { - if (Creature* portal = Unit::GetCreature((*me),pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) - CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI,portal->AI())->SummonedMobDied(me); + if (Creature* portal = Unit::GetCreature((*me), pInstance->GetData64(DATA_TELEPORTATION_PORTAL))) + CAST_AI(npc_teleportation_portal_vh::npc_teleportation_portalAI, portal->AI())->SummonedMobDied(me); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_REMOVE, 1); } void CreatureStartAttackDoor() @@ -791,7 +791,7 @@ struct violet_hold_trashAI : public npc_escortAI me->SetReactState(REACT_PASSIVE); DoCast(SPELL_DESTROY_DOOR_SEAL); if (pInstance) - pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD,1); + pInstance->SetData(DATA_NPC_PRESENCE_AT_DOOR_ADD, 1); } }; @@ -838,7 +838,7 @@ public: { if (uiCleaveTimer <= diff) { - DoCast(me->getVictim(),SPELL_CLEAVE); + DoCast(me->getVictim(), SPELL_CLEAVE); uiCleaveTimer = 5000; } else uiCleaveTimer -= diff; @@ -846,7 +846,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_IMPALE); + DoCast(pTarget, SPELL_IMPALE); uiImpaleTimer = 4000; } else uiImpaleTimer -= diff; } @@ -855,14 +855,14 @@ public: { if (uiBrutalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_BRUTAL_STRIKE); + DoCast(me->getVictim(), SPELL_BRUTAL_STRIKE); uiBrutalStrikeTimer = 5000; } else uiBrutalStrikeTimer -= diff; if (uiSunderArmorTimer <= diff) { - DoCast(me->getVictim(),SPELL_SUNDER_ARMOR); - uiSunderArmorTimer = urand(8000,10000); + DoCast(me->getVictim(), SPELL_SUNDER_ARMOR); + uiSunderArmorTimer = urand(8000, 10000); } else uiSunderArmorTimer -= diff; DoMeleeAttackIfReady(); @@ -916,7 +916,7 @@ public: { if (uiArcaneExplosionTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION,H_SPELL_ARCANE_EXPLOSION)); + DoCast(DUNGEON_MODE(SPELL_ARCANE_EXPLOSION, H_SPELL_ARCANE_EXPLOSION)); uiArcaneExplosionTimer = 5000; } else uiArcaneExplosionTimer -= diff; @@ -924,7 +924,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BARRAGE,H_SPELL_ARCANE_BARRAGE)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BARRAGE, H_SPELL_ARCANE_BARRAGE)); uiArcainBarrageTimer = 6000; } else uiArcainBarrageTimer -= diff; } @@ -933,7 +933,7 @@ public: { if (uiFrostNovaTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_FROST_NOVA,H_SPELL_FROST_NOVA)); + DoCast(DUNGEON_MODE(SPELL_FROST_NOVA, H_SPELL_FROST_NOVA)); uiFrostNovaTimer = 5000; } else uiFrostNovaTimer -= diff; @@ -941,7 +941,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_FROSTBOLT,H_SPELL_FROSTBOLT)); + DoCast(pTarget, DUNGEON_MODE(SPELL_FROSTBOLT, H_SPELL_FROSTBOLT)); uiFrostboltTimer = 6000; } else uiFrostboltTimer -= diff; } @@ -990,7 +990,7 @@ public: { if (uiArcaneEmpowermentTimer <= diff) { - DoCast(me,SPELL_ARCANE_EMPOWERMENT); + DoCast(me, SPELL_ARCANE_EMPOWERMENT); uiArcaneEmpowermentTimer = 14000; } else uiArcaneEmpowermentTimer -= diff; } @@ -1001,7 +1001,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SPELL_LOCK); + DoCast(pTarget, SPELL_SPELL_LOCK); uiSpellLockTimer = 9000; } else uiSpellLockTimer -= diff; } @@ -1048,14 +1048,14 @@ public: if (uiConcussionBlowTimer <= diff) { - DoCast(me->getVictim(),SPELL_CONCUSSION_BLOW); + DoCast(me->getVictim(), SPELL_CONCUSSION_BLOW); uiConcussionBlowTimer = 5000; } else uiConcussionBlowTimer -= diff; if (uiMagicReflectionTimer <= diff) { DoCast(SPELL_MAGIC_REFLECTION); - uiMagicReflectionTimer = urand(10000,15000); + uiMagicReflectionTimer = urand(10000, 15000); } else uiMagicReflectionTimer -= diff; DoMeleeAttackIfReady(); @@ -1105,7 +1105,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true); if (pTarget) - DoCast(pTarget,SPELL_TACTICAL_BLINK); + DoCast(pTarget, SPELL_TACTICAL_BLINK); uiTacticalBlinkTimer = 6000; TacticalBlinkCasted = true; } else uiTacticalBlinkTimer -= diff; @@ -1116,7 +1116,7 @@ public: if (uiBackstabTimer <= diff) { Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 10, true); - DoCast(pTarget,SPELL_BACKSTAB); + DoCast(pTarget, SPELL_BACKSTAB); TacticalBlinkCasted = false; uiBackstabTimer =1300; } else uiBackstabTimer -= diff; @@ -1167,7 +1167,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_BLAST,H_SPELL_ARCANE_BLAST)); + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_BLAST, H_SPELL_ARCANE_BLAST)); uiArcaneBlastTimer = 6000; } else uiArcaneBlastTimer -= diff; @@ -1175,7 +1175,7 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_SLOW); + DoCast(pTarget, SPELL_SLOW); uiSlowTimer = 5000; } else uiSlowTimer -= diff; } @@ -1186,13 +1186,13 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,SPELL_CHAINS_OF_ICE); + DoCast(pTarget, SPELL_CHAINS_OF_ICE); uiChainsOfIceTimer = 7000; } else uiChainsOfIceTimer -= diff; if (uiConeOfColdTimer <= diff) { - DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD,H_SPELL_CONE_OF_COLD)); + DoCast(DUNGEON_MODE(SPELL_CONE_OF_COLD, H_SPELL_CONE_OF_COLD)); uiConeOfColdTimer = 5000; } else uiConeOfColdTimer -= diff; } @@ -1243,13 +1243,13 @@ public: if (uiMortalStrikeTimer <= diff) { - DoCast(me->getVictim(),SPELL_MORTAL_STRIKE); + DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); uiMortalStrikeTimer = 5000; } else uiMortalStrikeTimer -= diff; if (uiWhirlwindTimer <= diff) { - DoCast(me,SPELL_WHIRLWIND_OF_STEEL); + DoCast(me, SPELL_WHIRLWIND_OF_STEEL); uiWhirlwindTimer = 8000; } else uiWhirlwindTimer -= diff; @@ -1299,15 +1299,15 @@ public: { Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); if (pTarget) - DoCast(pTarget,DUNGEON_MODE(SPELL_ARCANE_STREAM,H_SPELL_ARCANE_STREAM)); - uiArcaneStreamTimer = urand(0,5000)+5000; + DoCast(pTarget, DUNGEON_MODE(SPELL_ARCANE_STREAM, H_SPELL_ARCANE_STREAM)); + uiArcaneStreamTimer = urand(0, 5000)+5000; uiArcaneStreamTimerStartingValueHolder = uiArcaneStreamTimer; } else uiArcaneStreamTimer -= diff; if (uiManaDetonationTimer <= diff && uiArcaneStreamTimer >=1500 && uiArcaneStreamTimer <= uiArcaneStreamTimerStartingValueHolder/2) { - DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION,H_SPELL_MANA_DETONATION)); - uiManaDetonationTimer = urand(2000,6000); + DoCast(DUNGEON_MODE(SPELL_MANA_DETONATION, H_SPELL_MANA_DETONATION)); + uiManaDetonationTimer = urand(2000, 6000); } else uiManaDetonationTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/borean_tundra.cpp index 7b0c5de36d2..a675bcc6f03 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/borean_tundra.cpp @@ -100,13 +100,13 @@ public: case 1: DoCast(me, SPELL_EXPLODE_CART, true); DoCast(me, SPELL_SUMMON_CART, true); - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->SetUInt32Value(GAMEOBJECT_FACTION, 14); uiPhaseTimer = 3000; Phase = 2; break; case 2: - if (GameObject* cart = me->FindNearestGameObject(188160,3)) + if (GameObject* cart = me->FindNearestGameObject(188160, 3)) cart->UseDoorOrButton(); DoCast(me, SPELL_EXPLODE_CART, true); uiPhaseTimer = 3000; @@ -139,7 +139,7 @@ public: case 7: DoCast(me, SPELL_EXPLODE_CART, true); if (Player *caster = Unit::GetPlayer(*me, casterGuid)) - caster->KilledMonster(me->GetCreatureInfo(),me->GetGUID()); + caster->KilledMonster(me->GetCreatureInfo(), me->GetGUID()); uiPhaseTimer = 5000; Phase = 8; break; @@ -362,14 +362,14 @@ public: { if (CAST_PLR(Killer)->GetQuestStatus(11611) == QUEST_STATUS_INCOMPLETE) { - uint8 uiRand = urand(0,99); + uint8 uiRand = urand(0, 99); if (uiRand < 25) { - Killer->CastSpell(me,45532,true); + Killer->CastSpell(me, 45532, true); CAST_PLR(Killer)->KilledMonsterCredit(WARSONG_PEON, 0); } else if (uiRand < 75) - Killer->CastSpell(me, nerubarVictims[urand(0,2)], true); + Killer->CastSpell(me, nerubarVictims[urand(0, 2)], true); } } } @@ -403,7 +403,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_SCOURGE_CAGE, 5.0f)) if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); } @@ -471,7 +471,7 @@ public: { if (setCrateNumber) { - me->AddAura(SPELL_CRATES_CARRIED,me); + me->AddAura(SPELL_CRATES_CARRIED, me); setCrateNumber = false; } @@ -600,7 +600,7 @@ public: if (summon->isSummon()) if (Unit *pTemp = summon->GetSummoner()) if (pTemp->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(),0); + CAST_PLR(pTemp)->KilledMonsterCredit(me->GetEntry(), 0); if (GameObject *go_caribou = me->GetMap()->GetGameObject(go_caribouGUID)) go_caribou->SetGoState(GO_STATE_READY); @@ -742,12 +742,12 @@ public: switch(IntroPhase) { case 1: - //DoScriptText(SAY_WP_1_LUR_START,me); + //DoScriptText(SAY_WP_1_LUR_START, me); IntroPhase = 2; IntroTimer = 7500; break; case 2: - //DoScriptText(SAY_WP_1_LUR_END,me); + //DoScriptText(SAY_WP_1_LUR_END, me); IntroPhase = 3; IntroTimer = 7500; break; @@ -757,12 +757,12 @@ public: IntroTimer = 0; break; case 4: - //DoScriptText(SAY_WP_41_LUR_START,me); + //DoScriptText(SAY_WP_41_LUR_START, me); IntroPhase = 5; IntroTimer = 8000; break; case 5: - //DoScriptText(SAY_WP_41_LUR_END,me); + //DoScriptText(SAY_WP_41_LUR_END, me); IntroPhase = 6; IntroTimer = 2500; break; @@ -889,7 +889,7 @@ public: { if (Player *pHarpooner = Unit::GetPlayer(*me, HarpoonerGUID)) { - pHarpooner->KilledMonsterCredit(26175,0); + pHarpooner->KilledMonsterCredit(26175, 0); pHarpooner->RemoveAura(SPELL_DRAKE_HATCHLING_SUBDUED); SetFollowComplete(); HarpoonerGUID = 0; @@ -1031,13 +1031,13 @@ public: pArthas->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pArthas->SetReactState(REACT_PASSIVE); pArthas->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f,3564.841309f,477.433014f); + pArthas->GetMotionMaster()->MovePoint(0, 3737.374756f, 3564.841309f, 477.433014f); } - if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pTalbot = me->SummonCreature(NPC_COUNSELOR_TALBOT, 3747.23f, 3614.936f, 473.321f, 4.462012f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiTalbot = pTalbot->GetGUID(); pTalbot->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f,3568.882080f,477.433014f); + pTalbot->GetMotionMaster()->MovePoint(0, 3738.000977f, 3568.882080f, 477.433014f); } me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); break; @@ -1084,7 +1084,7 @@ public: case 2: if (pTalbot) { - pTalbot->UpdateEntry(NPC_PRINCE_VALANAR,ALLIANCE); + pTalbot->UpdateEntry(NPC_PRINCE_VALANAR, ALLIANCE); pTalbot->setFaction(14); pTalbot->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); pTalbot->SetReactState(REACT_PASSIVE); @@ -1115,13 +1115,13 @@ public: break; case 6: - if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature* pArlos = me->SummonCreature(NPC_GENERAL_ARLOS, 3745.527100f, 3615.655029f, 473.321533f, 4.447805f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiArlos = pArlos->GetGUID(); pArlos->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); pArlos->GetMotionMaster()->MovePoint(0, 3735.570068f, 3572.419922f, 477.441010f); } - if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN,120000)) + if (Creature *pLeryssa = me->SummonCreature(NPC_LERYSSA, 3749.654541f, 3614.959717f, 473.323486f, 4.524959f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 120000)) { uiLeryssa = pLeryssa->GetGUID(); pLeryssa->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1300,7 +1300,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArthasInPosition = true; } }; @@ -1332,7 +1332,7 @@ public: me->CastSpell(me, SPELL_STUN, true); if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bArlosInPosition = true; } }; @@ -1378,9 +1378,9 @@ public: LeryssaGUID = 0; ArlosGUID = 0; bCheck = false; - uiShadowBoltTimer = urand(5000,12000); - uiDeflectionTimer = urand(20000,25000); - uiSoulBlastTimer = urand (12000,18000); + uiShadowBoltTimer = urand(5000, 12000); + uiDeflectionTimer = urand(20000, 25000); + uiSoulBlastTimer = urand (12000, 18000); } void MovementInform(uint32 uiType, uint32 /*uiId*/) { @@ -1389,7 +1389,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bTalbotInPosition = true; } void UpdateAI(const uint32 uiDiff) @@ -1411,19 +1411,19 @@ public: if (uiShadowBoltTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(5000,12000); + uiShadowBoltTimer = urand(5000, 12000); } else uiShadowBoltTimer -= uiDiff; if (uiDeflectionTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_DEFLECTION); - uiDeflectionTimer = urand(20000,25000); + uiDeflectionTimer = urand(20000, 25000); } else uiDeflectionTimer -= uiDiff; if (uiSoulBlastTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_SOUL_BLAST); - uiSoulBlastTimer = urand (12000,18000); + uiSoulBlastTimer = urand (12000, 18000); } else uiSoulBlastTimer -= uiDiff; } @@ -1447,7 +1447,7 @@ public: pLeryssa->RemoveAura(SPELL_STUN); pLeryssa->ClearUnitState(UNIT_STAT_STUNNED); pLeryssa->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - pLeryssa->GetMotionMaster()->MovePoint(0,3722.114502f, 3564.201660f, 477.441437f); + pLeryssa->GetMotionMaster()->MovePoint(0, 3722.114502f, 3564.201660f, 477.441437f); if (pKiller->GetTypeId() == TYPEID_PLAYER) CAST_PLR(pKiller)->RewardPlayerAndGroupAtEvent(NPC_PRINCE_VALANAR, 0); @@ -1500,7 +1500,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pSummoner)->AI())->bLeryssaInPosition = true; bDone = true; } else @@ -1564,7 +1564,7 @@ public: if (Unit* pThassarian = CAST_SUM(me)->GetSummoner()) { DoScriptText(SAY_THASSARIAN_7, pThassarian); - CAST_AI(npc_thassarian::npc_thassarianAI,CAST_CRE(pThassarian)->AI())->uiPhase = 16; + CAST_AI(npc_thassarian::npc_thassarianAI, CAST_CRE(pThassarian)->AI())->uiPhase = 16; } uiPhaseTimer = 5000; Phase = 0; @@ -1765,7 +1765,7 @@ public: if (Player *pCaster = Unit::GetPlayer(*me, CasterGUID)) { DoScriptText(SAY_IMPRISIONED_BERYL_5, me); - pCaster->KilledMonsterCredit(25478,0); + pCaster->KilledMonsterCredit(25478, 0); uiStep = 6; } } @@ -1875,7 +1875,7 @@ public: me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); break; case 20: - me->SetPhaseMask(1,true); + me->SetPhaseMask(1, true); DoScriptText(SAY_5, me); me->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); if (pPlayer) @@ -1954,7 +1954,7 @@ public: { if (Bonker_agro == 0) { - DoScriptText(SAY_bonker_1,me); + DoScriptText(SAY_bonker_1, me); Bonker_agro++; } DoMeleeAttackIfReady(); @@ -2046,7 +2046,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetGoState(GO_STATE_ACTIVE); @@ -2063,7 +2063,7 @@ public: { Position pos; me->GetRandomNearPosition(pos, 10.0f); - me->GetMotionMaster()->MovePoint(0,pos); + me->GetMotionMaster()->MovePoint(0, pos); bStarted = false; } else uiTimer -= diff; @@ -2085,7 +2085,7 @@ public: GameObject* pTrap; for (uint8 i = 0; i < MammothTrapsNum; ++i) { - pTrap = me->FindNearestGameObject(MammothTraps[i],11.0f); + pTrap = me->FindNearestGameObject(MammothTraps[i], 11.0f); if (pTrap) { pTrap->SetLootState(GO_JUST_DEACTIVATED); @@ -2132,7 +2132,7 @@ public: { Quest const* qInfo = sObjectMgr->GetQuestTemplate(QUEST_YOU_RE_NOT_SO_BIG_NOW); if (qInfo) - CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0],0); + CAST_PLR(pKiller)->KilledMonsterCredit(qInfo->ReqCreatureOrGOId[0], 0); } } }; @@ -2162,7 +2162,7 @@ public: uint32 uiExplosionTimer; void Reset() { - uiExplosionTimer = urand(5000,10000); + uiExplosionTimer = urand(5000, 10000); } void UpdateAI(const uint32 diff) { @@ -2177,7 +2177,7 @@ public: { Player* pOwner = uOwner->ToPlayer(); if (pOwner && pOwner->GetQuestStatus(QUEST_BURY_THOSE_COCKROACHES) == QUEST_STATUS_INCOMPLETE) - pOwner->KilledMonsterCredit(cCredit->GetEntry(),cCredit->GetGUID()); + pOwner->KilledMonsterCredit(cCredit->GetEntry(), cCredit->GetGUID()); } } } @@ -2216,7 +2216,7 @@ public: void Reset() { - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } void UpdateAI(const uint32 diff) @@ -2224,12 +2224,12 @@ public: if (uiTimer <= diff) { me->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); - GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1,10); + GameObject* pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_1, 10); if (!pCannon) - pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2,10); + pCannon = me->FindNearestGameObject(GO_VALIANCE_KEEP_CANNON_2, 10); if (pCannon) pCannon->Use(me); - uiTimer = urand(13000,18000); + uiTimer = urand(13000, 18000); } else uiTimer -= diff; @@ -2299,10 +2299,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() > 6680) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_CALANDRA: @@ -2313,10 +2313,10 @@ public: { if (Creature* pOrb = *itr) if ((pOrb->GetPositionY() < 6680) && (pOrb->GetPositionY() > 6630)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; case NPC_WARMAGE_WATKINS: @@ -2327,10 +2327,10 @@ public: { if (Creature* pOrb = *itr) if (pOrb->GetPositionY() < 6630) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } } - m_uiTimer = urand(90000,120000); + m_uiTimer = urand(90000, 120000); } break; } @@ -2403,10 +2403,10 @@ public: void Reset() { if (uiEmoteState) - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,uiEmoteState); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, uiEmoteState); if (uiNpcFlags) - me->SetUInt32Value(UNIT_NPC_FLAGS,uiNpcFlags); + me->SetUInt32Value(UNIT_NPC_FLAGS, uiNpcFlags); uiEventTimer = 0; uiEventPhase = 0; @@ -2439,7 +2439,7 @@ public: void AttackPlayer() { me->setFaction(14); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) me->AI()->AttackStart(pPlayer); } @@ -2453,18 +2453,18 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - me->SetUInt32Value(UNIT_NPC_EMOTESTATE,0); - DoScriptText(SAY_HIDDEN_CULTIST_1,me); + me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); + DoScriptText(SAY_HIDDEN_CULTIST_1, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_GUARD_MITCHELLS: - DoScriptText(SAY_HIDDEN_CULTIST_2,me); + DoScriptText(SAY_HIDDEN_CULTIST_2, me); uiEventTimer = 5000; uiEventPhase = 2; break; case NPC_TOM_HEGGER: - DoScriptText(SAY_HIDDEN_CULTIST_3,me); + DoScriptText(SAY_HIDDEN_CULTIST_3, me); uiEventTimer = 5000; uiEventPhase = 2; break; @@ -2474,8 +2474,8 @@ public: switch(me->GetEntry()) { case NPC_SALTY_JOHN_THORPE: - DoScriptText(SAY_HIDDEN_CULTIST_4,me); - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + DoScriptText(SAY_HIDDEN_CULTIST_4, me); + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { me->SetInFront(pPlayer); me->SendMovementFlagUpdate(); diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/crystalsong_forest.cpp index 92040aed8d8..277f9d98091 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/crystalsong_forest.cpp @@ -87,13 +87,13 @@ public: }else { if (!uiTargetGUID) - if (Creature* pOrb = GetClosestCreatureWithEntry(me,NPC_TRANSITUS_SHIELD_DUMMY,32.0f)) + if (Creature* pOrb = GetClosestCreatureWithEntry(me, NPC_TRANSITUS_SHIELD_DUMMY, 32.0f)) uiTargetGUID = pOrb->GetGUID(); } - if (Creature* pOrb = me->GetCreature(*me,uiTargetGUID)) - DoCast(pOrb,SPELL_TRANSITUS_SHIELD_BEAM); + if (Creature* pOrb = me->GetCreature(*me, uiTargetGUID)) + DoCast(pOrb, SPELL_TRANSITUS_SHIELD_BEAM); } }; diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/grizzly_hills.cpp index 67e0ad5d776..fa08e8cafb4 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/grizzly_hills.cpp @@ -195,7 +195,7 @@ public: if (Unit::GetCreature(*me, MrfloppyGUID)) { DoScriptText(SAY_WORGHAGGRO1, me); - me->SummonCreature(NPC_HUNGRY_WORG,me->GetPositionX()+5,me->GetPositionY()+2,me->GetPositionZ()+1,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + me->SummonCreature(NPC_HUNGRY_WORG, me->GetPositionX()+5, me->GetPositionY()+2, me->GetPositionZ()+1, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; case 11: @@ -206,7 +206,7 @@ public: if (Creature *Mrfloppy = Unit::GetCreature(*me, MrfloppyGUID)) Mrfloppy->GetMotionMaster()->MovePoint(0, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ()); DoScriptText(SAY_WORGRAGGRO3, me); - if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG,me->GetPositionX()+10,me->GetPositionY()+8,me->GetPositionZ()+2,3.229f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000)) + if (Creature *RWORG = me->SummonCreature(NPC_RAVENOUS_WORG, me->GetPositionX()+10, me->GetPositionY()+8, me->GetPositionZ()+2, 3.229f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000)) { RWORG->setFaction(35); RWORGGUID = RWORG->GetGUID(); @@ -217,7 +217,7 @@ public: { if (Creature *RWORG = Unit::GetCreature(*me, RWORGGUID)) RWORG->GetMotionMaster()->MovePoint(0, Mrfloppy->GetPositionX(), Mrfloppy->GetPositionY(), Mrfloppy->GetPositionZ()); - DoCast(Mrfloppy,SPELL_MRFLOPPY); + DoCast(Mrfloppy, SPELL_MRFLOPPY); } break; case 19: @@ -242,7 +242,7 @@ public: RWORG->Kill(Mrfloppy); Mrfloppy->ExitVehicle(); RWORG->setFaction(14); - RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10,RWORG->GetPositionY()+80,RWORG->GetPositionZ()); + RWORG->GetMotionMaster()->MovePoint(0, RWORG->GetPositionX()+10, RWORG->GetPositionY()+80, RWORG->GetPositionZ()); DoScriptText(SAY_VICTORY2, me); } } @@ -600,7 +600,7 @@ public: && caster->ToPlayer()->GetQuestStatus(12288) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(CREDIT_NPC, 0); - DoScriptText(RAND(RANDOM_SAY_1,RANDOM_SAY_2,RANDOM_SAY_3),caster); + DoScriptText(RAND(RANDOM_SAY_1, RANDOM_SAY_2, RANDOM_SAY_3), caster); if(me->IsStandState()) me->GetMotionMaster()->MovePoint(1, me->GetPositionX()+7, me->GetPositionY()+7, me->GetPositionZ()); else @@ -656,7 +656,7 @@ public: void Reset() { - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } void UpdateAI(const uint32 uiDiff) @@ -667,7 +667,7 @@ public: if (uiChargedSentryTotem <= uiDiff) { DoCast(SPELL_CHARGED_SENTRY_TOTEM); - uiChargedSentryTotem = urand(10000,12000); + uiChargedSentryTotem = urand(10000, 12000); } else uiChargedSentryTotem -= uiDiff; @@ -728,7 +728,7 @@ public: { uiPlayerGUID = 0; uiTimer = 0; - uiChopTimer = urand(10000,12500); + uiChopTimer = urand(10000, 12500); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); } @@ -776,7 +776,7 @@ public: if (uiChopTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_CHOP); - uiChopTimer = urand(10000,12000); + uiChopTimer = urand(10000, 12000); } else uiChopTimer -= uiDiff; diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/howling_fjord.cpp index 1729f5f55d5..3810d445b61 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/howling_fjord.cpp @@ -114,22 +114,22 @@ public: me->DespawnOrUnsummon(); break; case 5: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 6: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; case 8: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(false); break; case 9: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); break; case 10: @@ -139,7 +139,7 @@ public: SetRun(false); break; case 14: - if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER,10.0f)) + if (Unit* Trigger = me->FindNearestCreature(NPC_HANES_FIRE_TRIGGER, 10.0f)) Trigger->CastSpell(Trigger, SPELL_COSMETIC_LOW_POLY_FIRE, false); SetRun(true); break; @@ -400,7 +400,7 @@ public: void JustSummoned(Creature* pSummon) { - if (Player* pPlayer = me->GetPlayer(*me,uiPlayerGUID)) + if (Player* pPlayer = me->GetPlayer(*me, uiPlayerGUID)) { if (pPlayer->isAlive()) { diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/icecrown.cpp index b29e3929722..6075bc52d25 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/icecrown.cpp @@ -187,7 +187,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->SummonCreature(NPC_ARGENT_VALIANT,8575.451f,952.472f,547.554f,0.38f); + pCreature->SummonCreature(NPC_ARGENT_VALIANT, 8575.451f, 952.472f, 547.554f, 0.38f); } return true; } @@ -214,7 +214,7 @@ public: { npc_argent_valiantAI(Creature* pCreature) : ScriptedAI(pCreature) { - pCreature->GetMotionMaster()->MovePoint(0,8599.258f,963.951f,547.553f); + pCreature->GetMotionMaster()->MovePoint(0, 8599.258f, 963.951f, 547.553f); pCreature->setFaction(35); //wrong faction in db? } @@ -240,10 +240,10 @@ public: if (uiDamage > me->GetHealth() && pDoneBy->GetTypeId() == TYPEID_PLAYER) { uiDamage = 0; - CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT,0); + CAST_PLR(pDoneBy)->KilledMonsterCredit(NPC_ARGENT_VALIANT_CREDIT, 0); me->setFaction(35); me->DespawnOrUnsummon(5000); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); EnterEvadeMode(); } } diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 7d2e0c2e2a1..f7011e00e6a 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -56,7 +56,7 @@ class npc_four_car_garage : public CreatureScript return; } - me->CastSpell(who,spellId,true); + me->CastSpell(who, spellId, true); } } }; diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/sholazar_basin.cpp index 53dfca49d5f..f03236f86a4 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/sholazar_basin.cpp @@ -101,7 +101,7 @@ public: if (Player* pPlayer = GetPlayerForEscort()) pPlayer->GroupEventHappens(QUEST_FORTUNATE_MISUNDERSTANDINGS, me); // me->RestoreFaction(); - DoScriptText(SAY_END_IRO,me); + DoScriptText(SAY_END_IRO, me); SetRun(false); break; } @@ -307,7 +307,7 @@ public: if (me->isSummon()) if (Unit* pSummoner = CAST_SUM(me)->GetSummoner()) if (pSummoner) - me->GetMotionMaster()->MovePoint(0,pSummoner->GetPositionX(),pSummoner->GetPositionY(),pSummoner->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, pSummoner->GetPositionX(), pSummoner->GetPositionY(), pSummoner->GetPositionZ()); } void UpdateAI(const uint32 /*uiDiff*/) diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/storm_peaks.cpp index a8575d72ee7..3f6003e8903 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/storm_peaks.cpp @@ -213,7 +213,7 @@ public: { me->SetReactState(REACT_PASSIVE); - if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE,5.0f)) + if (GameObject* pGO = me->FindNearestGameObject(GO_RUSTY_CAGE, 5.0f)) { if (pGO->GetGoState() == GO_STATE_ACTIVE) pGO->SetGoState(GO_STATE_READY); diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zuldrak.cpp index 2bf418a2130..befe34faeed 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zuldrak.cpp @@ -92,7 +92,7 @@ public: if (Creature* pRageclaw = Unit::GetCreature(*me, RageclawGUID)) { UnlockRageclaw(pCaster); - pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(),RageclawGUID); + pCaster->ToPlayer()->KilledMonster(pRageclaw->GetCreatureInfo(), RageclawGUID); me->DisappearAndDie(); } else @@ -122,7 +122,7 @@ const char * SAY_RAGECLAW_1 = "I poop on you, trollses!"; const char * SAY_RAGECLAW_2 = "ARRRROOOOGGGGAAAA!"; const char * SAY_RAGECLAW_3 = "No more mister nice wolvar!"; -#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1,SAY_RAGECLAW_2,SAY_RAGECLAW_3) +#define SAY_RAGECLAW RAND(SAY_RAGECLAW_1, SAY_RAGECLAW_2, SAY_RAGECLAW_3) class npc_captured_rageclaw : public CreatureScript { @@ -292,10 +292,10 @@ struct BossAndAdd static BossAndAdd Boss[]= { - {NPC_GARGORAL,NPC_FIEND_WATER,SPELL_CRASHING_WAVE,SPELL_ORB_OF_WATER}, - {NPC_AZ_BARIN,NPC_FIEND_AIR,SPELL_BLAST_OF_AIR,SPELL_ORB_OF_STORMS}, - {NPC_DUKE_SINGEN,NPC_FIEND_FIRE,SPELL_MAGMA_WAVE,SPELL_ORB_OF_FLAME}, - {NPC_ERATHIUS,NPC_FIEND_EARTH,SPELL_SHOCKWAVE,SPELL_BOULDER}, + {NPC_GARGORAL, NPC_FIEND_WATER, SPELL_CRASHING_WAVE, SPELL_ORB_OF_WATER}, + {NPC_AZ_BARIN, NPC_FIEND_AIR, SPELL_BLAST_OF_AIR, SPELL_ORB_OF_STORMS}, + {NPC_DUKE_SINGEN, NPC_FIEND_FIRE, SPELL_MAGMA_WAVE, SPELL_ORB_OF_FLAME}, + {NPC_ERATHIUS, NPC_FIEND_EARTH, SPELL_SHOCKWAVE, SPELL_BOULDER}, }; const Position SpawnPosition[] = @@ -457,7 +457,7 @@ public: std::string sText = ("The grand Amphitheater of Anguish awaits, " + std::string(pPlayer->GetName()) + ". Remember, once a battle starts you have to stay in the area. WIN OR DIE!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 9; } @@ -468,7 +468,7 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 3000; uiPhase = 8; } @@ -484,19 +484,19 @@ public: return; std::string sText = ("Here we are once again, ladies and gentlemen. The epic struggle between life and death in the Amphitheater of Anguish! For this round we have " + std::string(pPlayer->GetName()) + " versus the hulking jormungar, Yg... Yggd? Yggdoze? Who comes up with these names?! " + std::string(pPlayer->GetName()) + " versus big worm!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 10000; uiPhase = 10; } break; case 10: me->SummonCreature(NPC_YGGDRAS, SpawnPosition[1], TEMPSUMMON_CORPSE_DESPAWN, 1000); - DoScriptText(EMOTE_YGGDRAS_SPAWN,me); + DoScriptText(EMOTE_YGGDRAS_SPAWN, me); uiPhase = 0; break; case 11: if (Creature* pCreature = me->SummonCreature(NPC_STINKBEARD, SpawnPosition[0], TEMPSUMMON_CORPSE_DESPAWN, 1000)) - DoScriptText(SAY_STINKBEARD_SPAWN,pCreature); + DoScriptText(SAY_STINKBEARD_SPAWN, pCreature); uiPhase = 0; break; case 12: @@ -505,20 +505,20 @@ public: return; std::string sText = ("Prepare to make you stand, " + std::string(pPlayer->GetName()) + "! Get in the Amphitheater and stand ready! Remember, you and your opponent must stay in the arena at all times or you will be disqualified!"); - me->MonsterSay(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterSay(sText.c_str(), LANG_UNIVERSAL, 0); uiTimer = 5000; uiPhase = 13; } break; case 13: - DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN,me); + DoScriptText(SAY_GURGTHOCK_ELEMENTAL_SPAWN, me); uiTimer = 3000; uiPhase = 14; break; case 14: - uiBossRandom = urand(0,3); - if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss,SpawnPosition[2],TEMPSUMMON_CORPSE_DESPAWN, 1000)) - pCreature->AI()->SetData(1,uiBossRandom); + uiBossRandom = urand(0, 3); + if (Creature* pCreature = me->SummonCreature(Boss[uiBossRandom].uiBoss, SpawnPosition[2], TEMPSUMMON_CORPSE_DESPAWN, 1000)) + pCreature->AI()->SetData(1, uiBossRandom); uiPhase = 0; break; } @@ -624,7 +624,7 @@ public: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); uiBattleShoutTimer = 7000; } @@ -646,7 +646,7 @@ public: if (uiFishyScentTimer <= uiDiff) { - if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pAffected = SelectTarget(SELECT_TARGET_RANDOM, 0)) { DoCast(pAffected, SPELL_FISHY_SCENT); AffectedGUID = pAffected->GetGUID(); @@ -656,7 +656,7 @@ public: if (!bSummoned && !HealthAbovePct(50)) { - DoScriptText(SAY_CALL_FOR_HELP ,me); + DoScriptText(SAY_CALL_FOR_HELP , me); //DoCast(me->getVictim(), SPELL_SUMMON_WHISKER); petai is not working correctly??? if (Creature *pWhisker = me->SummonCreature(NPC_WHISKER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 0)) @@ -723,7 +723,7 @@ public: { npc_korrak_bloodragerAI(Creature* pCreature) : npc_escortAI(pCreature) { - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -746,7 +746,7 @@ public: switch(uiI) { case 6: - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(), 0); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); break; @@ -844,7 +844,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -872,7 +872,7 @@ public: if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) { std::string sText = (std::string(pKiller->GetName()) + " has defeated Yg.. Yggg-really big worm!"); - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } if (Player* pPlayer = pKiller->GetCharmerOrOwnerPlayerOrPlayerItself()) @@ -916,7 +916,7 @@ public: { me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); me->SetReactState(REACT_PASSIVE); - Start(true,true, 0, NULL); + Start(true, true, 0, NULL); SetDespawnAtEnd(false); } @@ -928,7 +928,7 @@ public: void Reset() { - me->AddAura(SPELL_THUNDERBLADE,me); + me->AddAura(SPELL_THUNDERBLADE, me); uiKnockAwayTimer = 10000; uiStinkyBeardTimer = 15000; bEnrage = false; @@ -966,7 +966,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1015,7 +1015,7 @@ public: pPlayer->GetCharmerOrOwnerPlayerOrPlayerItself()->GroupEventHappens(QUEST_AMPHITHEATER_ANGUISH_MAGNATAUR, pKiller); std::string sText = ("And with AUTHORITY, " + std::string(pKiller->GetName()) + " dominates the magnataur lord! Stinkbeard's clan is gonna miss him back home in the Dragonblight!"); - me->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + me->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1051,7 +1051,7 @@ public: { uiBossRandom = 0; uiSpellEntry = 0; - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); bAddAttack = false; } @@ -1074,9 +1074,9 @@ public: for (uint8 uiI = 0; uiI < 16 ; uiI++) { - if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd,AddSpawnPosition[uiI])) + if (Creature* pSummon = me->SummonCreature(Boss[uiBossRandom].uiAdd, AddSpawnPosition[uiI])) { - pSummon->AI()->SetData(1,uiBossRandom); + pSummon->AI()->SetData(1, uiBossRandom); SummonList.push_back(pSummon->GetGUID()); } } @@ -1111,7 +1111,7 @@ public: if (pUnit->GetPositionZ() <= 286.276f) { me->getThreatManager().resetAllAggro(); - me->AddThreat(pUnit,5.0f); + me->AddThreat(pUnit, 5.0f); break; } EnterEvadeMode(); @@ -1123,7 +1123,7 @@ public: { DoCastVictim(Boss[uiBossRandom].uiSpell); - uiElementalSpellTimer = urand(5000,8000); + uiElementalSpellTimer = urand(5000, 8000); } else uiElementalSpellTimer -= uiDiff; if (!bAddAttack && !HealthAbovePct(20)) @@ -1160,7 +1160,7 @@ public: std::string sText = (std::string(pKiller->GetName()) + " is victorious once more!"); if (Unit* pSummoner = me->ToTempSummon()->GetSummoner()) - pSummoner->MonsterYell(sText.c_str(),LANG_UNIVERSAL,0); + pSummoner->MonsterYell(sText.c_str(), LANG_UNIVERSAL, 0); } }; @@ -1192,7 +1192,7 @@ public: me->GetMotionMaster()->MoveIdle(); uiSpell = 0; - uiMissleTimer = urand(2000,7000); + uiMissleTimer = urand(2000, 7000); } void AttackStart(Unit* pWho) @@ -1219,8 +1219,8 @@ public: { if (uiMissleTimer <= uiDiff) { - DoCast(me,uiSpell); // this spell is not supported ... YET! - uiMissleTimer = urand(2000,7000); + DoCast(me, uiSpell); // this spell is not supported ... YET! + uiMissleTimer = urand(2000, 7000); } else uiMissleTimer -= uiDiff; } @@ -1322,14 +1322,14 @@ public: // say random text me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - DoScriptText(RAND(SAY_RECRUIT_1,SAY_RECRUIT_2,SAY_RECRUIT_3), me); + DoScriptText(RAND(SAY_RECRUIT_1, SAY_RECRUIT_2, SAY_RECRUIT_3), me); m_uiTimer = 3000; m_uiPhase = 2; break; case 2: // walk forward me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - me->GetMotionMaster()->MovePoint(0,me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); + me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + (cos(m_heading) * 10), me->GetPositionY() + (sin(m_heading) * 10), me->GetPositionZ()); m_uiTimer = 5000; m_uiPhase = 3; break; @@ -1401,11 +1401,11 @@ public: { if (pPlayer->GetQuestStatus(QUEST_OUR_ONLY_HOPE) == QUEST_STATUS_INCOMPLETE) { - Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY,20.0f); + Creature* pGymerDummy = pGO->FindNearestCreature(NPC_GYMER_DUMMY, 20.0f); if (pGymerDummy) { pGO->UseDoorOrButton(); - pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(),pGymerDummy->GetGUID()); + pPlayer->KilledMonsterCredit(pGymerDummy->GetEntry(), pGymerDummy->GetGUID()); pGymerDummy->CastSpell(pGymerDummy, 55529, true); pGymerDummy->DisappearAndDie(); } |