diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
70 files changed, 918 insertions, 918 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index c66eb20f3c7..424ddcc16e4 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -30,7 +30,7 @@ enum eSpells #define GOSSIP_ITEM_MORRIDUNE "Please port me to Darnassus" -const Position HomePosition = {-815.817f,-145.299f,-25.870f, 0}; +const Position HomePosition = {-815.817f, -145.299f, -25.870f, 0}; class go_blackfathom_altar : public GameObjectScript { @@ -40,7 +40,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGo*/) { if (!pPlayer->HasAura(SPELL_BLESSING_OF_BLACKFATHOM)) - pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM,pPlayer); + pPlayer->AddAura(SPELL_BLESSING_OF_BLACKFATHOM, pPlayer); return true; } @@ -102,9 +102,9 @@ public: { bFlee = false; - uiRavageTimer = urand(5000,8000); - uiFrostNovaTimer = urand(9000,12000); - uiFrostBoltVolleyTimer = urand(2000,4000); + uiRavageTimer = urand(5000, 8000); + uiFrostNovaTimer = urand(9000, 12000); + uiFrostBoltVolleyTimer = urand(2000, 4000); } void AttackPlayer() @@ -143,7 +143,7 @@ public: if (uiRavageTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_RAVAGE); - uiRavageTimer = urand(9000,14000); + uiRavageTimer = urand(9000, 14000); } else uiRavageTimer -= uiDiff; break; } @@ -161,17 +161,17 @@ public: { if (uiFrostBoltVolleyTimer <= uiDiff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { if (pTarget) DoCast(pTarget, SPELL_FROST_BOLT_VOLLEY); } - uiFrostBoltVolleyTimer = urand(5000,8000); + uiFrostBoltVolleyTimer = urand(5000, 8000); } else uiFrostBoltVolleyTimer -= uiDiff; if (uiFrostNovaTimer <= uiDiff) { - DoCastAOE(SPELL_FROST_NOVA,false); - uiFrostNovaTimer = urand(25000,30000); + DoCastAOE(SPELL_FROST_NOVA, false); + uiFrostNovaTimer = urand(25000, 30000); } else uiFrostNovaTimer -= uiDiff; break; } @@ -207,7 +207,7 @@ public: switch(uiAction) { case GOSSIP_ACTION_INFO_DEF+1: - pPlayer->TeleportTo(1,9952.239f,2284.277f,1341.394f,1.595f); + pPlayer->TeleportTo(1, 9952.239f, 2284.277f, 1341.394f, 1.595f); pPlayer->CLOSE_GOSSIP_MENU(); break; } @@ -231,9 +231,9 @@ public: { npc_morriduneAI(Creature* pCreature) : npc_escortAI(pCreature) { - DoScriptText(SAY_MORRIDUNE_1,pCreature); + DoScriptText(SAY_MORRIDUNE_1, pCreature); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - Start(false,false,0); + Start(false, false, 0); } void WaypointReached(uint32 uiPoint) @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2,me); + DoScriptText(SAY_MORRIDUNE_2, me); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp index 3580b3d4c30..fabe4ce7526 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp @@ -48,7 +48,7 @@ public: void Reset() { - uiPoisonCloudTimer = urand(5000,9000); + uiPoisonCloudTimer = urand(5000, 9000); bIsEnraged = false; if (pInstance) pInstance->SetData(TYPE_AKU_MAI, NOT_STARTED); @@ -74,12 +74,12 @@ public: if (uiPoisonCloudTimer < diff) { DoCastVictim(SPELL_POISON_CLOUD); - uiPoisonCloudTimer = urand(25000,50000); + uiPoisonCloudTimer = urand(25000, 50000); } else uiPoisonCloudTimer -= diff; if (!bIsEnraged && HealthBelowPct(30)) { - DoCast(me,SPELL_FRENZIED_RAGE); + DoCast(me, SPELL_FRENZIED_RAGE); bIsEnraged = true; } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp index 9eec90ad02f..88b6382c105 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_gelihast.cpp @@ -46,7 +46,7 @@ public: void Reset() { - uiNetTimer = urand(2000,4000); + uiNetTimer = urand(2000, 4000); if (pInstance) pInstance->SetData(TYPE_GELIHAST, NOT_STARTED); } @@ -71,7 +71,7 @@ public: if (uiNetTimer < diff) { DoCastVictim(SPELL_NET); - uiNetTimer = urand(4000,7000); + uiNetTimer = urand(4000, 7000); } else uiNetTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 5833cb2d123..471d4663b0c 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -56,8 +56,8 @@ public: void Reset() { - uiMindBlastTimer = urand(2000,5000); - uiSleepTimer = urand(9000,12000); + uiMindBlastTimer = urand(2000, 5000); + uiSleepTimer = urand(9000, 12000); if (pInstance) pInstance->SetData(TYPE_KELRIS, NOT_STARTED); } @@ -84,7 +84,7 @@ public: if (uiMindBlastTimer < diff) { DoCastVictim(SPELL_MIND_BLAST); - uiMindBlastTimer = urand(7000,9000); + uiMindBlastTimer = urand(7000, 9000); } else uiMindBlastTimer -= diff; if (uiSleepTimer < diff) @@ -94,7 +94,7 @@ public: DoScriptText(SAY_SLEEP, me); DoCast(pTarget, SPELL_SLEEP); } - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp index c1fb711e5fd..0b0e9076fc1 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp @@ -102,7 +102,7 @@ public: m_uiTwilightLordKelrisGUID = creature->GetGUID(); break; case NPC_LORGUS_JETT: - creature->SetHomePosition(LorgusPosition[urand(0,3)]); + creature->SetHomePosition(LorgusPosition[urand(0, 3)]); break; } } @@ -135,7 +135,7 @@ public: break; case GO_AKU_MAI_DOOR: if (m_auiEncounter[2] == DONE) - HandleGameObject(0,true,go); + HandleGameObject(0, true, go); m_uiMainDoorGUID = go->GetGUID(); break; } @@ -157,7 +157,7 @@ public: if (GameObject* go = instance->GetGameObject(m_uiAltarOfTheDeepsGUID)) { go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); - go->SummonCreature(NPC_MORRIDUNE,SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); + go->SummonCreature(NPC_MORRIDUNE, SpawnsLocation[4], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); } break; case DATA_FIRE: @@ -206,7 +206,7 @@ public: case DATA_EVENT: uiDeathTimes = uiData; if (uiDeathTimes == 18) - HandleGameObject(m_uiMainDoorGUID,true); + HandleGameObject(m_uiMainDoorGUID, true); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 3bd68634571..978b0b822b1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -106,7 +106,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -130,7 +130,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -177,8 +177,8 @@ public: if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CARRION_SWARM); - SwarmTimer = urand(45000,60000); - switch (urand(0,1)) + SwarmTimer = urand(45000, 60000); + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SWARM1); @@ -196,10 +196,10 @@ public: for (uint8 i = 0; i < 3; ++i) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) - pTarget->CastSpell(pTarget,SPELL_SLEEP,true); + pTarget->CastSpell(pTarget, SPELL_SLEEP, true); } SleepTimer = 60000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_SLEEP1); @@ -214,13 +214,13 @@ public: if (AuraTimer <= diff) { DoCast(me, SPELL_VAMPIRIC_AURA, true); - AuraTimer = urand(10000,20000); + AuraTimer = urand(10000, 20000); } else AuraTimer -= diff; if (InfernoTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_INFERNO1); @@ -297,7 +297,7 @@ public: { if (AnetheronGUID) { - Creature* boss = Unit::GetCreature((*me),AnetheronGUID); + Creature* boss = Unit::GetCreature((*me), AnetheronGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index e2fa3a69f96..8b2aa35e2ce 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -194,9 +194,9 @@ public: { if (ChangeTargetTimer <= diff) { - if (Unit *temp = Unit::GetUnit(*me,TargetGUID)) + if (Unit *temp = Unit::GetUnit(*me, TargetGUID)) { - me->GetMotionMaster()->MoveFollow(temp,0.0f,0.0f); + me->GetMotionMaster()->MoveFollow(temp, 0.0f, 0.0f); TargetGUID = 0; } else @@ -274,9 +274,9 @@ public: DrainNordrassilTimer = 0; FearTimer = 42000; AirBurstTimer = 30000; - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); DoomfireTimer = 20000; - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); SoulChargeCount = 0; MeleeRangeCheckTimer = 15000; HandOfDeathTimer = 2000; @@ -303,7 +303,7 @@ public: void KilledUnit(Unit * victim) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); if (victim && (victim->GetTypeId() == TYPEID_PLAYER)) GainSoulCharge(CAST_PLR(victim)); @@ -330,7 +330,7 @@ public: break; } - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); ++SoulChargeCount; } @@ -397,12 +397,12 @@ public: if (summoned->GetEntry() == CREATURE_DOOMFIRE) { - summoned->CastSpell(summoned,SPELL_DOOMFIRE_SPAWN,false); - summoned->CastSpell(summoned,SPELL_DOOMFIRE,true,0,0,me->GetGUID()); + summoned->CastSpell(summoned, SPELL_DOOMFIRE_SPAWN, false); + summoned->CastSpell(summoned, SPELL_DOOMFIRE, true, 0, 0, me->GetGUID()); if (Unit *DoomfireSpirit = Unit::GetUnit(*me, DoomfireSpiritGUID)) { - summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit,0.0f,0.0f); + summoned->GetMotionMaster()->MoveFollow(DoomfireSpirit, 0.0f, 0.0f); DoomfireSpiritGUID = 0; } } @@ -412,11 +412,11 @@ public: void SummonDoomfire(Unit *pTarget) { me->SummonCreature(CREATURE_DOOMFIRE_SPIRIT, - pTarget->GetPositionX()+15.0f,pTarget->GetPositionY()+15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()+15.0f, pTarget->GetPositionY()+15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); me->SummonCreature(CREATURE_DOOMFIRE, - pTarget->GetPositionX()-15.0f,pTarget->GetPositionY()-15.0f,pTarget->GetPositionZ(),0, + pTarget->GetPositionX()-15.0f, pTarget->GetPositionY()-15.0f, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 27000); } @@ -428,7 +428,7 @@ public: uint32 chargeSpell = 0; uint32 unleashSpell = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: chargeSpell = SPELL_SOUL_CHARGE_RED; @@ -453,7 +453,7 @@ public: } if (HasCast) - SoulChargeTimer = urand(2000,30000); + SoulChargeTimer = urand(2000, 30000); } void UpdateAI(const uint32 diff) @@ -584,18 +584,18 @@ public: if (GripOfTheLegionTimer <= diff) { DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); - GripOfTheLegionTimer = urand(5000,25000); + GripOfTheLegionTimer = urand(5000, 25000); } else GripOfTheLegionTimer -= diff; if (AirBurstTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_AIR_BURST1, me); else DoScriptText(SAY_AIR_BURST2, me); DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank - AirBurstTimer = urand(25000,40000); + AirBurstTimer = urand(25000, 40000); } else AirBurstTimer -= diff; if (FearTimer <= diff) @@ -606,7 +606,7 @@ public: if (DoomfireTimer <= diff) { - if (urand(0,1)) + if (urand(0, 1)) DoScriptText(SAY_DOOMFIRE1, me); else DoScriptText(SAY_DOOMFIRE2, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 3959337bc49..77a3549dbc3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -99,7 +99,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -123,7 +123,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -166,13 +166,13 @@ public: if (RainTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,30,true), SPELL_RAIN_OF_FIRE); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true), SPELL_RAIN_OF_FIRE); RainTimer = 20000+rand()%15000; } else RainTimer -= diff; if (DoomTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,1,100,true), SPELL_DOOM);//never on tank + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_DOOM);//never on tank DoomTimer = 45000+rand()%5000; } else DoomTimer -= diff; @@ -267,7 +267,7 @@ public: { if (AzgalorGUID) { - Creature* boss = Unit::GetCreature((*me),AzgalorGUID); + Creature* boss = Unit::GetCreature((*me), AzgalorGUID); if (!boss || (boss && boss->isDead())) { me->setDeathState(JUST_DIED); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index fc3abbaab9f..86e1348f399 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -118,7 +118,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -184,14 +184,14 @@ public: Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER && pTarget->getPowerType() == POWER_MANA) { - pTarget->CastSpell(pTarget, SPELL_MARK,true);//only cast on mana users + pTarget->CastSpell(pTarget, SPELL_MARK, true);//only cast on mana users } } MarkTimerBase -= 5000; if (MarkTimerBase < 5500) MarkTimerBase = 5500; MarkTimer = MarkTimerBase; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: DoPlaySoundToSet(me, SOUND_MARK1); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 295727c44ac..fdd046b454f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -94,7 +94,7 @@ public: void KilledUnit(Unit * /*victim*/) { - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_ONSLAY1); @@ -114,7 +114,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } @@ -165,7 +165,7 @@ public: { DoCast(me->getVictim(), SPELL_DEATH_AND_DECAY); DecayTimer = 60000+rand()%20000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_DECAY1); @@ -181,7 +181,7 @@ public: { DoCast(me->getVictim(), SPELL_FROST_NOVA); NovaTimer = 30000+rand()%15000; - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: DoPlaySoundToSet(me, SOUND_NOVA1); @@ -195,7 +195,7 @@ public: } else NovaTimer -= diff; if (IceboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM,0,40,true), SPELL_ICEBOLT); + DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_ICEBOLT); IceboltTimer = 11000+rand()%20000; } else IceboltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp index 26aa3fd7cfc..1394ec232fd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.cpp @@ -223,7 +223,7 @@ public: { Item* item = pPlayer->StoreNewItem(dest, ITEM_TEAR_OF_GODDESS, true); if (item && pPlayer) - pPlayer->SendNewItem(item,1,true,false,true); + pPlayer->SendNewItem(item, 1, true, false, true); } pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); CAST_AI(hyjalAI, pCreature->AI()); @@ -237,7 +237,7 @@ public: uint32 AzgalorEvent = ai->GetInstanceData(DATA_AZGALOREVENT); // Only let them get item if Azgalor is dead. - if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS,1)) + if (AzgalorEvent == DONE && !pPlayer->HasItemCount(ITEM_TEAR_OF_GODDESS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_TYRANDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(907, pCreature->GetGUID()); return true; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 38ffeeed042..1db2a350dac 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -72,8 +72,8 @@ float HordeBase[4][3]= // Lady Jaina's waypoints when retreathing float JainaWPs[2][3]= { - {5078.56f, -1789.79f, 1320.73f},//next to the small stairs - {5037.38f, -1778.39f, 1322.61f},//center of alliance base + {5078.56f, -1789.79f, 1320.73f}, //next to the small stairs + {5037.38f, -1778.39f, 1322.61f}, //center of alliance base }; float InfernalPos[8][3]=//spawn points for the infernals in the horde base @@ -138,10 +138,10 @@ float VeinPos[14][8]=//spawn points of the ancient gem veins float AllianceOverrunGargPos[5][4]=//gargoyle spawn points in the alliance overrun { - {5279.94f, -2049.68f, 1311.38f, 0},//garg1 - {5289.15f, -2219.06f, 1291.12f, 0},//garg2 - {5202.07f, -2136.10f, 1305.07f, 2.8f},//garg3 - {5071.52f, -2425.63f, 1454.48f, 5.54f},//garg4 + {5279.94f, -2049.68f, 1311.38f, 0}, //garg1 + {5289.15f, -2219.06f, 1291.12f, 0}, //garg2 + {5202.07f, -2136.10f, 1305.07f, 2.8f}, //garg3 + {5071.52f, -2425.63f, 1454.48f, 5.54f}, //garg4 {5120.65f, -2467.92f, 1463.93f, 2.54f}//garg5 }; @@ -456,19 +456,19 @@ void hyjalAI::SummonCreature(uint32 entry, float Base[4][3]) if (!FirstBossDead && (WaveCount == 1 || WaveCount == 3)) {//summon at tower - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20,20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][1]+irand(-20, 20), SpawnPointSpecial[SPAWN_NEAR_TOWER][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; }else{//summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10,10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10,10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_GARG_GATE][0]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][1]+irand(-10, 10), SpawnPointSpecial[SPAWN_GARG_GATE][2]+irand(-10, 10), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); } break; case 17907: //FROST_WYRM , if (FirstBossDead && WaveCount == 1) //summon at gate - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0],SpawnPointSpecial[SPAWN_WYRM_GATE][1],SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_WYRM_GATE][0], SpawnPointSpecial[SPAWN_WYRM_GATE][1], SpawnPointSpecial[SPAWN_WYRM_GATE][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); else { - pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1],SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); + pCreature = me->SummonCreature(entry, SpawnPointSpecial[SPAWN_NEAR_TOWER][0], SpawnPointSpecial[SPAWN_NEAR_TOWER][1], SpawnPointSpecial[SPAWN_NEAR_TOWER][2], 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (pCreature) CAST_AI(hyjal_trashAI, pCreature->AI())->useFlyPath = true; } @@ -652,27 +652,27 @@ void hyjalAI::Retreat() { if (pInstance) { - pInstance->SetData(TYPE_RETREAT,SPECIAL); + pInstance->SetData(TYPE_RETREAT, SPECIAL); if (Faction == 0) { pInstance->SetData(DATA_ALLIANCE_RETREAT, 1); - AddWaypoint(0,JainaWPs[0][0],JainaWPs[0][1],JainaWPs[0][2]); - AddWaypoint(1,JainaWPs[1][0],JainaWPs[1][1],JainaWPs[1][2]); + AddWaypoint(0, JainaWPs[0][0], JainaWPs[0][1], JainaWPs[0][2]); + AddWaypoint(1, JainaWPs[1][0], JainaWPs[1][1], JainaWPs[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } if (Faction == 1) { pInstance->SetData(DATA_HORDE_RETREAT, 1); - Creature* JainaDummy = me->SummonCreature(JAINA,JainaDummySpawn[0][0],JainaDummySpawn[0][1],JainaDummySpawn[0][2],JainaDummySpawn[0][3],TEMPSUMMON_TIMED_DESPAWN,60000); + Creature* JainaDummy = me->SummonCreature(JAINA, JainaDummySpawn[0][0], JainaDummySpawn[0][1], JainaDummySpawn[0][2], JainaDummySpawn[0][3], TEMPSUMMON_TIMED_DESPAWN, 60000); if (JainaDummy) { JainaDummy->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(hyjalAI, JainaDummy->AI())->IsDummy = true; DummyGuid = JainaDummy->GetGUID(); } - AddWaypoint(0,JainaDummySpawn[1][0],JainaDummySpawn[1][1],JainaDummySpawn[1][2]); + AddWaypoint(0, JainaDummySpawn[1][0], JainaDummySpawn[1][1], JainaDummySpawn[1][2]); Start(false, false); SetDespawnAtEnd(false);//move to center of alliance base } @@ -690,7 +690,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 0; i<7; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -700,7 +700,7 @@ void hyjalAI::SpawnVeins() return; for (uint8 i = 7; i<14; ++i) { - GameObject* gem = me->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0); + GameObject* gem = me->SummonGameObject(ANCIENT_VEIN, VeinPos[i][0], VeinPos[i][1], VeinPos[i][2], VeinPos[i][3], VeinPos[i][4], VeinPos[i][5], VeinPos[i][6], VeinPos[i][7], 0); if (gem) VeinGUID[i]=gem->GetGUID(); } @@ -714,7 +714,7 @@ void hyjalAI::DeSpawnVeins() return; if (Faction == 1) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_JAINAPROUDMOORE)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -725,7 +725,7 @@ void hyjalAI::DeSpawnVeins() } } else if (Faction) { - Creature* pUnit=Unit::GetCreature((*me),pInstance->GetData64(DATA_THRALL)); + Creature* pUnit=Unit::GetCreature((*me), pInstance->GetData64(DATA_THRALL)); if (!pUnit)return; hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI()); if (!ai)return; @@ -760,7 +760,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(me->GetPositionX(), me->GetPositionY()); HideNearPos(5037.76f, -1889.71f); for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); } else me->SetVisible(true); @@ -773,7 +773,7 @@ void hyjalAI::UpdateAI(const uint32 diff) HideNearPos(5563, -2763.19f); HideNearPos(5542.2f, -2629.36f); for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); } else me->SetVisible(true); @@ -975,14 +975,14 @@ void hyjalAI::WaypointReached(uint32 i) { if (i == 1 || (i == 0 && me->GetEntry() == THRALL)) { - me->MonsterYell(YELL_HURRY,0,0); + me->MonsterYell(YELL_HURRY, 0, 0); WaitForTeleport = true; TeleportTimer = 20000; if (me->GetEntry() == JAINA) DoCast(me, SPELL_MASS_TELEPORT, false); if (me->GetEntry() == THRALL && DummyGuid) { - Unit* Dummy = Unit::GetUnit((*me),DummyGuid); + Unit* Dummy = Unit::GetUnit((*me), DummyGuid); if (Dummy) { CAST_AI(hyjalAI, CAST_CRE(Dummy)->AI())->DoMassTeleport = true; @@ -1021,7 +1021,7 @@ void hyjalAI::WaypointReached(uint32 i) float range = 10; if (me->GetEntry() == THRALL)range = 20; me->GetNearPoint(me, x, y, z, range, 0, me->GetAngle((*itr))); - (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5,5), y+irand(-5,5), me->GetPositionZ()); + (*itr)->GetMotionMaster()->MovePoint(0, x+irand(-5, 5), y+irand(-5, 5), me->GetPositionZ()); } } } @@ -1075,12 +1075,12 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) { case 0://alliance for (uint8 i = 0; i < 92; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, AllianceFirePos[i][0], AllianceFirePos[i][1], AllianceFirePos[i][2], AllianceFirePos[i][3], AllianceFirePos[i][4], AllianceFirePos[i][5], AllianceFirePos[i][6], AllianceFirePos[i][7], 0); for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1092,7 +1092,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 3; ++i)//summon 3 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15, 15), AllianceBase[r][1]+irand(-15, 15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1116,7 +1116,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) break; case 1://horde for (uint8 i = 0; i < 65; ++i)//summon fires - me->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0); + me->SummonGameObject(FLAMEOBJECT, HordeFirePos[i][0], HordeFirePos[i][1], HordeFirePos[i][2], HordeFirePos[i][3], HordeFirePos[i][4], HordeFirePos[i][5], HordeFirePos[i][6], HordeFirePos[i][7], 0); for (uint8 i = 0; i < 26; ++i)//summon infernals { @@ -1133,7 +1133,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 25; ++i)//summon 25 ghouls { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; @@ -1145,7 +1145,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff) for (uint8 i = 0; i < 5; ++i)//summon 5 abominations { uint8 r = rand()%4; - Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); + Creature* pUnit = me->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15, 15), HordeBase[r][1]+irand(-15, 15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000); if (pUnit) { CAST_AI(hyjal_trashAI, pUnit->AI())->faction = Faction; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index 93450203aa0..c0be18cdb7f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -33,7 +33,7 @@ float HordeWPs[8][3]=//basic waypoints from spawn to leader {5554.58f, -2514.66f, 1476.12f}, {5554.16f, -2567.23f, 1479.90f}, {5540.67f, -2625.99f, 1480.89f}, - {5508.16f, -2659.20f, 1480.15f},//random rush starts from here + {5508.16f, -2659.20f, 1480.15f}, //random rush starts from here {5489.62f, -2704.05f, 1482.18f}, {5457.04f, -2726.26f, 1485.10f} }; @@ -43,7 +43,7 @@ float AllianceWPs[8][3]=//basic waypoints from spawn to leader {4898.68f, -1615.02f, 1329.48f}, {4907.12f, -1667.08f, 1321.00f}, {4963.18f, -1699.35f, 1340.51f}, - {4989.16f, -1716.67f, 1335.74f},//first WP in the base, after the gate + {4989.16f, -1716.67f, 1335.74f}, //first WP in the base, after the gate {5026.27f, -1736.89f, 1323.02f}, {5037.77f, -1770.56f, 1324.36f}, {5067.23f, -1789.95f, 1321.17f} @@ -72,87 +72,87 @@ float FlyPathWPs[3][3]=//waypoints for the gargoyls and frost wyrms in horde bas float AllianceOverrunWP[55][3]=//waypoints in the alliance base used in the end in the cleaning wave { - {4976.37f,-1708.02f,1339.43f},//0spawn - {4994.83f,-1725.52f,1333.25f},//1 start - {4982.92f,-1753.7f,1330.69f},//2 end - {4996.75f,-1721.47f,1332.95f},//3 start - {5015.74f,-1755.05f,1322.49f},//4 - {4998.68f,-1773.44f,1329.59f},//5 - {4994.83f,-1725.52f,1333.25f},//6 start - {5022.8f,-1735.46f,1323.53f},//7 - {5052.15f,-1729.02f,1320.88f},//8 - {5082.43f,-1726.29f,1327.87f},//9 - {4994.83f,-1725.52f,1333.25f},//10 start - {5018.92f,-1751.14f,1322.19f},//11 - {5040.09f,-1792.09f,1322.1f},//12 - {4994.83f,-1725.52f,1333.25f},//13 start - {5023.47f,-1748.1f,1322.51f},//14 - {5013.43f,-1842.39f,1322.07f},//15 - {4994.83f,-1725.52f,1333.25f},//16 start - {5020.8f,-1756.86f,1322.2f},//17 - {5019.53f,-1824.6f,1321.96f},//18 - {5043.42f,-1853.75f,1324.52f},//19 - {5053.02f,-1864.13f,1330.36f},//20 - {5062.49f,-1852.47f,1330.49f},//21 - {5015.27f, -1738.77f, 1324.83f},//35//start 22 - {5027.97f, -1775.25f, 1321.87f},//34 23 - {5015.94f, -1821.24f, 1321.86f},//33 24 - {4983.25f, -1857.4f, 1320.48f},//32 25 - {4981.51f, -1883.7f, 1322.34f},//31 26 - {5002.33f, -1893.98f, 1325.88f},//30 27 - {5049.32f, -1886.54f, 1331.69f},//29 28 - {5089.68f, -1846.88f, 1328.99f},//28 29 - {5127.90f, -1825.14f, 1335.58f},//27 30 - {5163.27f, -1789.08f, 1337.04f},//26 31 - {5138.97f, -1755.88f, 1334.57f},//25 32 - {5096.63f, -1742.22f, 1329.61f},//24 33 - {5065.81f, -1729.43f, 1325.66f},//23 34 - {5049.32f, -1726.31f, 1320.64f},//22 start - {5081.07f, -1902.10f, 1346.36f},//36 abo start - {5107.65f, -1912.03f, 1356.49f},//37 - {5132.83f, -1927.07f, 1362.42f},//38 - {5147.78f, -1954.41f, 1365.98f},//39 - {5164.96f, -1966.48f, 1367.04f},//40 - {5189.04f, -1961.06f, 1367.90f},//41 - {5212.27f, -1975.30f, 1365.58f},//42 - {5221.82f, -1994.18f, 1364.97f},//43 end1 - {5202.23f, -1994.94f, 1367.59f},//44 end2 - {5279.94f, -2049.68f, 1311.38f},//45 garg1 - {5289.15f, -2219.06f, 1291.12f},//46 garg2 - {5202.07f, -2136.10f, 1305.07f},//47 garg3 - {5071.52f, -2425.63f, 1454.48f},//48 garg4 - {5120.65f, -2467.92f, 1463.93f},//49 garg5 - {5283.04f, -2043.26f, 1300.11f},//50 garg target1 - {5313.22f, -2207.60f, 1290.06f},//51 garg target2 - {5180.41f, -2121.87f, 1292.62f},//52 garg target3 - {5088.68f, -2432.04f, 1441.73f},//53 garg target4 + {4976.37f, -1708.02f, 1339.43f}, //0spawn + {4994.83f, -1725.52f, 1333.25f}, //1 start + {4982.92f, -1753.7f, 1330.69f}, //2 end + {4996.75f, -1721.47f, 1332.95f}, //3 start + {5015.74f, -1755.05f, 1322.49f}, //4 + {4998.68f, -1773.44f, 1329.59f}, //5 + {4994.83f, -1725.52f, 1333.25f}, //6 start + {5022.8f, -1735.46f, 1323.53f}, //7 + {5052.15f, -1729.02f, 1320.88f}, //8 + {5082.43f, -1726.29f, 1327.87f}, //9 + {4994.83f, -1725.52f, 1333.25f}, //10 start + {5018.92f, -1751.14f, 1322.19f}, //11 + {5040.09f, -1792.09f, 1322.1f}, //12 + {4994.83f, -1725.52f, 1333.25f}, //13 start + {5023.47f, -1748.1f, 1322.51f}, //14 + {5013.43f, -1842.39f, 1322.07f}, //15 + {4994.83f, -1725.52f, 1333.25f}, //16 start + {5020.8f, -1756.86f, 1322.2f}, //17 + {5019.53f, -1824.6f, 1321.96f}, //18 + {5043.42f, -1853.75f, 1324.52f}, //19 + {5053.02f, -1864.13f, 1330.36f}, //20 + {5062.49f, -1852.47f, 1330.49f}, //21 + {5015.27f, -1738.77f, 1324.83f}, //35//start 22 + {5027.97f, -1775.25f, 1321.87f}, //34 23 + {5015.94f, -1821.24f, 1321.86f}, //33 24 + {4983.25f, -1857.4f, 1320.48f}, //32 25 + {4981.51f, -1883.7f, 1322.34f}, //31 26 + {5002.33f, -1893.98f, 1325.88f}, //30 27 + {5049.32f, -1886.54f, 1331.69f}, //29 28 + {5089.68f, -1846.88f, 1328.99f}, //28 29 + {5127.90f, -1825.14f, 1335.58f}, //27 30 + {5163.27f, -1789.08f, 1337.04f}, //26 31 + {5138.97f, -1755.88f, 1334.57f}, //25 32 + {5096.63f, -1742.22f, 1329.61f}, //24 33 + {5065.81f, -1729.43f, 1325.66f}, //23 34 + {5049.32f, -1726.31f, 1320.64f}, //22 start + {5081.07f, -1902.10f, 1346.36f}, //36 abo start + {5107.65f, -1912.03f, 1356.49f}, //37 + {5132.83f, -1927.07f, 1362.42f}, //38 + {5147.78f, -1954.41f, 1365.98f}, //39 + {5164.96f, -1966.48f, 1367.04f}, //40 + {5189.04f, -1961.06f, 1367.90f}, //41 + {5212.27f, -1975.30f, 1365.58f}, //42 + {5221.82f, -1994.18f, 1364.97f}, //43 end1 + {5202.23f, -1994.94f, 1367.59f}, //44 end2 + {5279.94f, -2049.68f, 1311.38f}, //45 garg1 + {5289.15f, -2219.06f, 1291.12f}, //46 garg2 + {5202.07f, -2136.10f, 1305.07f}, //47 garg3 + {5071.52f, -2425.63f, 1454.48f}, //48 garg4 + {5120.65f, -2467.92f, 1463.93f}, //49 garg5 + {5283.04f, -2043.26f, 1300.11f}, //50 garg target1 + {5313.22f, -2207.60f, 1290.06f}, //51 garg target2 + {5180.41f, -2121.87f, 1292.62f}, //52 garg target3 + {5088.68f, -2432.04f, 1441.73f}, //53 garg target4 {5111.26f, -2454.73f, 1449.63f}//54 garg target5 }; float HordeOverrunWP[21][3]=//waypoints in the horde base used in the end in the cleaning wave { - {5490.72f,-2702.94f,1482.14f},//0 start - {5469.77f,-2741.34f,1486.95f}, - {5439.47f,-2771.02f,1494.59f}, - {5408.85f,-2811.92f,1505.68f}, - {5423.87f,-2857.80f,1515.55f}, - {5428.19f,-2898.15f,1524.61f}, - {5394.59f,-2930.05f,1528.23f}, - {5351.11f,-2935.80f,1532.24f}, - {5312.37f,-2959.06f,1536.21f}, - {5264.93f,-2989.80f,1545.70f}, - {5256.63f,-3056.16f,1559.24f}, - {5267.32f,-3119.55f,1575.36f}, - {5305.61f,-3139.88f,1586.38f}, - {5330.56f,-3135.37f,1588.58f}, - {5365.87f,-3139.78f,1583.96f}, - {5389.39f,-3163.57f,1582.57f},//15 end - {5500.86f,-2669.89f,1481.04f},//16 start - {5472.08f,-2715.14f,1483.55f}, - {5450.11f,-2721.47f,1485.61f}, - {5433.25f,-2712.93f,1493.02f},//19 end 1 - {5429.91f,-2718.44f,1493.42f}//20 end 2 + {5490.72f, -2702.94f, 1482.14f}, //0 start + {5469.77f, -2741.34f, 1486.95f}, + {5439.47f, -2771.02f, 1494.59f}, + {5408.85f, -2811.92f, 1505.68f}, + {5423.87f, -2857.80f, 1515.55f}, + {5428.19f, -2898.15f, 1524.61f}, + {5394.59f, -2930.05f, 1528.23f}, + {5351.11f, -2935.80f, 1532.24f}, + {5312.37f, -2959.06f, 1536.21f}, + {5264.93f, -2989.80f, 1545.70f}, + {5256.63f, -3056.16f, 1559.24f}, + {5267.32f, -3119.55f, 1575.36f}, + {5305.61f, -3139.88f, 1586.38f}, + {5330.56f, -3135.37f, 1588.58f}, + {5365.87f, -3139.78f, 1583.96f}, + {5389.39f, -3163.57f, 1582.57f}, //15 end + {5500.86f, -2669.89f, 1481.04f}, //16 start + {5472.08f, -2715.14f, 1483.55f}, + {5450.11f, -2721.47f, 1485.61f}, + {5433.25f, -2712.93f, 1493.02f}, //19 end 1 + {5429.91f, -2718.44f, 1493.42f}//20 end 2 }; hyjal_trashAI::hyjal_trashAI(Creature *c) : npc_escortAI(c) @@ -176,7 +176,7 @@ void hyjal_trashAI::DamageTaken(Unit *done_by, uint32 &damage) { damageTaken += damage; if (pInstance) - pInstance->SetData(DATA_RAIDDAMAGE,damage);//store raid's damage + pInstance->SetData(DATA_RAIDDAMAGE, damage);//store raid's damage } } @@ -196,56 +196,56 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2]); - me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3,3), AllianceOverrunWP[43][1]+irand(-3,3), AllianceOverrunWP[43][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2]); + me->SetHomePosition(AllianceOverrunWP[43][0]+irand(-3, 3), AllianceOverrunWP[43][1]+irand(-3, 3), AllianceOverrunWP[43][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3,3), AllianceOverrunWP[22][1]+irand(-3,3), AllianceOverrunWP[22][2]); - AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3,3), AllianceOverrunWP[23][1]+irand(-3,3), AllianceOverrunWP[23][2]); - AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3,3), AllianceOverrunWP[24][1]+irand(-3,3), AllianceOverrunWP[24][2]); - AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3,3), AllianceOverrunWP[25][1]+irand(-3,3), AllianceOverrunWP[25][2]); - AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3,3), AllianceOverrunWP[26][1]+irand(-3,3), AllianceOverrunWP[26][2]); - AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3,3), AllianceOverrunWP[27][1]+irand(-3,3), AllianceOverrunWP[27][2]); - AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3,3), AllianceOverrunWP[28][1]+irand(-3,3), AllianceOverrunWP[28][2]); - - AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3,3), AllianceOverrunWP[36][1]+irand(-3,3), AllianceOverrunWP[36][2]); - AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3,3), AllianceOverrunWP[37][1]+irand(-3,3), AllianceOverrunWP[37][2]); - AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3,3), AllianceOverrunWP[38][1]+irand(-3,3), AllianceOverrunWP[38][2]); - AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3,3), AllianceOverrunWP[39][1]+irand(-3,3), AllianceOverrunWP[39][2]); - AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3,3), AllianceOverrunWP[40][1]+irand(-3,3), AllianceOverrunWP[40][2]); - AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3,3), AllianceOverrunWP[41][1]+irand(-3,3), AllianceOverrunWP[41][2]); - AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3,3), AllianceOverrunWP[42][1]+irand(-3,3), AllianceOverrunWP[42][2]); - AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2]); - me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3,3), AllianceOverrunWP[44][1]+irand(-3,3), AllianceOverrunWP[44][2],0); + AddWaypoint(4, AllianceOverrunWP[22][0]+irand(-3, 3), AllianceOverrunWP[22][1]+irand(-3, 3), AllianceOverrunWP[22][2]); + AddWaypoint(5, AllianceOverrunWP[23][0]+irand(-3, 3), AllianceOverrunWP[23][1]+irand(-3, 3), AllianceOverrunWP[23][2]); + AddWaypoint(6, AllianceOverrunWP[24][0]+irand(-3, 3), AllianceOverrunWP[24][1]+irand(-3, 3), AllianceOverrunWP[24][2]); + AddWaypoint(7, AllianceOverrunWP[25][0]+irand(-3, 3), AllianceOverrunWP[25][1]+irand(-3, 3), AllianceOverrunWP[25][2]); + AddWaypoint(8, AllianceOverrunWP[26][0]+irand(-3, 3), AllianceOverrunWP[26][1]+irand(-3, 3), AllianceOverrunWP[26][2]); + AddWaypoint(9, AllianceOverrunWP[27][0]+irand(-3, 3), AllianceOverrunWP[27][1]+irand(-3, 3), AllianceOverrunWP[27][2]); + AddWaypoint(10, AllianceOverrunWP[28][0]+irand(-3, 3), AllianceOverrunWP[28][1]+irand(-3, 3), AllianceOverrunWP[28][2]); + + AddWaypoint(11, AllianceOverrunWP[36][0]+irand(-3, 3), AllianceOverrunWP[36][1]+irand(-3, 3), AllianceOverrunWP[36][2]); + AddWaypoint(12, AllianceOverrunWP[37][0]+irand(-3, 3), AllianceOverrunWP[37][1]+irand(-3, 3), AllianceOverrunWP[37][2]); + AddWaypoint(13, AllianceOverrunWP[38][0]+irand(-3, 3), AllianceOverrunWP[38][1]+irand(-3, 3), AllianceOverrunWP[38][2]); + AddWaypoint(14, AllianceOverrunWP[39][0]+irand(-3, 3), AllianceOverrunWP[39][1]+irand(-3, 3), AllianceOverrunWP[39][2]); + AddWaypoint(15, AllianceOverrunWP[40][0]+irand(-3, 3), AllianceOverrunWP[40][1]+irand(-3, 3), AllianceOverrunWP[40][2]); + AddWaypoint(16, AllianceOverrunWP[41][0]+irand(-3, 3), AllianceOverrunWP[41][1]+irand(-3, 3), AllianceOverrunWP[41][2]); + AddWaypoint(17, AllianceOverrunWP[42][0]+irand(-3, 3), AllianceOverrunWP[42][1]+irand(-3, 3), AllianceOverrunWP[42][2]); + AddWaypoint(18, AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2]); + me->SetHomePosition(AllianceOverrunWP[44][0]+irand(-3, 3), AllianceOverrunWP[44][1]+irand(-3, 3), AllianceOverrunWP[44][2], 0); SetDespawnAtEnd(false); LastOverronPos = 18; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; @@ -256,69 +256,69 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 4; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3,3), AllianceOverrunWP[1][1]+irand(-3,3), AllianceOverrunWP[1][2]); - AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2]); - me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3,3), AllianceOverrunWP[2][1]+irand(-3,3), AllianceOverrunWP[2][2],0); + AddWaypoint(4, AllianceOverrunWP[1][0]+irand(-3, 3), AllianceOverrunWP[1][1]+irand(-3, 3), AllianceOverrunWP[1][2]); + AddWaypoint(5, AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2]); + me->SetHomePosition(AllianceOverrunWP[2][0]+irand(-3, 3), AllianceOverrunWP[2][1]+irand(-3, 3), AllianceOverrunWP[2][2], 0); SetDespawnAtEnd(false); LastOverronPos = 5; Start(true, true); break; case 1: - AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3,3), AllianceOverrunWP[3][1]+irand(-3,3), AllianceOverrunWP[3][2]); - AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3,3), AllianceOverrunWP[4][1]+irand(-3,3), AllianceOverrunWP[4][2]); - AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2]); - me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3,3), AllianceOverrunWP[5][1]+irand(-3,3), AllianceOverrunWP[5][2],0); + AddWaypoint(4, AllianceOverrunWP[3][0]+irand(-3, 3), AllianceOverrunWP[3][1]+irand(-3, 3), AllianceOverrunWP[3][2]); + AddWaypoint(5, AllianceOverrunWP[4][0]+irand(-3, 3), AllianceOverrunWP[4][1]+irand(-3, 3), AllianceOverrunWP[4][2]); + AddWaypoint(6, AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2]); + me->SetHomePosition(AllianceOverrunWP[5][0]+irand(-3, 3), AllianceOverrunWP[5][1]+irand(-3, 3), AllianceOverrunWP[5][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 2: - AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3,3), AllianceOverrunWP[6][1]+irand(-3,3), AllianceOverrunWP[6][2]); - AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3,3), AllianceOverrunWP[7][1]+irand(-3,3), AllianceOverrunWP[7][2]); - AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3,3), AllianceOverrunWP[8][1]+irand(-3,3), AllianceOverrunWP[8][2]); - AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2]); - me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3,3), AllianceOverrunWP[9][1]+irand(-3,3), AllianceOverrunWP[9][2],0); + AddWaypoint(4, AllianceOverrunWP[6][0]+irand(-3, 3), AllianceOverrunWP[6][1]+irand(-3, 3), AllianceOverrunWP[6][2]); + AddWaypoint(5, AllianceOverrunWP[7][0]+irand(-3, 3), AllianceOverrunWP[7][1]+irand(-3, 3), AllianceOverrunWP[7][2]); + AddWaypoint(6, AllianceOverrunWP[8][0]+irand(-3, 3), AllianceOverrunWP[8][1]+irand(-3, 3), AllianceOverrunWP[8][2]); + AddWaypoint(7, AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2]); + me->SetHomePosition(AllianceOverrunWP[9][0]+irand(-3, 3), AllianceOverrunWP[9][1]+irand(-3, 3), AllianceOverrunWP[9][2], 0); SetDespawnAtEnd(false); LastOverronPos = 7; Start(true, true); break; case 3: - AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3,3), AllianceOverrunWP[10][1]+irand(-3,3), AllianceOverrunWP[10][2]); - AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3,3), AllianceOverrunWP[11][1]+irand(-3,3), AllianceOverrunWP[11][2]); - AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2]); - me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3,3), AllianceOverrunWP[12][1]+irand(-3,3), AllianceOverrunWP[12][2],0); + AddWaypoint(4, AllianceOverrunWP[10][0]+irand(-3, 3), AllianceOverrunWP[10][1]+irand(-3, 3), AllianceOverrunWP[10][2]); + AddWaypoint(5, AllianceOverrunWP[11][0]+irand(-3, 3), AllianceOverrunWP[11][1]+irand(-3, 3), AllianceOverrunWP[11][2]); + AddWaypoint(6, AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2]); + me->SetHomePosition(AllianceOverrunWP[12][0]+irand(-3, 3), AllianceOverrunWP[12][1]+irand(-3, 3), AllianceOverrunWP[12][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 4: - AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3,3), AllianceOverrunWP[13][1]+irand(-3,3), AllianceOverrunWP[13][2]); - AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3,3), AllianceOverrunWP[14][1]+irand(-3,3), AllianceOverrunWP[14][2]); - AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2]); - me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3,3), AllianceOverrunWP[15][1]+irand(-3,3), AllianceOverrunWP[15][2],0); + AddWaypoint(4, AllianceOverrunWP[13][0]+irand(-3, 3), AllianceOverrunWP[13][1]+irand(-3, 3), AllianceOverrunWP[13][2]); + AddWaypoint(5, AllianceOverrunWP[14][0]+irand(-3, 3), AllianceOverrunWP[14][1]+irand(-3, 3), AllianceOverrunWP[14][2]); + AddWaypoint(6, AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2]); + me->SetHomePosition(AllianceOverrunWP[15][0]+irand(-3, 3), AllianceOverrunWP[15][1]+irand(-3, 3), AllianceOverrunWP[15][2], 0); SetDespawnAtEnd(false); LastOverronPos = 6; Start(true, true); break; case 5: - AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3,3), AllianceOverrunWP[16][1]+irand(-3,3), AllianceOverrunWP[16][2]); - AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3,3), AllianceOverrunWP[17][1]+irand(-3,3), AllianceOverrunWP[17][2]); - AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3,3), AllianceOverrunWP[18][1]+irand(-3,3), AllianceOverrunWP[18][2]); - AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3,3), AllianceOverrunWP[19][1]+irand(-3,3), AllianceOverrunWP[19][2]); - AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3,3), AllianceOverrunWP[20][1]+irand(-3,3), AllianceOverrunWP[20][2]); - AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2]); - me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3,3), AllianceOverrunWP[21][1]+irand(-3,3), AllianceOverrunWP[21][2],0); + AddWaypoint(4, AllianceOverrunWP[16][0]+irand(-3, 3), AllianceOverrunWP[16][1]+irand(-3, 3), AllianceOverrunWP[16][2]); + AddWaypoint(5, AllianceOverrunWP[17][0]+irand(-3, 3), AllianceOverrunWP[17][1]+irand(-3, 3), AllianceOverrunWP[17][2]); + AddWaypoint(6, AllianceOverrunWP[18][0]+irand(-3, 3), AllianceOverrunWP[18][1]+irand(-3, 3), AllianceOverrunWP[18][2]); + AddWaypoint(7, AllianceOverrunWP[19][0]+irand(-3, 3), AllianceOverrunWP[19][1]+irand(-3, 3), AllianceOverrunWP[19][2]); + AddWaypoint(8, AllianceOverrunWP[20][0]+irand(-3, 3), AllianceOverrunWP[20][1]+irand(-3, 3), AllianceOverrunWP[20][2]); + AddWaypoint(9, AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2]); + me->SetHomePosition(AllianceOverrunWP[21][0]+irand(-3, 3), AllianceOverrunWP[21][1]+irand(-3, 3), AllianceOverrunWP[21][2], 0); SetDespawnAtEnd(false); LastOverronPos = 9; Start(true, true); break; default: for (uint8 i = 22; i < 36; ++i) - AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]); + AddWaypoint(i-18, AllianceOverrunWP[i][0]+irand(-3, 3), AllianceOverrunWP[i][1]+irand(-3, 3), AllianceOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 17; Start(true, true); @@ -331,32 +331,32 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == GHOUL) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); switch(OverrunType) { case 0: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2]); - me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2],0); + me->SetHomePosition(HordeOverrunWP[19][0], HordeOverrunWP[19][1], HordeOverrunWP[19][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; case 1: - AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10,10), HordeOverrunWP[16][1]+irand(-10,10), HordeOverrunWP[16][2]); - AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10,10), HordeOverrunWP[17][1]+irand(-10,10), HordeOverrunWP[17][2]); + AddWaypoint(5, HordeOverrunWP[16][0]+irand(-10, 10), HordeOverrunWP[16][1]+irand(-10, 10), HordeOverrunWP[16][2]); + AddWaypoint(6, HordeOverrunWP[17][0]+irand(-10, 10), HordeOverrunWP[17][1]+irand(-10, 10), HordeOverrunWP[17][2]); AddWaypoint(7, HordeOverrunWP[18][0], HordeOverrunWP[18][1], HordeOverrunWP[18][2]); AddWaypoint(8, HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2]); - me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2],0); + me->SetHomePosition(HordeOverrunWP[20][0], HordeOverrunWP[20][1], HordeOverrunWP[20][2], 0); SetDespawnAtEnd(false); LastOverronPos = 8; Start(true, true); break; default: for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -366,9 +366,9 @@ void hyjal_trashAI::UpdateAI(const uint32 /*diff*/) if (me->GetEntry() == ABOMINATION) { for (uint8 i = 0; i < 6; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-10, 10), HordeWPs[i][1]+irand(-10, 10), HordeWPs[i][2]); for (uint8 i = 0; i < 16; ++i) - AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]); + AddWaypoint(i+6, HordeOverrunWP[i][0]+irand(-10, 10), HordeOverrunWP[i][1]+irand(-10, 10), HordeOverrunWP[i][2]); SetDespawnAtEnd(true); LastOverronPos = 21; Start(true, true); @@ -436,7 +436,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -452,15 +452,15 @@ public: } if (!meteor) { - float x,y,z; - me->GetPosition(x,y,z); - Creature* trigger = me->SummonCreature(NPC_TRIGGER,x+8,y+8,z+25+rand()%10,me->GetOrientation(),TEMPSUMMON_TIMED_DESPAWN,1000); + float x, y, z; + me->GetPosition(x, y, z); + Creature* trigger = me->SummonCreature(NPC_TRIGGER, x+8, y+8, z+25+rand()%10, me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 1000); if (trigger) { trigger->SetVisible(false); trigger->setFaction(me->getFaction()); trigger->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - trigger->CastSpell(me,SPELL_METEOR,true); + trigger->CastSpell(me, SPELL_METEOR, true); } me->GetMotionMaster()->Clear(); meteor = true; @@ -477,7 +477,7 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } else if (pInstance->GetData(DATA_ALLIANCE_RETREAT) && pInstance->GetData(DATA_HORDE_RETREAT)){ //do overrun } @@ -495,7 +495,7 @@ public: pGo = true; if (pInstance) { - AddWaypoint(0, HordeWPs[7][0]+irand(-3,3), HordeWPs[7][1]+irand(-3,3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall + AddWaypoint(0, HordeWPs[7][0]+irand(-3, 3), HordeWPs[7][1]+irand(-3, 3), HordeWPs[7][2]);//HordeWPs[7] infront of thrall Start(true, true); SetDespawnAtEnd(false); } @@ -564,11 +564,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -598,13 +598,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -669,11 +669,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } if (i == LastOverronPos && IsOverrun) @@ -705,13 +705,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -768,9 +768,9 @@ public: void JustSummoned(Creature* summon) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0,30,true); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); if (pTarget && summon) - summon->Attack(pTarget,false); + summon->Attack(pTarget, false); summons.Summon(summon); } void SummonedCreatureDespawn(Creature *summon) {summons.Despawn(summon);} @@ -783,29 +783,29 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } void KilledUnit(Unit* /*victim*/) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - DoSpawnCreature(17902,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17902,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17902, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 1: - DoSpawnCreature(17903,3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); - DoSpawnCreature(17903,-3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(17903, -3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; case 2: - DoSpawnCreature(RAND(17902,17903),3,0,0,0,TEMPSUMMON_TIMED_DESPAWN, 60000); + DoSpawnCreature(RAND(17902, 17903), 3, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000); break; } } @@ -827,13 +827,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(true, true); SetDespawnAtEnd(false); } @@ -899,11 +899,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -925,13 +925,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1000,11 +1000,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1026,13 +1026,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1092,11 +1092,11 @@ public: { Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); }else{ Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_JAINAPROUDMOORE)); if (pTarget && pTarget->isAlive()) - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); } } } @@ -1118,13 +1118,13 @@ public: if (pInstance->GetData(DATA_ALLIANCE_RETREAT))//2.alliance boss down, use horde WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]); + AddWaypoint(i, HordeWPs[i][0]+irand(-3, 3), HordeWPs[i][1]+irand(-3, 3), HordeWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else//use alliance WPs { for (uint8 i = 0; i < 8; ++i) - AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]); + AddWaypoint(i, AllianceWPs[i][0]+irand(-3, 3), AllianceWPs[i][1]+irand(-3, 3), AllianceWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1187,7 +1187,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_FROST_BREATH, true); } } @@ -1198,11 +1198,11 @@ public: if (pInstance && IsEvent) pInstance->SetData(DATA_TRASH, 0);//signal trash is dead - float x,y,z; - me->GetPosition(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); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); } void EnterCombat(Unit* /*who*/) {} @@ -1230,7 +1230,7 @@ public: SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1309,7 +1309,7 @@ public: Unit *pTarget = Unit::GetUnit((*me), pInstance->GetData64(DATA_THRALL)); if (pTarget && pTarget->isAlive()) { - me->AddThreat(pTarget,0.0f); + me->AddThreat(pTarget, 0.0f); DoCast(pTarget, SPELL_GARGOYLE_STRIKE, true); } } @@ -1317,11 +1317,11 @@ public: void JustDied(Unit *victim) { - float x,y,z; - me->GetPosition(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); - me->GetMap()->CreatureRelocation(me, x,y,z,0); + me->GetMotionMaster()->MovePoint(0, x, y, z); + me->GetMap()->CreatureRelocation(me, x, y, z, 0); hyjal_trashAI::JustDied(victim); } @@ -1343,12 +1343,12 @@ public: if (!useFlyPath) { for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, GargoyleWPs[i][0]+irand(-10,10), GargoyleWPs[i][1]+irand(-10,10), GargoyleWPs[i][2]); + AddWaypoint(i, GargoyleWPs[i][0]+irand(-10, 10), GargoyleWPs[i][1]+irand(-10, 10), GargoyleWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); }else{//fly path FlyPathWPs for (uint8 i = 0; i < 3; ++i) - AddWaypoint(i, FlyPathWPs[i][0]+irand(-10,10), FlyPathWPs[i][1]+irand(-10,10), FlyPathWPs[i][2]); + AddWaypoint(i, FlyPathWPs[i][0]+irand(-10, 10), FlyPathWPs[i][1]+irand(-10, 10), FlyPathWPs[i][2]); Start(false, true); SetDespawnAtEnd(false); } @@ -1361,7 +1361,7 @@ public: { if (StrikeTimer <= diff) { - me->CastSpell(DummyTarget[0],DummyTarget[1],DummyTarget[2],SPELL_GARGOYLE_STRIKE,false); + me->CastSpell(DummyTarget[0], DummyTarget[1], DummyTarget[2], SPELL_GARGOYLE_STRIKE, false); StrikeTimer = 2000+rand()%1000; } else StrikeTimer -= diff; } @@ -1375,13 +1375,13 @@ public: { Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) - me->Attack(pTarget,false); + me->Attack(pTarget, false); } if (MoveTimer <= diff) { - float x,y,z; - me->getVictim()->GetPosition(x,y,z); - me->GetMotionMaster()->MovePoint(0,x,y,z+Zpos); + float x, y, z; + me->getVictim()->GetPosition(x, y, z); + me->GetMotionMaster()->MovePoint(0, x, y, z+Zpos); Zpos-=1.0f; if (Zpos <= 0)Zpos=0; MoveTimer = 2000; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index a2be655c9f5..847a1f36ed8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -191,7 +191,7 @@ public: Creature* creature = instance->GetCreature(Azgalor); if (creature) { - Creature* pUnit = creature->SummonCreature(21987,creature->GetPositionX(),creature->GetPositionY(),creature->GetPositionZ(),0,TEMPSUMMON_TIMED_DESPAWN,10000); + Creature* pUnit = creature->SummonCreature(21987, creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); Map* pMap = creature->GetMap(); if (pMap->IsDungeon() && pUnit) @@ -206,7 +206,7 @@ public: if (i->getSource()) { WorldPacket data(SMSG_MESSAGECHAT, 200); - pUnit->BuildMonsterChat(&data,CHAT_MSG_MONSTER_YELL,YELL_EFFORTS,0,YELL_EFFORTS_NAME,i->getSource()->GetGUID()); + pUnit->BuildMonsterChat(&data, CHAT_MSG_MONSTER_YELL, YELL_EFFORTS, 0, YELL_EFFORTS_NAME, i->getSource()->GetGUID()); i->getSource()->GetSession()->SendPacket(&data); WorldPacket data2(SMSG_PLAY_SOUND, 4); @@ -235,7 +235,7 @@ public: for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr) { //don't know how long it expected - DoRespawnGameObject(*itr,DAY); + DoRespawnGameObject(*itr, DAY); } } } @@ -260,7 +260,7 @@ public: break; } - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)",type,data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Hyjal: Instance data updated for event %u (Data=%u)", type, data); if (data == DONE) { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 7981bdbed7e..426fcf50fc0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -123,7 +123,7 @@ public: if (uiTimeWarpTimer < diff) { - DoScriptText(RAND(SAY_TIME_WARP_1,SAY_TIME_WARP_2,SAY_TIME_WARP_3), me); + DoScriptText(RAND(SAY_TIME_WARP_1, SAY_TIME_WARP_2, SAY_TIME_WARP_3), me); DoCastAOE(SPELL_TIME_WARP); uiTimeWarpTimer = 25300; } else uiTimeWarpTimer -= diff; @@ -144,7 +144,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/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index b269587b19d..78d22aeb18a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -103,8 +103,8 @@ public: Phase = COMBAT; uiCarrionSwarmTimer = 6000; uiMindBlastTimer = 11000; - uiVampiricTouchTimer = urand(10000,15000); - uiSleepTimer = urand(15000,20000); + uiVampiricTouchTimer = urand(10000, 15000); + uiSleepTimer = urand(15000, 20000); uiOutroTimer = 1000; if (pInstance) @@ -184,10 +184,10 @@ public: if (uiSleepTimer < diff) { - DoScriptText(RAND(SAY_SLEEP_1,SAY_SLEEP_2), me); + DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SLEEP); - uiSleepTimer = urand(15000,20000); + uiSleepTimer = urand(15000, 20000); } else uiSleepTimer -= diff; DoMeleeAttackIfReady(); @@ -248,7 +248,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/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 7ad2ba18ff5..ff3ca08c3f2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -61,7 +61,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiChainTimer; @@ -72,9 +72,9 @@ public: void Reset() { - uiChainTimer = urand(12000,17000); //seen on video 13, 17, 15, 12, 16 - uiDiseaseTimer = urand(2000,4000); //approx 3s - uiFrenzyTimer = urand(21000,26000); //made it up + uiChainTimer = urand(12000, 17000); //seen on video 13, 17, 15, 12, 16 + uiDiseaseTimer = urand(2000, 4000); //approx 3s + uiFrenzyTimer = urand(21000, 26000); //made it up if (pInstance) pInstance->SetData(DATA_MEATHOOK_EVENT, NOT_STARTED); @@ -97,20 +97,20 @@ public: if (uiDiseaseTimer <= diff) { DoCastAOE(SPELL_DISEASE_EXPULSION); - uiDiseaseTimer = urand(1500,4000); + uiDiseaseTimer = urand(1500, 4000); } else uiDiseaseTimer -= diff; if (uiFrenzyTimer <= diff) { DoCast(me, SPELL_FRENZY); - uiFrenzyTimer = urand(21000,26000); + uiFrenzyTimer = urand(21000, 26000); } else uiFrenzyTimer -= diff; if (uiChainTimer <= diff) { if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_CONSTRICTING_CHAINS); //anyone but the tank - uiChainTimer = urand(2000,4000); + uiChainTimer = urand(2000, 4000); } else uiChainTimer -= diff; DoMeleeAttackIfReady(); @@ -129,7 +129,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/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index 6eb1cb66bd7..7b26df8871a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -70,7 +70,7 @@ public: { pInstance = c->GetInstanceScript(); if (pInstance) - DoScriptText(SAY_SPAWN,me); + DoScriptText(SAY_SPAWN, me); } uint32 uiCurseFleshTimer; @@ -84,10 +84,10 @@ public: void Reset() { uiCurseFleshTimer = 30000; //30s DBM - uiExplodeGhoulTimer = urand(25000,28000); //approx 6 sec after summon ghouls - uiShadowBoltTimer = urand(8000,12000); // approx 10s + uiExplodeGhoulTimer = urand(25000, 28000); //approx 6 sec after summon ghouls + uiShadowBoltTimer = urand(8000, 12000); // approx 10s uiStealFleshTimer = 12345; - uiSummonGhoulsTimer = urand(19000,24000); //on a video approx 24s after aggro + uiSummonGhoulsTimer = urand(19000, 24000); //on a video approx 24s after aggro if (pInstance) pInstance->SetData(DATA_SALRAMM_EVENT, NOT_STARTED); @@ -119,13 +119,13 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_SHADOW_BOLT); - uiShadowBoltTimer = urand(8000,12000); + uiShadowBoltTimer = urand(8000, 12000); } else uiShadowBoltTimer -= diff; //Steal Flesh timer if (uiStealFleshTimer <= diff) { - DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me); + DoScriptText(RAND(SAY_STEAL_FLESH_1, SAY_STEAL_FLESH_2, SAY_STEAL_FLESH_3), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_STEAL_FLESH); uiStealFleshTimer = 10000; @@ -134,7 +134,7 @@ public: //Summon ghouls timer if (uiSummonGhoulsTimer <= diff) { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me); + DoScriptText(RAND(SAY_SUMMON_GHOULS_1, SAY_SUMMON_GHOULS_2), me); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_SUMMON_GHOULS); uiSummonGhoulsTimer = 10000; @@ -156,7 +156,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/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index d73373910b0..3e86a796480 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -233,7 +233,7 @@ public: bool OnGossipSelect(Player *pPlayer, Creature *pCreature, uint32 /*sender*/, uint32 action) { pPlayer->PlayerTalkClass->ClearMenus(); - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (!pAI) return false; @@ -241,7 +241,7 @@ public: switch (action) { case GOSSIP_ACTION_INFO_DEF: - pAI->Start(true,true,pPlayer->GetGUID(),0,false,false); + pAI->Start(true, true, pPlayer->GetGUID(), 0, false, false); pAI->SetDespawnAtEnd(false); pAI->bStepping = false; pAI->uiStep = 1; @@ -275,7 +275,7 @@ public: bool OnGossipHello(Player* pPlayer, Creature* pCreature) { - npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI,pCreature->AI()); + npc_arthasAI* pAI = CAST_AI(npc_arthas::npc_arthasAI, pCreature->AI()); if (pAI && pAI->bStepping == false) { @@ -405,17 +405,17 @@ public: void SpawnTimeRift(uint32 timeRiftID, uint64* guidVector) { - me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_DESPAWN,11000); + me->SummonCreature((uint32)RiftAndSpawnsLocations[timeRiftID][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_DESPAWN, 11000); for (uint32 i = timeRiftID+1; i < ENCOUNTER_CHRONO_SPAWNS; ++i) { if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_TIME_RIFT) break; - if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0],RiftAndSpawnsLocations[timeRiftID][1],RiftAndSpawnsLocations[timeRiftID][2],RiftAndSpawnsLocations[timeRiftID][3],RiftAndSpawnsLocations[timeRiftID][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)RiftAndSpawnsLocations[i][0], RiftAndSpawnsLocations[timeRiftID][1], RiftAndSpawnsLocations[timeRiftID][2], RiftAndSpawnsLocations[timeRiftID][3], RiftAndSpawnsLocations[timeRiftID][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i-timeRiftID-1] = pTemp->GetGUID(); pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE | UNIT_FLAG_PASSIVE); pTemp->SetReactState(REACT_PASSIVE); - pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1],RiftAndSpawnsLocations[i][2],RiftAndSpawnsLocations[i][3]); + pTemp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) uiEpochGUID = pTemp->GetGUID(); } @@ -427,7 +427,7 @@ public: for (uint32 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { if ((uint32)WavesLocations[waveID][i][0] == 0) break; - if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0],WavesLocations[waveID][i][1],WavesLocations[waveID][i][2],WavesLocations[waveID][i][3],WavesLocations[waveID][i][4],TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pTemp = me->SummonCreature((uint32)WavesLocations[waveID][i][0], WavesLocations[waveID][i][1], WavesLocations[waveID][i][2], WavesLocations[waveID][i][3], WavesLocations[waveID][i][4], TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { guidVector[i] = pTemp->GetGUID(); } @@ -464,9 +464,9 @@ public: bStepping = true; break; case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN,2091.977f,1275.021f,140.757f,0.558f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2,2093.514f,1275.842f,140.408f,3.801f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,60000)) + if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) uiCitymenGUID[1] = pCityman1->GetGUID(); break; case 8: @@ -477,14 +477,14 @@ public: case 12: SetRun(true); DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3,2398.14f,1207.81f,134.04f,5.155249f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4,2403.22f,1205.54f,134.04f,3.311264f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN,2400.82f,1201.69f,134.01f,1.534082f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); pDisguised0->SetUInt64Value(UNIT_FIELD_TARGET, uiInfiniteDraconianGUID[1]); @@ -505,33 +505,33 @@ public: break; case 25: SetRun(false); - SpawnTimeRift(0,&uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307,me); + SpawnTimeRift(0, &uiInfiniteDraconianGUID[0]); + DoScriptText(SAY_PHASE307, me); break; case 29: SetRun(false); - SpawnTimeRift(5,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309,me); + SpawnTimeRift(5, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(8, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE309, me); SetHoldState(true); bStepping = true; break; case 31: SetRun(false); - SpawnTimeRift(11,&uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14,&uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311,me); + SpawnTimeRift(11, &uiInfiniteDraconianGUID[0]); + SpawnTimeRift(14, &uiInfiniteDraconianGUID[2]); + DoScriptText(SAY_PHASE311, me); SetHoldState(true); bStepping = true; break; case 32: - DoScriptText(SAY_PHASE401,me); + DoScriptText(SAY_PHASE401, me); break; case 34: - DoScriptText(SAY_PHASE402,me); + DoScriptText(SAY_PHASE402, me); break; case 35: - DoScriptText(SAY_PHASE403,me); + DoScriptText(SAY_PHASE403, me); break; case 36: if (pInstance) @@ -547,14 +547,14 @@ public: break; case 47: SetRun(false); - DoScriptText(SAY_PHASE405,me); + DoScriptText(SAY_PHASE405, me); break; case 48: SetRun(true); - DoScriptText(SAY_PHASE406,me); + DoScriptText(SAY_PHASE406, me); break; case 53: - DoScriptText(SAY_PHASE407,me); + DoScriptText(SAY_PHASE407, me); break; case 54: uiGossipStep = 5; @@ -580,7 +580,7 @@ public: case 0: if (Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f)) uiJainaGUID = pJaina->GetGUID(); - else if (Unit* pJaina = me->SummonCreature(NPC_JAINA,1895.48f,1292.66f,143.706f,0.023475f,TEMPSUMMON_DEAD_DESPAWN,180000)) + else if (Unit* pJaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000)) uiJainaGUID = pJaina->GetGUID(); bStepping = false; JumpToNextStep(0); @@ -588,7 +588,7 @@ public: //After waypoint 0 case 1: me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if (Unit* pUther = me->SummonCreature(NPC_UTHER,1794.357f,1272.183f,140.558f,1.37f,TEMPSUMMON_DEAD_DESPAWN,180000)) + if (Unit* pUther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { uiUtherGUID = pUther->GetGUID(); pUther->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -677,7 +677,7 @@ public: if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) { pUther->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pUther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -686,7 +686,7 @@ public: { me->SetUInt64Value(UNIT_FIELD_TARGET, uiJainaGUID); pJaina->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f,1272.183f,140.558f); + pJaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; @@ -727,7 +727,7 @@ public: break; //After Gossip 1 (waypoint 8) case 24: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2026.469f,1287.088f,143.596f,1.37f,TEMPSUMMON_TIMED_DESPAWN,14000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2026.469f, 1287.088f, 143.596f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 14000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -752,7 +752,7 @@ public: { pCityman->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); pCityman->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f,1279.191f,140.743f); + pCityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); } JumpToNextStep(2000); break; @@ -796,7 +796,7 @@ public: JumpToNextStep(1000); break; case 34: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -805,7 +805,7 @@ public: JumpToNextStep(3000); break; case 35: - if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { uiStalkerGUID = pStalkerM->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -813,10 +813,10 @@ public: JumpToNextStep(1000); break; case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2117.349f,1288.624f,136.271f,1.37f,TEMPSUMMON_TIMED_DESPAWN,60000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM,63793,false); + pMalganis->CastSpell(pStalkerM, 63793, false); uiMalganisGUID = pMalganis->GetGUID(); DoScriptText(SAY_PHASE206, pMalganis); @@ -851,7 +851,7 @@ public: JumpToNextStep(7000); break; case 40: - if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET,2081.447f,1287.770f,141.3241f,1.37f,TEMPSUMMON_TIMED_DESPAWN,10000)) + if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { uiStalkerGUID = pStalker->GetGUID(); me->SetUInt64Value(UNIT_FIELD_TARGET, uiStalkerGUID); @@ -921,11 +921,11 @@ public: else if (uiBossEvent == DATA_SALRAMM_EVENT) uiBossID = NPC_SALRAMM; - if (Unit* pBoss = me->SummonCreature(uiBossID,2232.19f,1331.933f,126.662f,3.15f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Unit* pBoss = me->SummonCreature(uiBossID, 2232.19f, 1331.933f, 126.662f, 3.15f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiBossGUID = pBoss->GetGUID(); pBoss->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - pBoss->GetMotionMaster()->MovePoint(0, 2194.110f,1332.00f,130.00f); + pBoss->GetMotionMaster()->MovePoint(0, 2194.110f, 1332.00f, 130.00f); } } JumpToNextStep(30000); @@ -985,12 +985,12 @@ public: JumpToNextStep(1000); break; case 66: - DoScriptText(SAY_PHASE304,me); + DoScriptText(SAY_PHASE304, me); JumpToNextStep(2000); break; case 67: if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305,pDisguised0); + DoScriptText(SAY_PHASE305, pDisguised0); JumpToNextStep(1000); break; case 68: @@ -1024,7 +1024,7 @@ public: JumpToNextStep(2000); break; case 71: - //After waypoint 26,29,31 + //After waypoint 26, 29, 31 case 73: case 75: case 77: @@ -1044,9 +1044,9 @@ public: uiPhaseTimer = 1000; else { - if (uiStep == 72) DoScriptText(SAY_PHASE308,me); - if (uiStep == 74) DoScriptText(SAY_PHASE308,me); - if (uiStep == 76) DoScriptText(SAY_PHASE310,me); + if (uiStep == 72) DoScriptText(SAY_PHASE308, me); + if (uiStep == 74) DoScriptText(SAY_PHASE308, me); + if (uiStep == 76) DoScriptText(SAY_PHASE310, me); SetHoldState(false); bStepping = false; SetRun(true); @@ -1058,21 +1058,21 @@ public: uiPhaseTimer = 1000; else { - DoScriptText(SAY_PHASE312,me); + DoScriptText(SAY_PHASE312, me); JumpToNextStep(5000); } break; case 79: - DoScriptText(SAY_PHASE313,me); + DoScriptText(SAY_PHASE313, me); JumpToNextStep(1000); break; case 80: if (pInstance) if (pInstance->GetData(DATA_EPOCH_EVENT) != DONE) { - SpawnTimeRift(17,&uiEpochGUID); + SpawnTimeRift(17, &uiEpochGUID); if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314,pEpoch); + DoScriptText(SAY_PHASE314, pEpoch); me->SetUInt64Value(UNIT_FIELD_TARGET, uiEpochGUID); } JumpToNextStep(18000); @@ -1117,14 +1117,14 @@ public: break; //After Gossip 4 case 84: - DoScriptText(SAY_PHASE404,me); + DoScriptText(SAY_PHASE404, me); SetHoldState(false); bStepping = false; break; //After Gossip 5 case 85: DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS,2296.665f,1502.362f,128.362f,4.961f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,900000)) + if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { uiMalganisGUID = pMalganis->GetGUID(); pMalganis->SetReactState(REACT_PASSIVE); @@ -1190,7 +1190,7 @@ public: if (uiExorcismTimer < diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_EXORCISM_N); uiExorcismTimer = 7300; } else uiExorcismTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp index 79bc8f9c1da..2e600b950ca 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp @@ -107,13 +107,13 @@ public: case GO_EXIT_GATE: uiExitGate = go->GetGUID(); if (m_auiEncounter[3] == DONE) - HandleGameObject(uiExitGate,true); + HandleGameObject(uiExitGate, true); break; case GO_MALGANIS_CHEST_N: case GO_MALGANIS_CHEST_H: uiMalGanisChest = go->GetGUID(); if (m_auiEncounter[3] == DONE) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } } @@ -137,15 +137,15 @@ public: switch(m_auiEncounter[3]) { case NOT_STARTED: - HandleGameObject(uiMalGanisGate2,true); + HandleGameObject(uiMalGanisGate2, true); break; case IN_PROGRESS: - HandleGameObject(uiMalGanisGate2,false); + HandleGameObject(uiMalGanisGate2, false); break; case DONE: HandleGameObject(uiExitGate, true); if (GameObject* go = instance->GetGameObject(uiMalGanisChest)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_INTERACT_COND); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_INTERACT_COND); break; } break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 00faa87a378..438a53c16ef 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -83,7 +83,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -99,14 +99,14 @@ public: if (pInstance) { - pInstance->SetData(TYPE_RIFT,DONE); - pInstance->SetData(TYPE_MEDIVH,DONE);//FIXME: later should be removed + pInstance->SetData(TYPE_RIFT, DONE); + pInstance->SetData(TYPE_MEDIVH, DONE);//FIXME: later should be removed } } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 3af197e8658..89e2fc763dd 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -85,7 +85,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); @@ -97,7 +97,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -105,7 +105,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 8c9a5c5c1b9..3151a773a9b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -81,7 +81,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -89,7 +89,7 @@ public: DoScriptText(SAY_DEATH, me); if (pInstance) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } void MoveInLineOfSight(Unit *who) @@ -97,7 +97,7 @@ public: //Despawn Time Keeper if (who->GetTypeId() == TYPEID_UNIT && who->GetEntry() == C_TIME_KEEPER) { - if (me->IsWithinDistInMap(who,20.0f)) + if (me->IsWithinDistInMap(who, 20.0f)) { DoScriptText(SAY_BANISH, me); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index adc2dc2be00..f6f45069b38 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -108,7 +108,7 @@ public: return; DoScriptText(SAY_INTRO, me); - pInstance->SetData(TYPE_MEDIVH,IN_PROGRESS); + pInstance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; } @@ -121,12 +121,12 @@ public: if (entry == C_ASSAS || entry == C_WHELP || entry == C_CHRON || entry == C_EXECU || entry == C_VANQU) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT,false); + who->CastSpell(me, SPELL_CORRUPT, false); } else if (entry == C_AEONUS) { who->StopMoving(); - who->CastSpell(me,SPELL_CORRUPT_AEONUS,false); + who->CastSpell(me, SPELL_CORRUPT_AEONUS, false); } } } @@ -170,7 +170,7 @@ public: { if (SpellCorrupt_Timer <= diff) { - pInstance->SetData(TYPE_MEDIVH,SPECIAL); + pInstance->SetData(TYPE_MEDIVH, SPECIAL); if (me->HasAura(SPELL_CORRUPT_AEONUS)) SpellCorrupt_Timer = 1000; @@ -223,7 +223,7 @@ public: me->RemoveAura(SPELL_CHANNEL); //TODO: start the post-event here - pInstance->SetData(TYPE_MEDIVH,DONE); + pInstance->SetData(TYPE_MEDIVH, DONE); } } else Check_Timer -= diff; } @@ -313,7 +313,7 @@ public: if (Unit *Summon = DoSummon(creature_entry, pos, 30000, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT)) if (Unit *temp = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_MEDIVH) : 0)) - Summon->AddThreat(temp,0.0f); + Summon->AddThreat(temp, 0.0f); } void DoSelectSummon() @@ -324,7 +324,7 @@ public: mRiftWaveCount = 0; entry = PortalWaves[mWaveId].PortalMob[mRiftWaveCount]; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).",mRiftWaveCount,entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: npc_time_rift: summoning wave Creature (Wave %u, Entry %u).", mRiftWaveCount, entry); ++mRiftWaveCount; @@ -353,7 +353,7 @@ public: me->setDeathState(JUST_DIED); if (pInstance->GetData(TYPE_RIFT) == IN_PROGRESS) - pInstance->SetData(TYPE_RIFT,SPECIAL); + pInstance->SetData(TYPE_RIFT, SPECIAL); } }; @@ -376,7 +376,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,SPELL_CHRONO_BEACON,false); + pCreature->CastSpell(pPlayer, SPELL_CHRONO_BEACON, false); } return true; } @@ -386,15 +386,15 @@ public: if (pCreature->isQuestGiver()) pPlayer->PrepareQuestMenu(pCreature->GetGUID()); - if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + if (pPlayer->GetQuestStatus(QUEST_OPENING_PORTAL) == QUEST_STATUS_INCOMPLETE && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10000, pCreature->GetGUID()); return true; } - else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON,1)) + else if (pPlayer->GetQuestRewardStatus(QUEST_OPENING_PORTAL) && !pPlayer->HasItemCount(ITEM_CHRONO_BEACON, 1)) { - pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT,GOSSIP_ITEM_OBTAIN,GOSSIP_SENDER_MAIN,GOSSIP_ACTION_INFO_DEF+1); + pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_ITEM_OBTAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); pPlayer->SEND_GOSSIP_MENU(10001, pCreature->GetGUID()); return true; } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp index 24ce52c6759..6ea59e4be02 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp @@ -111,7 +111,7 @@ public: void InitWorldState(bool Enable = true) { - DoUpdateWorldState(WORLD_STATE_BM,Enable ? 1 : 0); + DoUpdateWorldState(WORLD_STATE_BM, Enable ? 1 : 0); DoUpdateWorldState(WORLD_STATE_BM_SHIELD, 100); DoUpdateWorldState(WORLD_STATE_BM_RIFT, 0); } @@ -130,7 +130,7 @@ public: if (GetData(TYPE_MEDIVH) == IN_PROGRESS) return; - pPlayer->SendUpdateWorldState(WORLD_STATE_BM,0); + pPlayer->SendUpdateWorldState(WORLD_STATE_BM, 0); } void OnCreatureCreate(Creature* creature) @@ -267,7 +267,7 @@ public: if (entry == RIFT_BOSS) entry = RandRiftBoss(); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.",entry); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Summoning rift boss entry %u.", entry); Position pos; me->GetRandomNearPosition(pos, 10.0f); @@ -286,18 +286,18 @@ public: { if (Creature* pMedivh = instance->GetCreature(MedivhGUID)) { - uint8 tmp = urand(0,2); + uint8 tmp = urand(0, 2); if (tmp >= CurrentRiftId) ++tmp; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).",tmp,CurrentRiftId); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Dark Portal: Creating Time Rift at locationId %i (old locationId was %u).", tmp, CurrentRiftId); CurrentRiftId = tmp; Creature* pTemp = pMedivh->SummonCreature(C_TIME_RIFT, - PortalLocation[tmp][0],PortalLocation[tmp][1],PortalLocation[tmp][2],PortalLocation[tmp][3], - TEMPSUMMON_CORPSE_DESPAWN,0); + PortalLocation[tmp][0], PortalLocation[tmp][1], PortalLocation[tmp][2], PortalLocation[tmp][3], + TEMPSUMMON_CORPSE_DESPAWN, 0); if (pTemp) { pTemp->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); @@ -306,11 +306,11 @@ public: if (Creature* pBoss = SummonedPortalBoss(pTemp)) { if (pBoss->GetEntry() == C_AEONUS) - pBoss->AddThreat(pMedivh,0.0f); + pBoss->AddThreat(pMedivh, 0.0f); else { - pBoss->AddThreat(pTemp,0.0f); - pTemp->CastSpell(pBoss,SPELL_RIFT_CHANNEL,false); + pBoss->AddThreat(pTemp, 0.0f); + pTemp->CastSpell(pBoss, SPELL_RIFT_CHANNEL, false); } } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index e402a48c59a..f2dd3e2d481 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -85,7 +85,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 4fa3fafebc5..ac934c4e5f4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -76,12 +76,12 @@ public: void EnterCombat(Unit * /*who*/) { - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); } void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) @@ -106,7 +106,7 @@ public: DoCast(me->getVictim(), SPELL_SAND_BREATH); - DoScriptText(RAND(SAY_BREATH1,SAY_BREATH2), me); + DoScriptText(RAND(SAY_BREATH1, SAY_BREATH2), me); SandBreath_Timer = 10000 + rand()%10000; } else SandBreath_Timer -= diff; @@ -119,7 +119,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WING_BUFFET); WingBuffet_Timer = 25000+rand()%10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 0243441215b..0cdbcf9fc20 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -139,7 +139,7 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); } void JustDied(Unit * /*victim*/) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp index 974bd92c6cc..54382449303 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp @@ -96,7 +96,7 @@ public: for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) { if (Player* pPlayer = itr->getSource()) - pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER,0); + pPlayer->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0); } } } @@ -139,7 +139,7 @@ public: ++mBarrelCount; DoUpdateWorldState(WORLD_STATE_OH, mBarrelCount); - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u",mBarrelCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: go_barrel_old_hillsbrad count %u", mBarrelCount); m_auiEncounter[0] = IN_PROGRESS; @@ -160,7 +160,7 @@ public: { ++mThrallEventCount; m_auiEncounter[1] = NOT_STARTED; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); m_auiEncounter[2] = NOT_STARTED; m_auiEncounter[3] = NOT_STARTED; m_auiEncounter[4] = NOT_STARTED; @@ -173,29 +173,29 @@ public: m_auiEncounter[3] = data; m_auiEncounter[4] = data; m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.",mThrallEventCount); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event failed %u times. Resetting all sub-events.", mThrallEventCount); } } else m_auiEncounter[1] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall escort event adjusted to data %u.", data); break; } case TYPE_THRALL_PART1: m_auiEncounter[2] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part I adjusted to data %u.", data); break; case TYPE_THRALL_PART2: m_auiEncounter[3] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part II adjusted to data %u.", data); break; case TYPE_THRALL_PART3: m_auiEncounter[4] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part III adjusted to data %u.", data); break; case TYPE_THRALL_PART4: m_auiEncounter[5] = data; - sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.",data); + sLog->outDebug(LOG_FILTER_TSCR, "TSCR: Instance Old Hillsbrad: Thrall event part IV adjusted to data %u.", data); break; } } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 5c7f49e23df..ff296d3ce3b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -77,7 +77,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); InstanceScript* pInstance = pCreature->GetInstanceScript(); - if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS,1)) + if (pInstance && pInstance->GetData(TYPE_BARREL_DIVERSION) != DONE && !pPlayer->HasItemCount(ITEM_ENTRY_BOMBS, 1)) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_HELLO_EROZION1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (pPlayer->GetQuestStatus(QUEST_ENTRY_RETURN) == QUEST_STATUS_COMPLETE) @@ -208,8 +208,8 @@ public: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) { - pInstance->SetData(TYPE_THRALL_EVENT,IN_PROGRESS); - pInstance->SetData(TYPE_THRALL_PART1,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } DoScriptText(SAY_TH_START_EVENT_PART1, pCreature); @@ -229,9 +229,9 @@ public: case GOSSIP_ACTION_INFO_DEF+20: pPlayer->SEND_GOSSIP_MENU(GOSSIP_ID_SKARLOC3, pCreature->GetGUID()); - pCreature->SummonCreature(SKARLOC_MOUNT,2038.81f,270.26f,63.20f,5.41f,TEMPSUMMON_TIMED_DESPAWN,12000); + pCreature->SummonCreature(SKARLOC_MOUNT, 2038.81f, 270.26f, 63.20f, 5.41f, TEMPSUMMON_TIMED_DESPAWN, 12000); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART2,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); @@ -241,7 +241,7 @@ public: case GOSSIP_ACTION_INFO_DEF+3: pPlayer->CLOSE_GOSSIP_MENU(); if (pInstance) - pInstance->SetData(TYPE_THRALL_PART3,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART3, IN_PROGRESS); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, pCreature->AI())->StartWP(); break; } @@ -305,7 +305,7 @@ public: { case 8: SetRun(false); - me->SummonCreature(18764,2181.87f,112.46f,89.45f,0.26f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(18764, 2181.87f, 112.46f, 89.45f, 0.26f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 9: DoScriptText(SAY_TH_ARMORY, me); @@ -323,27 +323,27 @@ public: SetRun(); break; case 15: - me->SummonCreature(MOB_ENTRY_RIFLE,2200.28f,137.37f,87.93f,5.07f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2197.44f,131.83f,87.93f,0.78f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2203.62f,135.40f,87.93f,3.70f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2200.75f,130.13f,87.93f,1.48f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2200.28f, 137.37f, 87.93f, 5.07f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2197.44f, 131.83f, 87.93f, 0.78f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2203.62f, 135.40f, 87.93f, 3.70f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2200.75f, 130.13f, 87.93f, 1.48f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 21: - me->SummonCreature(MOB_ENTRY_RIFLE,2135.80f,154.01f,67.45f,4.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2144.36f,151.87f,67.74f,4.46f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2142.12f,154.41f,67.12f,4.56f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2138.08f,155.38f,67.24f,4.60f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2135.80f, 154.01f, 67.45f, 4.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2144.36f, 151.87f, 67.74f, 4.46f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2142.12f, 154.41f, 67.12f, 4.56f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2138.08f, 155.38f, 67.24f, 4.60f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 25: - me->SummonCreature(MOB_ENTRY_RIFLE,2102.98f,192.17f,65.24f,6.02f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WARDEN,2108.48f,198.75f,65.18f,5.15f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2106.11f,197.29f,65.18f,5.63f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_VETERAN,2104.18f,194.82f,65.18f,5.75f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_RIFLE, 2102.98f, 192.17f, 65.24f, 6.02f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WARDEN, 2108.48f, 198.75f, 65.18f, 5.15f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2106.11f, 197.29f, 65.18f, 5.63f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: DoScriptText(SAY_TH_SKARLOC_MEET, me); - me->SummonCreature(ENTRY_SCARLOC,2036.48f,271.22f,63.43f,5.27f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,30000); - //temporary,skarloc should rather be triggered to walk up to thrall + me->SummonCreature(ENTRY_SCARLOC, 2036.48f, 271.22f, 63.43f, 5.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); + //temporary, skarloc should rather be triggered to walk up to thrall break; case 30: SetEscortPaused(true); @@ -357,12 +357,12 @@ public: break; case 37: //possibly regular patrollers? If so, remove this and let database handle them - me->SummonCreature(MOB_ENTRY_WATCHMAN,2124.26f,522.16f,56.87f,3.99f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_WATCHMAN,2121.69f,525.37f,57.11f,4.01f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_SENTRY,2124.65f,524.55f,56.63f,3.98f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2124.26f, 522.16f, 56.87f, 3.99f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_WATCHMAN, 2121.69f, 525.37f, 57.11f, 4.01f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_SENTRY, 2124.65f, 524.55f, 56.63f, 3.98f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 59: - me->SummonCreature(SKARLOC_MOUNT,2488.64f,625.77f,58.26f,4.71f,TEMPSUMMON_TIMED_DESPAWN,10000); + me->SummonCreature(SKARLOC_MOUNT, 2488.64f, 625.77f, 58.26f, 4.71f, TEMPSUMMON_TIMED_DESPAWN, 10000); DoUnmount(); HadMount = false; SetRun(false); @@ -379,10 +379,10 @@ public: SetRun(false); break; case 68: - me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR,2500.22f,692.60f,55.50f,2.84f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT,2500.13f,696.55f,55.51f,3.38f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.55f,693.64f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN,2500.94f,695.81f,55.50f,3.14f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_BARN_PROTECTOR, 2500.22f, 692.60f, 55.50f, 2.84f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_LOOKOUT, 2500.13f, 696.55f, 55.51f, 3.38f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.55f, 693.64f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_BARN_GUARDSMAN, 2500.94f, 695.81f, 55.50f, 3.14f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 71: SetRun(); @@ -391,10 +391,10 @@ public: SetRun(false); break; case 83: - me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR,2627.33f,646.82f,56.03f,4.28f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT,2624.14f,648.03f,56.03f,4.50f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2625.32f,649.60f,56.03f,4.38f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); - me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN,2627.22f,649.00f,56.03f,4.34f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,5000); + me->SummonCreature(MOB_ENTRY_CHURCH_PROTECTOR, 2627.33f, 646.82f, 56.03f, 4.28f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_LOOKOUT, 2624.14f, 648.03f, 56.03f, 4.50f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2625.32f, 649.60f, 56.03f, 4.38f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); + me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: DoScriptText(SAY_TH_CHURCH_END, me); @@ -405,10 +405,10 @@ public: SetRun(false); break; case 93: - me->SummonCreature(MOB_ENTRY_INN_PROTECTOR,2652.71f,660.31f,61.93f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_LOOKOUT,2648.96f,662.59f,61.93f,0.79f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2657.36f,662.34f,61.93f,2.68f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); - me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN,2656.39f,659.77f,61.93f,2.61f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,5000); + me->SummonCreature(MOB_ENTRY_INN_PROTECTOR, 2652.71f, 660.31f, 61.93f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_LOOKOUT, 2648.96f, 662.59f, 61.93f, 0.79f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2657.36f, 662.34f, 61.93f, 2.68f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); + me->SummonCreature(MOB_ENTRY_INN_GUARDSMAN, 2656.39f, 659.77f, 61.93f, 2.61f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 94: if (uint64 TarethaGUID = pInstance->GetData64(DATA_TARETHA)) @@ -419,7 +419,7 @@ public: break; case 95: DoScriptText(SAY_TH_MEET_TARETHA, me); - pInstance->SetData(TYPE_THRALL_PART3,DONE); + pInstance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: @@ -456,7 +456,7 @@ public: } //alot will happen here, thrall and taretha talk, erozion appear at spot to explain - me->SummonCreature(EROZION_ENTRY,2646.47f,680.416f,55.38f,4.16f,TEMPSUMMON_TIMED_DESPAWN,120000); + me->SummonCreature(EROZION_ENTRY, 2646.47f, 680.416f, 55.38f, 4.16f, TEMPSUMMON_TIMED_DESPAWN, 120000); } break; case 108: @@ -483,7 +483,7 @@ public: } if (HasEscortState(STATE_ESCORT_ESCORTING)) { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1,SAY_TH_LEAVE_COMBAT2,SAY_TH_LEAVE_COMBAT3), me); + DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1, SAY_TH_LEAVE_COMBAT2, SAY_TH_LEAVE_COMBAT3), me); } } void StartWP() @@ -494,16 +494,16 @@ public: void DoMount() { me->Mount(SKARLOC_MOUNT_MODEL); - me->SetSpeed(MOVE_RUN,SPEED_MOUNT); + me->SetSpeed(MOVE_RUN, SPEED_MOUNT); } void DoUnmount() { me->Unmount(); - me->SetSpeed(MOVE_RUN,SPEED_RUN); + me->SetSpeed(MOVE_RUN, SPEED_RUN); } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1,SAY_TH_RANDOM_AGGRO2,SAY_TH_RANDOM_AGGRO3,SAY_TH_RANDOM_AGGRO4), me); + DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1, SAY_TH_RANDOM_AGGRO2, SAY_TH_RANDOM_AGGRO3, SAY_TH_RANDOM_AGGRO4), me); if (me->IsMounted()) { DoUnmount(); @@ -530,18 +530,18 @@ public: void KilledUnit(Unit * /*victim*/) { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1,SAY_TH_RANDOM_KILL2,SAY_TH_RANDOM_KILL3), me); + DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); } void JustDied(Unit *slayer) { if (pInstance) - pInstance->SetData(TYPE_THRALL_EVENT,FAIL); + pInstance->SetData(TYPE_THRALL_EVENT, FAIL); // Don't do a yell if he kills self (if player goes too far or at the end). if (slayer == me) return; - DoScriptText(RAND(SAY_TH_RANDOM_DIE1,SAY_TH_RANDOM_DIE2), me); + DoScriptText(RAND(SAY_TH_RANDOM_DIE1, SAY_TH_RANDOM_DIE2), me); } void UpdateAI(const uint32 diff) @@ -554,7 +554,7 @@ public: //TODO: add his abilities'n-crap here if (!LowHp && HealthBelowPct(20)) { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1,SAY_TH_RANDOM_LOW_HP2), me); + DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1, SAY_TH_RANDOM_LOW_HP2), me); LowHp = true; } } @@ -596,9 +596,9 @@ public: if (pInstance && pInstance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) { - pInstance->SetData(TYPE_THRALL_PART4,IN_PROGRESS); + pInstance->SetData(TYPE_THRALL_PART4, IN_PROGRESS); if (pInstance->GetData64(DATA_EPOCH) == 0) - pCreature->SummonCreature(ENTRY_EPOCH,2639.13f,698.55f,65.43f,4.59f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,120000); + pCreature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000); if (uint64 ThrallGUID = pInstance->GetData64(DATA_THRALL)) { diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index 7bbec40784d..5ff4d8e1381 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -70,7 +70,7 @@ public: if (Wrath_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_WRATH); Wrath_Timer = 8000; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp index 88426f473c6..a8f088f343b 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_noxxion.cpp @@ -63,7 +63,7 @@ public: void SummonAdds(Unit* pVictim) { - if (Creature *Add = DoSpawnCreature(13456, float(irand(-7,7)), float(irand(-7,7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) + if (Creature *Add = DoSpawnCreature(13456, float(irand(-7, 7)), float(irand(-7, 7)), 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Add->AI()->AttackStart(pVictim); } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 57231ba33fd..147e20fab80 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -63,7 +63,7 @@ public: void JustDied(Unit* /*killer*/) { - me->SummonCreature(12238,28.067f,61.875f,-123.405f,4.67f,TEMPSUMMON_TIMED_DESPAWN,600000); + me->SummonCreature(12238, 28.067f, 61.875f, -123.405f, 4.67f, TEMPSUMMON_TIMED_DESPAWN, 600000); } void UpdateAI(const uint32 diff) @@ -82,7 +82,7 @@ public: if (Boulder_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BOULDER); Boulder_Timer = 10000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 720e4603b1f..596d4eb8bbe 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -77,14 +77,14 @@ struct sOnyxMove static sOnyxMove aMoveData[]= { - {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f},//west - {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f},//east - {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f},//north-west - {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f},//north-east - {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f},//south-east - {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f},//south-west - {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f},//south - {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f},//north + {0, 1, SPELL_BREATH_WEST_TO_EAST, -33.5561f, -182.682f, -56.9457f}, //west + {1, 0, SPELL_BREATH_EAST_TO_WEST, -31.4963f, -250.123f, -55.1278f}, //east + {2, 4, SPELL_BREATH_NW_TO_SE, 6.8951f, -180.246f, -55.896f}, //north-west + {3, 5, SPELL_BREATH_NE_TO_SW, 10.2191f, -247.912f, -55.896f}, //north-east + {4, 2, SPELL_BREATH_SE_TO_NW, -63.5156f, -240.096f, -55.477f}, //south-east + {5, 3, SPELL_BREATH_SW_TO_NE, -58.2509f, -189.020f, -55.790f}, //south-west + {6, 7, SPELL_BREATH_SOUTH_TO_NORTH, -65.8444f, -213.809f, -55.2985f}, //south + {7, 6, SPELL_BREATH_NORTH_TO_SOUTH, 22.8763f, -217.152f, -55.0548f}, //north }; const Position MiddleRoomLocation = {-23.6155f, -215.357f, -55.7344f, 0.0f}; @@ -200,7 +200,7 @@ public: void JustSummoned(Creature *pSummoned) { pSummoned->SetInCombatWithZone(); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) pSummoned->AI()->AttackStart(pTarget); switch (pSummoned->GetEntry()) @@ -262,7 +262,7 @@ public: break; case 10: me->SetFlying(true); - me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(),Phase2Location.GetPositionY(),Phase2Location.GetPositionZ()+25); + me->GetMotionMaster()->MovePoint(11, Phase2Location.GetPositionX(), Phase2Location.GetPositionY(), Phase2Location.GetPositionZ()+25); me->SetSpeed(MOVE_FLIGHT, 1.0f); DoScriptText(SAY_PHASE_2_TRANS, me); if (m_pInstance) @@ -416,7 +416,7 @@ public: SetCombatMovement(true); me->SetFlying(false); m_bIsMoving = false; - me->GetMotionMaster()->MovePoint(9,me->GetHomePosition()); + me->GetMotionMaster()->MovePoint(9, me->GetHomePosition()); return; } @@ -478,7 +478,7 @@ public: { me->SummonCreature(NPC_WHELP, aSpawnLocations[0].GetPositionX(), aSpawnLocations[0].GetPositionY(), aSpawnLocations[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); me->SummonCreature(NPC_WHELP, aSpawnLocations[1].GetPositionX(), aSpawnLocations[1].GetPositionY(), aSpawnLocations[1].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_DESPAWN); - if (m_uiSummonWhelpCount >= RAID_MODE(20,40)) + if (m_uiSummonWhelpCount >= RAID_MODE(20, 40)) { m_uiSummonWhelpCount = 0; m_uiWhelpTimer = 90000; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index ca9f206835b..84923d3def5 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -41,7 +41,7 @@ public: //Eruption is a BFS graph problem //One map to remember all floor, one map to keep floor that still need to erupt and one queue to know what needs to be removed - std::map<uint64,uint32> FloorEruptionGUID[2]; + std::map<uint64, uint32> FloorEruptionGUID[2]; std::queue<uint64> FloorEruptionGUIDQueue; uint64 m_uiOnyxiasGUID; @@ -81,7 +81,7 @@ public: { if ((go->GetGOInfo()->displayId == 4392 || go->GetGOInfo()->displayId == 4472) && go->GetGOInfo()->trap.spellId == 17731) { - FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(),0)); + FloorEruptionGUID[0].insert(std::make_pair(go->GetGUID(), 0)); return; } @@ -90,7 +90,7 @@ public: case GO_WHELP_SPAWNER: Position goPos; go->GetPosition(&goPos); - if (Creature* pTemp = go->SummonCreature(NPC_WHELP,goPos,TEMPSUMMON_CORPSE_DESPAWN)) + if (Creature* pTemp = go->SummonCreature(NPC_WHELP, goPos, TEMPSUMMON_CORPSE_DESPAWN)) { pTemp->SetInCombatWithZone(); ++m_uiManyWhelpsCounter; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h index 8fb2130c730..bd163b2d484 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h +++ b/src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h @@ -61,6 +61,6 @@ enum eAchievementData ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER = 12568, // Criteria for achievement 4406: Many Whelps! Handle It! (25 player) Hatch 50 eggs in 10s ACHIEV_CRITERIA_DEEP_BREATH_10_PLAYER = 12566, // Criteria for achievement 4404: She Deep Breaths More (10 player) Everybody evade Deep Breath ACHIEV_CRITERIA_DEEP_BREATH_25_PLAYER = 12569, // Criteria for achievement 4407: She Deep Breaths More (25 player) Everybody evade Deep Breath - ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10,25 player) 5 min kill + ACHIEV_TIMED_START_EVENT = 6601, // Timed event for achievement 4402, 4005: More Dots! (10, 25 player) 5 min kill }; #endif diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp index e596773f875..abe8e7e8166 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp @@ -105,7 +105,7 @@ public: case GO_GONG: uiGongGUID = go->GetGUID(); if (m_auiEncounter[0] == DONE) - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; default: break; @@ -123,7 +123,7 @@ public: case 9: case 14: if (GameObject* go = instance->GetGameObject(uiGongGUID)) - go->RemoveFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); break; case 1: case 10: @@ -134,7 +134,7 @@ public: if (!go) return; - go->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_UNK1); + go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_UNK1); uint32 uiCreature = 0; uint8 uiSummonTimes = 0; @@ -156,17 +156,17 @@ public: break; } - if (Creature* creature = go->SummonCreature(uiCreature,2502.635f,844.140f,46.896f,0.633f)) + if (Creature* creature = go->SummonCreature(uiCreature, 2502.635f, 844.140f, 46.896f, 0.633f)) { if (uiGongWaves == 10 || uiGongWaves == 1) { for (uint8 i = 0; i < uiSummonTimes; ++i) { - if (Creature* pSummon = go->SummonCreature(uiCreature,2502.635f + float(irand(-5,5)),844.140f + float(irand(-5,5)),46.896f,0.633f)) - pSummon->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + if (Creature* pSummon = go->SummonCreature(uiCreature, 2502.635f + float(irand(-5, 5)), 844.140f + float(irand(-5, 5)), 46.896f, 0.633f)) + pSummon->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } } - creature->GetMotionMaster()->MovePoint(0,2533.479f + float(irand(-5,5)),870.020f + float(irand(-5,5)),47.678f); + creature->GetMotionMaster()->MovePoint(0, 2533.479f + float(irand(-5, 5)), 870.020f + float(irand(-5, 5)), 47.678f); } break; } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp index a49e12e99ca..cef5058187e 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.cpp @@ -100,7 +100,7 @@ public: if (pInstance) { - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); return true; } @@ -137,7 +137,7 @@ public: void Reset() { - uiWebTimer = urand(5000,8000); + uiWebTimer = urand(5000, 8000); } void UpdateAI(const uint32 uiDiff) @@ -151,7 +151,7 @@ public: if (uiWebTimer <= uiDiff) { DoCast(me->getVictim(), SPELL_WEB); - uiWebTimer = urand(7000,16000); + uiWebTimer = urand(7000, 16000); } else uiWebTimer -= uiDiff; } @@ -161,7 +161,7 @@ public: void JustDied(Unit* /*pKiller*/) { if (pInstance) - pInstance->SetData(DATA_GONG_WAVES,pInstance->GetData(DATA_GONG_WAVES)+1); + pInstance->SetData(DATA_GONG_WAVES, pInstance->GetData(DATA_GONG_WAVES)+1); } }; diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index f1b21dba2ab..8fc0c83f83d 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -111,13 +111,13 @@ public: DoScriptText(SAY_FINALY, me, pPlayer); break; case 43: - me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: DoScriptText(SAY_WIN, me, pPlayer); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (pPlayer && pPlayer->GetTypeId() == TYPEID_PLAYER) - CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER,me); + CAST_PLR(pPlayer)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: DoScriptText(SAY_END, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index bd916d801df..38477ab8486 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -65,11 +65,11 @@ public: void Reset() { bIsEnraged = false; - uiMortalWoundTimer = urand(2000,7000); - uiSandtrapTimer = urand(20000,30000); - uiWideSlashTimer = urand(10000,15000); - uiTrashTimer = urand(20000,25000); - uiSummonPlayerTimer = urand(30000,40000); + uiMortalWoundTimer = urand(2000, 7000); + uiSandtrapTimer = urand(20000, 30000); + uiWideSlashTimer = urand(10000, 15000); + uiTrashTimer = urand(20000, 25000); + uiSummonPlayerTimer = urand(30000, 40000); if (pInstance) pInstance->SetData(DATA_KURINNAXX_EVENT, NOT_STARTED); @@ -103,7 +103,7 @@ public: if (uiMortalWoundTimer <= diff) { DoCast(me->getVictim(), SPELL_MORTALWOUND); - uiMortalWoundTimer = urand(2000,7000); + uiMortalWoundTimer = urand(2000, 7000); } else uiMortalWoundTimer -= diff; //Santrap spell @@ -118,14 +118,14 @@ public: if (uiWideSlashTimer <= diff) { DoCast(me->getVictim(), SPELL_WIDE_SLASH); - uiWideSlashTimer = urand(10000,15000); + uiWideSlashTimer = urand(10000, 15000); } else uiWideSlashTimer -= diff; //Trash spell if (uiTrashTimer <= diff) { DoCast(me, SPELL_TRASH); - uiTrashTimer = urand(20000,25000); + uiTrashTimer = urand(20000, 25000); } else uiTrashTimer -= diff; //Summon Player spell @@ -133,7 +133,7 @@ public: { if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(pTarget, SPELL_SUMMON_PLAYER); - uiSummonPlayerTimer = urand(30000,40000); + uiSummonPlayerTimer = urand(30000, 40000); } else uiSummonPlayerTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index bae7f4ec8f7..37579f32a5e 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -78,11 +78,11 @@ public: void Reset() { - uiTrampleTimer = urand(3000,7000); - uiDrainManaTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); + uiDrainManaTimer = urand(3000, 7000); uiPhaseTimer = 90000; Phase = NORMAL; - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); if (pInstance) pInstance->SetData(DATA_MOAM_EVENT, NOT_STARTED); @@ -126,21 +126,21 @@ public: { DoCast(me->getVictim(), SPELL_ARCANEERUPTION); DoScriptText(EMOTE_MANA_FULL, me); - me->SetPower(POWER_MANA,0); + me->SetPower(POWER_MANA, 0); } //Trample Spell if (uiTrampleTimer <= diff) { DoCast(me->getVictim(), SPELL_TRAMPLE); - uiTrampleTimer = urand(3000,7000); + uiTrampleTimer = urand(3000, 7000); } else uiTrampleTimer -= diff; //Drain Mana if (uiDrainManaTimer <= diff) { DrainMana(); - uiDrainManaTimer = urand(3000,7000); + uiDrainManaTimer = urand(3000, 7000); } else uiDrainManaTimer -= diff; DoMeleeAttackIfReady(); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 47c6a5e9c6d..50aeea950d8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -194,11 +194,11 @@ public: if (Charge_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) { DoCast(pTarget, SPELL_CHARGE); - //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true,1); + //me->SendMonsterMove(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, true, 1); AttackStart(pTarget); } @@ -210,7 +210,7 @@ public: { DoCast(me->getVictim(), SPELL_KNOCKBACK); if (DoGetThreat(me->getVictim())) - DoModifyThreatPercent(me->getVictim(),-80); + DoModifyThreatPercent(me->getVictim(), -80); KnockBack_Timer = 15000 + rand()%10000; } else KnockBack_Timer -= diff; @@ -273,8 +273,8 @@ public: for (uint8 i = 0; i < 10; ++i) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); - Creature* Summoned = me->SummonCreature(15621,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000); if (Summoned && pTarget) Summoned->AI()->AttackStart(pTarget); } @@ -306,7 +306,7 @@ public: Unit *pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI)); Unit *pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM)); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: if (pKri) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index dfaf4c5187a..801a4b078b5 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -241,7 +241,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(pTarget); } @@ -284,7 +284,7 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { me->InterruptNonMeleeSpells(false); DoCast(pTarget, SPELL_GREEN_BEAM); @@ -300,7 +300,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { Creature* Spawned = NULL; @@ -328,7 +328,7 @@ public: me->SetUInt64Value(UNIT_FIELD_TARGET, 0); //Select random target for dark beam to start on - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) { //Face our target DarkGlareAngle = me->GetAngle(pTarget); @@ -617,12 +617,12 @@ public: for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr) { if (Player* pPlr = itr->getSource()) - pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER,pPlr); + pPlr->PlayDirectSound(RANDOM_SOUND_WHISPER, pPlr); } } //One random wisper every 90 - 300 seconds - WisperTimer = urand(90000,300000); + WisperTimer = urand(90000, 300000); } else WisperTimer -= diff; return; @@ -988,7 +988,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_MIND_FLAY); @@ -1064,7 +1064,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (!pTarget) { me->Kill(me); @@ -1281,7 +1281,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(pTarget, SPELL_GREEN_BEAM); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 1cb0a9631fb..8a17b7285e2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -112,19 +112,19 @@ public: //Summon 1-3 Spawns of Fankriss at random time. if (SpawnSpawns_Timer <= diff) { - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 1: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; case 2: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); break; } SpawnSpawns_Timer = 30000 + rand()%30000; @@ -137,7 +137,7 @@ public: if (SpawnHatchlings_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) { DoCast(pTarget, SPELL_ROOT); @@ -145,10 +145,10 @@ public: if (DoGetThreat(pTarget)) DoModifyThreatPercent(pTarget, -100); - switch(urand(0,2)) + switch(urand(0, 2)) { case 0: - DoTeleportPlayer(pTarget, -8106.0142f,1289.2900f,-74.419533f,5.112f); + DoTeleportPlayer(pTarget, -8106.0142f, 1289.2900f, -74.419533f, 5.112f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -163,7 +163,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 1: - DoTeleportPlayer(pTarget, -7990.135354f,1155.1907f,-78.849319f,2.608f); + DoTeleportPlayer(pTarget, -7990.135354f, 1155.1907f, -78.849319f, 2.608f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); @@ -178,7 +178,7 @@ public: Hatchling->AI()->AttackStart(pTarget); break; case 2: - DoTeleportPlayer(pTarget,-8159.7753f,1127.9064f,-76.868660f,0.675f); + DoTeleportPlayer(pTarget, -8159.7753f, 1127.9064f, -76.868660f, 0.675f); Hatchling = me->SummonCreature(15962, pTarget->GetPositionX()-3, pTarget->GetPositionY()-3, pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Hatchling) Hatchling->AI()->AttackStart(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 0ae028e99f6..02b671083b3 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -95,7 +95,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_WYVERNSTING); Wyvern_Timer = 15000 + rand()%17000; } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 510db661bf0..439ca675f1e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -112,7 +112,7 @@ public: if (Submerged && ChangeTarget_Timer <= diff) { Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 824c978e415..4c9e2f5eb7f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -106,7 +106,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -135,7 +135,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -243,7 +243,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); @@ -264,7 +264,7 @@ public: { //Attack random Gamers Unit *pTarget = NULL; - pTarget = SelectTarget(SELECT_TARGET_RANDOM,1); + pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1); if (pTarget) me->AddThreat(pTarget, 1.0f); me->TauntApply(pTarget); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index f29b3b9f070..e6ad78a9d85 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -44,7 +44,7 @@ EndScriptData */ class ov_mycoordinates { public: - float x,y,z,r; + float x, y, z, r; ov_mycoordinates(float cx, float cy, float cz, float cr) { x = cx; y = cy; z = cz; r = cr; @@ -102,7 +102,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1,SAY_SLAY2,SAY_SLAY3), me); + DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); } void JustDied(Unit* /*Killer*/) @@ -115,7 +115,7 @@ public: { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1,SAY_AGGRO2,SAY_AGGRO3), me); + DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); } void UpdateAI(const uint32 diff) @@ -154,18 +154,18 @@ public: if (Blink_Timer <= diff) { //DoCast(me, SPELL_BLINK); - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: - me->GetMap()->CreatureRelocation(me, -8340.782227f,2083.814453f,125.648788f,0.0f); + me->GetMap()->CreatureRelocation(me, -8340.782227f, 2083.814453f, 125.648788f, 0.0f); DoResetThreat(); break; case 1: - me->GetMap()->CreatureRelocation(me, -8341.546875f,2118.504639f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8341.546875f, 2118.504639f, 133.058151f, 0.0f); DoResetThreat(); break; case 2: - me->GetMap()->CreatureRelocation(me, -8318.822266f,2058.231201f,133.058151f,0.0f); + me->GetMap()->CreatureRelocation(me, -8318.822266f, 2058.231201f, 133.058151f, 0.0f); DoResetThreat(); break; } @@ -209,13 +209,13 @@ public: { DoScriptText(SAY_SPLIT, me); - ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f,2083.814453f,125.648788f,0); - ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f,2118.504639f,133.058151f,0); - ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f,2058.231201f,133.058151f,0); + ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); + ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); + ov_mycoordinates *place3 = new ov_mycoordinates(-8318.822266f, 2058.231201f, 133.058151f, 0); ov_mycoordinates *bossc=place1, *i1=place2, *i2=place3; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: bossc=place1; @@ -264,7 +264,7 @@ public: case 25: Images25 = true; break; } - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); Creature *Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image1) @@ -276,7 +276,7 @@ public: CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true; } - Creature *Image2 = me->SummonCreature(15263,i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); + Creature *Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000); if (Image2) { Image2->SetMaxHealth(me->GetMaxHealth() / 5); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index ac6dddc5f82..ceeb593d131 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -194,7 +194,7 @@ struct boss_twinemperorsAI : public ScriptedAI if (Heal_Timer <= diff) { Unit *pOtherBoss = GetOtherBoss(); - if (pOtherBoss && pOtherBoss->IsWithinDist(me,60)) + if (pOtherBoss && pOtherBoss->IsWithinDist(me, 60)) { DoCast(pOtherBoss, SPELL_HEAL_BROTHER); Heal_Timer = 1000; @@ -311,8 +311,8 @@ struct boss_twinemperorsAI : public ScriptedAI Creature *RespawnNearbyBugsAndGetOne() { std::list<Creature*> lUnitList; - me->GetCreatureListWithEntryInGrid(lUnitList,15316,150.0f); - me->GetCreatureListWithEntryInGrid(lUnitList,15317,150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15316, 150.0f); + me->GetCreatureListWithEntryInGrid(lUnitList, 15317, 150.0f); if (lUnitList.empty()) return NULL; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index 3d84ca41793..ade4fab62e8 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -152,7 +152,7 @@ public: void AddSentinelsNear(Unit * /*nears*/) { std::list<Creature*> assistList; - me->GetCreatureListWithEntryInGrid(assistList,15264,70.0f); + me->GetCreatureListWithEntryInGrid(assistList, 15264, 70.0f); if (assistList.empty()) return; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp index 5c376edf629..22973967052 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp @@ -25,66 +25,66 @@ int const pyramidSpawnTotal = 54; /* list of wave spawns: 0 = wave ID, 1 = creature id, 2 = x, 3 = y no z coordinat b/c they're all the same */ float pyramidSpawns [pyramidSpawnTotal][4] = { - {1,7789,1894.64f,1206.29f}, - {1,7787,1890.08f,1218.68f}, - {1,8876,1883.76f,1222.3f}, - {1,7789,1874.18f,1221.24f}, - {1,7787,1892.28f,1225.49f}, - {1,7788,1889.94f,1212.21f}, - {1,7787,1879.02f,1223.06f}, - {1,7789,1874.45f,1204.44f}, - {1,8876,1898.23f,1217.97f}, - {1,7787,1882.07f,1225.7f}, - {1,8877,1896.46f,1205.62f}, - {1,7787,1886.97f,1225.86f}, - {1,7787,1894.72f,1221.91f}, - {1,7787,1883.5f,1218.25f}, - {1,7787,1886.93f,1221.4f}, - {1,8876,1889.82f,1222.51f}, - {1,7788,1893.07f,1215.26f}, - {1,7788,1878.57f,1214.16f}, - {1,7788,1883.74f,1212.35f}, - {1,8877,1877,1207.27f}, - {1,8877,1873.63f,1204.65f}, - {1,8876,1877.4f,1216.41f}, - {1,8877,1899.63f,1202.52f}, - {2,7789,1902.83f,1223.41f}, - {2,8876,1889.82f,1222.51f}, - {2,7787,1883.5f,1218.25f}, - {2,7788,1883.74f,1212.35f}, - {2,8877,1877,1207.27f}, - {2,7787,1890.08f,1218.68f}, - {2,7789,1894.64f,1206.29f}, - {2,8876,1877.4f,1216.41f}, - {2,7787,1892.28f,1225.49f}, - {2,7788,1893.07f,1215.26f}, - {2,8877,1896.46f,1205.62f}, - {2,7789,1874.45f,1204.44f}, - {2,7789,1874.18f,1221.24f}, - {2,7787,1879.02f,1223.06f}, - {2,8876,1898.23f,1217.97f}, - {2,7787,1882.07f,1225.7f}, - {2,8877,1873.63f,1204.65f}, - {2,7787,1886.97f,1225.86f}, - {2,7788,1878.57f,1214.16f}, - {2,7787,1894.72f,1221.91f}, - {2,7787,1886.93f,1221.4f}, - {2,8876,1883.76f,1222.3f}, - {2,7788,1889.94f,1212.21f}, - {2,8877,1899.63f,1202.52f}, - {3,7788,1878.57f,1214.16f}, - {3,7787,1894.72f,1221.91f}, - {3,7787,1886.93f,1221.4f}, - {3,8876,1883.76f,1222.3f}, - {3,7788,1889.94f,1212.21f}, - {3,7275,1889.23f,1207.72f}, - {3,7796,1879.77f,1207.96f} + {1, 7789, 1894.64f, 1206.29f}, + {1, 7787, 1890.08f, 1218.68f}, + {1, 8876, 1883.76f, 1222.3f}, + {1, 7789, 1874.18f, 1221.24f}, + {1, 7787, 1892.28f, 1225.49f}, + {1, 7788, 1889.94f, 1212.21f}, + {1, 7787, 1879.02f, 1223.06f}, + {1, 7789, 1874.45f, 1204.44f}, + {1, 8876, 1898.23f, 1217.97f}, + {1, 7787, 1882.07f, 1225.7f}, + {1, 8877, 1896.46f, 1205.62f}, + {1, 7787, 1886.97f, 1225.86f}, + {1, 7787, 1894.72f, 1221.91f}, + {1, 7787, 1883.5f, 1218.25f}, + {1, 7787, 1886.93f, 1221.4f}, + {1, 8876, 1889.82f, 1222.51f}, + {1, 7788, 1893.07f, 1215.26f}, + {1, 7788, 1878.57f, 1214.16f}, + {1, 7788, 1883.74f, 1212.35f}, + {1, 8877, 1877, 1207.27f}, + {1, 8877, 1873.63f, 1204.65f}, + {1, 8876, 1877.4f, 1216.41f}, + {1, 8877, 1899.63f, 1202.52f}, + {2, 7789, 1902.83f, 1223.41f}, + {2, 8876, 1889.82f, 1222.51f}, + {2, 7787, 1883.5f, 1218.25f}, + {2, 7788, 1883.74f, 1212.35f}, + {2, 8877, 1877, 1207.27f}, + {2, 7787, 1890.08f, 1218.68f}, + {2, 7789, 1894.64f, 1206.29f}, + {2, 8876, 1877.4f, 1216.41f}, + {2, 7787, 1892.28f, 1225.49f}, + {2, 7788, 1893.07f, 1215.26f}, + {2, 8877, 1896.46f, 1205.62f}, + {2, 7789, 1874.45f, 1204.44f}, + {2, 7789, 1874.18f, 1221.24f}, + {2, 7787, 1879.02f, 1223.06f}, + {2, 8876, 1898.23f, 1217.97f}, + {2, 7787, 1882.07f, 1225.7f}, + {2, 8877, 1873.63f, 1204.65f}, + {2, 7787, 1886.97f, 1225.86f}, + {2, 7788, 1878.57f, 1214.16f}, + {2, 7787, 1894.72f, 1221.91f}, + {2, 7787, 1886.93f, 1221.4f}, + {2, 8876, 1883.76f, 1222.3f}, + {2, 7788, 1889.94f, 1212.21f}, + {2, 8877, 1899.63f, 1202.52f}, + {3, 7788, 1878.57f, 1214.16f}, + {3, 7787, 1894.72f, 1221.91f}, + {3, 7787, 1886.93f, 1221.4f}, + {3, 8876, 1883.76f, 1222.3f}, + {3, 7788, 1889.94f, 1212.21f}, + {3, 7275, 1889.23f, 1207.72f}, + {3, 7796, 1879.77f, 1207.96f} }; float Spawnsway[2][3] = { - {1884.86f,1228.62f,9}, - {1887.53f,1263,41} + {1884.86f, 1228.62f, 9}, + {1887.53f, 1263, 41} }; class instance_zulfarrak : public InstanceMapScript @@ -217,7 +217,7 @@ public: break; case PYRAMID_ARRIVED_AT_STAIR: SpawnPyramidWave(1); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_1); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_1); major_wave_Timer=120000; minor_wave_Timer=0; addGroupSize=2; @@ -225,7 +225,7 @@ public: case PYRAMID_WAVE_1: if (IsWaveAllDead()) { - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_2); major_wave_Timer = 10000; //give players a few seconds before wave 2 starts to rebuff } else @@ -242,7 +242,7 @@ public: { // beginning 2nd wave! SpawnPyramidWave(2); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_2); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_2); minor_wave_Timer = 0; addGroupSize=2; } @@ -253,7 +253,7 @@ public: if (IsWaveAllDead()) { SpawnPyramidWave(3); - SetData(EVENT_PYRAMID,PYRAMID_PRE_WAVE_3); + SetData(EVENT_PYRAMID, PYRAMID_PRE_WAVE_3); major_wave_Timer = 5000; //give NPCs time to return to their home spots } else @@ -269,12 +269,12 @@ public: if (major_wave_Timer<diff) { // move NPCs to bottom of stair - MoveNPCIfAlive(ENTRY_BLY,1887.92f,1228.179f,9.98f,4.78f); - MoveNPCIfAlive(ENTRY_MURTA,1891.57f,1228.68f,9.69f,4.78f); - MoveNPCIfAlive(ENTRY_ORO,1897.23f,1228.34f,9.43f,4.78f); - MoveNPCIfAlive(ENTRY_RAVEN,1883.68f,1227.95f,9.543f,4.78f); - MoveNPCIfAlive(ENTRY_WEEGLI,1878.02f,1227.65f,9.485f,4.78f); - SetData(EVENT_PYRAMID,PYRAMID_WAVE_3); + MoveNPCIfAlive(ENTRY_BLY, 1887.92f, 1228.179f, 9.98f, 4.78f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.57f, 1228.68f, 9.69f, 4.78f); + MoveNPCIfAlive(ENTRY_ORO, 1897.23f, 1228.34f, 9.43f, 4.78f); + MoveNPCIfAlive(ENTRY_RAVEN, 1883.68f, 1227.95f, 9.543f, 4.78f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1878.02f, 1227.65f, 9.485f, 4.78f); + SetData(EVENT_PYRAMID, PYRAMID_WAVE_3); } else major_wave_Timer -= diff; @@ -282,28 +282,28 @@ public: case PYRAMID_WAVE_3: if (IsWaveAllDead()) // move NPCS to their final positions { - SetData(EVENT_PYRAMID,PYRAMID_KILLED_ALL_TROLLS); - MoveNPCIfAlive(ENTRY_BLY,1883.82f,1200.83f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_MURTA,1891.83f,1201.45f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_ORO,1894.50f,1204.40f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_RAVEN,1874.11f,1206.17f,8.87f,1.32f); - MoveNPCIfAlive(ENTRY_WEEGLI,1877.52f,1199.63f,8.87f,1.32f); + SetData(EVENT_PYRAMID, PYRAMID_KILLED_ALL_TROLLS); + MoveNPCIfAlive(ENTRY_BLY, 1883.82f, 1200.83f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_MURTA, 1891.83f, 1201.45f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_ORO, 1894.50f, 1204.40f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_RAVEN, 1874.11f, 1206.17f, 8.87f, 1.32f); + MoveNPCIfAlive(ENTRY_WEEGLI, 1877.52f, 1199.63f, 8.87f, 1.32f); } break; }; } - std::list<uint64> addsAtBase,movedadds; + std::list<uint64> addsAtBase, movedadds; - void MoveNPCIfAlive(uint32 entry,float x,float y,float z,float o) + void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o) { if (Creature* npc = instance->GetCreature(GetData64(entry))) { if (npc->isAlive()) { npc->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - npc->GetMotionMaster()->MovePoint(1,x,y,z); - npc->SetHomePosition(x,y,z,o); + npc->GetMotionMaster()->MovePoint(1, x, y, z); + npc->SetHomePosition(x, y, z, o); } } } @@ -314,7 +314,7 @@ public: if (pyramidSpawns[i][0] == (float)wave) { Position pos = {pyramidSpawns[i][2], pyramidSpawns[i][3], 8.87f, 0}; - TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]),pos); + TempSummon* ts = instance->SummonCreature(uint32(pyramidSpawns[i][1]), pos); ts->GetMotionMaster()->MoveRandom(10); addsAtBase.push_back(ts->GetGUID()); } @@ -348,7 +348,7 @@ public: { if (Creature* add = instance->GetCreature(*addsAtBase.begin())) { - add->GetMotionMaster()->MovePath(PATH_ADDS,false); + add->GetMotionMaster()->MovePath(PATH_ADDS, false); movedadds.push_back(add->GetGUID()); } addsAtBase.erase(addsAtBase.begin()); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 554c3f94499..950ed2d7fc3 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -67,7 +67,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI,pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); + CAST_AI(npc_sergeant_bly::npc_sergeant_blyAI, pCreature->AI())->PlayerGUID = pPlayer->GetGUID(); pCreature->AI()->DoAction(0); } return true; @@ -133,11 +133,11 @@ public: //weegli doesn't fight - he goes & blows up the door if (Creature* pWeegli = pInstance->instance->GetCreature(pInstance->GetData64(ENTRY_WEEGLI))) pWeegli->AI()->DoAction(0); - DoScriptText(SAY_1,me); + DoScriptText(SAY_1, me); Text_Timer = 5000; break; case 2: - DoScriptText(SAY_2,me); + DoScriptText(SAY_2, me); Text_Timer = 5000; break; case 3: @@ -185,7 +185,7 @@ public: Text_Timer = 0; } - void switchFactionIfAlive(InstanceScript* pInstance,uint32 entry) + void switchFactionIfAlive(InstanceScript* pInstance, uint32 entry) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) if (crew->isAlive()) @@ -199,14 +199,14 @@ public: +## go_troll_cage +######*/ -void initBlyCrewMember(InstanceScript* pInstance, uint32 entry,float x,float y, float z) +void initBlyCrewMember(InstanceScript* pInstance, uint32 entry, float x, float y, float z) { if (Creature* crew = pInstance->instance->GetCreature(pInstance->GetData64(entry))) { crew->SetReactState(REACT_AGGRESSIVE); crew->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - crew->SetHomePosition(x,y,z,0); - crew->GetMotionMaster()->MovePoint(1,x,y,z); + crew->SetHomePosition(x, y, z, 0); + crew->GetMotionMaster()->MovePoint(1, x, y, z); crew->setFaction(FACTION_FREED); } } @@ -222,11 +222,11 @@ public: { pInstance->SetData(EVENT_PYRAMID, PYRAMID_CAGES_OPEN); //set bly & co to aggressive & start moving to top of stairs - initBlyCrewMember(pInstance,ENTRY_BLY,1884.99f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_RAVEN,1882.5f,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_ORO,1886.47f,1270.68f,41.68f); - initBlyCrewMember(pInstance,ENTRY_WEEGLI,1890,1263,41.52f); - initBlyCrewMember(pInstance,ENTRY_MURTA,1891.19f,1272.03f,41.60f); + initBlyCrewMember(pInstance, ENTRY_BLY, 1884.99f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_RAVEN, 1882.5f, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_ORO, 1886.47f, 1270.68f, 41.68f); + initBlyCrewMember(pInstance, ENTRY_WEEGLI, 1890, 1263, 41.52f); + initBlyCrewMember(pInstance, ENTRY_MURTA, 1891.19f, 1272.03f, 41.60f); } return false; } @@ -319,7 +319,7 @@ public: void AttackStart(Unit *victim) { - AttackStartCaster(victim,10);//keep back & toss bombs/shoot + AttackStartCaster(victim, 10);//keep back & toss bombs/shoot } void JustDied(Unit * /*victim*/) @@ -335,7 +335,7 @@ public: if (Bomb_Timer < diff) { - DoCast(me->getVictim(),SPELL_BOMB); + DoCast(me->getVictim(), SPELL_BOMB); Bomb_Timer = 10000; } else @@ -343,7 +343,7 @@ public: if (me->isAttackReady() && !me->IsWithinMeleeRange(me->getVictim())) { - DoCast(me->getVictim(),SPELL_SHOOT); + DoCast(me->getVictim(), SPELL_SHOOT); me->SetSheath(SHEATH_STATE_RANGED); } else @@ -359,9 +359,9 @@ public: { if (pInstance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { - pInstance->SetData(EVENT_PYRAMID,PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO,me); - me->SetHomePosition(1882.69f,1272.28f,41.87f,0); + pInstance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); + DoScriptText(SAY_WEEGLI_OHNO, me); + me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else if (destroyingDoor) @@ -383,9 +383,9 @@ public: if (me->isAlive()) { me->setFaction(FACTION_FRIENDLY); - me->GetMotionMaster()->MovePoint(0, 1858.57f,1146.35f,14.745f); - me->SetHomePosition(1858.57f,1146.35f,14.745f,3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO,me); + me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); + me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted + DoScriptText(SAY_WEEGLI_OK_I_GO, me); destroyingDoor=true; } } @@ -415,7 +415,7 @@ public: // randomly summon a zombie or dead hero the first time a grave is used if (pGo->GetUseCount() == 0) { - uint32 randomchance = urand(0,100); + uint32 randomchance = urand(0, 100); if (randomchance < ZOMBIE_CHANCE) pGo->SummonCreature(ZOMBIE, pGo->GetPositionX(), pGo->GetPositionY(), pGo->GetPositionZ(), 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000); else @@ -443,7 +443,7 @@ class at_zumrah : public AreaTriggerScript public: at_zumrah() : AreaTriggerScript("at_zumrah") { } - bool OnTrigger(Player* pPlayer,const AreaTriggerEntry * /*at*/) + bool OnTrigger(Player* pPlayer, const AreaTriggerEntry * /*at*/) { Creature* pZumrah = pPlayer->FindNearestCreature(ZUMRAH_ID, 30.0f); diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 3b85f4799ce..0b4428964eb 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -85,9 +85,9 @@ class npc_torek : public CreatureScript break; case 19: //TODO: verify location and creatures amount. - me->SummonCreature(ENTRY_DURIEL,1776.73f,-2049.06f,109.83f,1.54f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_SENTINEL,1774.64f,-2049.41f,109.83f,1.40f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); - me->SummonCreature(ENTRY_SILVERWING_WARRIOR,1778.73f,-2049.50f,109.83f,1.67f,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,25000); + me->SummonCreature(ENTRY_DURIEL, 1776.73f, -2049.06f, 109.83f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_SENTINEL, 1774.64f, -2049.41f, 109.83f, 1.40f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); + me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 20: DoScriptText(SAY_WIN, me, pPlayer); diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index e40775e9bb9..02d7852fbc7 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -138,7 +138,7 @@ public: { DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, pPlayer); - pPlayer->TalkedToCreature(me->GetEntry(),me->GetGUID()); + pPlayer->TalkedToCreature(me->GetEntry(), me->GetGUID()); } me->GetMotionMaster()->Clear(); @@ -390,7 +390,7 @@ public: case 29: DoScriptText(EMOTE_HUG, me, pPlayer); DoScriptText(SAY_END2, me, pPlayer); - pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP,me); + pPlayer->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } } @@ -533,7 +533,7 @@ public: if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE &&(*itr)->HasAura(SPELL_TREE_DISGUISE)) { - (*itr)->KilledMonsterCredit(MOB_SPARK,0); + (*itr)->KilledMonsterCredit(MOB_SPARK, 0); } } } @@ -541,7 +541,7 @@ public: void DespawnNagaFlag(bool despawn) { std::list<GameObject*> FlagList; - me->GetGameObjectListWithEntryInGrid(FlagList,GO_NAGA_FLAG, 100.0f); + me->GetGameObjectListWithEntryInGrid(FlagList, GO_NAGA_FLAG, 100.0f); if (!FlagList.empty()) { @@ -592,7 +592,7 @@ public: { if (Creature* ravager = pGo->FindNearestCreature(NPC_DEATH_RAVAGER, 5.0f, true)) { - ravager->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + ravager->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); ravager->SetReactState(REACT_AGGRESSIVE); ravager->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 74fd2c27715..632dd0925ac 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -63,7 +63,7 @@ public: { uint32 spawnCreatureID = 0; - switch (urand(0,2)) + switch (urand(0, 2)) { case 0: spawnCreatureID = 17681; @@ -72,7 +72,7 @@ public: break; case 1: case 2: - spawnCreatureID = possibleSpawns[urand(0,30)]; + spawnCreatureID = possibleSpawns[urand(0, 30)]; break; } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 81c7826c74f..454592e45dd 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -122,7 +122,7 @@ public: //ManaStorm_Timer if (ManaStorm_Timer <= diff) { - if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0)) + if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(pTarget, SPELL_MANASTORM); ManaStorm_Timer = 7500 + rand()%5000; } else ManaStorm_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index f756445462c..babc745af58 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -132,9 +132,9 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(EMOTE_KER_SLEEP_1,EMOTE_KER_SLEEP_2,EMOTE_KER_SLEEP_3), me); + DoScriptText(RAND(EMOTE_KER_SLEEP_1, EMOTE_KER_SLEEP_2, EMOTE_KER_SLEEP_3), me); - DoScriptText(RAND(SAY_KER_SLEEP_1,SAY_KER_SLEEP_2,SAY_KER_SLEEP_3,SAY_KER_SLEEP_4), me); + DoScriptText(RAND(SAY_KER_SLEEP_1, SAY_KER_SLEEP_2, SAY_KER_SLEEP_3, SAY_KER_SLEEP_4), me); me->SetStandState(UNIT_STAND_STATE_SLEEP); DoCast(me, SPELL_SLEEP_VISUAL, false); diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index a956ceacee1..a925090a16b 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -85,10 +85,10 @@ public: pCreatureTarget->GetEntry() == NPC_DYING_KODO || pCreatureTarget->GetEntry() == NPC_ANCIENT_KODO) { - pCaster->CastSpell(pCaster,SPELL_KODO_KOMBO_PLAYER_BUFF,true); + pCaster->CastSpell(pCaster, SPELL_KODO_KOMBO_PLAYER_BUFF, true); pCreatureTarget->UpdateEntry(NPC_TAMED_KODO); - pCreatureTarget->CastSpell(pCreatureTarget,SPELL_KODO_KOMBO_DESPAWN_BUFF,false); + pCreatureTarget->CastSpell(pCreatureTarget, SPELL_KODO_KOMBO_DESPAWN_BUFF, false); if (pCreatureTarget->GetMotionMaster()->GetCurrentMovementGeneratorType() == WAYPOINT_MOTION_TYPE) pCreatureTarget->GetMotionMaster()->MoveIdle(); @@ -127,7 +127,7 @@ public: if (me->IsWithinDistInMap(pWho, 10.0f)) { - DoScriptText(RAND(SAY_SMEED_HOME_1,SAY_SMEED_HOME_2,SAY_SMEED_HOME_3), pWho); + DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), pWho); //spell have no implemented effect (dummy), so useful to notify spellHit DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true); @@ -179,7 +179,7 @@ public: bool OnGossipHello(Player *pPlayer, GameObject* /*pGO*/) { if (pPlayer->GetQuestStatus(5381) == QUEST_STATUS_INCOMPLETE) - pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(),pPlayer->GetInnPosY(),pPlayer->GetInnPosZ(),0,TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT,10000); + pPlayer->SummonCreature(11876, pPlayer->GetInnPosX(), pPlayer->GetInnPosY(), pPlayer->GetInnPosZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000); return true; } diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index ebd10679fd8..d0186840228 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -72,11 +72,11 @@ public: if (spell->Id == SPELL_AWAKEN_PEON && caster->GetTypeId() == TYPEID_PLAYER && CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE) { - caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(),me->GetGUID()); + caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); DoScriptText(SAY_SPELL_HIT, me, caster); me->RemoveAllAuras(); if (GameObject* Lumberpile = me->FindNearestGameObject(GO_LUMBERPILE, 20)) - me->GetMotionMaster()->MovePoint(1,Lumberpile->GetPositionX()-1,Lumberpile->GetPositionY(),Lumberpile->GetPositionZ()); + me->GetMotionMaster()->MovePoint(1, Lumberpile->GetPositionX()-1, Lumberpile->GetPositionY(), Lumberpile->GetPositionZ()); } } @@ -320,9 +320,9 @@ class npc_tiger_matriarch : public CreatureScript // These models was found in sniff. // TODO: generalize these models with race from dbc uint32 const trollmodel[] = -{11665,11734,11750,12037,12038,12042,12049,12849,13529,14759,15570,15701, -15702,1882,1897,1976,2025,27286,2734,2735,4084,4085,4087,4089,4231,4357, -4358,4360,4361,4362,4363,4370,4532,4537,4540,4610,6839,7037,9767,9768}; +{11665, 11734, 11750, 12037, 12038, 12042, 12049, 12849, 13529, 14759, 15570, 15701, +15702, 1882, 1897, 1976, 2025, 27286, 2734, 2735, 4084, 4085, 4087, 4089, 4231, 4357, +4358, 4360, 4361, 4362, 4363, 4370, 4532, 4537, 4540, 4610, 6839, 7037, 9767, 9768}; class npc_troll_volunteer : public CreatureScript { @@ -336,7 +336,7 @@ class npc_troll_volunteer : public CreatureScript Reset(); Player* player = me->GetOwner()->ToPlayer(); - switch (urand(1,4)) + switch (urand(1, 4)) { case 1: _mountModel = 6471; diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 189054480a1..b38e95a4f87 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -110,7 +110,7 @@ public: if (CAST_PLR(pKiller)->GetQuestStatus(QUEST_WHATS_HAUNTING_WITCH_HILL) == QUEST_STATUS_INCOMPLETE) { DoCast(pKiller, SPELL_SUMMON_RESTLESS_APPARITION, true); - CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION,0); + CAST_PLR(pKiller)->KilledMonsterCredit(NPC_RESTLESS_APPARITION, 0); } } }; @@ -144,7 +144,7 @@ public: void Reset() { - DoScriptText(RAND(SAY_RESTLESS_1,SAY_RESTLESS_2,SAY_RESTLESS_3), me); + DoScriptText(RAND(SAY_RESTLESS_1, SAY_RESTLESS_2, SAY_RESTLESS_3), me); } }; @@ -186,7 +186,7 @@ public: if (uiAction == GOSSIP_SENDER_INFO) { pPlayer->CLOSE_GOSSIP_MENU(); - switch (urand(0,1)) + switch (urand(0, 1)) { case 0: pCreature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); @@ -507,7 +507,7 @@ public: ## npc_zelfrax ######*/ -const Position MovePosition = {-2967.030f,-3872.1799f,35.620f, 0.0f}; +const Position MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; enum eZelfrax { @@ -552,8 +552,8 @@ public: if (uiType != POINT_MOTION_TYPE) return; - me->SetHomePosition(me->GetPositionX(),me->GetPositionY(),me->GetPositionZ(),me->GetOrientation()); - me->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_OOC_NOT_ATTACKABLE); + me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation()); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); SetCombatMovement(true); if (me->isInCombat()) @@ -564,9 +564,9 @@ public: void MoveToDock() { SetCombatMovement(false); - me->GetMotionMaster()->MovePoint(0,MovePosition); - DoScriptText(SAY_ZELFRAX,me); - DoScriptText(SAY_ZELFRAX_2,me); + me->GetMotionMaster()->MovePoint(0, MovePosition); + DoScriptText(SAY_ZELFRAX, me); + DoScriptText(SAY_ZELFRAX_2, me); } void UpdateAI(uint32 const /*uiDiff*/) diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index 819b6ffe733..e7140cc1325 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -170,8 +170,8 @@ public: void EnterCombat(Unit* /*who*/) { //For an small probability the npc says something when he get aggro - if (urand(0,9) > 7) - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + if (urand(0, 9) > 7) + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 583ce6e31dc..c3706ae377f 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -366,7 +366,7 @@ public: AddWaypoint(i, Clintar_spirit_WP[i][0], Clintar_spirit_WP[i][1], Clintar_spirit_WP[i][2], (uint32)Clintar_spirit_WP[i][4]); } PlayerGUID = pPlayer->GetGUID(); - Start(true,false,PlayerGUID); + Start(true, false, PlayerGUID); } return; } @@ -408,7 +408,7 @@ public: switch(Step) { case 0: - me->Say(CLINTAR_SPIRIT_SAY_START,0,PlayerGUID); + me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); Event_Timer = 8000; Step = 1; break; @@ -467,7 +467,7 @@ public: Creature *mob = me->SummonCreature(ASPECT_RAVEN, ASPECT_RAVEN_SUMMON_X, ASPECT_RAVEN_SUMMON_Y, ASPECT_RAVEN_SUMMON_Z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000); if (mob) { - mob->AddThreat(me,10000.0f); + mob->AddThreat(me, 10000.0f); mob->AI()->AttackStart(me); } Event_Timer = 2000; diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 7ae0eb6cd8f..6e1f4064413 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -160,7 +160,7 @@ public: switch(uiEventPhase) { case 1: - if (Unit* pUnit = Unit::GetUnit(*me,uiPlayerGUID)) + if (Unit* pUnit = Unit::GetUnit(*me, uiPlayerGUID)) { if (GameObject* pGo = pUnit->GetGameObject(SPELL_LUNCH)) { diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index 9a9fba3aec0..1c82ad46e0e 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -96,7 +96,7 @@ public: pPlayer->PrepareQuestMenu(pCreature->GetGUID()); if (pPlayer->GetQuestStatus(7785) == QUEST_STATUS_NONE && - (pPlayer->HasItemCount(18563,1,false) || pPlayer->HasItemCount(18564,1,false))) + (pPlayer->HasItemCount(18563, 1, false) || pPlayer->HasItemCount(18564, 1, false))) pPlayer->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, GOSSIP_DEMITRIAN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); pPlayer->SEND_GOSSIP_MENU(6812, pCreature->GetGUID()); @@ -287,7 +287,7 @@ npc_anachronos_the_ancient : Creature that controls the event. npc_anachronos_quest_trigger: controls the spawning of the BG War mobs. go_crystalline_tear : GameObject that begins the event and hands out quest TO DO: get correct spell IDs and timings for spells cast upon dragon transformations -TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation,but for some unknown reason it doesnt work. +TO DO: Dragons should use the HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF) after transformation, but for some unknown reason it doesnt work. EndContentData */ #define QUEST_A_PAWN_ON_THE_ETERNAL_BOARD 8519 @@ -310,50 +310,50 @@ static QuestCinematic EventAnim[]= {ARYGOS_EMOTE_1, 2, 2000}, {CAELESTRASZ_SAY_1, 4, 8000}, {MERITHRA_SAY_2, 3, 6000}, - {0,3,2000}, + {0, 3, 2000}, {MERITHRA_YELL_1, 3, 2500}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1250},//fly - {0, 3, 250},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1250}, //fly + {0, 3, 250}, //remove flags {ARYGOS_SAY_1, 2, 3000}, - {0,3,2000}, + {0, 3, 2000}, {ARYGOS_YELL_1, 2, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 4000},// spell - {0, 3, 1000},//fly - {0, 3, 1000},//remove flags + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 4000}, // spell + {0, 3, 1000}, //fly + {0, 3, 1000}, //remove flags {CAELESTRASZ_SAY_2, 4, 5000}, - {0,3,3000}, + {0, 3, 3000}, {CAELESTRASZ_YELL_1, 4, 3000}, - {0, 3, 3000},//Morph - {0,3,4000},//EmoteLiftoff - {0, 3, 2500},// spell + {0, 3, 3000}, //Morph + {0, 3, 4000}, //EmoteLiftoff + {0, 3, 2500}, // spell {ANACHRONOS_SAY_2, 0, 2000}, - {0, 3, 250},//fly - {0, 3, 25},//remove flags + {0, 3, 250}, //fly + {0, 3, 25}, //remove flags {FANDRAL_SAY_2, 1, 3000}, - {ANACHRONOS_SAY_3, 0, 10000},//Both run through the armies - {0,3,2000},// Sands will stop - {0,3,8000},// Summon Gate + {ANACHRONOS_SAY_3, 0, 10000}, //Both run through the armies + {0, 3, 2000}, // Sands will stop + {0, 3, 8000}, // Summon Gate {ANACHRONOS_SAY_4, 0, 4000}, - {0, 0, 2000},//spell 1-> Arcane cosmetic (Mobs freeze) + {0, 0, 2000}, //spell 1-> Arcane cosmetic (Mobs freeze) {0, 0, 5000}, //Spell 2-> Arcane long cosmetic (barrier appears) (Barrier -> Glyphs) - {0, 0, 7000},//BarrieR - {0, 0, 4000},//Glyphs + {0, 0, 7000}, //BarrieR + {0, 0, 4000}, //Glyphs {ANACHRONOS_SAY_5, 0, 2000}, - {0, 0, 4000},// Roots - {FANDRAL_SAY_3, 1, 3000},//Root Text - {FANDRAL_EMOTE_1, 1, 3000},//falls knee + {0, 0, 4000}, // Roots + {FANDRAL_SAY_3, 1, 3000}, //Root Text + {FANDRAL_EMOTE_1, 1, 3000}, //falls knee {ANACHRONOS_SAY_6, 0, 3000}, {ANACHRONOS_SAY_7, 0, 3000}, {ANACHRONOS_SAY_8, 0, 8000}, - {ANACHRONOS_EMOTE_1, 0, 1000},//Give Scepter + {ANACHRONOS_EMOTE_1, 0, 1000}, //Give Scepter {FANDRAL_SAY_4, 1, 3000}, - {FANDRAL_SAY_5, 1, 3000},//->Equip hammer~Scepter, throw it at door - {FANDRAL_EMOTE_2, 1, 3000},//Throw hammer at door. + {FANDRAL_SAY_5, 1, 3000}, //->Equip hammer~Scepter, throw it at door + {FANDRAL_EMOTE_2, 1, 3000}, //Throw hammer at door. {ANACHRONOS_SAY_9, 0, 3000}, {FANDRAL_SAY_6, 1, 3000}, //fandral goes away {ANACHRONOS_EMOTE_2, 0, 3000}, @@ -376,76 +376,76 @@ static QuestCinematic EventAnim[]= //Cordinates for Spawns static const Position SpawnLocation[]= { - {-8085.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8085.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8080.0f, 1424.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8085.0f, 1422.0f, 2.61f, 3.141592f},//Kaldorei Infantry + {-8085.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8085.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8080.0f, 1424.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8085.0f, 1422.0f, 2.61f, 3.141592f}, //Kaldorei Infantry // 2 waves of warriors - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1525.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1523.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1521.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1528.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1519.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1526.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8082.0f, 1524.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1522.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8078.0f, 1518.0f, 2.61f, 3.141592f},//Kaldorei Infantry - {-8082.0f, 1516.0f, 2.61f, 3.141592f},//Kaldorei Infantry - - {-8088.0f, 1510.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8084.0f, 1520.0f, 2.61f, 0.0f},//Anubisath Conqueror - {-8088.0f, 1530.0f, 2.61f, 0.0f},//Anubisath Conqueror - - {-8080.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8085.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8082.0f, 1513.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1523.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1531.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8079.0f, 1516.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Wasp - {-8080.0f, 1518.0f, 2.61f, 0.0f},//Qiraj Wasp - - {-8081.0f, 1514.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1526.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1512.0f, 2.61f, 0.0f},//Qiraj Tank - {-8082.0f, 1520.0f, 2.61f, 0.0f},//Qiraj Tank - {-8081.0f, 1528.0f, 2.61f, 0.0f},//Qiraj Tank - - {-8082.0f, 1513.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1520.0f, 2.61f, 3.141592f},//Anubisath Conqueror - {-8082.0f, 1527.0f, 2.61f, 3.141592f},//Anubisath Conqueror + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1525.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1523.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1521.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1528.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1519.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1526.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8082.0f, 1524.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1522.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8078.0f, 1518.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + {-8082.0f, 1516.0f, 2.61f, 3.141592f}, //Kaldorei Infantry + + {-8088.0f, 1510.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8084.0f, 1520.0f, 2.61f, 0.0f}, //Anubisath Conqueror + {-8088.0f, 1530.0f, 2.61f, 0.0f}, //Anubisath Conqueror + + {-8080.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8085.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8082.0f, 1513.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1523.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1531.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8079.0f, 1516.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Wasp + {-8080.0f, 1518.0f, 2.61f, 0.0f}, //Qiraj Wasp + + {-8081.0f, 1514.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1526.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1512.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8082.0f, 1520.0f, 2.61f, 0.0f}, //Qiraj Tank + {-8081.0f, 1528.0f, 2.61f, 0.0f}, //Qiraj Tank + + {-8082.0f, 1513.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1520.0f, 2.61f, 3.141592f}, //Anubisath Conqueror + {-8082.0f, 1527.0f, 2.61f, 3.141592f}, //Anubisath Conqueror }; struct WaveData @@ -545,17 +545,17 @@ public: break; case 1: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, me->GetGUID()); - DoScriptText(FANDRAL_SAY_1, Fandral,me); + DoScriptText(FANDRAL_SAY_1, Fandral, me); break; case 2: Fandral->SetUInt64Value(UNIT_FIELD_TARGET, 0); - DoScriptText(MERITHRA_EMOTE_1,Merithra); + DoScriptText(MERITHRA_EMOTE_1, Merithra); break; case 3: - DoScriptText(MERITHRA_SAY_1,Merithra); + DoScriptText(MERITHRA_SAY_1, Merithra); break; case 4: - DoScriptText(ARYGOS_EMOTE_1,Arygos); + DoScriptText(ARYGOS_EMOTE_1, Arygos); break; case 5: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, Fandral->GetGUID()); @@ -566,81 +566,81 @@ public: break; case 7: Caelestrasz->SetUInt64Value(UNIT_FIELD_TARGET, 0); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); break; case 8: - DoScriptText(MERITHRA_YELL_1,Merithra); + DoScriptText(MERITHRA_YELL_1, Merithra); break; case 9: - Merithra->CastSpell(Merithra,25105,true); + Merithra->CastSpell(Merithra, 25105, true); break; case 10: Merithra->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Merithra->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Merithra->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,3); + Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 3); break; case 11: - Merithra->CastSpell(Merithra,24818,false); + Merithra->CastSpell(Merithra, 24818, false); break; case 12: - Merithra->GetMotionMaster()->MoveCharge(-8100,1530,50,42); + Merithra->GetMotionMaster()->MoveCharge(-8100, 1530, 50, 42); break; case 13: break; case 14: - DoScriptText(ARYGOS_SAY_1,Arygos); + DoScriptText(ARYGOS_SAY_1, Arygos); Merithra->SetVisible(false); break; case 15: - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); - Merithra->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); + Merithra->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); break; case 16: DoScriptText(ARYGOS_YELL_1, Arygos); break; case 17: - Arygos->CastSpell(Arygos,25107,true); + Arygos->CastSpell(Arygos, 25107, true); break; case 18: Arygos->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF); Arygos->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Arygos->GetMotionMaster()->MoveCharge(-8065,1530,6.61f,42); + Arygos->GetMotionMaster()->MoveCharge(-8065, 1530, 6.61f, 42); break; case 19: - Arygos->CastSpell(Arygos,50505,false); + Arygos->CastSpell(Arygos, 50505, false); break; case 20: - Arygos->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Arygos->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); break; case 21: break; case 22: - DoScriptText(CAELESTRASZ_SAY_2,Caelestrasz, Fandral); + DoScriptText(CAELESTRASZ_SAY_2, Caelestrasz, Fandral); break; case 23: - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,2.61f,10); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); Arygos->SetVisible(false); - Arygos->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,10); + Arygos->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 10); break; case 24: DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); break; case 25: - Caelestrasz->CastSpell(Caelestrasz,25106,true); + Caelestrasz->CastSpell(Caelestrasz, 25106, true); break; case 26: Caelestrasz->HandleEmoteCommand(254); Caelestrasz->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); - Caelestrasz->GetMotionMaster()->MoveCharge(-8065,1530,7.61f,4); + Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 7.61f, 4); break; case 27: - Caelestrasz->CastSpell(Caelestrasz,54293,false); + Caelestrasz->CastSpell(Caelestrasz, 54293, false); break; case 28: - DoScriptText(ANACHRONOS_SAY_2,me, Fandral); + DoScriptText(ANACHRONOS_SAY_2, me, Fandral); break; case 29: - Caelestrasz->GetMotionMaster()->MoveCharge(-8095,1530,50,42); + Caelestrasz->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); DoScriptText(FANDRAL_SAY_2, Fandral, me); break; case 30: @@ -650,29 +650,29 @@ public: break; case 32: Caelestrasz->SetVisible(false); - Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f,1535.14f,2.61f,42); - Fandral->GetMotionMaster()->MoveCharge(-8108,1529,2.77f,8); - me->GetMotionMaster()->MoveCharge(-8113,1525,2.77f,8); + Caelestrasz->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); + Fandral->GetMotionMaster()->MoveCharge(-8108, 1529, 2.77f, 8); + me->GetMotionMaster()->MoveCharge(-8113, 1525, 2.77f, 8); break;//both run to the gate case 33: DoScriptText(ANACHRONOS_SAY_4, me); - Caelestrasz->GetMotionMaster()->MoveCharge(-8050,1473,65,15); + Caelestrasz->GetMotionMaster()->MoveCharge(-8050, 1473, 65, 15); break; //Text: sands will stop case 34: DoCast(plr, 23017, true);//Arcane Channeling break; case 35: - me->CastSpell(-8088,1520.43f,2.67f,25158,true); + me->CastSpell(-8088, 1520.43f, 2.67f, 25158, true); break; case 36: DoCast(plr, 25159, true); break; case 37: - me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GATE_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 38: DoCast(plr, 25166, true); - me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 39: DoScriptText(ANACHRONOS_SAY_5, me, Fandral); @@ -681,7 +681,7 @@ public: Fandral->CastSpell(me, 25167, true); break; case 41: - Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ,-8130,1525,17.5f,0,0,0,0,0,0); + Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); DoScriptText(FANDRAL_SAY_3, Fandral); break; case 42: @@ -699,70 +699,70 @@ public: break; case 46: DoScriptText(ANACHRONOS_SAY_8, me); - me->GetMotionMaster()->MoveCharge(-8110,1527,2.77f,4); + me->GetMotionMaster()->MoveCharge(-8110, 1527, 2.77f, 4); break; case 47: DoScriptText(ANACHRONOS_EMOTE_1, me); break; case 48: - DoScriptText(FANDRAL_SAY_4,Fandral,me); + DoScriptText(FANDRAL_SAY_4, Fandral, me); break; case 49: - DoScriptText(FANDRAL_SAY_5,Fandral,me); + DoScriptText(FANDRAL_SAY_5, Fandral, me); break; case 50: - DoScriptText(FANDRAL_EMOTE_2,Fandral); - Fandral->CastSpell(-8127,1525,17.5f,33806,true); + DoScriptText(FANDRAL_EMOTE_2, Fandral); + Fandral->CastSpell(-8127, 1525, 17.5f, 33806, true); break; case 51: { uint32 entries[4] = { 15423, 15424, 15414, 15422 }; for (uint8 i = 0; i < 4; ++i) { - mob = plr->FindNearestCreature(entries[i],50,me); + mob = plr->FindNearestCreature(entries[i], 50, me); while (mob) { mob->RemoveFromWorld(); - mob = plr->FindNearestCreature(15423,50,me); + mob = plr->FindNearestCreature(15423, 50, me); } } break; } case 52: - Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f,4); - DoScriptText(ANACHRONOS_SAY_9, me,Fandral); + Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f, 4); + DoScriptText(ANACHRONOS_SAY_9, me, Fandral); break; case 53: - DoScriptText(FANDRAL_SAY_6,Fandral); + DoScriptText(FANDRAL_SAY_6, Fandral); break; case 54: - DoScriptText(ANACHRONOS_EMOTE_2,me); + DoScriptText(ANACHRONOS_EMOTE_2, me); break; case 55: Fandral->SetVisible(false); break; case 56: DoScriptText(ANACHRONOS_EMOTE_3, me); - me->GetMotionMaster()->MoveCharge(-8116,1522,3.65f,4); + me->GetMotionMaster()->MoveCharge(-8116, 1522, 3.65f, 4); break; case 57: - me->GetMotionMaster()->MoveCharge(-8116.7f,1527,3.7f,4); + me->GetMotionMaster()->MoveCharge(-8116.7f, 1527, 3.7f, 4); break; case 58: - me->GetMotionMaster()->MoveCharge(-8112.67f,1529.9f,2.86f,4); + me->GetMotionMaster()->MoveCharge(-8112.67f, 1529.9f, 2.86f, 4); break; case 59: - me->GetMotionMaster()->MoveCharge(-8117.99f,1532.24f,3.94f,4); + me->GetMotionMaster()->MoveCharge(-8117.99f, 1532.24f, 3.94f, 4); break; case 60: if (plr) - DoScriptText(ANACHRONOS_SAY_10, me,plr); - me->GetMotionMaster()->MoveCharge(-8113.46f,1524.16f,2.89f,4); + DoScriptText(ANACHRONOS_SAY_10, me, plr); + me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: - me->GetMotionMaster()->MoveCharge(-8057.1f,1470.32f,2.61f,6); - if (plr->IsInRange(me,0,15)) - plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD ,me); + me->GetMotionMaster()->MoveCharge(-8057.1f, 1470.32f, 2.61f, 6); + if (plr->IsInRange(me, 0, 15)) + plr->GroupEventHappens(QUEST_A_PAWN_ON_THE_ETERNAL_BOARD , me); break; case 62: me->SetDisplayId(15500); @@ -772,13 +772,13 @@ public: me->AddUnitMovementFlag(MOVEMENTFLAG_LEVITATING); break; case 64: - me->GetMotionMaster()->MoveCharge(-8000,1400,150,9); + me->GetMotionMaster()->MoveCharge(-8000, 1400, 150, 9); break; case 65: me->SetVisible(false); if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID))) { - DoScriptText(ARYGOS_YELL_1,me); + DoScriptText(ARYGOS_YELL_1, me); AnachronosQuestTrigger->AI()->EnterEvadeMode(); eventEnd=true; } @@ -824,7 +824,7 @@ public: uint64 MobGUID; uint64 PlayerGUID; - uint32 SpellTimer1, SpellTimer2, SpellTimer3,SpellTimer4; + uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4; bool Timers; bool hasTarget; @@ -888,23 +888,23 @@ public: if (!hasTarget) { if (me->GetEntry() == 15424 || me->GetEntry() == 15422 || me->GetEntry() == 15414) - pTarget = me->FindNearestCreature(15423,20,true); + pTarget = me->FindNearestCreature(15423, 20, true); if (me->GetEntry() == 15423) { - uint8 tar = urand(0,2); + uint8 tar = urand(0, 2); if (tar == 0) - pTarget = me->FindNearestCreature(15422,20,true); + pTarget = me->FindNearestCreature(15422, 20, true); else if (tar == 1) - pTarget = me->FindNearestCreature(15424,20,true); + pTarget = me->FindNearestCreature(15424, 20, true); else if (tar == 2) - pTarget = me->FindNearestCreature(15414,20,true); + pTarget = me->FindNearestCreature(15414, 20, true); } hasTarget = true; if (pTarget) me->AI()->AttackStart(pTarget); } - if (!(me->FindNearestCreature(15379,60))) + if (!(me->FindNearestCreature(15379, 60))) DoCast(me, 33652); if (!UpdateVictim()) @@ -1091,33 +1091,33 @@ public: if (Unit* Anachronos_Quest_Trigger = go->FindNearestCreature(15454, 100, plr)) { - Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378,-8034.535f,1535.14f,2.61f,0,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379,-8032.767f, 1533.148f,2.61f, 1.5f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380,-8034.52f, 1537.843f, 2.61f, 5.7f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382,-8028.462f, 1535.843f, 2.61f, 3.141592f,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); - Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381,-8028.75f, 1538.795f, 2.61f, 4,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,220000); + Unit *Merithra = Anachronos_Quest_Trigger->SummonCreature(15378, -8034.535f, 1535.14f, 2.61f, 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Caelestrasz = Anachronos_Quest_Trigger->SummonCreature(15379, -8032.767f, 1533.148f, 2.61f, 1.5f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Unit *Arygos = Anachronos_Quest_Trigger->SummonCreature(15380, -8034.52f, 1537.843f, 2.61f, 5.7f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + /* Unit *Fandral = */ Anachronos_Quest_Trigger->SummonCreature(15382, -8028.462f, 1535.843f, 2.61f, 3.141592f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); + Creature *Anachronos = Anachronos_Quest_Trigger->SummonCreature(15381, -8028.75f, 1538.795f, 2.61f, 4, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 220000); if (Merithra) { Merithra->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID,15420); + Merithra->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Merithra->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15420); Merithra->setFaction(35); } if (Caelestrasz) { Caelestrasz->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID,15419); + Caelestrasz->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Caelestrasz->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15419); Caelestrasz->setFaction(35); } if (Arygos) { Arygos->SetUInt32Value(UNIT_NPC_FLAGS, 0); - Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1,0); - Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID,15418); + Arygos->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); + Arygos->SetUInt32Value(UNIT_FIELD_DISPLAYID, 15418); Arygos->setFaction(35); } diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index fde36d3e590..e322baf4186 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -52,7 +52,7 @@ public: if (uiAction == GOSSIP_ACTION_INFO_DEF+1) { pPlayer->CLOSE_GOSSIP_MENU(); - pCreature->CastSpell(pPlayer,6766,false); + pCreature->CastSpell(pPlayer, 6766, false); } if (uiAction == GOSSIP_ACTION_INFO_DEF+2) diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 68ee527bbce..c3937ddc95e 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -80,10 +80,10 @@ public: void SendItem(Unit* receiver) { - if (CAST_PLR(receiver)->HasItemCount(11169,1,false) && - CAST_PLR(receiver)->HasItemCount(11172,11,false) && - CAST_PLR(receiver)->HasItemCount(11173,1,false) && - !CAST_PLR(receiver)->HasItemCount(11522,1,true)) + if (CAST_PLR(receiver)->HasItemCount(11169, 1, false) && + CAST_PLR(receiver)->HasItemCount(11172, 11, false) && + CAST_PLR(receiver)->HasItemCount(11173, 1, false) && + !CAST_PLR(receiver)->HasItemCount(11522, 1, true)) { ItemPosCountVec dest; uint8 msg = CAST_PLR(receiver)->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, 11522, 1, false); @@ -282,7 +282,7 @@ public: bool OnQuestAccept(Player* pPlayer, Creature* /*pCreature*/, Quest const *quest) { if (quest->GetQuestId() == 10279) //Quest: To The Master's Lair - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return false; } @@ -291,7 +291,7 @@ public: { pPlayer->PlayerTalkClass->ClearMenus(); if (uiAction == GOSSIP_ACTION_INFO_DEF + 1) - pPlayer->CastSpell(pPlayer,34891,true); //(Flight through Caverns) + pPlayer->CastSpell(pPlayer, 34891, true); //(Flight through Caverns) return true; } @@ -409,7 +409,7 @@ public: { pCreature->setFaction(113); pCreature->SetFullHealth(); - pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); + pCreature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); pCreature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); DoScriptText(SAY_OOX_START, pCreature); @@ -466,7 +466,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1,SAY_OOX_AGGRO2), me); + DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); } void JustSummoned(Creature* summoned) @@ -626,8 +626,8 @@ public: { m_uiCheckSpeechTimer = 5000; - if (urand(0,9) > 8) - DoScriptText(RAND(SAY_TOOG_THIRST,SAY_TOOG_WORRIED), me); + if (urand(0, 9) > 8) + DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me); } else m_uiCheckSpeechTimer -= uiDiff; diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 0698ae4f0d5..6ede81728e6 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -446,7 +446,7 @@ public: if (!EventGrate && EventInProgress) { - float x,y,z; + float x, y, z; pWarrior->GetPosition(x, y, z); if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) { diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index f27e8e75edd..973cf0b7e1e 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -234,7 +234,7 @@ public: DoScriptText(SAY_START, pCreature, pPlayer); pCreature->setFaction(FACTION_ESCORTEE); - if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI,pCreature->AI())) + if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, pCreature->AI())) pEscortAI->Start(false, false, pPlayer->GetGUID(), pQuest); } return true; @@ -415,7 +415,7 @@ public: { if (Creature* panther = pGo->FindNearestCreature(ENRAGED_PANTHER, 5, true)) { - panther->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NON_ATTACKABLE); + panther->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); panther->SetReactState(REACT_AGGRESSIVE); panther->AI()->AttackStart(pPlayer); } diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/thunder_bluff.cpp index 2c202e68754..7dd6b5b21eb 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/thunder_bluff.cpp @@ -99,7 +99,7 @@ public: if (BerserkerCharge_Timer <= diff) { - Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0); + Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); if (pTarget) DoCast(pTarget, SPELL_BERSERKER_CHARGE); BerserkerCharge_Timer = 25000; diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index 0094e970e3d..35d70c64a6e 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -249,7 +249,7 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(SAY_FAINT_1,SAY_FAINT_2,SAY_FAINT_3,SAY_FAINT_4), me); + DoScriptText(RAND(SAY_FAINT_1, SAY_FAINT_2, SAY_FAINT_3, SAY_FAINT_4), me); } //what does actually happen here? Emote? Aura? @@ -263,7 +263,7 @@ public: if (HasFollowState(STATE_FOLLOW_POSTEVENT)) return; - DoScriptText(RAND(SAY_WAKE_1,SAY_WAKE_2,SAY_WAKE_3,SAY_WAKE_4), me); + DoScriptText(RAND(SAY_WAKE_1, SAY_WAKE_2, SAY_WAKE_3, SAY_WAKE_4), me); SetFollowPaused(false); } |