diff options
Diffstat (limited to 'src')
157 files changed, 1606 insertions, 1616 deletions
diff --git a/src/common/Collision/DynamicTree.cpp b/src/common/Collision/DynamicTree.cpp index aef80fa914..4fcfc55b49 100644 --- a/src/common/Collision/DynamicTree.cpp +++ b/src/common/Collision/DynamicTree.cpp @@ -279,7 +279,7 @@ bool DynamicMapTree::isInLineOfSight(float x1, float y1, float z1, float x2, flo float maxDist = (v2 - v1).magnitude(); - if (!G3D::fuzzyGt(maxDist, 0) ) + if (!G3D::fuzzyGt(maxDist, 0)) { return true; } diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp index b86d83419b..50cf2eaca0 100644 --- a/src/common/Collision/Maps/TileAssembler.cpp +++ b/src/common/Collision/Maps/TileAssembler.cpp @@ -418,7 +418,7 @@ namespace VMAP std::string model_name(buff, name_length); WorldModel_Raw raw_model; - if ( !raw_model.Read((iSrcDir + "/" + model_name).c_str()) ) + if (!raw_model.Read((iSrcDir + "/" + model_name).c_str())) { continue; } @@ -527,7 +527,7 @@ namespace VMAP READ_OR_RETURN_WITH_DELETE(vectorarray, nvectors * sizeof(float) * 3); for (uint32 i = 0; i < nvectors; ++i) { - vertexArray.push_back( Vector3(vectorarray + 3 * i) ); + vertexArray.push_back( Vector3(vectorarray + 3 * i)); } delete[] vectorarray; diff --git a/src/common/Collision/Models/ModelInstance.cpp b/src/common/Collision/Models/ModelInstance.cpp index 4510461bdd..4a540a7857 100644 --- a/src/common/Collision/Models/ModelInstance.cpp +++ b/src/common/Collision/Models/ModelInstance.cpp @@ -227,5 +227,4 @@ namespace VMAP if (check != nameLen) { return false; } return true; } - } diff --git a/src/common/Dynamic/TypeContainerFunctions.h b/src/common/Dynamic/TypeContainerFunctions.h index 12094a4909..b517f4529a 100644 --- a/src/common/Dynamic/TypeContainerFunctions.h +++ b/src/common/Dynamic/TypeContainerFunctions.h @@ -237,7 +237,7 @@ namespace Acore //{ // // The head element is bad // SPECIFIC_TYPE* t = Remove(elements._elements, obj); - // return ( t != nullptr ? t : Remove(elements._TailElements, obj) ); + // return ( t != nullptr ? t : Remove(elements._TailElements, obj)); //} } #endif diff --git a/src/common/Dynamic/TypeContainerFunctionsPtr.h b/src/common/Dynamic/TypeContainerFunctionsPtr.h index 37be105cee..7b17b4c388 100644 --- a/src/common/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/common/Dynamic/TypeContainerFunctionsPtr.h @@ -137,7 +137,7 @@ namespace Acore template<class SPECIFIC_TYPE> bool Remove(ContainerMapList<SPECIFIC_TYPE>& elements, CountedPtr<SPECIFIC_TYPE>& obj, OBJECT_HANDLE hdl) { typename std::map<OBJECT_HANDLE, CountedPtr<SPECIFIC_TYPE>>::iterator iter = elements._element.find(hdl); - if ( iter != elements._element.end() ) + if (iter != elements._element.end()) { elements._element.erase(iter); return true; @@ -163,6 +163,5 @@ namespace Acore bool t = Remove(elements._elements, obj, hdl); return ( !t ? Remove(elements._TailElements, obj, hdl) : t ); } - } #endif diff --git a/src/common/Platform/ServiceWin32.cpp b/src/common/Platform/ServiceWin32.cpp index 7ff540ba88..b0104e43bb 100644 --- a/src/common/Platform/ServiceWin32.cpp +++ b/src/common/Platform/ServiceWin32.cpp @@ -52,7 +52,7 @@ bool WinServiceInstall() if (serviceControlMgr) { char path[_MAX_PATH + 10]; - if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0]) ) > 0) + if (GetModuleFileName( 0, path, sizeof(path) / sizeof(path[0])) > 0) { SC_HANDLE service; std::strcat(path, " --service"); @@ -170,7 +170,7 @@ void WINAPI ServiceControlHandler(DWORD controlCode) break; default: - if ( controlCode >= 128 && controlCode <= 255 ) + if (controlCode >= 128 && controlCode <= 255) // user defined control code { break; @@ -198,7 +198,7 @@ void WINAPI ServiceMain(DWORD argc, char* argv[]) serviceStatusHandle = RegisterServiceCtrlHandler(serviceName, ServiceControlHandler); - if ( serviceStatusHandle ) + if (serviceStatusHandle) { char path[_MAX_PATH + 1]; unsigned int i, last_slash = 0; diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 0652e56673..56cc75e166 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -90,7 +90,7 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText) { ss << minutes << (shortText ? "m" : " minute(s) "); } - if (secs || (!days && !hours && !minutes) ) + if (secs || (!days && !hours && !minutes)) { ss << secs << (shortText ? "s" : " second(s) "); } diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 507b7c2256..13609a9b56 100644 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -256,7 +256,7 @@ void TurretAI::UpdateAI(uint32 /*diff*/) if (!UpdateVictim()) return; - if( me->m_spells[0] ) + if (me->m_spells[0]) DoSpellAttackIfReady(me->m_spells[0]); } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 97e6ea1645..91eda147d0 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1562,7 +1562,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u for (WorldObject* target : targets) { // xinef: allow gameobjects to summon gameobjects! - //if(!IsUnit((*itr))) + //if (!IsUnit((*itr))) // continue; target->GetPosition(x, y, z, o); diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index 697dd05a3e..1850fb03a9 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -2352,7 +2352,7 @@ void AchievementMgr::CompletedAchievement(AchievementEntry const* achievement) LocaleConstant localeConstant = GetPlayer()->GetSession()->GetSessionDbLocaleIndex(); if (localeConstant != LOCALE_enUS) { - if(AchievementRewardLocale const* loc = sAchievementMgr->GetAchievementRewardLocale(achievement)) + if (AchievementRewardLocale const* loc = sAchievementMgr->GetAchievementRewardLocale(achievement)) { ObjectMgr::GetLocaleString(loc->Subject, localeConstant, subject); ObjectMgr::GetLocaleString(loc->Text, localeConstant, text); @@ -2539,7 +2539,7 @@ bool AchievementGlobalMgr::IsStatisticAchievement(AchievementEntry const* achiev AchievementCategoryEntry const* cat = sAchievementCategoryStore.LookupEntry(achievement->categoryId); do { - switch(cat->ID) + switch (cat->ID) { case ACHIEVEMENT_CATEGORY_STATISTICS: return true; diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp index e7cf7ab95e..0d2c96d5dd 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp @@ -250,7 +250,7 @@ AuctionHouseObject* AuctionHouseMgr::GetAuctionsMapByHouseId(uint8 auctionHouseI if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_AUCTION)) return &_neutralAuctions; - switch(auctionHouseId) + switch (auctionHouseId) { case AUCTIONHOUSE_ALLIANCE: return &_allianceAuctions; @@ -260,7 +260,6 @@ AuctionHouseObject* AuctionHouseMgr::GetAuctionsMapByHouseId(uint8 auctionHouseI } return &_neutralAuctions; - } uint32 AuctionHouseMgr::GetAuctionDeposit(AuctionHouseEntry const* entry, uint32 time, Item* pItem, uint32 count) diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index ac87609351..57844197f7 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -64,7 +64,7 @@ void BattlefieldMgr::InitBattlefield() /* For Cataclysm: Tol Barad pBf = new BattlefieldTB; // respawn, init variables - if(!pBf->SetupBattlefield()) + if (!pBf->SetupBattlefield()) { LOG_DEBUG("bg.battlefield", "Battlefield : Tol Barad init failed."); delete pBf; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp index 3b6d385e3b..36a55b71c8 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp @@ -73,7 +73,7 @@ void BattlegroundNA::FillInitialWorldStates(WorldPacket& data) bool BattlegroundNA::SetupBattleground() { // gates - if ( !AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.0462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY) + if (!AddObject(BG_NA_OBJECT_DOOR_1, BG_NA_OBJECT_TYPE_DOOR_1, 4031.854f, 2966.833f, 12.0462f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_2, BG_NA_OBJECT_TYPE_DOOR_2, 4081.179f, 2874.97f, 12.00171f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_3, BG_NA_OBJECT_TYPE_DOOR_3, 4023.709f, 2981.777f, 10.70117f, -2.648788f, 0, 0, 0.9697962f, -0.2439165f, RESPAWN_IMMEDIATELY) || !AddObject(BG_NA_OBJECT_DOOR_4, BG_NA_OBJECT_TYPE_DOOR_4, 4090.064f, 2858.438f, 10.23631f, 0.4928045f, 0, 0, 0.2439165f, 0.9697962f, RESPAWN_IMMEDIATELY) diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp index 83c320fc1f..9d0a325220 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp @@ -589,7 +589,7 @@ void BattlegroundSA::DefendersPortalTeleport(GameObject* portal, Player* plr) uint32 portal_num = 0; //get it via X - switch( (uint32)portal->GetPositionX() ) + switch ((uint32)portal->GetPositionX()) { case 1394: portal_num = 0; @@ -947,7 +947,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source) uint32 npc = 0; uint32 flag = 0; - switch(i) + switch (i) { case BG_SA_LEFT_CAPTURABLE_GY: flag = BG_SA_LEFT_FLAG; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h index 1126e75673..4e0832a23d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.h @@ -536,7 +536,7 @@ private: uint32 GetGateIDFromEntry(uint32 id) { uint32 i = 0; - switch(id) + switch (id) { case 190722: i = BG_SA_GREEN_GATE; diff --git a/src/server/game/Calendar/CalendarMgr.h b/src/server/game/Calendar/CalendarMgr.h index e633b1a310..c92661be37 100644 --- a/src/server/game/Calendar/CalendarMgr.h +++ b/src/server/game/Calendar/CalendarMgr.h @@ -28,7 +28,7 @@ enum CalendarMailAnswers { // else CALENDAR_EVENT_REMOVED_MAIL_SUBJECT = 0, - // if ( *(_DWORD *)(a1 + 8292) & 0x100 ) + // if (*(_DWORD *)(a1 + 8292) & 0x100 ) CALENDAR_INVITE_REMOVED_MAIL_SUBJECT = 0x100 }; diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index 59508328c3..e662419acc 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -304,7 +304,7 @@ namespace lfg //UpdateBestCompatibleInQueue(itQueue, strGuids); AddToCompatibles(strGuids); if (roleCheckResult && roleCheckResult <= 15) - foundMask |= ( (((uint64)1) << (roleCheckResult - 1)) | (((uint64)1) << (16 + roleCheckResult - 1)) | (((uint64)1) << (32 + roleCheckResult - 1)) | (((uint64)1) << (48 + roleCheckResult - 1)) ); + foundMask |= ( (((uint64)1) << (roleCheckResult - 1)) | (((uint64)1) << (16 + roleCheckResult - 1)) | (((uint64)1) << (32 + roleCheckResult - 1)) | (((uint64)1) << (48 + roleCheckResult - 1))); return LFG_COMPATIBLES_WITH_LESS_PLAYERS; } diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index d52ea04117..01fcd1f118 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -3609,10 +3609,10 @@ float Creature::GetAttackDistance(Unit const* player) const if (creatureLevel + 5 <= sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL)) { // detect range auras - retDistance += static_cast<float>( GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE) ); + retDistance += static_cast<float>( GetTotalAuraModifier(SPELL_AURA_MOD_DETECT_RANGE)); // detected range auras - retDistance += static_cast<float>( player->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE) ); + retDistance += static_cast<float>( player->GetTotalAuraModifier(SPELL_AURA_MOD_DETECTED_RANGE)); } // "Minimum Aggro Radius for a mob seems to be combat range (5 yards)" diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index c3fa426a5c..141eab8813 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1175,7 +1175,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel + (petlevel / 4))); } - switch(GetEntry()) + switch (GetEntry()) { case NPC_FELGUARD: { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index b53ef50cb5..707ac73ee3 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4684,7 +4684,7 @@ void Player::DurabilityLossAll(double percent, bool inventory) void Player::DurabilityLoss(Item* item, double percent) { - if(!item || percent == 0.0) + if (!item || percent == 0.0) return; uint32 pMaxDurability = item ->GetUInt32Value(ITEM_FIELD_MAXDURABILITY); @@ -10001,13 +10001,13 @@ void Player::RemoveSpellMods(Spell* spell) spell->m_appliedMods.erase(iterMod); // MAGE T8P4 BONUS - if( spellInfo->SpellFamilyName == SPELLFAMILY_MAGE ) + if (spellInfo->SpellFamilyName == SPELLFAMILY_MAGE) { SpellInfo const* sp = mod->ownerAura->GetSpellInfo(); // Missile Barrage, Hot Streak, Brain Freeze (trigger spell - Fireball!) - if( sp->SpellIconID == 3261 || sp->SpellIconID == 2999 || sp->SpellIconID == 2938 ) - if( AuraEffect* aurEff = GetAuraEffectDummy(64869) ) - if( roll_chance_i(aurEff->GetAmount()) ) + if (sp->SpellIconID == 3261 || sp->SpellIconID == 2999 || sp->SpellIconID == 2938) + if (AuraEffect* aurEff = GetAuraEffectDummy(64869)) + if (roll_chance_i(aurEff->GetAmount())) { mod->charges = 1; continue; @@ -15443,7 +15443,7 @@ void Player::PrepareCharmAISpells() } else if (spellInfo->Effects[i].ApplyAuraName == SPELL_AURA_PERIODIC_DAMAGE) { - if( (int32)periodic_damage < CalculateSpellDamage(this, spellInfo, i) ) + if ((int32)periodic_damage < CalculateSpellDamage(this, spellInfo, i)) { m_charmAISpells[SPELL_DOT_DAMAGE] = spellInfo->Id; break; diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp index 2a95b3e277..b566d2d763 100644 --- a/src/server/game/Entities/Player/PlayerQuest.cpp +++ b/src/server/game/Entities/Player/PlayerQuest.cpp @@ -294,7 +294,7 @@ bool Player::CanCompleteQuest(uint32 quest_id, const QuestStatusData* q_savedSta return false; // Xinef: take seasonals into account - if(!qInfo->IsRepeatable() && !qInfo->IsSeasonal() && IsQuestRewarded(quest_id)) + if (!qInfo->IsRepeatable() && !qInfo->IsSeasonal() && IsQuestRewarded(quest_id)) return false; // not allow re-complete quest // auto complete quest diff --git a/src/server/game/Entities/Player/PlayerStorage.cpp b/src/server/game/Entities/Player/PlayerStorage.cpp index 2716faaa98..fc41fafaa5 100644 --- a/src/server/game/Entities/Player/PlayerStorage.cpp +++ b/src/server/game/Entities/Player/PlayerStorage.cpp @@ -991,7 +991,7 @@ InventoryResult Player::CanStoreItem_InBag(uint8 bag, ItemPosCountVec& dest, Ite // skip not existed bag or self targeted bag Bag* pBag = GetBagByPos(bag); - if (!pBag || pBag == pSrcItem || (pSrcItem && (pSrcItem->GetGUID() == pBag->GetGUID())) ) + if (!pBag || pBag == pSrcItem || (pSrcItem && (pSrcItem->GetGUID() == pBag->GetGUID()))) return EQUIP_ERR_ITEM_DOESNT_GO_INTO_BAG; if (pSrcItem && pSrcItem->IsNotEmptyBag()) @@ -1119,8 +1119,8 @@ InventoryResult Player::CanStoreItem(uint8 bag, uint8 slot, ItemPosCountVec& des if (pItem) { // you bad chet0rz, wpe pro - if( bag == NULL_BAG && slot == NULL_SLOT ) - if( pItem->IsBag() && pItem->IsNotEmptyBag() ) + if (bag == NULL_BAG && slot == NULL_SLOT) + if (pItem->IsBag() && pItem->IsNotEmptyBag()) return EQUIP_ERR_CAN_ONLY_DO_WITH_EMPTY_BAGS; // Xinef: Removed next loot generated check @@ -7197,7 +7197,7 @@ void Player::_SaveAuras(CharacterDatabaseTransaction trans, bool logout) continue; Aura* aura = itr->second; - if( !logout && aura->GetDuration() < 60 * IN_MILLISECONDS ) + if (!logout && aura->GetDuration() < 60 * IN_MILLISECONDS ) continue; int32 damage[MAX_SPELL_EFFECTS]; diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index f2191b39ef..aee22dcd23 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -237,7 +237,7 @@ void Player::UpdateResistances(uint32 school) AuraEffectList const& mResbyIntellect = GetAuraEffectsByType(SPELL_AURA_MOD_RESISTANCE_OF_STAT_PERCENT); for(AuraEffectList::const_iterator i = mResbyIntellect.begin(); i != mResbyIntellect.end(); ++i) { - if((*i)->GetMiscValue() & (1 << (school - 1)) ) + if ((*i)->GetMiscValue() & (1 << (school - 1))) value += int32(GetStat(Stats((*i)->GetMiscValueB())) * (*i)->GetAmount() / 100.0f); } @@ -923,7 +923,7 @@ void Player::ApplyHealthRegenBonus(int32 amount, bool apply) void Player::UpdateManaRegen() { - if( HasAuraTypeWithMiscvalue(SPELL_AURA_PREVENT_REGENERATE_POWER, POWER_MANA + 1) ) + if (HasAuraTypeWithMiscvalue(SPELL_AURA_PREVENT_REGENERATE_POWER, POWER_MANA + 1)) { SetStatFloatValue(UNIT_FIELD_POWER_REGEN_INTERRUPTED_FLAT_MODIFIER, 0); SetStatFloatValue(UNIT_FIELD_POWER_REGEN_FLAT_MODIFIER, 0); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index fde228d5d4..19c2be2f9d 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2772,7 +2772,7 @@ MeleeHitOutcome Unit::RollMeleeOutcomeAgainst(Unit const* victim, WeaponAttackTy // Critical hit chance float crit_chance = GetUnitCriticalChance(attType, victim); - if( crit_chance < 0 ) + if (crit_chance < 0) crit_chance = 0; float dodge_chance = victim->GetUnitDodgeChance(); @@ -4956,7 +4956,7 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint32 dispellerSpellId if (Aura* noxious = Aura::TryCreate(aura->GetSpellInfo(), aura->GetEffectMask(), dispeller, caster)) { noxious->SetDuration(aura->GetDuration() * aureff->GetAmount() / 100); - if (aura->GetUnitOwner() ) + if (aura->GetUnitOwner()) if (const std::vector<int32>* spell_triggered = sSpellMgr->GetSpellLinked(-int32(aura->GetId()))) for (std::vector<int32>::const_iterator itr = spell_triggered->begin(); itr != spell_triggered->end(); ++itr) aura->GetUnitOwner()->RemoveAurasDueToSpell(*itr); @@ -5691,7 +5691,7 @@ bool Unit::HasVisibleAuraType(AuraType auraType) const { AuraEffectList const& mAuraList = GetAuraEffectsByType(auraType); for (AuraEffectList::const_iterator i = mAuraList.begin(); i != mAuraList.end(); ++i) - if( (*i)->GetBase()->CanBeSentToClient() ) + if ((*i)->GetBase()->CanBeSentToClient()) return true; return false; @@ -6221,7 +6221,7 @@ void Unit::RemoveGameObject(uint32 spellid, bool del) } go->SetOwnerGUID(ObjectGuid::Empty); - if(del) + if (del) { go->SetRespawnTime(0); go->Delete(); @@ -6236,7 +6236,7 @@ void Unit::RemoveAllGameObjects() while(!m_gameObj.empty()) { GameObject* go = ObjectAccessor::GetGameObject(*this, *m_gameObj.begin()); - if(go) + if (go) { go->SetOwnerGUID(ObjectGuid::Empty); go->SetRespawnTime(0); @@ -7537,7 +7537,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } case SPELLFAMILY_ROGUE: { - switch(dummySpell->Id) + switch (dummySpell->Id) { // Glyph of Backstab case 56800: @@ -7546,7 +7546,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere if (AuraEffect* aurEff = victim->GetAuraEffect(SPELL_AURA_PERIODIC_DAMAGE, SPELLFAMILY_ROGUE, 0x100000, 0, 0, GetGUID())) if (Aura* aur = aurEff->GetBase()) if (!aur->IsRemoved() && aur->GetDuration() > 0) - if ((aur->GetApplyTime() + aur->GetMaxDuration() / 1000 + 5) > (GameTime::GetGameTime().count() + aur->GetDuration() / 1000) ) + if ((aur->GetApplyTime() + aur->GetMaxDuration() / 1000 + 5) > (GameTime::GetGameTime().count() + aur->GetDuration() / 1000)) { aur->SetDuration(aur->GetDuration() + 2000); return true; @@ -7565,7 +7565,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere } } // Master of subtlety - if( dummySpell->SpellIconID == 2114 ) + if (dummySpell->SpellIconID == 2114) { triggered_spell_id = 31665; basepoints0 = triggerAmount; @@ -8317,7 +8317,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Lightning Overload if (dummySpell->SpellIconID == 2018) // only this spell have SpellFamily Shaman SpellIconID == 2018 and dummy aura { - if(!procSpell || !IsPlayer() || !victim) + if (!procSpell || !IsPlayer() || !victim) return false; if (procEx & PROC_EX_CRITICAL_HIT) @@ -8548,7 +8548,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere basepoints0 = triggerEntry->Effects[EFFECT_0].BasePoints * 2; SetCantProc(true); - if(basepoints0) + if (basepoints0) CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster); else CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster); @@ -8688,7 +8688,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere AddSpellCooldown(cooldown_spell_id, 0, cooldown); } - if(basepoints0) + if (basepoints0) CastCustomSpell(target, triggered_spell_id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura, originalCaster); else CastSpell(target, triggered_spell_id, true, castItem, triggeredByAura, originalCaster); @@ -9586,7 +9586,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg { if (cooldown) { - if (pTarget->HasSpellCooldown(trigger_spell_id) ) + if (pTarget->HasSpellCooldown(trigger_spell_id)) return false; pTarget->AddSpellCooldown(trigger_spell_id, 0, cooldown); } @@ -9622,7 +9622,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg // Ruby Drake, Evasive Aura case 50241: { - if( GetAura(50240) ) + if (GetAura(50240)) return false; break; @@ -9812,7 +9812,7 @@ bool Unit::HandleProcTriggerSpell(Unit* victim, uint32 damage, AuraEffect* trigg AddSpellCooldown(triggerEntry->Id, 0, cooldown); } - if(basepoints0) + if (basepoints0) CastCustomSpell(target, triggerEntry->Id, &basepoints0, nullptr, nullptr, true, castItem, triggeredByAura); else CastSpell(target, triggerEntry->Id, true, castItem, triggeredByAura); @@ -10466,11 +10466,11 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply) Unit::AuraMap& tAuras = GetOwnedAuras(); for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr) { - if( (*itr).second->IsRemoved() ) + if ((*itr).second->IsRemoved()) continue; - if( (*itr).second->GetSpellInfo()->CasterAuraState == flag ) - if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) ) + if ((*itr).second->GetSpellInfo()->CasterAuraState == flag ) + if (AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID())) (*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, true); } } @@ -10486,8 +10486,8 @@ void Unit::ModifyAuraState(AuraStateType flag, bool apply) Unit::AuraMap& tAuras = GetOwnedAuras(); for (Unit::AuraMap::iterator itr = tAuras.begin(); itr != tAuras.end(); ++itr) { - if( (*itr).second->GetSpellInfo()->CasterAuraState == flag ) - if( AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID()) ) + if ((*itr).second->GetSpellInfo()->CasterAuraState == flag ) + if (AuraApplication* aurApp = (*itr).second->GetApplicationOfTarget(GetGUID())) (*itr).second->HandleAllEffects(aurApp, AURA_EFFECT_HANDLE_REAL, false); } } @@ -11383,7 +11383,7 @@ float Unit::SpellPctDamageModsDone(Unit* victim, SpellInfo const* spellProto, Da // Merciless Combat if ((*i)->GetSpellInfo()->SpellIconID == 2656) { - if( (spellProto && spellProto->SpellFamilyFlags[0] & 0x2) || spellProto->SpellFamilyFlags[1] & 0x2 ) + if ((spellProto && spellProto->SpellFamilyFlags[0] & 0x2) || spellProto->SpellFamilyFlags[1] & 0x2 ) if (!victim->HealthAbovePct(35)) AddPct(DoneTotalMod, (*i)->GetAmount()); } @@ -12463,7 +12463,7 @@ uint32 Unit::SpellHealingBonusDone(Unit* victim, SpellInfo const* spellProto, ui // Check for table values SpellBonusEntry const* bonus = sSpellMgr->GetSpellBonusData(spellProto->Id); - if(bonus) + if (bonus) { if (damagetype == DOT) { @@ -12711,7 +12711,7 @@ bool Unit::IsImmunedToDamage(SpellSchoolMask meleeSchoolMask) const // If m_immuneToDamage type contain magic, IMMUNE damage. SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE]; for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr) - if((itr->type & meleeSchoolMask) == meleeSchoolMask) + if ((itr->type & meleeSchoolMask) == meleeSchoolMask) return true; return false; @@ -12743,7 +12743,7 @@ bool Unit::IsImmunedToDamage(SpellInfo const* spellInfo) const // If m_immuneToDamage type contain magic, IMMUNE damage. SpellImmuneList const& damageList = m_spellImmune[IMMUNITY_DAMAGE]; for (SpellImmuneList::const_iterator itr = damageList.begin(); itr != damageList.end(); ++itr) - if((itr->type & schoolMask) == schoolMask) + if ((itr->type & schoolMask) == schoolMask) return true; return false; @@ -12796,7 +12796,7 @@ bool Unit::IsImmunedToSchool(SpellSchoolMask meleeSchoolMask) const // If m_immuneToSchool type contain this school type, IMMUNE damage. SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) - if((itr->type & meleeSchoolMask) == meleeSchoolMask) + if ((itr->type & meleeSchoolMask) == meleeSchoolMask) return true; return false; @@ -12818,7 +12818,7 @@ bool Unit::IsImmunedToSchool(SpellInfo const* spellInfo) const // If m_immuneToSchool type contain this school type, IMMUNE damage. SpellImmuneList const& schoolList = m_spellImmune[IMMUNITY_SCHOOL]; for (SpellImmuneList::const_iterator itr = schoolList.begin(); itr != schoolList.end(); ++itr) - if((itr->type & schoolMask) == schoolMask && !spellInfo->CanPierceImmuneAura(sSpellMgr->GetSpellInfo(itr->spellId))) + if ((itr->type & schoolMask) == schoolMask && !spellInfo->CanPierceImmuneAura(sSpellMgr->GetSpellInfo(itr->spellId))) return true; } @@ -13897,7 +13897,7 @@ bool Unit::_IsValidAttackTarget(Unit const* target, SpellInfo const* bySpell, Wo { Player* owner = GetAffectingPlayer(); Unit const* const thisUnit = owner ? owner : this; - if (!(target->IsPlayer() && thisUnit->IsPlayer()) && + if (!(target->IsPlayer() && thisUnit->IsPlayer()) && !(target->IsCreature() && thisUnit->IsCreature())) { Player const* player = target->IsPlayer() ? target->ToPlayer() : thisUnit->ToPlayer(); @@ -15385,7 +15385,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, Unit* victim) con if (attType == RANGED_ATTACK) { int32 ap = GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_RANGED_ATTACK_POWER_MODS); - if( victim ) + if (victim) ap += victim->GetTotalAuraModifier(SPELL_AURA_RANGED_ATTACK_POWER_ATTACKER_BONUS); if (ap < 0) @@ -15395,7 +15395,7 @@ float Unit::GetTotalAttackPowerValue(WeaponAttackType attType, Unit* victim) con else { int32 ap = GetInt32Value(UNIT_FIELD_ATTACK_POWER) + GetInt32Value(UNIT_FIELD_ATTACK_POWER_MODS); - if( victim ) + if (victim) ap += victim->GetTotalAuraModifier(SPELL_AURA_MELEE_ATTACK_POWER_ATTACKER_BONUS); if (ap < 0) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index f2fca152a4..e19e6098d8 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -702,7 +702,6 @@ void ObjectMgr::LoadCreatureTemplate(Field* fields, bool triggerHook) { sScriptMgr->OnAfterDatabaseLoadCreatureTemplates(_creatureTemplateStoreFast); } - } void ObjectMgr::LoadCreatureTemplateModels() diff --git a/src/server/game/Grids/Notifiers/GridNotifiers.h b/src/server/game/Grids/Notifiers/GridNotifiers.h index e238a30619..58a1069a45 100644 --- a/src/server/game/Grids/Notifiers/GridNotifiers.h +++ b/src/server/game/Grids/Notifiers/GridNotifiers.h @@ -838,8 +838,8 @@ namespace Acore FriendlyMissingBuffInRange(Unit const* obj, float range, uint32 spellid) : i_obj(obj), i_range(range) { i_spell = spellid; - if( SpellInfo const* spell = sSpellMgr->GetSpellInfo(spellid) ) - if( SpellInfo const* newSpell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, const_cast<Unit*>(obj)) ) + if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(spellid)) + if (SpellInfo const* newSpell = sSpellMgr->GetSpellForDifficultyFromSpell(spell, const_cast<Unit*>(obj))) i_spell = newSpell->Id; } bool operator()(Unit* u) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 9119151465..3ecdf17c69 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -1573,7 +1573,7 @@ void Group::CountTheRoll(Rolls::iterator rollI, Map* allowedMap) ItemPosCountVec dest; InventoryResult msg = player->CanStoreNewItem(NULL_BAG, NULL_SLOT, dest, roll->itemid, item->count); - if(msg == EQUIP_ERR_OK) + if (msg == EQUIP_ERR_OK) { player->AutoStoreLoot(pProto->DisenchantID, LootTemplates_Disenchant, true); } diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 648131080b..16473a2ac8 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -241,7 +241,7 @@ void Guild::BankEventLogEntry::WritePacket(WorldPackets::Guild::GuildBankLogQuer bankLogEntry.TimeOffset = int32(GameTime::GetGameTime().count() - m_timestamp); bankLogEntry.EntryType = int8(m_eventType); - switch(m_eventType) + switch (m_eventType) { case GUILD_BANK_LOG_DEPOSIT_ITEM: case GUILD_BANK_LOG_WITHDRAW_ITEM: diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 7f22c320cd..aac4ade3cc 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -1160,7 +1160,7 @@ void WorldSession::HandleGroupSwapSubGroupOpcode(WorldPacket& recv_data) ObjectGuid guid1 = getGuid(playerName1); ObjectGuid guid2 = getGuid(playerName2); - if(!guid1 || !guid2) + if (!guid1 || !guid2) { SendPartyResult(PARTY_OP_SWAP, playerName1, ERR_GROUP_SWAP_FAILED); return; diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 71cd2dfb0b..387c80298b 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -319,7 +319,7 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) needItemDelay = GetAccountId() != rc_account; } - if( money >= 10 * GOLD ) + if (money >= 10 * GOLD) { CleanStringForMysqlQuery(subject); CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"{}\", NOW(), {})", @@ -551,7 +551,7 @@ void WorldSession::HandleMailTakeItem(WorldPacket& recvData) .AddMoney(m->COD) .SendMailTo(trans, MailReceiver(sender, m->sender), MailSender(MAIL_NORMAL, m->receiver), MAIL_CHECK_MASK_COD_PAYMENT); - if( m->COD >= 10 * GOLD ) + if (m->COD >= 10 * GOLD) { std::string senderName; if (!sCharacterCache->GetCharacterNameByGuid(ObjectGuid(HighGuid::Player, m->sender), senderName)) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 0f5debee73..1f54dfdf37 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1707,7 +1707,7 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/) if (_player->IsInFlight()) return; - if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId())) + if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId())) { bf->PlayerAskToLeave(_player); return; diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index af53948caa..328c5a3fb7 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -462,7 +462,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe spell->SendPetCastResult(SPELL_FAILED_DONT_REPORT); if (!pet->HasSpellCooldown(spellId)) - if(pet->ToPet()) + if (pet->ToPet()) pet->ToPet()->RemoveSpellCooldown(spellId, true); spell->finish(false); diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp index e932155873..079ebf7b5b 100644 --- a/src/server/game/Handlers/SpellHandler.cpp +++ b/src/server/game/Handlers/SpellHandler.cpp @@ -375,7 +375,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) if (mover->IsPlayer()) { // not have spell in spellbook or spell passive and not casted by client - if( !(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive()) ) + if (!(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!mover->ToPlayer()->HasActiveSpell(spellId) || spellInfo->IsPassive())) { bool allow = false; @@ -411,7 +411,7 @@ void WorldSession::HandleCastSpellOpcode(WorldPacket& recvPacket) if (seat->m_flags & VEHICLE_SEAT_FLAG_CAN_ATTACK || spellInfo->Effects[EFFECT_0].Effect == SPELL_EFFECT_OPEN_LOCK /*allow looting from vehicle, but only if player has required spell (all necessary opening spells are in playercreateinfo_spell)*/) if ((mover->IsCreature() && !mover->ToCreature()->HasSpell(spellId)) || spellInfo->IsPassive()) // the creature can't cast that spell, check player instead { - if( !(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!_player->HasActiveSpell (spellId) || spellInfo->IsPassive()) ) + if (!(spellInfo->Targets & TARGET_FLAG_GAMEOBJECT_ITEM) && (!_player->HasActiveSpell (spellId) || spellInfo->IsPassive())) { //cheater? kick? ban? recvPacket.rfinish(); // prevent spam at ignore packet diff --git a/src/server/game/Handlers/TradeHandler.cpp b/src/server/game/Handlers/TradeHandler.cpp index 77cba1d8e5..1de3e182ea 100644 --- a/src/server/game/Handlers/TradeHandler.cpp +++ b/src/server/game/Handlers/TradeHandler.cpp @@ -462,12 +462,12 @@ void WorldSession::HandleAcceptTradeOpcode(WorldPacket& /*recvPacket*/) // execute trade: 2. store moveItems(myItems, hisItems); - if( my_trade->GetMoney() >= 10 * GOLD ) + if (my_trade->GetMoney() >= 10 * GOLD ) { CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})", GetAccountId(), _player->GetGUID().GetCounter(), _player->GetName(), GetRemoteAddress(), trader->GetSession()->GetAccountId(), trader->GetName(), my_trade->GetMoney(), 6); } - if( his_trade->GetMoney() >= 10 * GOLD ) + if (his_trade->GetMoney() >= 10 * GOLD ) { CharacterDatabase.Execute("INSERT INTO log_money VALUES({}, {}, \"{}\", \"{}\", {}, \"{}\", {}, \"goods\", NOW(), {})", trader->GetSession()->GetAccountId(), trader->GetGUID().GetCounter(), trader->GetName(), trader->GetSession()->GetRemoteAddress(), GetAccountId(), _player->GetName(), his_trade->GetMoney(), 6); diff --git a/src/server/game/Movement/Spline/Spline.cpp b/src/server/game/Movement/Spline/Spline.cpp index 59086cc1ad..a4f1916792 100644 --- a/src/server/game/Movement/Spline/Spline.cpp +++ b/src/server/game/Movement/Spline/Spline.cpp @@ -301,5 +301,4 @@ namespace Movement return str.str(); } - } diff --git a/src/server/game/Movement/Spline/Spline.h b/src/server/game/Movement/Spline/Spline.h index d9d255f0a2..b8800eb2c0 100644 --- a/src/server/game/Movement/Spline/Spline.h +++ b/src/server/game/Movement/Spline/Spline.h @@ -205,7 +205,6 @@ namespace Movement void set_length(index_type i, length_type length) { lengths[i] = length;} void clear(); }; - } #include "SplineImpl.h" diff --git a/src/server/game/Movement/Spline/SplineImpl.h b/src/server/game/Movement/Spline/SplineImpl.h index 96ce4fac8b..48b9b2ac05 100644 --- a/src/server/game/Movement/Spline/SplineImpl.h +++ b/src/server/game/Movement/Spline/SplineImpl.h @@ -92,5 +92,4 @@ namespace Movement SplineBase::clear(); lengths.clear(); } - } diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.cpp b/src/server/game/OutdoorPvP/OutdoorPvP.cpp index 2fc354e01b..bc55486c04 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.cpp +++ b/src/server/game/OutdoorPvP/OutdoorPvP.cpp @@ -299,7 +299,6 @@ void OutdoorPvP::HandlePlayerLeaveZone(Player* player, uint32 /*zone*/) void OutdoorPvP::HandlePlayerResurrects(Player* /*player*/, uint32 /*zone*/) { - } bool OutdoorPvP::Update(uint32 diff) diff --git a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp index 7d4e286e37..45d90cf108 100644 --- a/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/AllCreatureScript.cpp @@ -55,7 +55,6 @@ void ScriptMgr::OnBeforeCreatureSelectLevel(const CreatureTemplate* cinfo, Creat { script->OnBeforeCreatureSelectLevel(cinfo, creature, level); }); - } void ScriptMgr::Creature_SelectLevel(const CreatureTemplate* cinfo, Creature* creature) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 55ab51c007..957ae12817 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -988,7 +988,7 @@ void WorldSession::ReadMovementInfo(WorldPacket& data, MovementInfo* mi) if (mi->HasMovementFlag(MOVEMENTFLAG_SPLINE_ELEVATION)) data >> mi->splineElevation; - //! Anti-cheat checks. Please keep them in seperate if() blocks to maintain a clear overview. + //! Anti-cheat checks. Please keep them in seperate if () blocks to maintain a clear overview. //! Might be subject to latency, so just remove improper flags. #ifdef ACORE_DEBUG #define REMOVE_VIOLATING_FLAGS(check, maskToRemove) \ diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index acb1089525..fcb9a7d355 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1058,7 +1058,7 @@ float AuraEffect::CalcPeriodicCritChance(Unit const* caster, Unit const* target) } } - switch(GetSpellInfo()->SpellFamilyName) + switch (GetSpellInfo()->SpellFamilyName) { // Rupture - since 3.3.3 can crit case SPELLFAMILY_ROGUE: @@ -5603,7 +5603,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (Battleground* bg = target->ToPlayer()->GetBattleground()) bg->RemovePlayerFromResurrectQueue(target->ToPlayer()); - if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId())) + if (Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId())) bf->RemovePlayerFromResurrectQueue(target->GetGUID()); } break; @@ -5623,7 +5623,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool // Halls of Lightning, Arc Lightning case 52921: { - if( aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE ) + if (aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE ) return; Player* player = nullptr; @@ -5631,7 +5631,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool Acore::PlayerSearcher<Acore::AnyPlayerInObjectRangeCheck> searcher(target, player, checker); Cell::VisitWorldObjects(target, searcher, 10.0f); - if( player && player->GetGUID() != target->GetGUID() ) + if (player && player->GetGUID() != target->GetGUID()) target->CastSpell(player, 52921, true); return; @@ -6488,7 +6488,7 @@ void AuraEffect::HandlePeriodicTriggerSpellAuraTick(Unit* target, Unit* caster) { if (caster) if (Unit* victim = caster->GetVictim()) - if(victim->GetDistance(caster) < 45.0f) + if (victim->GetDistance(caster) < 45.0f) { target = victim; break; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 0a4e6e7c41..04ee6b7234 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1613,7 +1613,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b case SPELLFAMILY_GENERIC: if (!caster) break; - switch(GetId()) + switch (GetId()) { case 61987: // Avenging Wrath // Remove the immunity shield marker on Avenging Wrath removal if Forbearance is not present @@ -2010,7 +2010,7 @@ bool Aura::IsAuraStronger(Aura const* newAura) const return true; if (curValue == std::abs(newEffect->GetAmount())) - if(!IsPassive() && !IsPermanent() && GetDuration() < newAura->GetDuration()) + if (!IsPassive() && !IsPermanent() && GetDuration() < newAura->GetDuration()) return true; } } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index e26a2a087a..e3ae154234 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -3069,7 +3069,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA { // for delayed spells ignore negative spells (after duel end) for friendly targets /// @todo: this cause soul transfer bugged - if(!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->IsPlayer() && !m_spellInfo->IsPositive()) + if (!IsTriggered() && m_spellInfo->Speed > 0.0f && unit->IsPlayer() && !m_spellInfo->IsPositive()) return SPELL_MISS_EVADE; // assisting case, healing and resurrection @@ -3248,7 +3248,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA HandleEffects(unit, nullptr, nullptr, effectNumber, SPELL_EFFECT_HANDLE_HIT_TARGET); } - if( sanct_effect >= 0 && (effectMask & (1 << sanct_effect)) ) + if (sanct_effect >= 0 && (effectMask & (1 << sanct_effect))) HandleEffects(unit, nullptr, nullptr, sanct_effect, SPELL_EFFECT_HANDLE_HIT_TARGET); return SPELL_MISS_NONE; @@ -3275,7 +3275,7 @@ void Spell::DoTriggersOnSpellHit(Unit* unit, uint8 effMask) m_caster->CastSpell(unit, 61988, true); // Fearie Fire (Feral) - damage - if( m_preCastSpell == 60089 ) + if (m_preCastSpell == 60089) m_caster->CastSpell(unit, m_preCastSpell, true); else if (sSpellMgr->GetSpellInfo(m_preCastSpell)) // Blizz seems to just apply aura without bothering to cast @@ -6540,24 +6540,24 @@ SpellCastResult Spell::CheckCast(bool strict) } case SPELL_EFFECT_STEAL_BENEFICIAL_BUFF: { - if( !m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster) + if (!m_targets.GetUnitTarget() || m_targets.GetUnitTarget() == m_caster) return SPELL_FAILED_BAD_TARGETS; bool found = false; Unit::VisibleAuraMap const* visibleAuras = m_targets.GetUnitTarget()->GetVisibleAuras(); for(Unit::VisibleAuraMap::const_iterator itr = visibleAuras->begin(); itr != visibleAuras->end(); ++itr) { - if( itr->second->GetBase()->IsPassive() ) + if (itr->second->GetBase()->IsPassive()) continue; - if( !itr->second->IsPositive() ) + if (!itr->second->IsPositive()) continue; found = true; break; } - if( !found ) + if (!found) return SPELL_FAILED_NOTHING_TO_STEAL; break; @@ -8757,17 +8757,17 @@ void Spell::PrepareTriggersExecutedOnHit() { case SPELLFAMILY_PALADIN: { - if( m_spellInfo->SpellFamilyFlags[1] & 0x40000000 ) + if (m_spellInfo->SpellFamilyFlags[1] & 0x40000000) { Unit::AuraEffectList const& mVindication = m_caster->GetAuraEffectsByType(SPELL_AURA_PROC_TRIGGER_SPELL); for(Unit::AuraEffectList::const_iterator itr = mVindication.begin(); itr != mVindication.end(); ++itr) { - if( (*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 26017 ) + if ((*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 26017 ) { m_preCastSpell = 26017; break; } - else if( (*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 67 ) + else if ((*itr)->GetSpellInfo()->Effects[EFFECT_0].TriggerSpell == 67 ) m_preCastSpell = 67; } } @@ -8776,7 +8776,7 @@ void Spell::PrepareTriggersExecutedOnHit() case SPELLFAMILY_DRUID: { // Faerie Fire (Feral) - if( m_spellInfo->Id == 16857 && (m_caster->GetShapeshiftForm() == FORM_BEAR || m_caster->GetShapeshiftForm() == FORM_DIREBEAR) ) + if (m_spellInfo->Id == 16857 && (m_caster->GetShapeshiftForm() == FORM_BEAR || m_caster->GetShapeshiftForm() == FORM_DIREBEAR)) m_preCastSpell = 60089; break; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 5c16b3090d..fe5fef96dc 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -681,16 +681,16 @@ void Spell::EffectDummy(SpellEffIndex effIndex) // Trial of the Champion, Trample case 67866: { - if( unitTarget && !unitTarget->IsVehicle() && !unitTarget->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) ) + if (unitTarget && !unitTarget->IsVehicle() && !unitTarget->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID)) unitTarget->CastSpell(unitTarget, 67867, false); return; } // Trial of the Champion, Hammer of the Righteous case 66867: { - if( !unitTarget ) + if (!unitTarget) return; - if( unitTarget->HasAura(66940) ) + if (unitTarget->HasAura(66940)) m_caster->CastSpell(unitTarget, 66903, true); else m_caster->CastSpell(unitTarget, 66904, true); @@ -699,12 +699,12 @@ void Spell::EffectDummy(SpellEffIndex effIndex) case 17731: case 69294: { - if( !gameObjTarget || gameObjTarget->GetRespawnTime() > GameTime::GetGameTime().count() ) + if (!gameObjTarget || gameObjTarget->GetRespawnTime() > GameTime::GetGameTime().count()) return; gameObjTarget->SetRespawnTime(10); gameObjTarget->SendCustomAnim(gameObjTarget->GetGoAnimProgress()); - if( Creature* trigger = gameObjTarget->SummonCreature(12758, *gameObjTarget, TEMPSUMMON_TIMED_DESPAWN, 1000) ) + if (Creature* trigger = gameObjTarget->SummonCreature(12758, *gameObjTarget, TEMPSUMMON_TIMED_DESPAWN, 1000)) trigger->CastSpell(trigger, 17731, false); return; @@ -712,7 +712,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) // HoL, Arc Weld case 59086: { - if( m_caster && m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving() ) + if (m_caster && m_caster->IsPlayer() && m_caster->ToPlayer()->isMoving()) m_caster->CastSpell(m_caster, 59097, true); return; @@ -753,7 +753,7 @@ void Spell::EffectDummy(SpellEffIndex effIndex) break; case SPELLFAMILY_ROGUE: // Hunger for Blood - if( m_spellInfo->Id == 51662 ) + if (m_spellInfo->Id == 51662) { m_caster->CastSpell(m_caster, 63848, true); return; @@ -3126,7 +3126,7 @@ void Spell::EffectSummonPet(SpellEffIndex effIndex) uint32 petentry = m_spellInfo->Effects[effIndex].MiscValue; int32 duration = m_spellInfo->GetDuration(); - if(Player* modOwner = m_originalCaster->GetSpellModOwner()) + if (Player* modOwner = m_originalCaster->GetSpellModOwner()) modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_DURATION, duration); Player* owner = m_originalCaster->ToPlayer(); @@ -3448,7 +3448,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) case SPELLFAMILY_HUNTER: { // Kill Shot - if( m_spellInfo->SpellFamilyFlags[1] & 0x800000 ) + if (m_spellInfo->SpellFamilyFlags[1] & 0x800000) { spell_bonus += int32(m_caster->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.4f); } @@ -3469,7 +3469,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) { float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); //Death Knight T8 Melee 4P Bonus - if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) + if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736)) AddPct(disease_amt, aurEff->GetAmount()); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID()) / 2.0f); @@ -3501,7 +3501,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); //Death Knight T8 Melee 4P Bonus - if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) + if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736)) AddPct(disease_amt, aurEff->GetAmount()); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID(), consumeDiseases) / 2.0f); @@ -3520,7 +3520,7 @@ void Spell::EffectWeaponDmg(SpellEffIndex effIndex) { float disease_amt = m_spellInfo->Effects[EFFECT_2].CalcValue(); //Death Knight T8 Melee 4P Bonus - if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736) ) + if (AuraEffect* aurEff = m_caster->GetAuraEffectDummy(64736)) AddPct(disease_amt, aurEff->GetAmount()); AddPct(totalDamagePercentMod, disease_amt * unitTarget->GetDiseasesByCaster(m_caster->GetGUID())); @@ -3945,7 +3945,7 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case 61263: // for item Intravenous Healing Potion (44698) { - if( !m_caster || !unitTarget ) + if (!m_caster || !unitTarget) return; m_caster->CastSpell(m_caster, 61267, true); @@ -3957,16 +3957,16 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) } case SPELLFAMILY_ROGUE: { - switch( m_spellInfo->Id ) + switch (m_spellInfo->Id) { // Master of Subtlety case 31666: { - if( !unitTarget ) + if (!unitTarget) return; Aura* mos = unitTarget->GetAura(31665); - if( mos ) + if (mos) { mos->SetMaxDuration(6000); mos->SetDuration(6000, true); @@ -3977,11 +3977,11 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) // Overkill case 58428: { - if( !unitTarget ) + if (!unitTarget) return; Aura* overkill = unitTarget->GetAura(58427); - if( overkill ) + if (overkill) { overkill->SetMaxDuration(20000); overkill->SetDuration(20000, true); diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 2e3c2d2cea..11e7a8d80b 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3038,7 +3038,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes() { if (spellInfo->Effects[j].Effect) { - switch(spellInfo->Effects[j].Effect) + switch (spellInfo->Effects[j].Effect) { case SPELL_EFFECT_SCHOOL_DAMAGE: case SPELL_EFFECT_WEAPON_DAMAGE: @@ -3503,7 +3503,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes() { if (spellInfo->Effects[j].ApplyAuraName && spellInfo->Effects[j].TriggerSpell) { - switch(spellInfo->Effects[j].ApplyAuraName) + switch (spellInfo->Effects[j].ApplyAuraName) { case SPELL_AURA_PERIODIC_TRIGGER_SPELL: case SPELL_AURA_PERIODIC_TRIGGER_SPELL_FROM_CLIENT: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp index 63219693bf..71025059c6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp @@ -194,7 +194,7 @@ public: _events.Update(diff); - switch(_events.ExecuteEvent()) + switch (_events.ExecuteEvent()) { case EVENT_SPELL_FIREBLAST: DoCastVictim(SPELL_FIREBLAST); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp index cfecdbfdcb..a9432797e3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp @@ -218,7 +218,7 @@ public: _events.Update(diff); - switch(_events.ExecuteEvent()) + switch (_events.ExecuteEvent()) { case EVENT_SPELL_SHADOWBOLTVOLLEY: DoCastVictim(SPELL_SHADOWBOLTVOLLEY); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp index 1e7dde5657..0d44cf717f 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp @@ -456,7 +456,7 @@ public: { case TYPE_RING_OF_LAW: encounter[0] = data; - switch(data) + switch (data) { case IN_PROGRESS: TempSummonGrimstone = instance->SummonCreature(NPC_GRIMSTONE, GrimstonePositon); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp index cff24c0814..0bf6092541 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp @@ -358,7 +358,7 @@ public: } break; case DATA_SOLAKAR_FLAMEWREATH: - switch(data) + switch (data) { case IN_PROGRESS: if (SolakarState == NOT_STARTED) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index d667d1ecc6..000d7088d7 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -242,7 +242,7 @@ struct boss_nightbane : public BossAI _skeletonscheduler.Schedule(50ms, [this](TaskContext context) { //spawns skeletons every 2 seconds until skeletonCount is reached - if(_skeletonSpawnCounter < _skeletonCount) + if (_skeletonSpawnCounter < _skeletonCount) { me->CastSpell(_skeletonSpawnPos.GetPositionX(), _skeletonSpawnPos.GetPositionY(), _skeletonSpawnPos.GetPositionZ(), SPELL_SUMMON_SKELETON, true); _skeletonSpawnCounter++; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 6de5d782e0..9027d546af 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -941,7 +941,7 @@ struct boss_julianne : public ScriptedAI void DoAction(int32 action) override { - switch(action) + switch (action) { case ACTION_FAKING_DEATH: isFakingDeath = false; @@ -1138,7 +1138,7 @@ struct boss_romulo : public ScriptedAI void DoAction(int32 action) override { - switch(action) + switch (action) { case ACTION_FAKING_DEATH: isFakingDeath = false; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp index 4e93c8c46c..56aefe2cd5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp @@ -456,7 +456,7 @@ public: uint32 NextStep(uint32 nextStep) { - switch(nextStep) + switch (nextStep) { case 1: Talk(SAY_DIALOG_MEDIVH_1); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp index 87ed304235..6ccc8b13a3 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp @@ -140,7 +140,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case TYPE_MOGRAINE_AND_WHITE_EVENT: if (data == IN_PROGRESS) @@ -317,7 +317,7 @@ public: mograine->Kill(me, me, true); return 0; default: - if(mograine) + if (mograine) mograine->DespawnOrUnsummon(0); return 0; } @@ -468,7 +468,7 @@ public: while (uint32 eventId = events.ExecuteEvent()) { - switch(eventId) + switch (eventId) { case EVENT_SPELL_CRUSADER_STRIKE: me->CastSpell(me->GetVictim(), SPELL_CRUSADER_STRIKE, true); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 71e3f7e3f4..0937c701ab 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -417,7 +417,7 @@ public: return; } - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 1: me->CastSpell(me, BONE_ARMOR_SPELL, false); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index bce86175df..0187c46b3f 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -281,7 +281,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_RESTORE_COMBAT: me->SetReactState(REACT_AGGRESSIVE); diff --git a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index 6bff7a27da..f301171e3d 100644 --- a/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp @@ -193,7 +193,7 @@ public: { me->RemoveAurasDueToSpell(67541); me->GetMotionMaster()->MoveCharge(11779.30f, -7065.43f, 24.92f, me->GetSpeed(MOVE_RUN), EVENT_CHARGE); - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case NPC_SCOURGE_ZOMBIE: events.ScheduleEvent(EVENT_SPAWN_WAVE_2, 3000); 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 4dcd08647b..98b8839ed4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -517,7 +517,7 @@ public: void WaypointReached(uint32 uiPointId) override { - switch(uiPointId) + switch (uiPointId) { // Starting waypoint, After reaching uther and jaina case 0: diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp index 7b6872bf0a..bc8a7c609e 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp @@ -97,7 +97,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_MANY_WHELPS_10_PLAYER: case ACHIEV_CRITERIA_MANY_WHELPS_25_PLAYER: diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index 31e94f04f3..0f67f215e4 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -330,12 +330,12 @@ public: instance->SetData(DATA_PYRAMID, PYRAMID_CAGES_OPEN); //setting gossip option as soon as the cages open - if(Creature* bly = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BLY))) + if (Creature* bly = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BLY))) { bly->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } - if(Creature* weegli = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_WEEGLI))) + if (Creature* weegli = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_WEEGLI))) { weegli->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 50ac54cb8f..daa36c3066 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -256,7 +256,7 @@ public: void JustSummoned(Creature* summon) override { - if(summon->GetEntry() != me->GetEntry()) + if (summon->GetEntry() != me->GetEntry()) { summon->GetMotionMaster()->MovePoint(0, *me, false); summon->GetMotionMaster()->MoveFollow(me, 0.1f, 0.0f + M_PI * 0.3f * summons.size()); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp index 5dd29389e3..b8b709239b 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp @@ -48,7 +48,7 @@ public: void OnCreatureCreate(Creature* pCreature) override { - switch(pCreature->GetEntry()) + switch (pCreature->GetEntry()) { case NPC_SARTHARION: m_uiSartharionGUID = pCreature->GetGUID(); @@ -67,7 +67,7 @@ public: ObjectGuid GetGuidData(uint32 uiData) const override { - switch(uiData) + switch (uiData) { case DATA_SARTHARION: return m_uiSartharionGUID; @@ -84,7 +84,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { // Gonna Go When the Volcano Blows (10 player) (2047) case 7326: diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index 63b0024358..47f6266c65 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -104,19 +104,19 @@ public: { events.Reset(); me->SetReactState(REACT_PASSIVE); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED); } void MovementInform(uint32 type, uint32 id) override { - if( type == POINT_MOTION_TYPE && id == 1 ) + if (type == POINT_MOTION_TYPE && id == 1) me->SetFacingTo(3 * M_PI / 2); } void KilledUnit(Unit* who) override { - if( who->IsPlayer() ) + if (who->IsPlayer()) { Talk(SAY_EADRIC_KILL_PLAYER); } @@ -129,7 +129,7 @@ public: events.ScheduleEvent(EVENT_SPELL_HAMMER_RIGHTEOUS, 25000); Talk(SAY_EADRIC_AGGRO); me->CastSpell(me, SPELL_VENGEANCE, false); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS); } @@ -141,7 +141,7 @@ public: void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if( damage >= me->GetHealth() ) + if (damage >= me->GetHealth()) { damage = me->GetHealth() - 1; if (me->GetFaction() != FACTION_FRIENDLY) @@ -156,7 +156,7 @@ public: _EnterEvadeMode(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(true); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE); } } @@ -164,15 +164,15 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -182,7 +182,7 @@ public: events.Repeat(16s); break; case EVENT_SPELL_HAMMER_RIGHTEOUS: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 55.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 55.0f, true)) { Talk(SAY_EADRIC_EMOTE_HAMMER_RIGHTEOUS, target); Talk(SAY_EADRIC_HAMMER_RIGHTEOUS); @@ -224,26 +224,26 @@ public: { events.Reset(); summoned = false; - if( MemoryGUID ) + if (MemoryGUID) { - if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) + if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID)) memory->DespawnOrUnsummon(); MemoryGUID.Clear(); } me->SetReactState(REACT_PASSIVE); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_ARGENT_CHALLENGE, NOT_STARTED); } void MovementInform(uint32 type, uint32 id) override { - if( type == POINT_MOTION_TYPE && id == 1 ) + if (type == POINT_MOTION_TYPE && id == 1) me->SetFacingTo(3 * M_PI / 2); } void KilledUnit(Unit* who) override { - if( who->IsPlayer() ) + if (who->IsPlayer()) { Talk(SAY_PALETRESS_KILL_PLAYER); } @@ -256,22 +256,22 @@ public: events.ScheduleEvent(EVENT_SPELL_SMITE, 2s, 3s); me->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); Talk(SAY_PALETRESS_AGGRO); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_ARGENT_CHALLENGE, IN_PROGRESS); } void DoAction(int32 param) override { - if( param == 1 ) + if (param == 1) { MemoryGUID.Clear(); me->RemoveAura(SPELL_SHIELD); Talk(SAY_PALETRESS_MEMORY_DEATH); } - else if( param == (-1) ) + else if (param == (-1)) { - if( MemoryGUID ) - if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) + if (MemoryGUID) + if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID)) { memory->DespawnOrUnsummon(); MemoryGUID.Clear(); @@ -281,10 +281,10 @@ public: void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { - //if( me->HasAura(SPELL_SHIELD) ) + //if (me->HasAura(SPELL_SHIELD)) // return; - if( damage >= me->GetHealth() ) + if (damage >= me->GetHealth()) { damage = me->GetHealth() - 1; @@ -299,7 +299,7 @@ public: _EnterEvadeMode(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(true); - if( pInstance ) + if (pInstance) { pInstance->SetData(BOSS_ARGENT_CHALLENGE, DONE); pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 68206); @@ -310,7 +310,7 @@ public: void JustSummoned(Creature* summon) override { - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_MEMORY_ENTRY, summon->GetEntry()); MemoryGUID = summon->GetGUID(); } @@ -324,12 +324,12 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !summoned && HealthBelowPct(25) ) + if (!summoned && HealthBelowPct(25)) { me->InterruptNonMeleeSpells(true); Talk(SAY_PALETRESS_MEMORY_SUMMON); @@ -343,32 +343,32 @@ public: return; } - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_SMITE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_SMITE, false); events.Repeat(3s, 4s); break; case EVENT_SPELL_HOLY_FIRE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_HOLY_FIRE, false); events.Repeat(9s, 12s); break; case EVENT_SPELL_RENEW: - if( !MemoryGUID ) + if (!MemoryGUID) { break; } - if( urand(0, 1) ) + if (urand(0, 1)) me->CastSpell(me, SPELL_RENEW, false); - else if( Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID) ) - if( memory->IsAlive() ) + else if (Creature* memory = ObjectAccessor::GetCreature(*me, MemoryGUID)) + if (memory->IsAlive()) me->CastSpell(memory, SPELL_RENEW, false); events.Repeat(15s, 17s); break; @@ -410,8 +410,8 @@ public: void JustDied(Unit* /*killer*/) override { me->DespawnOrUnsummon(20000); - if( pInstance ) - if( Creature* paletress = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_PALETRESS)) ) + if (pInstance) + if (Creature* paletress = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(DATA_PALETRESS))) paletress->AI()->DoAction(1); } @@ -421,10 +421,10 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -436,7 +436,7 @@ public: case EVENT_MEMORY_START_ATTACK: me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(false); - if( Unit* target = me->SelectNearestTarget(200.0f) ) + if (Unit* target = me->SelectNearestTarget(200.0f)) { AttackStart(target); DoZoneInCombat(); @@ -447,12 +447,12 @@ public: events.ScheduleEvent(EVENT_SPELL_WAKING_NIGHTMARE, 20s, 30s); break; case EVENT_SPELL_OLD_WOUNDS: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true)) me->CastSpell(target, SPELL_OLD_WOUNDS, true); events.Repeat(12s); break; case EVENT_SPELL_SHADOWS_PAST: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_SHADOWS_PAST, false); events.Repeat(15s, 20s); break; @@ -541,9 +541,9 @@ public: void WaypointReached(uint32 uiPoint) override { - if( uiPoint == 1 ) + if (uiPoint == 1) { - switch( uiWaypoint ) + switch (uiWaypoint) { case 0: me->SetFacingTo(5.4f); @@ -561,10 +561,10 @@ public: void SetData(uint32 uiType, uint32 /*uiData*/) override { AddWaypoint(0, me->GetPositionX(), 660.0f, 411.80f); - switch( me->GetEntry() ) + switch (me->GetEntry()) { case NPC_ARGENT_LIGHTWIELDER: - switch( uiType ) + switch (uiType) { case 0: AddWaypoint(1, 716.321f, 647.047f, 411.93f); @@ -578,7 +578,7 @@ public: } break; case NPC_ARGENT_MONK: - switch( uiType ) + switch (uiType) { case 0: AddWaypoint(1, 717.86f, 649.0f, 411.923f); @@ -592,7 +592,7 @@ public: } break; case NPC_PRIESTESS: - switch( uiType ) + switch (uiType) { case 0: AddWaypoint(1, 719.872f, 650.94f, 411.93f); @@ -613,7 +613,7 @@ public: void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if( bCheck && damage >= me->GetHealth() ) + if (bCheck && damage >= me->GetHealth()) { bCheck = false; damage = me->GetHealth() - 1; @@ -625,25 +625,25 @@ public: void JustEngagedWith(Unit* /*who*/) override { - switch( me->GetEntry() ) + switch (me->GetEntry()) { case NPC_ARGENT_MONK: events.RescheduleEvent(EVENT_MONK_SPELL_FLURRY_OF_BLOWS, 5s); events.RescheduleEvent(EVENT_MONK_SPELL_PUMMEL, 7s); - if( IsHeroic() ) + if (IsHeroic()) bCheck = true; break; case NPC_PRIESTESS: events.RescheduleEvent(EVENT_PRIESTESS_SPELL_HOLY_SMITE, 5s, 8s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN, 3s, 6s); events.RescheduleEvent(EVENT_PRIESTESS_SPELL_FOUNTAIN_OF_LIGHT, 8s, 15s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_PRIESTESS_SPELL_MIND_CONTROL_H, 12s); break; case NPC_ARGENT_LIGHTWIELDER: events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT, 12s, 15s); events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_CLEAVE, 3s, 5s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H, 8s, 12s); break; } @@ -653,15 +653,15 @@ public: { npc_escortAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -671,18 +671,18 @@ public: events.Repeat(12s, 18s); break; case EVENT_MONK_SPELL_PUMMEL: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_PUMMEL, false); events.Repeat(8s, 11s); break; case EVENT_PRIESTESS_SPELL_HOLY_SMITE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_HOLY_SMITE, false); events.Repeat(6s, 8s); break; case EVENT_PRIESTESS_SPELL_SHADOW_WORD_PAIN: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SHADOW_WORD_PAIN, false); events.Repeat(12s, 15s); break; @@ -691,7 +691,7 @@ public: events.Repeat(35s, 45s); break; case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_MIND_CONTROL_H, false); events.Repeat(22s, 30s); break; @@ -699,19 +699,19 @@ public: case EVENT_LIGHTWIELDER_SPELL_BLAZING_LIGHT: { Unit* target = DoSelectLowestHpFriendly(40.0f); - if( !target ) + if (!target) target = me; me->CastSpell(target, SPELL_BLAZING_LIGHT, false); events.Repeat(8s, 12s); } break; case EVENT_LIGHTWIELDER_SPELL_CLEAVE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_CLEAVE, false); events.Repeat(6s, 8s); break; case EVENT_LIGHTWIELDER_SPELL_UNBALANCING_STRIKE_H: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_UNBALANCING_STRIKE_H, false); events.Repeat(12s, 15s); break; @@ -723,7 +723,7 @@ public: void JustDied(Unit* /*pKiller*/) override { me->DespawnOrUnsummon(10000); - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_ARGENT_SOLDIER_DEFEATED, 0); } }; @@ -742,7 +742,7 @@ class spell_eadric_radiance : public SpellScript { std::list<WorldObject*> tmplist; for( std::list<WorldObject*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr) - if( (*itr)->ToUnit()->HasInArc(M_PI, GetCaster()) ) + if ((*itr)->ToUnit()->HasInArc(M_PI, GetCaster())) tmplist.push_back(*itr); targets.clear(); @@ -798,8 +798,8 @@ class spell_reflective_shield_aura : public AuraScript void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& dmgInfo, uint32& absorbAmount) { - if( Unit* attacker = dmgInfo.GetAttacker() ) - if( GetOwner() && attacker->GetGUID() != GetOwner()->GetGUID() ) + if (Unit* attacker = dmgInfo.GetAttacker()) + if (GetOwner() && attacker->GetGUID() != GetOwner()->GetGUID()) { int32 damage = (int32)(absorbAmount * 0.25f); GetOwner()->ToUnit()->CastCustomSpell(attacker, SPELL_REFLECTIVE_SHIELD_DAMAGE, &damage, nullptr, nullptr, true); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 0b2a7ffc54..47b89b1624 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -123,7 +123,7 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(true); me->SetReactState(REACT_PASSIVE); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_BLACK_KNIGHT, NOT_STARTED); //me->SetLootMode(0); // [LOOT] @@ -143,7 +143,7 @@ public: return; } - if( Phase < 3 && damage >= me->GetHealth() ) + if (Phase < 3 && damage >= me->GetHealth()) { damage = 0; me->SetHealth(me->GetMaxHealth()); @@ -164,19 +164,19 @@ public: void DoAction(int32 param) override { - if( param == -1 ) + if (param == -1) { summons.DespawnAll(); } - else if( param == 1 ) + else if (param == 1) { - if( !pInstance ) + if (!pInstance) return; pInstance->SetData(BOSS_BLACK_KNIGHT, IN_PROGRESS); Talk(SAY_BK_AGGRO); me->CastSpell((Unit*)nullptr, (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? SPELL_RAISE_DEAD_JAEREN : SPELL_RAISE_DEAD_ARELAS), false); - if( Creature* announcer = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_ANNOUNCER)) ) + if (Creature* announcer = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_ANNOUNCER))) announcer->DespawnOrUnsummon(); events.Reset(); @@ -190,7 +190,7 @@ public: void SpellHitTarget(Unit* /*target*/, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case SPELL_BLACK_KNIGHT_RES: me->SetHealth(me->GetMaxHealth()); @@ -205,7 +205,7 @@ public: ++Phase; - switch( Phase ) + switch (Phase) { case 2: me->SetDisplayId(MODEL_SKELETON); @@ -236,46 +236,46 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_ANNOUNCER_SAY_ZOMBIE: - if( pInstance && !summons.empty() ) - if( Creature* ghoul = pInstance->instance->GetCreature(*summons.begin()) ) + if (pInstance && !summons.empty()) + if (Creature* ghoul = pInstance->instance->GetCreature(*summons.begin())) if (urand(0, 1)) ghoul->Yell("[Zombie] .... . Brains ....", LANG_UNIVERSAL); /// @todo: Multiple variations + not always happening, from video sources, needs sniff to transition from DB. break; case EVENT_SPELL_PLAGUE_STRIKE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_PLAGUE_STRIKE, false); events.Repeat(10s, 12s); break; case EVENT_SPELL_ICY_TOUCH: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_ICY_TOUCH, false); events.Repeat(5s, 6s); break; case EVENT_SPELL_DEATH_RESPITE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_DEATH_RESPITE, false); events.Repeat(13s, 15s); break; case EVENT_SPELL_OBLITERATE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_OBLITERATE, false); events.Repeat(15s, 17s); break; case EVENT_SPELL_DESECRATION: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_DESECRATION, false); events.Repeat(14s, 17s); break; @@ -284,7 +284,7 @@ public: events.Repeat(2s, 4s); break; case EVENT_SPELL_MARKED_DEATH: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.000000f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.000000f, true)) me->CastSpell(target, SPELL_MARKED_DEATH, false); events.Repeat(9s); break; @@ -296,7 +296,7 @@ public: void JustSummoned(Creature* summon) override { summons.Summon(summon); - if( Unit* target = summon->SelectNearestTarget(200.0f) ) + if (Unit* target = summon->SelectNearestTarget(200.0f)) { summon->AI()->AttackStart(target); DoZoneInCombat(summon); @@ -305,7 +305,7 @@ public: void KilledUnit(Unit* victim) override { - if( victim->IsPlayer() ) + if (victim->IsPlayer()) { Talk(SAY_BK_KILL_PLAYER); } @@ -315,9 +315,9 @@ public: { me->CastSpell((Unit*)nullptr, SPELL_BK_KILL_CREDIT, true); Talk(SAY_BK_DEATH); - if( pInstance ) + if (pInstance) pInstance->SetData(BOSS_BLACK_KNIGHT, DONE); - if( me->ToTempSummon() ) + if (me->ToTempSummon()) me->ToTempSummon()->SetTempSummonType(TEMPSUMMON_MANUAL_DESPAWN); } }; @@ -347,7 +347,7 @@ public: void DoAction(int32 param) override { - if( param == 1 ) + if (param == 1) { me->SetControlled(false, UNIT_STATE_ROOT); me->DisableRotate(false); @@ -358,7 +358,7 @@ public: void WaypointReached(uint32 i) override { - if( i == 12 ) + if (i == 12) { SetEscortPaused(true); me->SetOrientation(3.62f); @@ -366,7 +366,7 @@ public: me->DisableRotate(true); me->SetFacingTo(3.62f); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_MOUNT_SPECIAL); - if( InstanceScript* pInstance = me->GetInstanceScript() ) + if (InstanceScript* pInstance = me->GetInstanceScript()) pInstance->SetData(DATA_SKELETAL_GRYPHON_LANDED, 0); } } @@ -422,7 +422,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - switch(spell->Id) + switch (spell->Id) { case SPELL_CLAW_N: case SPELL_CLAW_H: @@ -443,15 +443,15 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp index 7ed03a36d6..436fad32ac 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -173,7 +173,7 @@ public: if (me->IsDuringRemoveFromWorld()) return; - if( apply ) + if (apply) { me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetSpeed(MOVE_RUN, 2.0f, false); @@ -193,7 +193,7 @@ public: if (me->IsDuringRemoveFromWorld()) return; - if( !apply ) + if (!apply) { me->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND); who->RemoveAura(SPELL_PLAYER_VEHICLE_DEFEND); @@ -260,7 +260,7 @@ public: void UpdateAI(uint32 diff) override { - if( ShieldTimer <= (int32)diff ) + if (ShieldTimer <= (int32)diff ) { me->CastSpell(me, SPELL_MINIONS_DEFEND, true); ShieldTimer = 5000; @@ -268,15 +268,15 @@ public: else ShieldTimer -= diff; - if ( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -285,22 +285,22 @@ public: GuidVector LIST; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) { - if( me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead() ) + if (me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead()) continue; - if( !plr->GetVehicle() ) + if (!plr->GetVehicle()) LIST.push_back(plr->GetGUID()); - else if( Vehicle* v = plr->GetVehicle() ) + else if (Vehicle* v = plr->GetVehicle()) { - if( Unit* mount = v->GetBase() ) + if (Unit* mount = v->GetBase()) LIST.push_back(mount->GetGUID()); } } - if( !LIST.empty() ) + if (!LIST.empty()) { uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; - if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) + if (Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd))) { me->GetThreatMgr().ResetAllThreat(); me->AddThreat(target, 10000.0f); @@ -316,25 +316,25 @@ public: GuidVector LIST; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) { - if( me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) + if (me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) continue; - if( Vehicle* v = plr->GetVehicle() ) - if( Unit* mount = v->GetBase() ) + if (Vehicle* v = plr->GetVehicle()) + if (Unit* mount = v->GetBase()) LIST.push_back(mount->GetGUID()); } - if( !LIST.empty() ) + if (!LIST.empty()) { uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; - if( Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)) ) + if (Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd))) me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false); } events.Repeat(6s, 8s); } break; case EVENT_THRUST: - if( me->GetVictim() && me->GetExactDist(me->GetVictim()) <= 5.5f ) + if (me->GetVictim() && me->GetExactDist(me->GetVictim()) <= 5.5f ) me->CastSpell(me->GetVictim(), SPELL_PLAYER_VEHICLE_THRUST, false); events.Repeat(3s, 5s); break; @@ -345,7 +345,7 @@ public: { me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, 0); me->DespawnOrUnsummon(10000); - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_MOUNT_DIED, 0); } }; @@ -402,7 +402,7 @@ public: void Reset() override { - if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) + if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) { DoAction(1); DoAction(2); @@ -415,7 +415,7 @@ public: void JustEngagedWith(Unit* /*who*/) override { - if( pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) + if (pInstance && pInstance->GetData(DATA_INSTANCE_PROGRESS) == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) me->CallForHelp(100.0f); } @@ -423,7 +423,7 @@ public: { me->m_spellImmune[IMMUNITY_MECHANIC].clear(); events.Reset(); - switch( me->GetEntry() ) + switch (me->GetEntry()) { case NPC_AMBROSE: // Ambrose Boltspark case NPC_ERESSEA: // Eressea Dawnsinger @@ -485,7 +485,7 @@ public: void DoAction(int32 param) override { - if( param == 1 ) + if (param == 1) { MountPhase = false; NewMountGUID.Clear(); @@ -500,16 +500,16 @@ public: AddCreatureAddonAuras(); events.Reset(); } - else if( param == 2 ) + else if (param == 2) ScheduleAbilitiesEvents(); } void SetData(uint32 uiType, uint32 uiData) override { BossOrder = uiType; - if( uiData > 1 ) + if (uiData > 1) return; - switch( BossOrder ) + switch (BossOrder) { case 0: if (uiData == 0) // 1 == short version @@ -545,11 +545,11 @@ public: void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if( MountPhase ) + if (MountPhase) { - if( me->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) == 0 ) + if (me->GetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID) == 0 ) damage = 0; - else if( damage >= me->GetHealth() ) + else if (damage >= me->GetHealth()) { events.Reset(); damage = me->GetHealth() - 1; @@ -565,10 +565,10 @@ public: me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(true); me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( pInstance ) + if (pInstance) { pInstance->SetData(DATA_MOUNT_DIED, BossOrder); - if( Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ) ) + if (Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true )) { NewMountGUID = mount->GetGUID(); me->GetMotionMaster()->MovePoint(7, *mount); @@ -579,7 +579,7 @@ public: } else { - if( damage >= me->GetHealth() ) + if (damage >= me->GetHealth()) { MountPhase = true; events.Reset(); @@ -593,7 +593,7 @@ public: me->SetRegeneratingHealth(false); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(true); - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_GRAND_CHAMPION_DIED, BossOrder); } } @@ -603,26 +603,26 @@ public: void WaypointReached(uint32 i) override { - if( !pInstance ) + if (!pInstance) return; - if( (i == 2 && (BossOrder == 1 || BossOrder == 2)) || (i == 3 && BossOrder == 0) ) + if ((i == 2 && (BossOrder == 1 || BossOrder == 2)) || (i == 3 && BossOrder == 0)) pInstance->SetData(DATA_GRAND_CHAMPION_REACHED_DEST, BossOrder); } void MovementInform(uint32 type, uint32 id) override { - if( id < 4 ) + if (id < 4) npc_escortAI::MovementInform(type, id); - if( type == POINT_MOTION_TYPE ) + if (type == POINT_MOTION_TYPE) { - if( id == 5 ) + if (id == 5) me->SetFacingTo(3 * M_PI / 2); - else if( id == 7 ) // reached new mount! + else if (id == 7) // reached new mount! { - if( NewMountGUID ) - if( Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID) ) + if (NewMountGUID) + if (Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID)) { mount->DespawnOrUnsummon(); me->SetUInt32Value(UNIT_FIELD_MOUNTDISPLAYID, mount->GetDisplayId()); @@ -637,16 +637,16 @@ public: me->SetReactState(REACT_AGGRESSIVE); me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetImmuneToAll(false); - if( Unit* target = me->SelectNearestTarget(200.0f) ) + if (Unit* target = me->SelectNearestTarget(200.0f)) AttackStart(target); DoZoneInCombat(); me->CastSpell(me, SPELL_TRAMPLE_AURA, true); - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_REACHED_NEW_MOUNT, 0); NewMountGUID.Clear(); } } - else if( id == 9 ) + else if (id == 9) me->DespawnOrUnsummon(); } } @@ -661,37 +661,37 @@ public: { npc_escortAI::UpdateAI(diff); - if ( !UpdateVictim() && !NewMountGUID ) + if (!UpdateVictim() && !NewMountGUID ) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) || ((me->GetEntry() == NPC_JACOB || me->GetEntry() == NPC_MOKRA) && me->HasAura(SPELL_BLADESTORM)) ) + if (me->HasUnitState(UNIT_STATE_CASTING) || ((me->GetEntry() == NPC_JACOB || me->GetEntry() == NPC_MOKRA) && me->HasAura(SPELL_BLADESTORM))) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_FIND_NEW_MOUNT: { - if( me->HasAura(SPELL_TRAMPLE_STUN) ) + if (me->HasAura(SPELL_TRAMPLE_STUN)) { events.Repeat(200ms); break; } // hackfix, trample won't hit grand champions because of UNIT_FLAG_NON_ATTACKABLE - if( pInstance ) + if (pInstance) { bool trample = false; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( me->GetExactDist(plr) <= 5.0f ) - if( Vehicle* v = plr->GetVehicle() ) - if( Unit* c = v->GetBase() ) - if( c->IsCreature() && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE) ) + if (Player* plr = itr->GetSource()) + if (me->GetExactDist(plr) <= 5.0f ) + if (Vehicle* v = plr->GetVehicle()) + if (Unit* c = v->GetBase()) + if (c->IsCreature() && c->ToCreature()->GetEntry() == (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_BATTLEWORG : VEHICLE_ARGENT_WARHORSE)) { me->GetMotionMaster()->MovementExpired(); me->GetMotionMaster()->MoveIdle(); @@ -701,23 +701,23 @@ public: break; } - if( trample ) + if (trample) { events.Repeat(15s); break; } } - if( Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID) ) - if( mount->IsAlive() ) + if (Creature* mount = ObjectAccessor::GetCreature(*me, NewMountGUID)) + if (mount->IsAlive()) { - if( me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) + if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) me->GetMotionMaster()->MovePoint(7, *mount); events.Repeat(200ms); break; } - if( Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true ) ) + if (Creature* mount = me->FindNearestCreature( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_HORDE ? VEHICLE_ARGENT_WARHORSE : VEHICLE_ARGENT_BATTLEWORG, 100.0f, true )) { me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); NewMountGUID = mount->GetGUID(); @@ -734,22 +734,22 @@ public: GuidVector LIST; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) { - if( me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead() ) + if (me->GetExactDist(plr) < 8.0f || me->GetExactDist(plr) > 25.0f || plr->isDead()) continue; - if( !plr->GetVehicle() ) + if (!plr->GetVehicle()) LIST.push_back(plr->GetGUID()); - else if( Vehicle* v = plr->GetVehicle() ) + else if (Vehicle* v = plr->GetVehicle()) { - if( Unit* mount = v->GetBase() ) + if (Unit* mount = v->GetBase()) LIST.push_back(mount->GetGUID()); } } - if( !LIST.empty() ) + if (!LIST.empty()) { uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; - if( Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd)) ) + if (Unit* target = ObjectAccessor::GetUnit(*me, LIST.at(rnd))) { me->GetThreatMgr().ResetAllThreat(); me->AddThreat(target, 10000.0f); @@ -765,33 +765,33 @@ public: GuidVector LIST; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) { - if( me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) + if (me->GetExactDist(plr) < 10.0f || me->GetExactDist(plr) > 30.0f ) continue; - if( Vehicle* v = plr->GetVehicle() ) - if( Unit* mount = v->GetBase() ) + if (Vehicle* v = plr->GetVehicle()) + if (Unit* mount = v->GetBase()) LIST.push_back(mount->GetGUID()); } - if( !LIST.empty() ) + if (!LIST.empty()) { uint8 rnd = LIST.size() > 1 ? urand(0, LIST.size() - 1) : 0; - if( Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd)) ) + if (Unit* target = ObjectAccessor::GetCreature(*me, LIST.at(rnd))) me->CastSpell(target, SPELL_NPC_SHIELD_BREAKER, false); } events.Repeat(6s, 8s); } break; case EVENT_THRUST: - if( Unit* victim = me->GetVictim() ) - if( me->GetExactDist(victim) <= 6.0f ) + if (Unit* victim = me->GetVictim()) + if (me->GetExactDist(victim) <= 6.0f ) me->CastSpell(victim, SPELL_PLAYER_VEHICLE_THRUST, false); events.Repeat(3s, 5s); break; /******************* MAGE *******************/ case EVEMT_MAGE_SPELL_FIREBALL: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_FIREBALL, false); events.Repeat(5s); break; @@ -804,7 +804,7 @@ public: events.Repeat(22s); break; case EVEMT_MAGE_SPELL_POLYMORPH: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_POLYMORPH, false); events.Repeat(8s); break; @@ -812,7 +812,7 @@ public: /****************** SHAMAN ******************/ case EVENT_SHAMAN_SPELL_CHAIN_LIGHTNING: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); events.Repeat(16s); break; @@ -823,10 +823,10 @@ public: case EVENT_SHAMAN_SPELL_HEALING_WAVE: { Unit* target = nullptr; - if( urand(0, 1) ) + if (urand(0, 1)) { target = DoSelectLowestHpFriendly(40.0f); - if( !target ) + if (!target) target = me; } else @@ -836,7 +836,7 @@ public: } break; case EVENT_SHAMAN_SPELL_HEX_OF_MENDING: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_HEX_OF_MENDING, false); events.Repeat(20s, 25s); break; @@ -852,9 +852,9 @@ public: break; case EVENT_HUNTER_SPELL_MULTI_SHOT: { - if( !UnitTargetGUID ) + if (!UnitTargetGUID) { - if( Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true)) { me->CastSpell(target, SPELL_SHOOT, false); UnitTargetGUID = target->GetGUID(); @@ -865,7 +865,7 @@ public: else { Unit* target = ObjectAccessor::GetUnit(*me, UnitTargetGUID); - if( target && me->IsInRange(target, 5.0f, 30.0f, false) ) + if (target && me->IsInRange(target, 5.0f, 30.0f, false)) me->CastSpell(target, SPELL_MULTI_SHOT, false); else { @@ -873,7 +873,7 @@ public: for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { Player* player = itr->GetSource(); - if( player && me->IsInRange(player, 5.0f, 30.0f, false) ) + if (player && me->IsInRange(player, 5.0f, 30.0f, false)) { me->CastSpell(player, SPELL_MULTI_SHOT, false); break; @@ -889,7 +889,7 @@ public: /****************** ROGUE *******************/ case EVENT_ROGUE_SPELL_EVISCERATE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_EVISCERATE, false); events.Repeat(8s); break; @@ -898,7 +898,7 @@ public: events.Repeat(14s); break; case EVENT_ROGUE_SPELL_POISON_BOTTLE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_POISON_BOTTLE, false); events.Repeat(19s); break; @@ -906,12 +906,12 @@ public: /***************** WARRIOR ******************/ case EVENT_WARRIOR_SPELL_MORTAL_STRIKE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_MORTAL_STRIKE, false); events.Repeat(8s, 12s); break; case EVENT_WARRIOR_SPELL_BLADESTORM: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_BLADESTORM, false); events.Repeat(15s, 20s); break; @@ -921,7 +921,7 @@ public: for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { Player* player = itr->GetSource(); - if( player && me->IsInRange(player, 8.0f, 25.0f, false) ) + if (player && me->IsInRange(player, 8.0f, 25.0f, false)) { DoResetThreatList(); me->AddThreat(player, 5.0f); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp index 76b54fe59f..e5ca3913b7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp @@ -101,7 +101,7 @@ public: bool IsEncounterInProgress() const override { for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) - if( m_auiEncounter[i] == IN_PROGRESS ) + if (m_auiEncounter[i] == IN_PROGRESS) return true; return false; @@ -112,54 +112,54 @@ public: if (TeamIdInInstance == TEAM_NEUTRAL) { Map::PlayerList const& players = instance->GetPlayers(); - if( !players.IsEmpty() ) - if( Player* pPlayer = players.begin()->GetSource() ) + if (!players.IsEmpty()) + if (Player* pPlayer = players.begin()->GetSource()) TeamIdInInstance = pPlayer->GetTeamId(); } - switch( creature->GetEntry() ) + switch (creature->GetEntry()) { // Grand Champions: case NPC_MOKRA: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_JACOB); break; case NPC_ERESSEA: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_AMBROSE); break; case NPC_RUNOK: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_COLOSOS); break; case NPC_ZULTORE: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_JAELYNE); break; case NPC_VISCERI: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_LANA); break; // Grand Champion Minions: case NPC_ORGRIMMAR_MINION: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_STORMWIND_MINION); break; case NPC_SILVERMOON_MINION: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_GNOMEREGAN_MINION); break; case NPC_THUNDER_BLUFF_MINION: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_EXODAR_MINION); break; case NPC_SENJIN_MINION: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_DARNASSUS_MINION); break; case NPC_UNDERCITY_MINION: - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) creature->UpdateEntry(NPC_IRONFORGE_MINION); break; @@ -173,7 +173,7 @@ public: case NPC_JAEREN: case NPC_ARELAS: NPC_AnnouncerGUID = creature->GetGUID(); - //if( TeamIdInInstance == TEAM_ALLIANCE ) + //if (TeamIdInInstance == TEAM_ALLIANCE) // creature->UpdateEntry(NPC_ARELAS); creature->SetReactState(REACT_PASSIVE); break; @@ -186,7 +186,7 @@ public: // Beginning vehicles: case VEHICLE_ARGENT_WARHORSE: case VEHICLE_ARGENT_BATTLEWORG: - if( InstanceProgress < INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED && m_auiEncounter[0] == NOT_STARTED ) + if (InstanceProgress < INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED && m_auiEncounter[0] == NOT_STARTED) { creature->DespawnOrUnsummon(); creature->SetRespawnTime(3); @@ -204,7 +204,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch( go->GetEntry() ) + switch (go->GetEntry()) { case GO_MAIN_GATE: GO_MainGateGUID = go->GetGUID(); @@ -237,7 +237,7 @@ public: events.Reset(); events.RescheduleEvent(EVENT_CHECK_PLAYERS, 0ms); - if( !in ) + if (!in) { OUT_LOAD_INST_DATA_FAIL; return; @@ -250,17 +250,17 @@ public: std::istringstream loadStream(in); loadStream >> dataHead1 >> dataHead2 >> data0 >> data1 >> data2 >> data3; - if( dataHead1 == 'T' && dataHead2 == 'C' ) + if (dataHead1 == 'T' && dataHead2 == 'C') { m_auiEncounter[0] = data0; m_auiEncounter[1] = data1; m_auiEncounter[2] = data2; InstanceProgress = data3; - if( InstanceProgress == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED ) + if (InstanceProgress == INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED) InstanceProgress = INSTANCE_PROGRESS_INITIAL; for( uint8 i = 0; i < MAX_ENCOUNTER; ++i ) - if( m_auiEncounter[i] == IN_PROGRESS ) + if (m_auiEncounter[i] == IN_PROGRESS) m_auiEncounter[i] = NOT_STARTED; } else @@ -306,10 +306,10 @@ public: void InstanceCleanup() { - if( CLEANED ) + if (CLEANED) return; - switch( InstanceProgress ) + switch (InstanceProgress) { case INSTANCE_PROGRESS_INITIAL: case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST: @@ -328,15 +328,15 @@ public: { for( uint8 j = 0; j < 3; ++j ) { - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[i][j]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[i][j])) c->DespawnOrUnsummon(); NPC_GrandChampionMinionsGUID[i][j].Clear(); } - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) c->DespawnOrUnsummon(); NPC_GrandChampionGUID[i].Clear(); } - if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID)) { c->DespawnOrUnsummon(); c->SetHomePosition(748.309f, 619.488f, 411.172f, 4.71239f); @@ -349,7 +349,7 @@ public: break; case INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { announcer->DespawnOrUnsummon(); announcer->SetHomePosition(735.81f, 661.92f, 412.39f, 4.714f); @@ -358,28 +358,28 @@ public: announcer->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { uint32 entry = c->GetEntry(); c->DespawnOrUnsummon(); - switch( i ) + switch (i) { case 0: - if( Creature* pBoss = announcer->SummonCreature(entry, 736.695f, 650.02f, 412.4f, 3 * M_PI / 2) ) + if (Creature* pBoss = announcer->SummonCreature(entry, 736.695f, 650.02f, 412.4f, 3 * M_PI / 2)) { NPC_GrandChampionGUID[0] = pBoss->GetGUID(); pBoss->AI()->SetData(0, 2); } break; case 1: - if( Creature* pBoss = announcer->SummonCreature(entry, 756.32f, 650.05f, 412.4f, 3 * M_PI / 2) ) + if (Creature* pBoss = announcer->SummonCreature(entry, 756.32f, 650.05f, 412.4f, 3 * M_PI / 2)) { NPC_GrandChampionGUID[1] = pBoss->GetGUID(); pBoss->AI()->SetData(1, 2); } break; case 2: - if( Creature* pBoss = announcer->SummonCreature(entry, 746.5f, 650.65f, 411.7f, 3 * M_PI / 2) ) + if (Creature* pBoss = announcer->SummonCreature(entry, 746.5f, 650.65f, 411.7f, 3 * M_PI / 2)) { NPC_GrandChampionGUID[2] = pBoss->GetGUID(); pBoss->AI()->SetData(2, 2); @@ -397,17 +397,17 @@ public: for( uint8 i = 0; i < 3; ++i ) for( uint8 j = 0; j < 3; ++j ) { - if( Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]) ) + if (Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j])) c->DespawnOrUnsummon(); NPC_ArgentSoldierGUID[i][j].Clear(); } - if( Creature* c = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* c = instance->GetCreature(NPC_ArgentChampionGUID)) { c->AI()->DoAction(-1); // paletress despawn memory c->DespawnOrUnsummon(); } NPC_ArgentChampionGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID)) { c->DespawnOrUnsummon(); c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f); @@ -422,16 +422,16 @@ public: case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: // revert to INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED { - if( Creature* c = instance->GetCreature(NPC_BlackKnightVehicleGUID) ) + if (Creature* c = instance->GetCreature(NPC_BlackKnightVehicleGUID)) c->DespawnOrUnsummon(); NPC_BlackKnightVehicleGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* c = instance->GetCreature(NPC_BlackKnightGUID)) { c->AI()->DoAction(-1); c->DespawnOrUnsummon(); } NPC_BlackKnightGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID)) { c->DespawnOrUnsummon(); c->SetHomePosition(743.14f, 628.77f, 411.2f, 4.71239f); @@ -443,7 +443,7 @@ public: } break; case INSTANCE_PROGRESS_FINISHED: - if( Creature* c = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* c = instance->GetCreature(NPC_AnnouncerGUID)) c->DespawnOrUnsummon(); break; } @@ -460,7 +460,7 @@ public: uint32 GetData(uint32 uiData) const override { - switch( uiData ) + switch (uiData) { case DATA_INSTANCE_PROGRESS: return InstanceProgress; @@ -473,7 +473,7 @@ public: ObjectGuid GetGuidData(uint32 uiData) const override { - switch( uiData ) + switch (uiData) { case DATA_ANNOUNCER: return NPC_AnnouncerGUID; @@ -486,21 +486,21 @@ public: void SetData(uint32 uiType, uint32 uiData) override { - switch( uiType ) + switch (uiType) { case DATA_ANNOUNCER_GOSSIP_SELECT: - switch( InstanceProgress ) + switch (InstanceProgress) { case INSTANCE_PROGRESS_INITIAL: if (uiData == 0) // normal intro { shortver = false; - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { - if( GameObject* gate = instance->GetGameObject(GO_MainGateGUID) ) + if (GameObject* gate = instance->GetGameObject(GO_MainGateGUID)) announcer->SetFacingToObject(gate); - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_WELCOME); } events.RescheduleEvent(EVENT_YELL_WELCOME_2, 8s); @@ -521,7 +521,7 @@ public: InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST; uiData = DONE; // save to db - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { announcer->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); announcer->GetMotionMaster()->MovePoint(1, 735.81f, 661.92f, 412.39f); @@ -530,10 +530,10 @@ public: } break; case INSTANCE_PROGRESS_CHAMPIONS_DEAD: - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { Counter = urand(0, 1); - if( Counter ) + if (Counter) announcer->AI()->Talk(SAY_EADRIC_INTRO_ANNOUNCER); else announcer->AI()->Talk(SAY_JAEREN_PALETRESS_INTRO); @@ -542,7 +542,7 @@ public: events.RescheduleEvent(EVENT_START_ARGENT_CHALLENGE_INTRO, 0ms); break; case INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED: - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_BK_INTRO); events.RescheduleEvent(EVENT_SUMMON_BLACK_KNIGHT, 3s); break; @@ -551,7 +551,7 @@ public: case DATA_GRAND_CHAMPION_REACHED_DEST: if (shortver) break; - switch( uiData ) + switch (uiData) { case 0: events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_2, 0ms); @@ -560,7 +560,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_GRAND_CHAMPION_3, 0ms); break; case 2: - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { InstanceProgress = INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST; uiData = DONE; // save to db @@ -572,10 +572,10 @@ public: } break; case DATA_MOUNT_DIED: - switch( InstanceProgress ) + switch (InstanceProgress) { case INSTANCE_PROGRESS_GRAND_CHAMPIONS_REACHED_DEST: // fighting group 1/3 - if( ++Counter >= 3 ) + if (++Counter >= 3) { Counter = 0; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1; @@ -584,7 +584,7 @@ public: } break; case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_1: // fighting group 2/3 - if( ++Counter >= 3 ) + if (++Counter >= 3) { Counter = 0; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2; @@ -593,7 +593,7 @@ public: } break; case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_2: // fighting group 3/3 - if( ++Counter >= 3 ) + if (++Counter >= 3) { Counter = 0; InstanceProgress = INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3; @@ -602,7 +602,7 @@ public: } break; case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3: // fighting grand champions (on vehicles) - if( ++Counter >= 3 ) + if (++Counter >= 3) { Counter = 0; InstanceProgress = INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED; @@ -618,7 +618,7 @@ public: --Counter; break; case DATA_GRAND_CHAMPION_DIED: - if( ++Counter >= 3 ) + if (++Counter >= 3) { Counter = 0; VehicleList.clear(); @@ -627,7 +627,7 @@ public: m_auiEncounter[0] = DONE; bool creditCasted = false; for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { c->GetMotionMaster()->MovePoint(9, 747.36f, 670.07f, 411.9f); if (!creditCasted) @@ -636,7 +636,7 @@ public: creditCasted = true; } } - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f); announcer->SummonGameObject(instance->IsHeroic() ? GO_CHAMPIONS_LOOT_H : GO_CHAMPIONS_LOOT, 746.59f, 618.49f, 411.09f, 1.42f, 0, 0, 0, 0, 90000000); // [LOOT] @@ -645,12 +645,12 @@ public: } // bind players to instance - if( instance->IsHeroic() ) + if (instance->IsHeroic()) instance->ToInstanceMap()->PermBindAllPlayers(); } break; case DATA_ARGENT_SOLDIER_DEFEATED: - if( ++Counter >= 9 ) + if (++Counter >= 9) { Counter = 0; InstanceProgress = INSTANCE_PROGRESS_ARGENT_SOLDIERS_DIED; @@ -661,7 +661,7 @@ public: case BOSS_ARGENT_CHALLENGE: { m_auiEncounter[1] = uiData; - if( uiData == DONE ) + if (uiData == DONE) { HandleGameObject(GO_EnterGateGUID, true); InstanceProgress = INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED; @@ -685,7 +685,7 @@ public: HandleGameObject(GO_EnterGateGUID, false); bAchievIveHadWorse = true; } - else if( uiData == DONE ) + else if (uiData == DONE) { HandleGameObject(GO_EnterGateGUID, true); InstanceProgress = INSTANCE_PROGRESS_FINISHED; @@ -698,7 +698,7 @@ public: break; } - if( uiData == DONE ) + if (uiData == DONE) SaveToDB(); } @@ -708,7 +708,7 @@ public: uint32 MINION_TO_SUMMON = 0; int32 TEXT_ID = 0; - switch( BossNumber ) + switch (BossNumber) { case 0: CHAMPION_TO_SUMMON = NPC_MOKRA; @@ -754,7 +754,7 @@ public: break; } - if( Creature* pBoss = instance->SummonCreature(CHAMPION_TO_SUMMON, SpawnPos) ) + if (Creature* pBoss = instance->SummonCreature(CHAMPION_TO_SUMMON, SpawnPos)) { NPC_GrandChampionGUID[BossOrder] = pBoss->GetGUID(); pBoss->ToCreature()->SetReactState(REACT_PASSIVE); @@ -764,7 +764,7 @@ public: pBoss->AI()->SetData(BossOrder, (shortver ? 1 : 0)); for( uint8 i = 0; i < 3; ++i ) - if( Creature* pAdd = instance->SummonCreature(MINION_TO_SUMMON, SpawnPos) ) + if (Creature* pAdd = instance->SummonCreature(MINION_TO_SUMMON, SpawnPos)) { NPC_GrandChampionMinionsGUID[BossOrder][i] = pAdd->GetGUID(); pAdd->SetReactState(REACT_PASSIVE); @@ -776,7 +776,7 @@ public: } if (!shortver) - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { announcer->AI()->Talk(TEXT_ID); /// @todo: Missing Argent Raid Spectator cheers. } @@ -785,7 +785,7 @@ public: void Update(uint32 diff) override { events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case EVENT_NULL: break; @@ -842,15 +842,15 @@ public: } case EVENT_GRAND_GROUP_1_MOVE_MIDDLE: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { announcer->SetFacingTo(4.714f); - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_BEGIN); HandleGameObject(GO_EnterGateGUID, false); } for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i])) { float angle = rand_norm() * 2 * M_PI; c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); @@ -862,12 +862,12 @@ public: case EVENT_GRAND_GROUP_1_ATTACK: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[1][i])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); } @@ -877,7 +877,7 @@ public: case EVENT_GRAND_GROUP_2_MOVE_MIDDLE: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i])) { float angle = rand_norm() * 2 * M_PI; c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); @@ -889,12 +889,12 @@ public: case EVENT_GRAND_GROUP_2_ATTACK: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[0][i])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); } @@ -903,7 +903,7 @@ public: case EVENT_GRAND_GROUP_3_MOVE_MIDDLE: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i])) { float angle = rand_norm() * 2 * M_PI; c->GetMotionMaster()->MovePoint(0, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); @@ -915,12 +915,12 @@ public: case EVENT_GRAND_GROUP_3_ATTACK: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionMinionsGUID[2][i])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); } @@ -929,7 +929,7 @@ public: case EVENT_GRAND_CHAMPIONS_MOVE_MIDDLE: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { float angle = rand_norm() * 2 * M_PI; c->GetMotionMaster()->MovePoint(4, 748.309f + 3.0f * cos(angle), 619.448f + 3.0f * std::sin(angle), 411.3f); @@ -941,12 +941,12 @@ public: case EVENT_GRAND_CHAMPIONS_MOUNTS_ATTACK: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); c->CastSpell(c, 67865, true); // SPELL_TRAMPLE_AURA @@ -956,10 +956,10 @@ public: case EVENT_GRAND_CHAMPIONS_MOVE_SIDE: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { c->AI()->DoAction(1); - switch( i ) + switch (i) { case 0: c->GetMotionMaster()->MovePoint(5, 736.695f, 650.02f, 412.4f); @@ -979,12 +979,12 @@ public: case EVENT_GRAND_CHAMPIONS_ATTACK: { for( uint8 i = 0; i < 3; ++i ) - if( Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i]) ) + if (Creature* c = instance->GetCreature(NPC_GrandChampionGUID[i])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); c->AI()->DoAction(2); @@ -993,7 +993,7 @@ public: break; case EVENT_GRATZ_SLAIN_CHAMPIONS: { - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_GRATZ_SLAIN_CHAMPIONS); HandleGameObject(GO_EnterGateGUID, true); @@ -1001,15 +1001,15 @@ public: break; case EVENT_RESTORE_ANNOUNCER_GOSSIP: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) announcer->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); } break; case EVENT_START_ARGENT_CHALLENGE_INTRO: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { - if( GameObject* gate = instance->GetGameObject(GO_MainGateGUID) ) + if (GameObject* gate = instance->GetGameObject(GO_MainGateGUID)) { announcer->SetFacingToObject(gate); HandleGameObject(GO_MainGateGUID, true, gate); @@ -1023,19 +1023,19 @@ public: float x = pos.GetPositionX(); pos.m_positionX = x - 2.0f + (i - 1) * 10.0f; - if( Creature* pTrash = instance->SummonCreature(NPC_ARGENT_LIGHTWIELDER, pos) ) + if (Creature* pTrash = instance->SummonCreature(NPC_ARGENT_LIGHTWIELDER, pos)) { pTrash->AI()->SetData(i, 0); NPC_ArgentSoldierGUID[i][0] = pTrash->GetGUID(); } pos.m_positionX = x + (i - 1) * 10.0f; - if( Creature* pTrash = instance->SummonCreature(NPC_ARGENT_MONK, pos) ) + if (Creature* pTrash = instance->SummonCreature(NPC_ARGENT_MONK, pos)) { pTrash->AI()->SetData(i, 0); NPC_ArgentSoldierGUID[i][1] = pTrash->GetGUID(); } pos.m_positionX = x + 2.0f + (i - 1) * 10.0f; - if( Creature* pTrash = instance->SummonCreature(NPC_PRIESTESS, pos) ) + if (Creature* pTrash = instance->SummonCreature(NPC_PRIESTESS, pos)) { pTrash->AI()->SetData(i, 0); NPC_ArgentSoldierGUID[i][2] = pTrash->GetGUID(); @@ -1046,7 +1046,7 @@ public: break; case EVENT_SUMMON_ARGENT_CHALLENGE: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) announcer->GetMotionMaster()->MovePoint(0, 735.81f, 661.92f, 412.39f); if (Creature* boss = instance->SummonCreature(Counter ? NPC_EADRIC : NPC_PALETRESS, SpawnPosition)) boss->GetMotionMaster()->MovePoint(0, 746.881f, 660.263f, 411.7f); @@ -1057,15 +1057,15 @@ public: break; case EVENT_ARGENT_CHALLENGE_SAY_1: { - if( Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID)) ac->AI()->Talk(Counter ? SAY_EADRIC_INTRO : SAY_PALETRESS_INTRO_1); - if( !Counter ) + if (!Counter) events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_SAY_2, 6s); } break; case EVENT_ARGENT_CHALLENGE_SAY_2: { - if( Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* ac = instance->GetCreature(NPC_ArgentChampionGUID)) ac->AI()->Talk(SAY_PALETRESS_INTRO_2); } break; @@ -1074,14 +1074,14 @@ public: Counter = 0; for( uint8 i = 0; i < 3; ++i ) for( uint8 j = 0; j < 3; ++j ) - if( Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j]) ) + if (Creature* c = instance->GetCreature(NPC_ArgentSoldierGUID[i][j])) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->SetImmuneToAll(false); //c->AI()->DoZoneInCombat(); } - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_YOU_MAY_BEGIN); } break; @@ -1096,12 +1096,12 @@ public: break; case EVENT_ARGENT_CHALLENGE_ATTACK: { - if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) { boss->SetReactState(REACT_AGGRESSIVE); boss->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); boss->SetImmuneToAll(false); - if( Unit* target = boss->SelectNearestTarget(200.0f) ) + if (Unit* target = boss->SelectNearestTarget(200.0f)) boss->AI()->AttackStart(target); boss->AI()->DoZoneInCombat(); } @@ -1109,7 +1109,7 @@ public: break; case EVENT_ARGENT_CHALLENGE_RUN_MIDDLE: { - if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) { boss->GetMotionMaster()->MovePoint(1, 747.13f, 628.037f, 411.2f); events.ScheduleEvent(EVENT_ARGENT_CHALLENGE_LEAVE_CHEST, 6s); @@ -1118,12 +1118,12 @@ public: break; case EVENT_ARGENT_CHALLENGE_LEAVE_CHEST: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) - if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) + if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) { announcer->GetMotionMaster()->MovePoint(0, 743.14f, 628.77f, 411.2f); uint32 chest = 0; - if( instance->IsHeroic() ) + if (instance->IsHeroic()) chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT_H : GO_PALETRESS_LOOT_H; else chest = (boss->GetEntry() == NPC_EADRIC || boss->GetEntry() == NPC_EADRIC_H) ? GO_EADRIC_LOOT : GO_PALETRESS_LOOT; @@ -1136,7 +1136,7 @@ public: break; case EVENT_ARGENT_CHALLENGE_DISAPPEAR: { - if( Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID) ) + if (Creature* boss = instance->GetCreature(NPC_ArgentChampionGUID)) { boss->GetMotionMaster()->MovePoint(0, SpawnPosition); boss->DespawnOrUnsummon(3000); @@ -1145,18 +1145,18 @@ public: break; case EVENT_SUMMON_BLACK_KNIGHT: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) - if( Creature* bk_vehicle = announcer->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0.0f) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) + if (Creature* bk_vehicle = announcer->SummonCreature(VEHICLE_BLACK_KNIGHT, 769.834f, 651.915f, 447.035f, 0.0f)) { NPC_BlackKnightVehicleGUID = bk_vehicle->GetGUID(); bk_vehicle->SetReactState(REACT_PASSIVE); bk_vehicle->SetFacingTo(M_PI); - if( Vehicle* v = bk_vehicle->GetVehicleKit() ) - if( Unit* bk = v->GetPassenger(0) ) + if (Vehicle* v = bk_vehicle->GetVehicleKit()) + if (Unit* bk = v->GetPassenger(0)) { NPC_BlackKnightGUID = bk->GetGUID(); bk->SendMovementFlagUpdate(); // put him on vehicle visually - if( bk->IsCreature() ) + if (bk->IsCreature()) bk->ToCreature()->SetReactState(REACT_PASSIVE); } @@ -1167,7 +1167,7 @@ public: break; case EVENT_START_BLACK_KNIGHT_SCENE: { - if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID)) { Position exitPos = { 751.003357f, 638.145508f, 411.570129f, M_PI }; bk->ExitVehicle(/*&exitPos*/); @@ -1179,9 +1179,9 @@ public: break; case EVENT_BLACK_KNIGHT_CAST_ANNOUNCER: { - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) { - if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID)) { bk->SetPosition(745.016f, 631.506f, 411.575f, bk->GetAngle(announcer)); bk->SetHomePosition(*bk); @@ -1189,7 +1189,7 @@ public: announcer->SetFacingToObject(bk); announcer->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); bk->AddAura(68306, announcer); // spell has attribute player only - if( Creature* tirion = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* tirion = instance->GetCreature(NPC_TirionGUID)) tirion->AI()->Talk(TEXT_BK_MEANING); } } @@ -1198,7 +1198,7 @@ public: break; case EVENT_BLACK_KNIGHT_KILL_ANNOUNCER: { - if( Creature* bk_vehicle = instance->GetCreature(NPC_BlackKnightVehicleGUID) ) + if (Creature* bk_vehicle = instance->GetCreature(NPC_BlackKnightVehicleGUID)) bk_vehicle->AI()->DoAction(1); events.ScheduleEvent(EVENT_BLACK_KNIGHT_MOVE_FORWARD, 4s); @@ -1206,13 +1206,13 @@ public: break; case EVENT_BLACK_KNIGHT_MOVE_FORWARD: { - if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID)) { bk->SetUnitMovementFlags(MOVEMENTFLAG_WALKING); bk->GetMotionMaster()->MovePoint(0, 746.81f, 623.15f, 411.42f); bk->AI()->Talk(SAY_BK_INTRO_2); } - if( Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID) ) + if (Creature* announcer = instance->GetCreature(NPC_AnnouncerGUID)) if (announcer->IsAlive()) Unit::Kill(announcer, announcer); events.ScheduleEvent(EVENT_BLACK_KNIGHT_SAY_TASK, 14s); @@ -1220,7 +1220,7 @@ public: break; case EVENT_BLACK_KNIGHT_SAY_TASK: { - if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID)) { bk->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); bk->AI()->Talk(SAY_BK_INTRO_3); @@ -1230,11 +1230,11 @@ public: break; case EVENT_BLACK_KNIGHT_ATTACK: { - if( Creature* bk = instance->GetCreature(NPC_BlackKnightGUID) ) + if (Creature* bk = instance->GetCreature(NPC_BlackKnightGUID)) { bk->SetReactState(REACT_AGGRESSIVE); bk->ReplaceAllUnitFlags(UNIT_FLAG_NONE); - if( Unit* target = bk->SelectNearestTarget(200.0f) ) + if (Unit* target = bk->SelectNearestTarget(200.0f)) bk->AI()->AttackStart(target); bk->AI()->DoZoneInCombat(); bk->AI()->DoAction(1); @@ -1246,7 +1246,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 11789: // I've Had Worse criteria id return bAchievIveHadWorse; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp index bda0821886..c6118f2aac 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.cpp @@ -88,14 +88,14 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override { - if(!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) + if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) return true; InstanceScript* pInstance = creature->GetInstanceScript(); - if(!pInstance) + if (!pInstance) return true; - if(uiAction == GOSSIP_ACTION_INFO_DEF + 1 || uiAction == GOSSIP_ACTION_INFO_DEF + 2 || uiAction == GOSSIP_ACTION_INFO_DEF + 3 || uiAction == GOSSIP_ACTION_INFO_DEF + 4) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1 || uiAction == GOSSIP_ACTION_INFO_DEF + 2 || uiAction == GOSSIP_ACTION_INFO_DEF + 3 || uiAction == GOSSIP_ACTION_INFO_DEF + 4) { pInstance->SetData(DATA_ANNOUNCER_GOSSIP_SELECT, (uiAction == GOSSIP_ACTION_INFO_DEF + 2 ? 1 : 0)); creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); @@ -117,9 +117,9 @@ public: void Reset() override { InstanceScript* pInstance = me->GetInstanceScript(); - if( !pInstance ) + if (!pInstance) return; - if( pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE ) + if (pInstance->GetData(DATA_TEAMID_IN_INSTANCE) == TEAM_ALLIANCE ) me->UpdateEntry(NPC_ARELAS); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); // removed during black knight scene } @@ -135,7 +135,7 @@ public: if (type != EFFECT_MOTION_TYPE) return; InstanceScript* pInstance = me->GetInstanceScript(); - if( !pInstance ) + if (!pInstance) return; if (pInstance->GetData(DATA_INSTANCE_PROGRESS) < INSTANCE_PROGRESS_ARGENT_CHALLENGE_DIED) return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index bb41e7eeee..848b3fdb2d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -182,7 +182,7 @@ public: { float angle = rand_norm() * 2 * M_PI; float dist = rand_norm() * 40.0f; - if( Creature* c = me->SummonCreature(NPC_SCARAB, AnubLocs[0].GetPositionX() + cos(angle) * dist, AnubLocs[0].GetPositionY() + std::sin(angle) * dist, AnubLocs[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000) ) + if (Creature* c = me->SummonCreature(NPC_SCARAB, AnubLocs[0].GetPositionX() + cos(angle) * dist, AnubLocs[0].GetPositionY() + std::sin(angle) * dist, AnubLocs[0].GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) { c->SetFaction(FACTION_PREY); c->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); @@ -193,7 +193,7 @@ public: void DoAction(int32 param) override { - switch( param ) + switch (param) { case -1: summons.DespawnAll(); @@ -210,7 +210,7 @@ public: events.RescheduleEvent(EVENT_SPELL_PENETRATING_COLD, 15s, 20s); events.RescheduleEvent(EVENT_SUMMON_NERUBIAN, 5s, 8s); events.RescheduleEvent(EVENT_SUBMERGE, 80s); - if( !IsHeroic() ) + if (!IsHeroic()) events.RescheduleEvent(EVENT_RESPAWN_SPHERE, 4s); for (ObjectGuid const& guid : summons) @@ -224,15 +224,15 @@ public: } summons.clear(); for( uint8 i = 0; i < 4; ++i ) - if( Creature* c = me->SummonCreature(NPC_BURROW, AnubLocs[i + 1]) ) + if (Creature* c = me->SummonCreature(NPC_BURROW, AnubLocs[i + 1])) BurrowGUID[i] = c->GetGUID(); for( uint8 i = 0; i < 6; ++i ) - if( Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]) ) + if (Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5])) SphereGUID[i] = c->GetGUID(); Talk(SAY_AGGRO); DoZoneInCombat(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_ANUBARAK, IN_PROGRESS); } @@ -243,21 +243,21 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - if( !bPhase3 && HealthBelowPct(30) && !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) && !me->HasAura(SPELL_SUBMERGE) && !me->HasAura(SPELL_EMERGE) ) + if (!bPhase3 && HealthBelowPct(30) && !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) && !me->HasAura(SPELL_SUBMERGE) && !me->HasAura(SPELL_EMERGE)) { bPhase3 = true; events.CancelEvent(EVENT_SUBMERGE); events.CancelEvent(EVENT_EMERGE); events.CancelEvent(EVENT_EMERGE_2); - if( !IsHeroic() ) + if (!IsHeroic()) events.CancelEvent(EVENT_SUMMON_NERUBIAN); me->CastSpell((Unit*)nullptr, SPELL_LEECHING_SWARM, false); Talk(EMOTE_LEECHING_SWARM); @@ -265,7 +265,7 @@ public: return; } - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -280,10 +280,10 @@ public: uint8 i = StartAt; do { - if( Creature* c = ObjectAccessor::GetCreature(*me, SphereGUID[i]) ) - if( !c->HasAura(SPELL_FROST_SPHERE) ) + if (Creature* c = ObjectAccessor::GetCreature(*me, SphereGUID[i])) + if (!c->HasAura(SPELL_FROST_SPHERE)) { - if( Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5]) ) + if (Creature* c = me->SummonCreature(NPC_FROST_SPHERE, AnubLocs[i + 5])) SphereGUID[i] = c->GetGUID(); break; } @@ -294,7 +294,7 @@ public: break; case EVENT_SPELL_FREEZING_SLASH: { - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_FREEZING_SLASH, false); events.Repeat(15s, 20s); } @@ -332,7 +332,7 @@ public: case EVENT_SUMMON_SCARAB: { uint8 i = urand(0, 3); - if( Creature* c = ObjectAccessor::GetCreature(*me, BurrowGUID[i]) ) + if (Creature* c = ObjectAccessor::GetCreature(*me, BurrowGUID[i])) me->CastSpell(c, SPELL_SUMMON_SCARAB, true); events.Repeat(4s); } @@ -368,7 +368,7 @@ public: void JustSummoned(Creature* summon) override { - if( !summon ) + if (!summon) return; summons.Summon(summon); @@ -379,13 +379,13 @@ public: events.Reset(); summons.DespawnAll(); Talk(SAY_DEATH); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_ANUBARAK, DONE); } void KilledUnit(Unit* who) override { - if( who->IsPlayer() ) + if (who->IsPlayer()) Talk(SAY_KILL_PLAYER); } @@ -394,7 +394,7 @@ public: events.Reset(); summons.DespawnAll(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 1); } @@ -409,7 +409,7 @@ public: if (!bIntro) { me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( !me->IsInCombat() ) + if (!me->IsInCombat()) Talk(SAY_INTRO); bIntro = true; } @@ -442,7 +442,7 @@ public: void DoAction(int32 param) override { - if( param == 1 ) + if (param == 1) despawnTimer = 2000; } @@ -453,11 +453,11 @@ public: determinationTimer = urand(10000, 50000); despawnTimer = 0; if (me->GetFaction() == FACTION_MONSTER_2) // hostile - it's phase 2 - if( Unit* target = me->SelectNearestTarget(250.0f) ) + if (Unit* target = me->SelectNearestTarget(250.0f)) { AttackStart(target); DoZoneInCombat(); - if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) + if (Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true)) { me->AddThreat(t, 20000.0f); AttackStart(t); @@ -472,9 +472,9 @@ public: void UpdateAI(uint32 diff) override { - if( despawnTimer ) + if (despawnTimer) { - if( despawnTimer <= (int32)diff ) + if (despawnTimer <= (int32)diff ) { despawnTimer = 0; me->DisappearAndDie(); @@ -485,10 +485,10 @@ public: return; } - if( !UpdateVictim() ) + if (!UpdateVictim()) return; - if( determinationTimer <= (int32)diff ) + if (determinationTimer <= (int32)diff ) { me->CastSpell(me, SPELL_DETERMINATION, false); determinationTimer = urand(20000, 60000); @@ -556,10 +556,10 @@ public: void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if( me->GetHealth() <= damage ) + if (me->GetHealth() <= damage ) { damage = 0; - if( !me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE)) { me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->GetMotionMaster()->MoveIdle(); @@ -571,7 +571,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if( spell->Id == SPELL_SPIKE_FAIL ) + if (spell->Id == SPELL_SPIKE_FAIL) { me->RemoveAllAuras(); me->DespawnOrUnsummon(1500); @@ -580,9 +580,9 @@ public: void UpdateAI(uint32 diff) override { - if( permafrostTimer ) + if (permafrostTimer) { - if( permafrostTimer <= diff ) + if (permafrostTimer <= diff) { permafrostTimer = 0; me->RemoveAurasDueToSpell(SPELL_FROST_SPHERE); @@ -631,9 +631,9 @@ public: me->CastSpell(me, SPELL_SPIDER_FRENZY, true); events.Reset(); events.RescheduleEvent(EVENT_SUBMERGE, 30s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_SPELL_SHADOW_STRIKE, 30s, 45s); - if( Unit* target = me->SelectNearestTarget(250.0f) ) + if (Unit* target = me->SelectNearestTarget(250.0f)) { AttackStart(target); DoZoneInCombat(); @@ -642,13 +642,13 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - if( !target || !spell ) + if (!target || !spell) return; - if( spell->Id == SPELL_SHADOW_STRIKE ) + if (spell->Id == SPELL_SHADOW_STRIKE) { float o = target->GetOrientation(); - if( o >= M_PI ) + if (o >= M_PI) o -= M_PI; else o += M_PI; @@ -661,25 +661,25 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_SHADOW_STRIKE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true)) me->CastSpell(target, SPELL_SHADOW_STRIKE, false); events.Repeat(30s, 45s); break; case EVENT_SUBMERGE: - if( HealthBelowPct(80) && !me->HasAura(RAID_MODE(66193, 67855, 67856, 67857)) ) // not having permafrost - allow submerge + if (HealthBelowPct(80) && !me->HasAura(RAID_MODE(66193, 67855, 67856, 67857))) // not having permafrost - allow submerge { me->GetMotionMaster()->MoveIdle(); me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE); @@ -743,9 +743,9 @@ public: void DoAction(int32 param) override { - if( param == -1 ) + if (param == -1) { - if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) + if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID)) target->RemoveAura(SPELL_MARK); TargetGUID.Clear(); me->RemoveAllAuras(); @@ -758,7 +758,7 @@ public: void SelectNewTarget(bool next) { if (TargetGUID) - if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) + if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID)) target->RemoveAura(SPELL_MARK); TargetGUID.Clear(); if (!next) @@ -768,7 +768,7 @@ public: } DoZoneInCombat(); DoResetThreatList(); - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true)) { if (!next) { @@ -791,10 +791,10 @@ public: void UpdateAI(uint32 diff) override { - if( TargetGUID ) + if (TargetGUID) { Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID); - if( !target || !target->HasAura(SPELL_MARK) || !me->IsValidAttackTarget(target) || me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE || !me->HasUnitState(UNIT_STATE_CHASE_MOVE) ) + if (!target || !target->HasAura(SPELL_MARK) || !me->IsValidAttackTarget(target) || me->GetMotionMaster()->GetCurrentMovementGeneratorType() != CHASE_MOTION_TYPE || !me->HasUnitState(UNIT_STATE_CHASE_MOVE)) { SelectNewTarget(true); return; @@ -803,7 +803,7 @@ public: events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -840,13 +840,13 @@ public: void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { - if( Unit* target = GetTarget() ) + if (Unit* target = GetTarget()) { - if( Creature* c = target->FindNearestCreature(NPC_FROST_SPHERE, 8.0f, true) ) + if (Creature* c = target->FindNearestCreature(NPC_FROST_SPHERE, 8.0f, true)) { target->UpdatePosition(*c, false); target->CastCustomSpell(SPELL_SPIKE_FAIL, SPELLVALUE_MAX_TARGETS, 1); - if( target->IsCreature() ) + if (target->IsCreature()) target->ToCreature()->AI()->DoAction(-1); Remove(); return; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 72aa2abfcc..acf9bc5be8 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -56,16 +56,16 @@ struct boss_faction_championsAI : public ScriptedAI { me->SetInCombatWithZone(); RecalculateThreat(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FACTION_CHAMPIONS_START, 0); } void AttackStart(Unit* who) override { - if( !who ) + if (!who) return; - if( mAIType == AI_MELEE || mAIType == AI_PET ) + if (mAIType == AI_MELEE || mAIType == AI_PET) UnitAI::AttackStart(who); else UnitAI::AttackStartCaster(who, 18.5f); @@ -107,7 +107,7 @@ struct boss_faction_championsAI : public ScriptedAI for( ThreatContainer::StorageType::const_iterator itr = tList.begin(); itr != tList.end(); ++itr ) { Unit* pUnit = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()); - if( pUnit && pUnit->IsPlayer() && me->GetThreatMgr().GetThreat(pUnit) ) + if (pUnit && pUnit->IsPlayer() && me->GetThreatMgr().GetThreat(pUnit)) { float threatMod = GetThreatMod(me->GetDistance2d(pUnit), (float)pUnit->GetArmor(), pUnit->GetHealth(), pUnit->GetMaxHealth(), pUnit); me->GetThreatMgr().ModifyThreatByPercent(pUnit, -100); @@ -126,19 +126,19 @@ struct boss_faction_championsAI : public ScriptedAI void JustDied(Unit* /*pKiller*/) override { - if( pInstance && mAIType != AI_PET ) + if (pInstance && mAIType != AI_PET) pInstance->SetData(TYPE_FACTION_CHAMPIONS, DONE); } void KilledUnit(Unit* /*who*/) override { - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FACTION_CHAMPIONS_PLAYER_DIED, 1); } void EnterEvadeMode(EvadeReason /* why */) override { - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 0); } @@ -146,11 +146,11 @@ struct boss_faction_championsAI : public ScriptedAI { // check for stun, fear, etc. // for casting, silence, disarm check individually in the ai - if( me->isFeared() || me->isFrozen() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasUnitState(UNIT_STATE_CONFUSED) ) + if (me->isFeared() || me->isFrozen() || me->HasUnitState(UNIT_STATE_STUNNED) || me->HasUnitState(UNIT_STATE_CONFUSED)) { - if( !IsHeroic() ) + if (!IsHeroic()) return true; - if( me->HasSpellCooldown(SPELL_PVP_TRINKET) ) + if (me->HasSpellCooldown(SPELL_PVP_TRINKET)) return true; else { @@ -164,12 +164,12 @@ struct boss_faction_championsAI : public ScriptedAI Creature* SelectTarget_MostHPLostFriendlyMissingBuff(uint32 spell, float range) { std::list<Creature*> lst = DoFindFriendlyMissingBuff(range, spell); - if( lst.empty() ) + if (lst.empty()) return nullptr; std::list<Creature*>::const_iterator iter = lst.begin(); uint32 lowestHP = (*iter)->GetMaxHealth() - (*iter)->GetHealth(); for( std::list<Creature*>::const_iterator itr = lst.begin(); itr != lst.end(); ++itr ) - if( ((*itr)->GetMaxHealth() - (*itr)->GetHealth()) > lowestHP ) + if (((*itr)->GetMaxHealth() - (*itr)->GetHealth()) > lowestHP ) { iter = itr; lowestHP = (*itr)->GetMaxHealth() - (*itr)->GetHealth(); @@ -185,7 +185,7 @@ struct boss_faction_championsAI : public ScriptedAI for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter ) { target = ObjectAccessor::GetUnit((*me), (*iter)->getUnitGuid()); - if( target && me->GetDistance2d(target) < distance ) + if (target && me->GetDistance2d(target) < distance ) ++count; } return count; @@ -198,7 +198,7 @@ struct boss_faction_championsAI : public ScriptedAI for( ThreatContainer::StorageType::const_iterator iter = tList.begin(); iter != tList.end(); ++iter ) { target = ObjectAccessor::GetUnit((*me), (*iter)->getUnitGuid()); - if( target && target->getPowerType() == POWER_MANA && (!casting || target->HasUnitState(UNIT_STATE_CASTING)) && me->GetExactDist(target) <= range ) + if (target && target->getPowerType() == POWER_MANA && (!casting || target->HasUnitState(UNIT_STATE_CASTING)) && me->GetExactDist(target) <= range ) return target; } return nullptr; @@ -209,7 +209,7 @@ struct boss_faction_championsAI : public ScriptedAI if (!me->IsInCombat()) return; - if( threatTimer <= diff ) + if (threatTimer <= diff) { RecalculateThreat(); threatTimer = urand(8750, 9250); @@ -217,9 +217,9 @@ struct boss_faction_championsAI : public ScriptedAI else threatTimer -= diff; - if( me->getPowerType() == POWER_MANA ) + if (me->getPowerType() == POWER_MANA ) { - if( powerTimer <= diff ) + if (powerTimer <= diff) { me->ModifyPower(POWER_MANA, me->GetMaxPower(POWER_MANA) / 3); powerTimer = 4000; @@ -227,9 +227,9 @@ struct boss_faction_championsAI : public ScriptedAI else powerTimer -= diff; } - else if( me->getPowerType() == POWER_ENERGY ) + else if (me->getPowerType() == POWER_ENERGY ) { - if( powerTimer <= diff ) + if (powerTimer <= diff) { me->ModifyPower(POWER_ENERGY, me->GetMaxPower(POWER_ENERGY) / 3); powerTimer = 1000; @@ -300,44 +300,44 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_LIFEBLOOM: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_LIFEBLOOM, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_LIFEBLOOM, 40.0f)) me->CastSpell(target, SPELL_LIFEBLOOM, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_NOURISH: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_NOURISH, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_NOURISH, 40.0f)) me->CastSpell(target, SPELL_NOURISH, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_REGROWTH: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_REGROWTH, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_REGROWTH, 40.0f)) me->CastSpell(target, SPELL_REGROWTH, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_REJUVENATION: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_REJUVENATION, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_REJUVENATION, 40.0f)) me->CastSpell(target, SPELL_REJUVENATION, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_THORNS: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_THORNS, 30.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_THORNS, 30.0f)) me->CastSpell(target, SPELL_THORNS, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); @@ -348,7 +348,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_BARKSKIN: - if( HealthBelowPct(50) ) + if (HealthBelowPct(50)) { me->CastSpell(me, SPELL_BARKSKIN, false); events.Repeat(1min); @@ -429,38 +429,38 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_HEALING_WAVE: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HEALING_WAVE, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HEALING_WAVE, 40.0f)) me->CastSpell(target, SPELL_HEALING_WAVE, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_RIPTIDE: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_RIPTIDE, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_RIPTIDE, 40.0f)) me->CastSpell(target, SPELL_RIPTIDE, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SPIRIT_CLEANSE: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_SPIRIT_CLEANSE, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_SPIRIT_CLEANSE, 40.0f)) me->CastSpell(target, SPELL_SPIRIT_CLEANSE, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_HEROISM_OR_BLOODLUST: - if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) + if (me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true); else me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true); @@ -468,19 +468,19 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_HEX: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) me->CastSpell(target, SPELL_HEX, false); events.Repeat(45s); EventMapGCD(events, 1500); break; case EVENT_SPELL_EARTH_SHIELD: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_EARTH_SHIELD, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_EARTH_SHIELD, 40.0f)) me->CastSpell(target, SPELL_EARTH_SHIELD, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_EARTH_SHOCK: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_EARTH_SHOCK, false); events.Repeat(5s, 10s); EventMapGCD(events, 1500); @@ -552,26 +552,26 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_HAND_OF_FREEDOM: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM, 30.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_FREEDOM, 30.0f)) me->CastSpell(target, SPELL_HAND_OF_FREEDOM, false); events.Repeat(25s); EventMapGCD(events, 1500); break; case EVENT_SPELL_BUBBLE: - if( HealthBelowPct(25) ) + if (HealthBelowPct(25)) { me->CastSpell(me, SPELL_BUBBLE, false); events.Repeat(5min); @@ -581,31 +581,31 @@ public: events.Repeat(10s); break; case EVENT_SPELL_CLEANSE: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_CLEANSE, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_CLEANSE, 40.0f)) me->CastSpell(target, SPELL_CLEANSE, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_FLASH_OF_LIGHT: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_FLASH_OF_LIGHT, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_FLASH_OF_LIGHT, 40.0f)) me->CastSpell(target, SPELL_FLASH_OF_LIGHT, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_HOLY_LIGHT: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HOLY_LIGHT, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HOLY_LIGHT, 40.0f)) me->CastSpell(target, SPELL_HOLY_LIGHT, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_HOLY_SHOCK: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HOLY_SHOCK, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HOLY_SHOCK, 40.0f)) me->CastSpell(target, SPELL_HOLY_SHOCK, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_HAND_OF_PROTECTION: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_PROTECTION, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_PROTECTION, 40.0f)) { me->CastSpell(target, SPELL_HAND_OF_PROTECTION, false); events.Repeat(5min); @@ -615,7 +615,7 @@ public: events.Repeat(10s); break; case EVENT_SPELL_HAMMER_OF_JUSTICE: - if( Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 15.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 15.0f, true)) { me->CastSpell(target, SPELL_HAMMER_OF_JUSTICE, false); events.Repeat(40s); @@ -685,44 +685,44 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_RENEW: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_RENEW, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_RENEW, 40.0f)) me->CastSpell(target, SPELL_RENEW, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SHIELD: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_SHIELD, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_SHIELD, 40.0f)) me->CastSpell(target, SPELL_SHIELD, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_FLASH_HEAL: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_FLASH_HEAL, 40.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_FLASH_HEAL, 40.0f)) me->CastSpell(target, SPELL_FLASH_HEAL, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_DISPEL: - if( Unit* target = (urand(0, 1) ? SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.0f, true) : SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_DISPEL, 40.0f)) ) + if (Unit* target = (urand(0, 1) ? SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.0f, true) : SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_DISPEL, 40.0f))) me->CastSpell(target, SPELL_DISPEL, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_MANA_BURN: - if( Unit* target = SelectEnemyCaster(false, 30.0f) ) + if (Unit* target = SelectEnemyCaster(false, 30.0f)) { me->CastSpell(target, SPELL_MANA_BURN, false); events.Repeat(10s, 15s); @@ -732,7 +732,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_PSYCHIC_SCREAM: - if( HealthBelowPct(50) && EnemiesInRange(8.0f) >= 3 ) + if (HealthBelowPct(50) && EnemiesInRange(8.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false); events.Repeat(30s); @@ -808,20 +808,20 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_SILENCE: - if( Unit* target = SelectEnemyCaster(false, 30.0f) ) + if (Unit* target = SelectEnemyCaster(false, 30.0f)) { me->CastSpell(target, SPELL_SILENCE, false); events.Repeat(45s); @@ -832,31 +832,31 @@ public: events.Repeat(6s); break; case EVENT_SPELL_VAMPIRIC_TOUCH: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_VAMPIRIC_TOUCH, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SW_PAIN: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SW_PAIN, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_MIND_FLAY: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_MIND_FLAY, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_MIND_BLAST: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_MIND_BLAST, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_HORROR: - if( me->GetVictim() && me->GetExactDist2d(me->GetVictim()) <= 30.0f ) + if (me->GetVictim() && me->GetExactDist2d(me->GetVictim()) <= 30.0f ) { me->CastSpell(me->GetVictim(), SPELL_HORROR, false); events.Repeat(2min); @@ -866,7 +866,7 @@ public: events.Repeat(10s); break; case EVENT_SPELL_DISPERSION: - if( HealthBelowPct(25) ) + if (HealthBelowPct(25)) { me->CastSpell(me, SPELL_DISPERSION, false); events.Repeat(3min); @@ -876,13 +876,13 @@ public: events.Repeat(6s); break; case EVENT_SPELL_DISPEL: - if( Unit* target = (urand(0, 1) ? SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.0f, true) : SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_DISPEL, 40.0f)) ) + if (Unit* target = (urand(0, 1) ? SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.0f, true) : SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_DISPEL, 40.0f))) me->CastSpell(target, SPELL_DISPEL, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_PSYCHIC_SCREAM: - if( EnemiesInRange(8.0f) >= 3 ) + if (EnemiesInRange(8.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_PSYCHIC_SCREAM, false); events.Repeat(30s); @@ -961,22 +961,22 @@ public: void JustSummoned(Creature* c) override { - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); } void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -985,7 +985,7 @@ public: break; case EVENT_SPELL_HELLFIRE: - if( EnemiesInRange(9.0f) >= 3 ) + if (EnemiesInRange(9.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_HELLFIRE, false); events.Repeat(30s); @@ -995,43 +995,43 @@ public: events.Repeat(6s); break; case EVENT_SPELL_CORRUPTION: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_CORRUPTION, false); events.Repeat(10s, 20s); EventMapGCD(events, 1500); break; case EVENT_SPELL_CURSE_OF_AGONY: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_CURSE_OF_AGONY, false); events.Repeat(10s, 20s); EventMapGCD(events, 1500); break; case EVENT_SPELL_CURSE_OF_EXHAUSTION: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_CURSE_OF_EXHAUSTION, false); events.Repeat(10s, 20s); EventMapGCD(events, 1500); break; case EVENT_SPELL_FEAR: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) me->CastSpell(target, SPELL_FEAR, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SEARING_PAIN: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SEARING_PAIN, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SHADOW_BOLT: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SHADOW_BOLT, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_UNSTABLE_AFFLICTION: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_UNSTABLE_AFFLICTION, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); @@ -1105,32 +1105,32 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_ARCANE_BARRAGE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_ARCANE_BARRAGE, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_ARCANE_BLAST: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_ARCANE_BLAST, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_ARCANE_EXPLOSION: - if( EnemiesInRange(9.0f) >= 3 ) + if (EnemiesInRange(9.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_ARCANE_EXPLOSION, false); events.Repeat(6s); @@ -1140,7 +1140,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_BLINK: - if( HealthBelowPct(50) && EnemiesInRange(10.0f) >= 3 ) + if (HealthBelowPct(50) && EnemiesInRange(10.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_FROST_NOVA, false); events.Repeat(15s); @@ -1151,7 +1151,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_COUNTERSPELL: - if( Unit* target = SelectEnemyCaster(true, 30.0f) ) + if (Unit* target = SelectEnemyCaster(true, 30.0f)) { me->CastSpell(target, SPELL_COUNTERSPELL, false); events.Repeat(24s); @@ -1161,13 +1161,13 @@ public: events.Repeat(6s); break; case EVENT_SPELL_FROSTBOLT: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_FROSTBOLT, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_ICE_BLOCK: - if( HealthBelowPct(25) ) + if (HealthBelowPct(25)) { me->CastSpell(me, SPELL_ICE_BLOCK, false); events.Repeat(5min); @@ -1177,7 +1177,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_POLYMORPH: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_POLYMORPH, false); events.Repeat(15s); EventMapGCD(events, 1500); @@ -1252,22 +1252,22 @@ public: void JustSummoned(Creature* c) override { - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); } void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -1276,13 +1276,13 @@ public: break; case EVENT_SPELL_AIMED_SHOT: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_AIMED_SHOT, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_DETERRENCE: - if( HealthBelowPct(25) ) + if (HealthBelowPct(25)) { me->CastSpell(me, SPELL_DETERRENCE, false); events.Repeat(90s); @@ -1292,7 +1292,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_DISENGAGE: - if( EnemiesInRange(10.0f) >= 3 ) + if (EnemiesInRange(10.0f) >= 3 ) { me->CastSpell(me, SPELL_DISENGAGE, false); events.Repeat(20s); @@ -1302,7 +1302,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_EXPLOSIVE_SHOT: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_EXPLOSIVE_SHOT, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); @@ -1313,19 +1313,19 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_STEADY_SHOT: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_STEADY_SHOT, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_WING_CLIP: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) me->CastSpell(me->GetVictim(), SPELL_WING_CLIP, false); events.Repeat(8s); EventMapGCD(events, 1500); break; case EVENT_SPELL_WYVERN_STING: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) { me->CastSpell(target, SPELL_WYVERN_STING, false); events.Repeat(1min); @@ -1336,7 +1336,7 @@ public: break; } - if( me->isAttackReady() && !me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->isAttackReady() && !me->HasUnitState(UNIT_STATE_CASTING)) { me->CastSpell(me->GetVictim(), SPELL_SHOOT, true); me->resetAttackTimer(); @@ -1405,27 +1405,27 @@ public: void JustSummoned(Creature* c) override { - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) c->AI()->AttackStart(target); } void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_BARKSKIN: - if( HealthBelowPct(50) ) + if (HealthBelowPct(50)) { me->CastSpell(me, SPELL_BARKSKIN, false); events.Repeat(1min); @@ -1435,43 +1435,43 @@ public: events.Repeat(6s); break; case EVENT_SPELL_WRATH: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_WRATH, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_MOONFIRE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_MOONFIRE, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_STARFIRE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_STARFIRE, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_INSECT_SWARM: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_INSECT_SWARM, false); events.Repeat(5s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_ENTANGLING_ROOTS: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_ENTANGLING_ROOTS, false); events.Repeat(10s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_FAERIE_FIRE: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_FAERIE_FIRE, false); events.Repeat(15s, 20s); EventMapGCD(events, 1500); break; case EVENT_SPELL_CYCLONE: - if( Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 20.0f, true)) me->CastSpell(target, SPELL_CYCLONE, false); events.Repeat(25s, 40s); EventMapGCD(events, 1500); @@ -1551,25 +1551,25 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_BLADESTORM: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( EnemiesInRange(8.0f) >= 3 ) + if (EnemiesInRange(8.0f) >= 3 ) { me->CastSpell(me, SPELL_BLADESTORM, false); events.Repeat(90s); @@ -1579,7 +1579,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_INTIMIDATING_SHOUT: - if( EnemiesInRange(8.0f) >= 3 ) + if (EnemiesInRange(8.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_INTIMIDATING_SHOUT, false); events.Repeat(2min); @@ -1589,18 +1589,18 @@ public: events.Repeat(5s); break; case EVENT_SPELL_MORTAL_STRIKE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_MORTAL_STRIKE, false); events.Repeat(6s, 8s); EventMapGCD(events, 1500); break; case EVENT_SPELL_CHARGE: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) > 8.0f && me->GetDistance2d(me->GetVictim()) < 25.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) > 8.0f && me->GetDistance2d(me->GetVictim()) < 25.0f ) { me->CastSpell(me->GetVictim(), SPELL_CHARGE, false); events.Repeat(10s); @@ -1610,7 +1610,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_DISARM: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_DISARM, false); events.Repeat(1min); @@ -1620,12 +1620,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_OVERPOWER: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_OVERPOWER, false); events.Repeat(10s, 15s); @@ -1635,12 +1635,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_SUNDER_ARMOR: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_SUNDER_ARMOR, false); events.Repeat(10s, 15s); @@ -1650,12 +1650,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_SHATTERING_THROW: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 25.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 25.0f ) { me->CastSpell(me->GetVictim(), SPELL_SHATTERING_THROW, false); events.Repeat(5min); @@ -1665,12 +1665,12 @@ public: events.Repeat(6s); break; case EVENT_SPELL_RETALIATION: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( EnemiesInRange(8.0f) >= 3 ) + if (EnemiesInRange(8.0f) >= 3 ) { me->CastSpell(me, SPELL_RETALIATION, false); events.Repeat(5min); @@ -1743,20 +1743,20 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_CHAINS_OF_ICE: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 25.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 25.0f ) { me->CastSpell(me->GetVictim(), SPELL_CHAINS_OF_ICE, false); events.Repeat(10s, 15s); @@ -1766,7 +1766,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_DEATH_COIL: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 30.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 30.0f ) { me->CastSpell(me->GetVictim(), SPELL_DEATH_COIL, false); events.Repeat(5s, 8s); @@ -1776,7 +1776,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_DEATH_GRIP: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 30.0f && me->GetDistance2d(me->GetVictim()) >= 12.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 30.0f && me->GetDistance2d(me->GetVictim()) >= 12.0f ) { me->CastSpell(me->GetVictim(), SPELL_DEATH_GRIP, false); Position pos; @@ -1791,12 +1791,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_FROST_STRIKE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_FROST_STRIKE, false); events.Repeat(6s, 10s); @@ -1806,7 +1806,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_ICEBOUND_FORTITUDE: - if( HealthBelowPct(50) ) + if (HealthBelowPct(50)) { me->CastSpell(me, SPELL_ICEBOUND_FORTITUDE, false); events.Repeat(1min); @@ -1816,7 +1816,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_ICY_TOUCH: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 20.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 20.0f ) { me->CastSpell(me->GetVictim(), SPELL_ICY_TOUCH, false); events.Repeat(10s, 15s); @@ -1826,7 +1826,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_STRANGULATE: - if(SelectEnemyCaster(false, 30.0f)) + if (SelectEnemyCaster(false, 30.0f)) { me->CastSpell(me->GetVictim(), SPELL_STRANGULATE, false); events.Repeat(2min); @@ -1900,25 +1900,25 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_FAN_OF_KNIVES: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( EnemiesInRange(10.0f) >= 3 ) + if (EnemiesInRange(10.0f) >= 3 ) { me->CastSpell(me->GetVictim(), SPELL_FAN_OF_KNIVES, false); events.Repeat(6s, 10s); @@ -1928,7 +1928,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_BLIND: - if( Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true)) { me->CastSpell(target, SPELL_BLIND, false); events.Repeat(2min); @@ -1938,7 +1938,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_CLOAK: - if( HealthBelowPct(50) ) + if (HealthBelowPct(50)) { me->CastSpell(me, SPELL_CLOAK, false); events.Repeat(90s); @@ -1948,7 +1948,7 @@ public: events.Repeat(6s); break; case EVENT_SPELL_BLADE_FLURRY: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) events.Repeat(5s); else { @@ -1958,7 +1958,7 @@ public: } break; case EVENT_SPELL_SHADOWSTEP: - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 40.0f && me->GetDistance2d(me->GetVictim()) > 10.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) < 40.0f && me->GetDistance2d(me->GetVictim()) > 10.0f ) { me->CastSpell(me->GetVictim(), SPELL_SHADOWSTEP, false); events.Repeat(30s); @@ -1968,12 +1968,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_HEMORRHAGE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_HEMORRHAGE, false); events.Repeat(5s); @@ -1983,12 +1983,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_EVISCERATE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) + if (me->GetVictim() && me->GetDistance2d(me->GetVictim()) <= 5.0f ) { me->CastSpell(me->GetVictim(), SPELL_EVISCERATE, false); events.Repeat(15s, 25s); @@ -2058,25 +2058,25 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_EARTH_SHOCK_ENH: - if( me->HasUnitFlag(UNIT_FLAG_SILENCED) ) + if (me->HasUnitFlag(UNIT_FLAG_SILENCED)) { events.Repeat(5s); break; } - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 25.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 25.0f, true)) { me->CastSpell(target, SPELL_EARTH_SHOCK_ENH, false); events.Repeat(6s, 8s); @@ -2086,12 +2086,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_LAVA_LASH: - if( me->HasUnitFlag2(UNIT_FLAG2_DISARM_OFFHAND) ) + if (me->HasUnitFlag2(UNIT_FLAG2_DISARM_OFFHAND)) { events.Repeat(5s); break; } - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true)) { me->CastSpell(target, SPELL_LAVA_LASH, false); events.Repeat(6s, 8s); @@ -2101,12 +2101,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_STORMSTRIKE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) && me->HasUnitFlag2(UNIT_FLAG2_DISARM_OFFHAND) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED) && me->HasUnitFlag2(UNIT_FLAG2_DISARM_OFFHAND)) { events.Repeat(5s); break; } - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true)) { me->CastSpell(target, SPELL_STORMSTRIKE, false); events.Repeat(8s, 9s); @@ -2116,7 +2116,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_HEROISM_OR_BLOODLUST: - if( me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) + if (me->GetEntry() == NPC_ALLIANCE_SHAMAN_RESTORATION ) me->CastSpell((Unit*)nullptr, SPELL_HEROISM, true); else me->CastSpell((Unit*)nullptr, SPELL_BLOODLUST, true); @@ -2196,15 +2196,15 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -2214,12 +2214,12 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_CRUSADER_STRIKE: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true)) { me->CastSpell(target, SPELL_CRUSADER_STRIKE, false); events.Repeat(6s, 8s); @@ -2229,7 +2229,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_DIVINE_SHIELD: - if( HealthBelowPct(25) ) + if (HealthBelowPct(25)) { me->CastSpell(me, SPELL_DIVINE_SHIELD, false); events.Repeat(5min); @@ -2239,12 +2239,12 @@ public: events.Repeat(5s); break; case EVENT_SPELL_DIVINE_STORM: - if( me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (me->HasUnitFlag(UNIT_FLAG_DISARMED)) { events.Repeat(5s); break; } - if( EnemiesInRange(5.0f) >= 3 ) + if (EnemiesInRange(5.0f) >= 3 ) { me->CastSpell((Unit*)nullptr, SPELL_DIVINE_STORM, false); events.Repeat(10s, 15s); @@ -2254,7 +2254,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_HAMMER_OF_JUSTICE_RET: - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 15.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 15.0f, true)) { me->CastSpell(target, SPELL_HAMMER_OF_JUSTICE_RET, false); events.Repeat(40s); @@ -2264,7 +2264,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_HAND_OF_PROTECTION_RET: - if( Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_PROTECTION_RET, 30.0f) ) + if (Creature* target = SelectTarget_MostHPLostFriendlyMissingBuff(SPELL_HAND_OF_PROTECTION_RET, 30.0f)) { me->CastSpell(target, SPELL_HAND_OF_PROTECTION_RET, false); events.Repeat(5min); @@ -2274,7 +2274,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_JUDGEMENT_OF_COMMAND: - if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 20.0f, true)) { me->CastSpell(target, SPELL_JUDGEMENT_OF_COMMAND, false); events.Repeat(10s, 15s); @@ -2284,7 +2284,7 @@ public: events.Repeat(5s); break; case EVENT_SPELL_REPENTANCE: - if( Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true)) { me->CastSpell(target, SPELL_REPENTANCE, false); events.Repeat(1min); @@ -2341,26 +2341,26 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_DEVOUR_MAGIC: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_DEVOUR_MAGIC, false); events.Repeat(8s, 15s); EventMapGCD(events, 1500); break; case EVENT_SPELL_SPELL_LOCK: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SPELL_LOCK, false); events.Repeat(24s); EventMapGCD(events, 1500); @@ -2415,20 +2415,20 @@ public: void UpdateAI(uint32 diff) override { boss_faction_championsAI::UpdateAI(diff); - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( !myCanCast() ) + if (!myCanCast()) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_CLAW: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_CLAW, false); events.Repeat(8s, 15s); break; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index 7f8d8c6e3a..ebb2299dbb 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -116,7 +116,7 @@ public: void Reset() override { events.Reset(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_JARAXXUS, NOT_STARTED); std::list<Creature*> creatures; @@ -135,34 +135,34 @@ public: events.RescheduleEvent(EVENT_SPELL_INCINERATE_FLESH, 24s, 26s); events.RescheduleEvent(EVENT_SPELL_NETHER_POWER, 25s, 45s); events.RescheduleEvent(EVENT_SPELL_LEGION_FLAME, 30s); - //if( GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC ) + //if (GetDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC ) // events.RescheduleEvent(EVENT_SPELL_TOUCH_OF_JARAXXUS, 10s, 15s); events.RescheduleEvent(EVENT_SUMMON_NETHER_PORTAL, 20s); // it schedules EVENT_SUMMON_VOLCANO me->RemoveAura(SPELL_CHAINS); Talk(SAY_AGGRO); DoZoneInCombat(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_JARAXXUS, IN_PROGRESS); } void SpellHit(Unit* caster, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case 66228: case 67106: case 67107: case 67108: - if( Aura* a = me->GetAura(spell->Id) ) + if (Aura* a = me->GetAura(spell->Id)) a->SetStackAmount(spell->StackAmount); break; case 30449: { - if( !caster ) + if (!caster) return; uint32 id = 0; - switch( me->GetMap()->GetDifficulty() ) + switch (me->GetMap()->GetDifficulty()) { case 0: id = 66228; @@ -177,9 +177,9 @@ public: id = 67108; break; } - if( Aura* a = me->GetAura(id) ) + if (Aura* a = me->GetAura(id)) { - if( a->GetStackAmount() > 1 ) + if (a->GetStackAmount() > 1 ) a->ModStackAmount(-1); else a->Remove(); @@ -194,30 +194,30 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_FEL_FIREBALL: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_FEL_FIREBALL, false); events.Repeat(10s, 15s); break; case EVENT_SPELL_FEL_LIGHTNING: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true)) me->CastSpell(target, SPELL_FEL_LIGHTNING, false); events.Repeat(10s, 15s); break; case EVENT_SPELL_INCINERATE_FLESH: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true)) { Talk(EMOTE_INCINERATE, target); Talk(SAY_INCINERATE); @@ -231,7 +231,7 @@ public: events.Repeat(25s, 45s); break; case EVENT_SPELL_LEGION_FLAME: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true)) { Talk(EMOTE_LEGION_FLAME, target); me->CastSpell(target, SPELL_LEGION_FLAME, false); @@ -239,7 +239,7 @@ public: events.Repeat(30s); break; case EVENT_SPELL_TOUCH_OF_JARAXXUS: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) me->CastSpell(target, SPELL_TOUCH_OF_JARAXXUS, false); events.Repeat(10s, 15s); break; @@ -266,7 +266,7 @@ public: { summons.DespawnAll(); Talk(SAY_DEATH); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_JARAXXUS, DONE); } @@ -285,7 +285,7 @@ public: events.Reset(); summons.DespawnAll(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 1); } @@ -311,7 +311,7 @@ public: void Reset() override { - if( Unit* target = me->SelectNearestTarget(200.0f) ) + if (Unit* target = me->SelectNearestTarget(200.0f)) { AttackStart(target); DoZoneInCombat(); @@ -322,20 +322,20 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_FEL_STEAK: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 44.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 44.0f, true)) { DoResetThreatList(); me->AddThreat(target, 50000.0f); @@ -381,7 +381,7 @@ public: void Reset() override { - if( Unit* target = me->SelectNearestTarget(200.0f) ) + if (Unit* target = me->SelectNearestTarget(200.0f)) { AttackStart(target); DoZoneInCombat(); @@ -389,7 +389,7 @@ public: events.Reset(); events.RescheduleEvent(EVENT_SPELL_SHIVAN_SLASH, 10s, 20s); events.RescheduleEvent(EVENT_SPELL_SPINNING_PAIN_SPIKE, 22s, 30s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_SPELL_MISTRESS_KISS, 10s, 15s); } @@ -401,25 +401,25 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_SHIVAN_SLASH: - if( me->GetVictim() ) + if (me->GetVictim()) me->CastSpell(me->GetVictim(), SPELL_SHIVAN_SLASH, false); events.Repeat(15s, 25s); break; case EVENT_SPELL_SPINNING_PAIN_SPIKE: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true)) me->CastSpell(target, SPELL_SPINNING_PAIN_SPIKE, false); events.Repeat(25s, 30s); break; @@ -457,7 +457,7 @@ public: { if (Unit* caster = GetCaster()) if (Unit* target = GetTarget()) - if( target->HasUnitState(UNIT_STATE_CASTING) ) + if (target->HasUnitState(UNIT_STATE_CASTING)) { caster->CastSpell(target, 66359, true); SetDuration(0); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 01a4a72030..9ad8b6230d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -113,7 +113,7 @@ public: void AttackStart(Unit* who) override { - if( who->GetGUID() != TargetGUID ) + if (who->GetGUID() != TargetGUID ) return; ScriptedAI::AttackStart(who); } @@ -122,26 +122,26 @@ public: void UpdateAI(uint32 diff) override { - if( !TargetGUID && !me->GetVehicle() ) + if (!TargetGUID && !me->GetVehicle()) return; Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID); - if( !t && !(t = me->GetVehicleBase()) ) + if (!t && !(t = me->GetVehicleBase())) return; - if( t->isDead() ) + if (t->isDead()) { t->RemoveAura(SPELL_CHANGE_VEHICLE); me->RemoveAllAuras(); me->GetThreatMgr().ClearAllThreat(); me->CombatStop(true); me->SetHealth(me->GetMaxHealth()); - if( pInstance ) - if( Creature* gormok = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_GORMOK)) ) - if( gormok->IsAlive() ) - if( Vehicle* vk = gormok->GetVehicleKit() ) + if (pInstance) + if (Creature* gormok = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_GORMOK))) + if (gormok->IsAlive()) + if (Vehicle* vk = gormok->GetVehicleKit()) for( uint8 i = 0; i < 4; ++i ) - if( !vk->GetPassenger(i) ) + if (!vk->GetPassenger(i)) { me->EnterVehicleUnattackable(gormok, i); Reset(); @@ -153,26 +153,26 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_SNOBOLLED: - if( t->IsPlayer() ) + if (t->IsPlayer()) me->CastSpell((Unit*)nullptr, SPELL_SNOBOLLED, true); break; case EVENT_SPELL_BATTER: - if( t->IsPlayer() ) + if (t->IsPlayer()) me->CastSpell(t, SPELL_BATTER); events.Repeat(6s, 8s); break; case EVENT_SPELL_FIRE_BOMB: { - if( !t->IsPlayer() && pInstance ) + if (!t->IsPlayer() && pInstance ) { GuidVector validPlayers; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); @@ -180,14 +180,14 @@ public: for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { - if( Player* p = itr->GetSource() ) - if( p->IsAlive() && p->GetGUID() != TargetGUID && (!gormok || !p->IsWithinMeleeRange(gormok)) ) + if (Player* p = itr->GetSource()) + if (p->IsAlive() && p->GetGUID() != TargetGUID && (!gormok || !p->IsWithinMeleeRange(gormok))) validPlayers.push_back(p->GetGUID()); } - if( !validPlayers.empty() ) - if( Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))) ) - if( Creature* trigger = me->SummonCreature(NPC_FIRE_BOMB, *p, TEMPSUMMON_TIMED_DESPAWN, 60000) ) + if (!validPlayers.empty()) + if (Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1)))) + if (Creature* trigger = me->SummonCreature(NPC_FIRE_BOMB, *p, TEMPSUMMON_TIMED_DESPAWN, 60000)) { me->CastSpell(trigger, SPELL_FIRE_BOMB_AURA, true); // periodic damage aura, speed 14.0f me->CastSpell(trigger, SPELL_FIRE_BOMB); // visual + initial damage 4k @@ -198,7 +198,7 @@ public: } break; case EVENT_SPELL_HEAD_CRACK: - if( t->IsPlayer() ) + if (t->IsPlayer()) me->CastSpell(t, SPELL_HEAD_CRACK); events.Repeat(30s, 35s); break; @@ -209,17 +209,17 @@ public: void JustDied(Unit* /*pKiller*/) override { - if( Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID)) + if (Unit* t = ObjectAccessor::GetUnit(*me, TargetGUID)) { t->RemoveAura(SPELL_CHANGE_VEHICLE); - if( t->IsAlive() ) + if (t->IsAlive()) t->RemoveAurasDueToSpell(SPELL_SNOBOLLED); } } void DoAction(int32 param) override { - if( param == 1 && !TargetGUID ) + if (param == 1 && !TargetGUID) me->DespawnOrUnsummon(); } }; @@ -265,9 +265,9 @@ public: events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 16s, 24s); // refresh snobold position - if( Vehicle* vk = me->GetVehicleKit() ) + if (Vehicle* vk = me->GetVehicleKit()) for( uint8 i = 0; i < 4; ++i ) - if( Unit* snobold = vk->GetPassenger(i) ) + if (Unit* snobold = vk->GetPassenger(i)) snobold->SendMovementFlagUpdate(); } @@ -280,22 +280,22 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_IMPALE: - if( !me->HasUnitFlag(UNIT_FLAG_DISARMED) ) + if (!me->HasUnitFlag(UNIT_FLAG_DISARMED)) { - if( Unit* victim = me->GetVictim() ) + if (Unit* victim = me->GetVictim()) me->CastSpell(victim, SPELL_IMPALE, false); events.Repeat(9s, 10s); } @@ -307,21 +307,21 @@ public: events.Repeat(20s, 25s); break; case EVENT_PICK_SNOBOLD_TARGET: - if( Vehicle* vk = me->GetVehicleKit() ) + if (Vehicle* vk = me->GetVehicleKit()) for( uint8 i = 0; i < 4; ++i ) - if( Unit* snobold = vk->GetPassenger(i) ) + if (Unit* snobold = vk->GetPassenger(i)) { GuidVector validPlayers; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { - if( Player* p = itr->GetSource() ) - if( p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() && !p->IsGameMaster() ) + if (Player* p = itr->GetSource()) + if (p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() && !p->IsGameMaster()) validPlayers.push_back(p->GetGUID()); } - if( !validPlayers.empty() ) - if( Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1))) ) + if (!validPlayers.empty()) + if (Player* p = ObjectAccessor::GetPlayer(*me, validPlayers.at(urand(0, validPlayers.size() - 1)))) { snobold->ChangeSeat(4); // switch to hand me->setAttackTimer(BASE_ATTACK, 3000); @@ -337,12 +337,12 @@ public: { me->CastSpell(me, SPELL_RISING_ANGER, true); Player* p = ObjectAccessor::GetPlayer(*me, PlayerGUID); - if( p && p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle() ) + if (p && p->IsAlive() && !p->GetVehicleKit() && !p->IsMounted() && !p->GetVehicle()) { - if( Vehicle* vk = me->GetVehicleKit() ) - if( Unit* snobold = vk->GetPassenger(4) ) + if (Vehicle* vk = me->GetVehicleKit()) + if (Unit* snobold = vk->GetPassenger(4)) { - if( snobold->IsCreature() ) + if (snobold->IsCreature()) { CAST_AI(npc_snobold_vassal::npc_snobold_vassalAI, snobold->ToCreature()->AI())->TargetGUID = PlayerGUID; snobold->ToCreature()->AI()->AttackStart(p); @@ -353,21 +353,21 @@ public: //snobold->ClearUnitState(UNIT_STATE_ONVEHICLE); } } - else if( Vehicle* vk = me->GetVehicleKit() ) + else if (Vehicle* vk = me->GetVehicleKit()) { events.RescheduleEvent(EVENT_PICK_SNOBOLD_TARGET, 5s); - if( Unit* snobold = vk->GetPassenger(4) ) - if( snobold->IsCreature() ) + if (Unit* snobold = vk->GetPassenger(4)) + if (snobold->IsCreature()) { bool needDespawn = true; for( uint8 i = 0; i < 4; ++i ) - if( !vk->GetPassenger(i) ) + if (!vk->GetPassenger(i)) { snobold->ChangeSeat(i); needDespawn = false; break; } - if( needDespawn ) + if (needDespawn) snobold->ToCreature()->DespawnOrUnsummon(); } } @@ -383,7 +383,7 @@ public: { summons.DoAction(1); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_GORMOK, DONE); } @@ -394,7 +394,7 @@ public: void DoAction(int32 param) override { - switch( param ) + switch (param) { case -1: summons.DespawnAll(); @@ -407,7 +407,7 @@ public: events.Reset(); summons.DespawnAll(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 1); } }; @@ -488,16 +488,16 @@ struct boss_jormungarAI : public ScriptedAI void DoAction(int32 param) override { - switch( param ) + switch (param) { case -1: - if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) events.RescheduleEvent(EVENT_SUBMERGE, 1500ms); break; case -2: - if( me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) bIsStationary = true; // it will come out mobile soon - else if( me->GetDisplayId() == _MODEL_STATIONARY ) + else if (me->GetDisplayId() == _MODEL_STATIONARY ) events.RescheduleEvent(EVENT_SUBMERGE, 1s); else events.CancelEvent(EVENT_SUBMERGE); @@ -510,7 +510,7 @@ struct boss_jormungarAI : public ScriptedAI void ScheduleEvents() { events.Reset(); - if( me->GetDisplayId() == _MODEL_STATIONARY ) + if (me->GetDisplayId() == _MODEL_STATIONARY ) { me->SetAttackTime(BASE_ATTACK, 1500); events.RescheduleEvent(EVENT_SPELL_SPRAY, (me->GetEntry() == NPC_ACIDMAW ? 20s : 15s)); @@ -523,7 +523,7 @@ struct boss_jormungarAI : public ScriptedAI events.RescheduleEvent(EVENT_SPELL_SPEW, 15s, 30s); events.RescheduleEvent(EVENT_SPELL_SLIME_POOL, 15s); } - if( !me->HasAura(SPELL_ENRAGE) ) + if (!me->HasAura(SPELL_ENRAGE)) events.RescheduleEvent(EVENT_SUBMERGE, 45s, 50s); } @@ -540,11 +540,11 @@ struct boss_jormungarAI : public ScriptedAI void AttackStart(Unit* who) override { - if( me->GetDisplayId() == _MODEL_STATIONARY ) + if (me->GetDisplayId() == _MODEL_STATIONARY ) { - if( !who ) + if (!who) return; - if( me->Attack(who, true) ) + if (me->Attack(who, true)) DoStartNoMovement(who); } else @@ -553,15 +553,15 @@ struct boss_jormungarAI : public ScriptedAI void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -573,8 +573,8 @@ struct boss_jormungarAI : public ScriptedAI Talk(EMOTE_SUBMERGE); // second one submerge 1.5sec after the first one, used also for synchronizing - if( pInstance ) - if( Creature* c = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(_TYPE_OTHER)) ) + if (pInstance) + if (Creature* c = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(_TYPE_OTHER))) c->AI()->DoAction(-1); events.Reset(); @@ -584,7 +584,7 @@ struct boss_jormungarAI : public ScriptedAI case EVENT_MOVE_UNDERGROUND: { float angle = me->GetAngle(Locs[LOC_CENTER].GetPositionX() + urand(0, 20) - 10.0f, Locs[LOC_CENTER].GetPositionY() + urand(0, 20) - 10.0f), dist = urand(10, 35); - if( Creature* c = me->SummonCreature(NPC_WORLD_TRIGGER, *me, TEMPSUMMON_TIMED_DESPAWN, 6000) ) + if (Creature* c = me->SummonCreature(NPC_WORLD_TRIGGER, *me, TEMPSUMMON_TIMED_DESPAWN, 6000)) { c->SetSpeed(MOVE_RUN, 2.5f); c->CastSpell(c, SPELL_CHURNING_GROUND, true); @@ -603,11 +603,11 @@ struct boss_jormungarAI : public ScriptedAI me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MoveIdle(); me->StopMoving(); - if( bIsStationary ) + if (bIsStationary) { me->SetNativeDisplayId(_MODEL_MOBILE); me->SetCombatMovement(true); - if( Unit* victim = me->GetVictim() ) + if (Unit* victim = me->GetVictim()) me->GetMotionMaster()->MoveChase(victim); } else @@ -623,7 +623,7 @@ struct boss_jormungarAI : public ScriptedAI } break; case EVENT_SPELL_SPRAY: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, _SPELL_SPRAY, false); events.Repeat(20s); break; @@ -632,7 +632,7 @@ struct boss_jormungarAI : public ScriptedAI events.Repeat(15s, 30s); break; case EVENT_SPELL_BITE: - if( Unit* victim = me->GetVictim() ) + if (Unit* victim = me->GetVictim()) me->CastSpell(victim, _SPELL_BITE, false); events.Repeat(20s); break; @@ -641,15 +641,15 @@ struct boss_jormungarAI : public ScriptedAI events.Repeat(15s, 30s); break; case EVENT_SPELL_SLIME_POOL: - if( Creature* c = me->SummonCreature(NPC_SLIME_POOL, *me, TEMPSUMMON_TIMED_DESPAWN, 30000) ) + if (Creature* c = me->SummonCreature(NPC_SLIME_POOL, *me, TEMPSUMMON_TIMED_DESPAWN, 30000)) c->CastSpell(c, SPELL_SLIME_POOL_EFFECT, true); events.Repeat(30s); break; } - if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) { - if( me->GetDisplayId() == _MODEL_STATIONARY ) + if (me->GetDisplayId() == _MODEL_STATIONARY ) DoSpellAttackIfReady(_SPELL_SPIT); else DoMeleeAttackIfReady(); @@ -658,10 +658,10 @@ struct boss_jormungarAI : public ScriptedAI void JustDied(Unit* /*pKiller*/) override { - if( pInstance ) + if (pInstance) { - if( Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(_TYPE_OTHER)) ) - if( c->IsAlive() ) + if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(_TYPE_OTHER))) + if (c->IsAlive()) c->AI()->DoAction(-2); pInstance->SetData(TYPE_JORMUNGAR, DONE); } @@ -671,7 +671,7 @@ struct boss_jormungarAI : public ScriptedAI { events.Reset(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 1); } }; @@ -817,8 +817,8 @@ public: { Map::PlayerList const& lPlayers = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = lPlayers.begin(); itr != lPlayers.end(); ++itr ) - if( Unit* p = itr->GetSource() ) - if( p->IsAlive() && p->GetExactDist(me) <= 12.0f ) + if (Unit* p = itr->GetSource()) + if (p->IsAlive() && p->GetExactDist(me) <= 12.0f ) { DoCastAOE(SPELL_TRAMPLE); return true; @@ -829,7 +829,7 @@ public: void MovementInform(uint32 /*type*/, uint32 id) override { - if( id == EVENT_CHARGE ) + if (id == EVENT_CHARGE) { events.Reset(); events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s); @@ -843,7 +843,7 @@ public: me->UpdatePosition(destX, destY, destZ, angle, true); me->StopMovingOnCurrentPos(); - if( !DoTrampleIfValid() ) + if (!DoTrampleIfValid()) { me->CastSpell(me, SPELL_STAGGERED_DAZE, true); me->CastSpell((Unit*)nullptr, SPELL_TRAMPLE, true); @@ -862,20 +862,20 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_FEROCIOUS_BUTT: - if( Unit* victim = me->GetVictim() ) + if (Unit* victim = me->GetVictim()) me->CastSpell(victim, SPELL_FEROCIOUS_BUTT, false); events.Repeat(15s, 30s); break; @@ -884,7 +884,7 @@ public: events.Repeat(15s, 20s); break; case EVENT_SPELL_ARCTIC_BREATH: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true)) me->CastSpell(target, SPELL_ARCTIC_BREATH, false); events.Repeat(20s, 30s); break; @@ -906,7 +906,7 @@ public: events.RescheduleEvent(EVENT_GAZE, 2s); break; case EVENT_GAZE: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 500.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 500.0f, true)) { TargetGUID = target->GetGUID(); me->SetGuidValue(UNIT_FIELD_TARGET, TargetGUID); @@ -929,14 +929,14 @@ public: case EVENT_JUMP_BACK: { float angle; - if( Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID) ) + if (Unit* target = ObjectAccessor::GetPlayer(*me, TargetGUID)) angle = me->GetAngle(target); else // in case something went wrong angle = rand_norm() * 2 * M_PI; float jumpangle = angle >= M_PI ? angle - M_PI : angle + M_PI; float dist = 50.0f; - if( angle > 1.0f && angle < 2.0f ) // near main gate + if (angle > 1.0f && angle < 2.0f) // near main gate dist = 46.0f; destX = Locs[LOC_CENTER].GetPositionX() + cos(angle) * dist; destY = Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * dist; @@ -946,8 +946,8 @@ public: events.RescheduleEvent(EVENT_TRAMPLE, 1500ms); - if( pInstance ) - switch( GetDifficulty() ) + if (pInstance) + switch (GetDifficulty()) { case RAID_DIFFICULTY_10MAN_NORMAL: pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_MASSIVE_CRASH); @@ -976,7 +976,7 @@ public: break; case EVENT_CHECK_TRAMPLE_PLAYERS: - if( DoTrampleIfValid() ) + if (DoTrampleIfValid()) { events.Reset(); events.RescheduleEvent(EVENT_SPELL_FEROCIOUS_BUTT, 5s, 15s); @@ -996,7 +996,7 @@ public: break; } - if( me->GetReactState() != REACT_PASSIVE ) + if (me->GetReactState() != REACT_PASSIVE ) DoMeleeAttackIfReady(); } @@ -1004,13 +1004,13 @@ public: { events.Reset(); me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 1); } void JustDied(Unit* /*killer*/) override { - if( !pInstance ) + if (!pInstance) return; pInstance->SetData(TYPE_ICEHOWL, DONE); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index e3f805fb7e..48e3fbd579 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -116,9 +116,9 @@ struct boss_twin_valkyrAI : public ScriptedAI me->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_HASTE_SPELLS, true); events.Reset(); - if( me->GetEntry() == NPC_LIGHTBANE ) + if (me->GetEntry() == NPC_LIGHTBANE ) { - if( pInstance ) + if (pInstance) pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853); // special events here @@ -127,7 +127,7 @@ struct boss_twin_valkyrAI : public ScriptedAI events.RescheduleEvent(EVENT_SPECIAL, 45s); } events.RescheduleEvent(EVENT_SPELL_SPIKE, 5s, 8s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_SPELL_TOUCH, 10s, 25s, 1); me->SetCanFly(true); @@ -142,14 +142,14 @@ struct boss_twin_valkyrAI : public ScriptedAI void DoAction(int32 a) override { - switch( a ) + switch (a) { case -1: summons.DespawnAll(); - if( pInstance && me->GetEntry() == NPC_LIGHTBANE ) + if (pInstance && me->GetEntry() == NPC_LIGHTBANE ) { uint32 essenceId1 = 0, empoweredId1 = 0, touchId1 = 0, essenceId2 = 0, empoweredId2 = 0, touchId2 = 0; - switch( me->GetMap()->GetDifficulty() ) + switch (me->GetMap()->GetDifficulty()) { case 0: essenceId1 = 65684; @@ -207,7 +207,7 @@ struct boss_twin_valkyrAI : public ScriptedAI /*void AttackStart(Unit* victim) { - if( victim && me->Attack(victim, true) ) + if (victim && me->Attack(victim, true)) me->GetMotionMaster()->MoveChase(victim, 0.0f, 0.0f, 6.0f); }*/ @@ -216,15 +216,15 @@ struct boss_twin_valkyrAI : public ScriptedAI me->setActive(true); me->LowerPlayerDamageReq(me->GetMaxHealth()); DoZoneInCombat(); - if( Creature* twin = GetSister() ) - if( !twin->IsInCombat() ) - if( Unit* target = twin->SelectNearestTarget(200.0f) ) + if (Creature* twin = GetSister()) + if (!twin->IsInCombat()) + if (Unit* target = twin->SelectNearestTarget(200.0f)) twin->AI()->AttackStart(target); Talk(SAY_AGGRO); me->CastSpell(me, me->GetEntry() == NPC_LIGHTBANE ? SPELL_LIGHT_SURGE : SPELL_DARK_SURGE, true); - if( pInstance && me->GetEntry() == NPC_LIGHTBANE ) + if (pInstance && me->GetEntry() == NPC_LIGHTBANE ) pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, 21853); } @@ -265,13 +265,13 @@ struct boss_twin_valkyrAI : public ScriptedAI void UpdateSharedHealth() { // lightbane synchronizes - if( me->GetEntry() == NPC_LIGHTBANE ) - if( Creature* twin = GetSister() ) - if( twin->IsAlive() && me->IsAlive() ) + if (me->GetEntry() == NPC_LIGHTBANE ) + if (Creature* twin = GetSister()) + if (twin->IsAlive() && me->IsAlive()) { int32 d = CAST_AI(boss_twin_valkyrAI, twin->AI())->LastSynchroHP - (int32)twin->GetHealth(); int32 newhealth = (int32)me->GetHealth() - d; - if( newhealth <= 0 ) + if (newhealth <= 0) newhealth = 1; me->SetHealth( (uint32)newhealth ); twin->SetHealth(me->GetHealth()); @@ -281,25 +281,25 @@ struct boss_twin_valkyrAI : public ScriptedAI void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; UpdateSharedHealth(); events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; uint8 eventId = events.ExecuteEvent(); - switch(eventId) + switch (eventId) { case 0: break; case EVENT_BERSERK: me->CastSpell(me, SPELL_BERSERK, true); Talk(SAY_BERSERK); - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) { twin->CastSpell(twin, SPELL_BERSERK, true); twin->AI()->Talk(SAY_BERSERK); @@ -311,18 +311,18 @@ struct boss_twin_valkyrAI : public ScriptedAI case EVENT_SUMMON_BALLS_3: { uint8 count = 0; - if( IsHeroic() ) + if (IsHeroic()) count = eventId == EVENT_SUMMON_BALLS_3 ? 36 : 6; else count = eventId == EVENT_SUMMON_BALLS_3 ? 24 : 4; for( uint8 i = 0; i < count; ++i ) { float angle = rand_norm() * 2 * M_PI; - if( Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500) ) + if (Creature* ball = me->SummonCreature((i % 2) ? NPC_CONCENTRATED_DARK : NPC_CONCENTRATED_LIGHT, Locs[LOC_CENTER].GetPositionX() + cos(angle) * 47.0f, Locs[LOC_CENTER].GetPositionY() + std::sin(angle) * 47.0f, Locs[LOC_CENTER].GetPositionZ() + 1.5f, 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 1500)) boss_twin_valkyrAI::JustSummoned(ball); } - switch( eventId ) + switch (eventId) { case EVENT_SUMMON_BALLS_1: events.RescheduleEvent(EVENT_SUMMON_BALLS_2, 8s); @@ -343,10 +343,10 @@ struct boss_twin_valkyrAI : public ScriptedAI case EVENT_SPELL_TOUCH: { uint32 essenceId = 0; - switch( me->GetEntry() ) + switch (me->GetEntry()) { case NPC_LIGHTBANE: - switch( GetDifficulty() ) + switch (GetDifficulty()) { case 0: essenceId = 65684; @@ -363,7 +363,7 @@ struct boss_twin_valkyrAI : public ScriptedAI } break; case NPC_DARKBANE: - switch( GetDifficulty() ) + switch (GetDifficulty()) { case 0: essenceId = 65686; @@ -382,7 +382,7 @@ struct boss_twin_valkyrAI : public ScriptedAI } /* - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, essenceId) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, essenceId)) me->CastSpell(target, me->GetEntry()==NPC_LIGHTBANE ? SPELL_LIGHT_TOUCH : SPELL_DARK_TOUCH, false); events.RepeatEvent(urand(45000,50000)); */ @@ -414,17 +414,17 @@ struct boss_twin_valkyrAI : public ScriptedAI do s = urand(0, 3); while( SpecialMask & (1 << s) && (SpecialMask & 0xF) != 0xF ); SpecialMask |= (1 << s); - switch( s ) + switch (s) { case 0: // light vortex me->CastSpell((Unit*)nullptr, SPELL_LIGHT_VORTEX, false); Talk(EMOTE_VORTEX); Talk(SAY_LIGHT); - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) twin->AI()->Talk(SAY_LIGHT); break; case 1: // dark vortex - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) { twin->CastSpell((Unit*)nullptr, SPELL_DARK_VORTEX, false); twin->AI()->Talk(EMOTE_VORTEX); @@ -435,7 +435,7 @@ struct boss_twin_valkyrAI : public ScriptedAI case 2: // light pact Talk(EMOTE_TWINK_PACT); Talk(SAY_TWINK_PACT); - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) { twin->AI()->Talk(SAY_TWINK_PACT); twin->AI()->DoAction(-3); @@ -444,7 +444,7 @@ struct boss_twin_valkyrAI : public ScriptedAI me->CastSpell(me, SPELL_LIGHT_TWIN_PACT, false); break; case 3: // dark pact - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) { twin->AI()->Talk(EMOTE_TWINK_PACT); twin->AI()->Talk(SAY_TWINK_PACT); @@ -455,7 +455,7 @@ struct boss_twin_valkyrAI : public ScriptedAI } break; } - if( (SpecialMask & 0xF) == 0xF ) + if ((SpecialMask & 0xF) == 0xF ) SpecialMask = 0; events.Repeat(45s); events.DelayEventsToMax(15000, 1); // no touch of light/darkness during special abilities! @@ -474,13 +474,13 @@ struct boss_twin_valkyrAI : public ScriptedAI { DoAction(-1); Talk(SAY_DEATH); - if( pInstance ) + if (pInstance) { pInstance->SetData(TYPE_VALKYR, DONE); pInstance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POWERING_UP); } - if( Creature* twin = GetSister() ) - if( twin->IsAlive() ) + if (Creature* twin = GetSister()) + if (twin->IsAlive()) { twin->SetHealth(1); Unit::Kill(twin, twin); @@ -499,17 +499,17 @@ struct boss_twin_valkyrAI : public ScriptedAI void KilledUnit(Unit* who) override { - if( who->IsPlayer() ) + if (who->IsPlayer()) { Talk(SAY_KILL_PLAYER); - if( Creature* twin = GetSister() ) + if (Creature* twin = GetSister()) twin->AI()->Talk(SAY_KILL_PLAYER); } } void EnterEvadeMode(EvadeReason /* why */) override { - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_FAILED, 0); } }; @@ -530,9 +530,9 @@ public: { me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (19 - 1)); SetEquipmentSlots(false, EQUIP_MAIN_2, EQUIP_OFFHAND_2, EQUIP_RANGED_2); - if( Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_1]) ) + if (Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_1])) boss_twin_valkyrAI::JustSummoned(c); - if( Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_2]) ) + if (Creature* c = me->SummonCreature(NPC_DARK_ESSENCE, Locs[LOC_DARKESS_2])) boss_twin_valkyrAI::JustSummoned(c); } @@ -556,9 +556,9 @@ public: { me->SetFlag(UNIT_FIELD_AURASTATE, 1 << (22 - 1)); SetEquipmentSlots(false, EQUIP_MAIN_1, EQUIP_OFFHAND_1, EQUIP_RANGED_1); - if( Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_1]) ) + if (Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_1])) boss_twin_valkyrAI::JustSummoned(c); - if( Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_2]) ) + if (Creature* c = me->SummonCreature(NPC_LIGHT_ESSENCE, Locs[LOC_LIGHTESS_2])) boss_twin_valkyrAI::JustSummoned(c); } @@ -573,7 +573,7 @@ public: bool OnGossipHello(Player* player, Creature* creature) override { - switch( creature->GetEntry() ) + switch (creature->GetEntry()) { case NPC_LIGHT_ESSENCE: { @@ -582,7 +582,7 @@ public: //uint32 empoweredId = 0; uint32 touchId1 = 0; //uint32 touchId2 = 0; - switch( creature->GetMap()->GetDifficulty() ) + switch (creature->GetMap()->GetDifficulty()) { case 0: essenceId = 65684; @@ -628,7 +628,7 @@ public: //uint32 empoweredId = 0; //uint32 touchId1 = 0; uint32 touchId2 = 0; - switch( creature->GetMap()->GetDifficulty() ) + switch (creature->GetMap()->GetDifficulty()) { case 0: essenceId = 65686; @@ -706,10 +706,10 @@ public: void MovementInform(uint32 type, uint32 id) override { - if( type != POINT_MOTION_TYPE || id != 0 ) + if (type != POINT_MOTION_TYPE || id != 0) return; - if( urand(0, 2) ) + if (urand(0, 2)) me->DespawnOrUnsummon(0); } @@ -721,10 +721,10 @@ public: void UpdateAI(uint32 /*diff*/) override { - if( despawning ) + if (despawning) return; - if( me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) + if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE ) MoveToNextPoint(); } }; @@ -742,15 +742,15 @@ public: void HandleAfterEffectAbsorb(AuraEffect* /*aurEff*/, DamageInfo& /*dmgInfo*/, uint32& absorbAmount) { uint16 count = absorbAmount / 1000; - if( !count || !GetOwner() ) + if (!count || !GetOwner()) return; - if( SpellInfo const* se = GetAura()->GetSpellInfo() ) - if( Unit* owner = GetOwner()->ToUnit() ) + if (SpellInfo const* se = GetAura()->GetSpellInfo()) + if (Unit* owner = GetOwner()->ToUnit()) { uint32 auraId = 0; uint32 empoweredId = 0; - switch( se->Id ) + switch (se->Id) { case 65686: auraId = 67590; @@ -785,15 +785,15 @@ public: empoweredId = 65724; break; } - if( !owner->HasAura(auraId) ) + if (!owner->HasAura(auraId)) { owner->CastSpell(owner, SPELL_POWERING_UP, true); - if( --count == 0 ) + if (--count == 0) return; } - if( Aura* aur = owner->GetAura(auraId) ) + if (Aura* aur = owner->GetAura(auraId)) { - if( aur->GetStackAmount() + count < 100 ) + if (aur->GetStackAmount() + count < 100 ) { aur->ModStackAmount(count); @@ -834,15 +834,15 @@ public: { PreventDefaultAction(); Unit* caster = GetCaster(); - if( !caster ) + if (!caster) return; - if( caster->GetMap()->GetId() == 649 ) + if (caster->GetMap()->GetId() == 649 ) { uint32 excludedID = GetSpellInfo()->ExcludeTargetAuraSpell; Map::PlayerList const& pl = caster->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( plr->IsAlive() && !plr->HasAura(excludedID) && !plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION) ) + if (Player* plr = itr->GetSource()) + if (plr->IsAlive() && !plr->HasAura(excludedID) && !plr->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) { uint32 absorb = 0; uint32 resist = 0; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 8a9a3a4988..8a4dc0d70d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -185,18 +185,18 @@ public: { Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( plr->IsAlive() && !plr->IsGameMaster() ) + if (Player* plr = itr->GetSource()) + if (plr->IsAlive() && !plr->IsGameMaster()) return EncounterStatus == IN_PROGRESS; // found alive player - if( EncounterStatus != NOT_STARTED ) + if (EncounterStatus != NOT_STARTED) *(const_cast<uint32*>(&EncounterStatus)) = NOT_STARTED; return false; } void OnCreatureCreate(Creature* creature) override { - switch( creature->GetEntry() ) + switch (creature->GetEntry()) { case NPC_BARRENT: NPC_BarrettGUID = creature->GetGUID(); @@ -246,7 +246,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch( go->GetEntry() ) + switch (go->GetEntry()) { case GO_MAIN_GATE_DOOR: GO_MainGateGUID = go->GetGUID(); @@ -274,26 +274,26 @@ public: void SetData(uint32 type, uint32 data) override { - switch( type ) + switch (type) { case TYPE_FAILED: // - some scene here? - if( instance->IsHeroic() && !CLEANED ) + if (instance->IsHeroic() && !CLEANED ) { - if( AttemptsLeft > 0 ) + if (AttemptsLeft > 0) --AttemptsLeft; Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) plr->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, AttemptsLeft); } InstanceCleanup(true); SaveToDB(); break; case TYPE_ANNOUNCER_GOSSIP_SELECT: - if( instance->IsHeroic() && AttemptsLeft == 0 ) + if (instance->IsHeroic() && AttemptsLeft == 0 ) break; - switch( InstanceProgress ) + switch (InstanceProgress) { case INSTANCE_PROGRESS_INITIAL: events.RescheduleEvent(EVENT_SCENE_001, 0); @@ -316,7 +316,7 @@ public: } break; case TYPE_GORMOK: - if( data == DONE ) + if (data == DONE) { if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000)) { @@ -336,9 +336,9 @@ public: } break; case TYPE_JORMUNGAR: - if( data == DONE ) + if (data == DONE) { - if( ++Counter == 2 ) + if (++Counter == 2) { if (Creature* trigger = instance->SummonCreature(WORLD_TRIGGER, Locs[LOC_CENTER], nullptr, 25000)) { @@ -348,11 +348,11 @@ public: trigger->SetInCombatWithZone(); } - if( Creature* c = instance->GetCreature(NPC_AcidmawGUID) ) + if (Creature* c = instance->GetCreature(NPC_AcidmawGUID)) c->DespawnOrUnsummon(10000); - if( Creature* c = instance->GetCreature(NPC_DreadscaleGUID) ) + if (Creature* c = instance->GetCreature(NPC_DreadscaleGUID)) c->DespawnOrUnsummon(10000); - if( AchievementTimer + 10 >= GameTime::GetGameTime().count() ) + if (AchievementTimer + 10 >= GameTime::GetGameTime().count()) DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, SPELL_JORMUNGAR_ACHIEV); AchievementTimer = 0; @@ -376,7 +376,7 @@ public: AchievementTimer = 0; break; case TYPE_ICEHOWL: - if( data == DONE ) + if (data == DONE) { northrendBeastsMask |= 4; if ((northrendBeastsMask & 7) == 7) @@ -397,9 +397,9 @@ public: break; case TYPE_JARAXXUS: EncounterStatus = data == IN_PROGRESS ? IN_PROGRESS : NOT_STARTED; - if( data == IN_PROGRESS ) + if (data == IN_PROGRESS) HandleGameObject(GO_EnterGateGUID, false); - else if( data == DONE ) + else if (data == DONE) { HandleGameObject(GO_EnterGateGUID, true); InstanceProgress = INSTANCE_PROGRESS_JARAXXUS_DEAD; @@ -408,11 +408,11 @@ public: } break; case TYPE_FACTION_CHAMPIONS: - if( data == DONE ) + if (data == DONE) { - if( ++Counter >= NPC_ChampionGUIDs.size() ) + if (++Counter >= NPC_ChampionGUIDs.size()) { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->CastSpell(c, SPELL_FACTION_CHAMPIONS_KILL_CREDIT, true); Counter = 0; EncounterStatus = NOT_STARTED; @@ -424,10 +424,10 @@ public: c->DespawnOrUnsummon(15000); NPC_ChampionGUIDs.clear(); - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { uint32 cacheEntry = 0; - switch( instance->GetDifficulty() ) + switch (instance->GetDifficulty()) { case RAID_DIFFICULTY_10MAN_NORMAL: cacheEntry = GO_CRUSADERS_CACHE_10; @@ -451,13 +451,13 @@ public: HandleGameObject(GO_EnterGateGUID, true); - if( AchievementTimer + 60 >= GameTime::GetGameTime().count() ) + if (AchievementTimer + 60 >= GameTime::GetGameTime().count()) DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, SPELL_RESILIENCE_WILL_FIX_IT_CREDIT); AchievementTimer = 0; SaveToDB(); } - else if( Counter == 1 ) + else if (Counter == 1) AchievementTimer = GameTime::GetGameTime().count(); } break; @@ -473,19 +473,19 @@ public: } break; case TYPE_FACTION_CHAMPIONS_PLAYER_DIED: - if( urand(0, 2) == 0 ) + if (urand(0, 2) == 0 ) { - if( TeamIdInInstance == TEAM_HORDE ) + if (TeamIdInInstance == TEAM_HORDE) { - if( Creature* pTemp = instance->GetCreature(NPC_VarianGUID) ) + if (Creature* pTemp = instance->GetCreature(NPC_VarianGUID)) pTemp->AI()->Talk(SAY_VARIAN_KILL_HORDE_PLAYER_1); } - else if( Creature* pTemp = instance->GetCreature(NPC_GarroshGUID) ) + else if (Creature* pTemp = instance->GetCreature(NPC_GarroshGUID)) pTemp->AI()->Talk(SAY_GARROSH_KILL_ALLIANCE_PLAYER_1); } break; case TYPE_VALKYR: - if( data == DONE && ++Counter >= 2 ) + if (data == DONE && ++Counter >= 2) { Counter = 0; EncounterStatus = NOT_STARTED; @@ -498,12 +498,12 @@ public: } break; case TYPE_ANUBARAK: - if( data == IN_PROGRESS ) + if (data == IN_PROGRESS) { EncounterStatus = IN_PROGRESS; HandleGameObject(GO_WebDoorGUID, false); } - else if( data == DONE ) + else if (data == DONE) { Counter = 0; EncounterStatus = NOT_STARTED; @@ -512,14 +512,14 @@ public: HandleGameObject(GO_WebDoorGUID, true); SaveToDB(); - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { c->UpdatePosition(Locs[LOC_TIRION_FINAL], true); c->StopMovingOnCurrentPos(); c->SetFacingTo(Locs[LOC_TIRION_FINAL].GetOrientation()); events.RescheduleEvent(EVENT_SCENE_501, 20000); } - if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) + if (GameObject* floor = instance->GetGameObject(GO_FloorGUID)) floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); } break; @@ -528,7 +528,7 @@ public: uint32 GetData(uint32 type) const override { - switch( type ) + switch (type) { case TYPE_INSTANCE_PROGRESS: return InstanceProgress; @@ -538,7 +538,7 @@ public: ObjectGuid GetGuidData(uint32 type) const override { - switch( type ) + switch (type) { case TYPE_GORMOK: return NPC_GormokGUID; @@ -560,7 +560,7 @@ public: void Update(uint32 diff) override { events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -589,7 +589,7 @@ public: break; case EVENT_SCENE_001: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_0_01); events.RescheduleEvent(EVENT_SCENE_002, 22000); @@ -597,7 +597,7 @@ public: break; case EVENT_SCENE_002: { - if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) + if (Creature* c = instance->GetCreature(NPC_VarianGUID)) c->AI()->Talk(SAY_STAGE_0_03a); events.RescheduleEvent(EVENT_SCENE_003, 5000); @@ -605,7 +605,7 @@ public: break; case EVENT_SCENE_003: { - if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(NPC_GarroshGUID)) c->AI()->Talk(SAY_STAGE_0_03h); events.RescheduleEvent(EVENT_SCENE_004, 8000); @@ -616,7 +616,7 @@ public: InstanceProgress = INSTANCE_PROGRESS_INTRO_DONE; EncounterStatus = IN_PROGRESS; - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_0_02); HandleGameObject(GO_MainGateGUID, true); HandleGameObject(GO_EnterGateGUID, false); @@ -631,24 +631,24 @@ public: } break; case EVENT_NORTHREND_BEASTS_ENRAGE: - if( Creature* c = instance->GetCreature(NPC_GormokGUID) ) + if (Creature* c = instance->GetCreature(NPC_GormokGUID)) if (c->IsAlive()) c->CastSpell(c, 26662, true); - if( Creature* c = instance->GetCreature(NPC_AcidmawGUID) ) + if (Creature* c = instance->GetCreature(NPC_AcidmawGUID)) if (c->IsAlive()) c->CastSpell(c, 26662, true); - if( Creature* c = instance->GetCreature(NPC_DreadscaleGUID) ) + if (Creature* c = instance->GetCreature(NPC_DreadscaleGUID)) if (c->IsAlive()) c->CastSpell(c, 26662, true); - if( Creature* c = instance->GetCreature(NPC_IcehowlGUID) ) + if (Creature* c = instance->GetCreature(NPC_IcehowlGUID)) if (c->IsAlive()) c->CastSpell(c, 26662, true); break; case EVENT_SUMMON_GORMOK: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) - if( Creature* gormok = c->SummonCreature(NPC_GORMOK, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) + if (Creature* gormok = c->SummonCreature(NPC_GORMOK, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 30000)) gormok->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ()); events.RescheduleEvent(EVENT_GORMOK_ATTACK, 10000); @@ -658,12 +658,12 @@ public: case EVENT_GORMOK_ATTACK: { northrendBeastsMask = 0; - if( Creature* c = instance->GetCreature(NPC_GormokGUID) ) + if (Creature* c = instance->GetCreature(NPC_GormokGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); @@ -674,7 +674,7 @@ public: case EVENT_SCENE_005: { northrendBeastsMask |= 16; - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_0_04); events.RescheduleEvent(EVENT_OPEN_GATE, 3000); @@ -683,11 +683,11 @@ public: } case EVENT_SUMMON_ACIDMAW_AND_DREADSCALE: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { - if( Creature* dreadscale = c->SummonCreature(NPC_DREADSCALE, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) + if (Creature* dreadscale = c->SummonCreature(NPC_DREADSCALE, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN)) dreadscale->GetMotionMaster()->MovePoint(0, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY() - 25.0f, Locs[LOC_BEHIND_GATE].GetPositionZ()); - if( Creature* acidmaw = c->SummonCreature(NPC_ACIDMAW, Locs[LOC_ACIDMAW].GetPositionX(), Locs[LOC_ACIDMAW].GetPositionY(), Locs[LOC_ACIDMAW].GetPositionZ(), Locs[LOC_ACIDMAW].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) + if (Creature* acidmaw = c->SummonCreature(NPC_ACIDMAW, Locs[LOC_ACIDMAW].GetPositionX(), Locs[LOC_ACIDMAW].GetPositionY(), Locs[LOC_ACIDMAW].GetPositionZ(), Locs[LOC_ACIDMAW].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN)) acidmaw->AddAura(53421, acidmaw); } @@ -697,7 +697,7 @@ public: case EVENT_SCENE_005_2: { - if( Creature* dreadscale = instance->GetCreature(NPC_DreadscaleGUID) ) + if (Creature* dreadscale = instance->GetCreature(NPC_DreadscaleGUID)) dreadscale->GetMotionMaster()->MovePoint(0, Locs[LOC_DREADSCALE].GetPositionX(), Locs[LOC_DREADSCALE].GetPositionY(), Locs[LOC_DREADSCALE].GetPositionZ()); events.RescheduleEvent(EVENT_ACIDMAW_AND_DREADSCALE_ATTACK, 7000); @@ -706,23 +706,23 @@ public: case EVENT_ACIDMAW_AND_DREADSCALE_ATTACK: { HandleGameObject(GO_MainGateGUID, false); - if( Creature* c = instance->GetCreature(NPC_DreadscaleGUID) ) + if (Creature* c = instance->GetCreature(NPC_DreadscaleGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); } } - if( Creature* c = instance->GetCreature(NPC_AcidmawGUID) ) + if (Creature* c = instance->GetCreature(NPC_AcidmawGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) { c->RemoveAura(53421); c->CastSpell(c, 66947, false); @@ -735,7 +735,7 @@ public: case EVENT_SCENE_006: { northrendBeastsMask |= 32; - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_0_05); events.RescheduleEvent(EVENT_OPEN_GATE, 2000); @@ -744,8 +744,8 @@ public: } case EVENT_SUMMON_ICEHOWL: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) - if( Creature* icehowl = c->SummonCreature(NPC_ICEHOWL, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) + if (Creature* icehowl = c->SummonCreature(NPC_ICEHOWL, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000)) icehowl->GetMotionMaster()->MovePoint(0, Locs[LOC_GATE_FRONT].GetPositionX(), Locs[LOC_GATE_FRONT].GetPositionY(), Locs[LOC_GATE_FRONT].GetPositionZ()); events.RescheduleEvent(EVENT_ICEHOWL_ATTACK, 10000); @@ -754,12 +754,12 @@ public: } case EVENT_ICEHOWL_ATTACK: { - if( Creature* c = instance->GetCreature(NPC_IcehowlGUID) ) + if (Creature* c = instance->GetCreature(NPC_IcehowlGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); @@ -769,19 +769,19 @@ public: } case EVENT_SCENE_BEASTS_DONE: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_0_06); - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); break; } case EVENT_SCENE_101: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { HandleGameObject(GO_MainGateGUID, true); c->AI()->Talk(SAY_STAGE_1_01); - if( Creature* fizzlebang = c->SummonCreature(NPC_FIZZLEBANG, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000) ) + if (Creature* fizzlebang = c->SummonCreature(NPC_FIZZLEBANG, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY(), Locs[LOC_BEHIND_GATE].GetPositionZ(), Locs[LOC_BEHIND_GATE].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000)) { fizzlebang->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); fizzlebang->GetMotionMaster()->MovePoint(0, Locs[LOC_BEHIND_GATE].GetPositionX(), Locs[LOC_BEHIND_GATE].GetPositionY() - 65.0f, Locs[LOC_BEHIND_GATE].GetPositionZ() - 1.0f); @@ -789,7 +789,7 @@ public: events.RescheduleEvent(EVENT_SCENE_102, 20000); // move Icehowl to side, can't remove corpse because of loot! - if( Creature* icehowl = instance->GetCreature(NPC_IcehowlGUID) ) + if (Creature* icehowl = instance->GetCreature(NPC_IcehowlGUID)) { icehowl->UpdatePosition(513.19f, 139.48f, 395.22f, 3 * M_PI / 2, true); icehowl->StopMovingOnCurrentPos(); @@ -801,7 +801,7 @@ public: case EVENT_SCENE_102: { HandleGameObject(GO_MainGateGUID, false); - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) c->AI()->Talk(SAY_STAGE_1_02); events.RescheduleEvent(EVENT_SCENE_103, 11000); @@ -809,11 +809,11 @@ public: } case EVENT_SCENE_103: { - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) { c->AI()->Talk(SAY_STAGE_1_03); c->HandleEmoteCommand(EMOTE_STATE_SPELL_PRECAST); - if( Creature* trigger = c->SummonCreature(NPC_PURPLE_GROUND, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) + if (Creature* trigger = c->SummonCreature(NPC_PURPLE_GROUND, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN)) NPC_PurpleGroundGUID = trigger->GetGUID(); } @@ -822,9 +822,9 @@ public: } case EVENT_SCENE_104: { - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) { - if( Creature* portal = c->SummonCreature(NPC_WORLD_TRIGGER, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN) ) + if (Creature* portal = c->SummonCreature(NPC_WORLD_TRIGGER, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN)) { NPC_PortalGUID = portal->GetGUID(); portal->SetObjectScale(3.0f); @@ -839,9 +839,9 @@ public: } case EVENT_SUMMON_JARAXXUS: { - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) { - if( Creature* jaraxxus = c->SummonCreature(NPC_JARAXXUS, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) + if (Creature* jaraxxus = c->SummonCreature(NPC_JARAXXUS, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000)) jaraxxus->GetMotionMaster()->MovePoint(0, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY() - 10.0f, Locs[LOC_CENTER].GetPositionZ()); c->HandleEmoteCommand(EMOTE_STATE_NONE); c->AI()->Talk(SAY_STAGE_1_04); @@ -852,12 +852,12 @@ public: } case EVENT_SCENE_105: { - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) c->SetFacingTo(M_PI / 2); - if( Creature* c = instance->GetCreature(NPC_PurpleGroundGUID) ) + if (Creature* c = instance->GetCreature(NPC_PurpleGroundGUID)) c->DespawnOrUnsummon(); NPC_PurpleGroundGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_PortalGUID) ) + if (Creature* c = instance->GetCreature(NPC_PortalGUID)) c->DespawnOrUnsummon(); NPC_PortalGUID.Clear(); @@ -866,7 +866,7 @@ public: } case EVENT_SCENE_106: { - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) c->AI()->Talk(SAY_STAGE_1_05); events.RescheduleEvent(EVENT_SCENE_107, 5000); @@ -874,7 +874,7 @@ public: } case EVENT_SCENE_107: { - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) c->AI()->Talk(SAY_STAGE_1_06); events.RescheduleEvent(EVENT_SCENE_108, 800); @@ -882,10 +882,10 @@ public: } case EVENT_SCENE_108: { - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) { c->AI()->Talk(SAY_STAGE_1_06_1); - if( Creature* f = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* f = instance->GetCreature(NPC_FizzlebangGUID)) { c->CastSpell(f, 67888, true); Unit::Kill(f, f); @@ -897,9 +897,9 @@ public: } case EVENT_SCENE_109: { - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) c->SetFacingTo(3 * M_PI / 2); - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_1_07); events.RescheduleEvent(EVENT_JARAXXUS_ATTACK, 6000); @@ -908,12 +908,12 @@ public: case EVENT_JARAXXUS_ATTACK: { InstanceProgress = INSTANCE_PROGRESS_JARAXXUS_INTRO_DONE; - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - if( Unit* target = c->SelectNearestTarget(200.0f) ) + if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); @@ -923,7 +923,7 @@ public: } case EVENT_SCENE_110: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_1_08); events.RescheduleEvent(EVENT_SCENE_111, 18000); @@ -931,7 +931,7 @@ public: } case EVENT_SCENE_111: { - if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(NPC_GarroshGUID)) c->AI()->Talk(SAY_STAGE_1_09); events.RescheduleEvent(EVENT_SCENE_112, 9000); @@ -939,7 +939,7 @@ public: } case EVENT_SCENE_112: { - if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) + if (Creature* c = instance->GetCreature(NPC_VarianGUID)) c->AI()->Talk(SAY_STAGE_1_10); events.RescheduleEvent(EVENT_SCENE_113, 5000); @@ -947,23 +947,23 @@ public: } case EVENT_SCENE_113: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_1_11); - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); break; } case EVENT_SCENE_201: { // move Jaraxxus to side, can't remove corpse because of loot! - if( Creature* jaraxxus = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* jaraxxus = instance->GetCreature(NPC_JaraxxusGUID)) { jaraxxus->UpdatePosition(613.83f, 139.5f, 395.22f, 3 * M_PI / 2, true); jaraxxus->StopMovingOnCurrentPos(); jaraxxus->DestroyForNearbyPlayers(); } - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_2_01); events.RescheduleEvent(EVENT_SCENE_202, 9000); @@ -973,22 +973,22 @@ public: { Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( !plr->IsGameMaster() ) + if (Player* plr = itr->GetSource()) + if (!plr->IsGameMaster()) { TeamIdInInstance = plr->GetTeamId(); break; } - if( TeamIdInInstance == TEAM_ALLIANCE ) + if (TeamIdInInstance == TEAM_ALLIANCE) { - if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(NPC_GarroshGUID)) c->AI()->Talk(SAY_STAGE_2_02h); events.RescheduleEvent(EVENT_SCENE_203, 15000); } else { - if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) + if (Creature* c = instance->GetCreature(NPC_VarianGUID)) c->AI()->Talk(SAY_STAGE_2_02a); events.RescheduleEvent(EVENT_SCENE_203, 18000); } @@ -996,7 +996,7 @@ public: } case EVENT_SCENE_203: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_2_03); events.RescheduleEvent(EVENT_SCENE_204, 5000); @@ -1004,15 +1004,15 @@ public: } case EVENT_SCENE_204: { - if( TeamIdInInstance == TEAM_ALLIANCE ) + if (TeamIdInInstance == TEAM_ALLIANCE) { - if( Creature* c = instance->GetCreature(NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(NPC_GarroshGUID)) c->AI()->Talk(SAY_STAGE_2_04h); events.RescheduleEvent(EVENT_SCENE_205, 6000); } else { - if( Creature* c = instance->GetCreature(NPC_VarianGUID) ) + if (Creature* c = instance->GetCreature(NPC_VarianGUID)) c->AI()->Talk(SAY_STAGE_2_04a); events.RescheduleEvent(EVENT_SCENE_205, 5000); } @@ -1022,7 +1022,7 @@ public: } case EVENT_SCENE_205: { - if( Creature* c = instance->GetCreature(TeamIdInInstance == TEAM_ALLIANCE ? NPC_VarianGUID : NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(TeamIdInInstance == TEAM_ALLIANCE ? NPC_VarianGUID : NPC_GarroshGUID)) c->AI()->Talk(TeamIdInInstance == TEAM_ALLIANCE ? SAY_STAGE_2_05a : SAY_STAGE_2_05h); break; @@ -1044,12 +1044,12 @@ public: vOtherEntries.push_back(TeamIdInInstance == TEAM_ALLIANCE ? NPC_HORDE_WARRIOR : NPC_ALLIANCE_WARRIOR); uint8 healersSubtracted = 2; - if( instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC ) + if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_NORMAL || instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC ) healersSubtracted = 1; for( uint8 i = 0; i < healersSubtracted; ++i ) { uint8 pos = urand(0, vHealerEntries.size() - 1); - switch( vHealerEntries[pos] ) + switch (vHealerEntries[pos]) { case NPC_ALLIANCE_DRUID_RESTORATION: vOtherEntries.push_back(NPC_ALLIANCE_DRUID_BALANCE); @@ -1079,7 +1079,7 @@ public: vHealerEntries.erase(vHealerEntries.begin() + pos); } - if( instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC ) + if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_NORMAL || instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC ) for( uint8 i = 0; i < 4; ++i ) vOtherEntries.erase(vOtherEntries.begin() + urand(0, vOtherEntries.size() - 1)); @@ -1089,7 +1089,7 @@ public: uint8 pos2 = 10; for( std::vector<uint32>::iterator itr = vOtherEntries.begin(); itr != vOtherEntries.end(); ++itr ) { - if( Creature* pTemp = instance->SummonCreature(*itr, FactionChampionLoc[urand(0, 4) + (TeamIdInInstance == TEAM_ALLIANCE ? 0 : 5)]) ) + if (Creature* pTemp = instance->SummonCreature(*itr, FactionChampionLoc[urand(0, 4) + (TeamIdInInstance == TEAM_ALLIANCE ? 0 : 5)])) { NPC_ChampionGUIDs.push_back(pTemp->GetGUID()); pTemp->SetHomePosition((TeamIdInInstance == TEAM_ALLIANCE ? FactionChampionLoc[pos2].GetPositionX() : (Locs[LOC_CENTER].GetPositionX() * 2 - FactionChampionLoc[pos2].GetPositionX())), FactionChampionLoc[pos2].GetPositionY(), FactionChampionLoc[pos2].GetPositionZ(), 0.0f); @@ -1110,7 +1110,7 @@ public: c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); c->RemoveUnitMovementFlag(MOVEMENTFLAG_WALKING); - //if( Unit* target = c->SelectNearestTarget(200.0f) ) + //if (Unit* target = c->SelectNearestTarget(200.0f)) // c->AI()->AttackStart(target); } Map::PlayerList const& pl = instance->GetPlayers(); @@ -1121,15 +1121,15 @@ public: } case EVENT_SCENE_FACTION_CHAMPIONS_DEAD: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_2_06); - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); break; } case EVENT_SCENE_301: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_3_01); events.RescheduleEvent(EVENT_SCENE_302, 13000); @@ -1137,7 +1137,7 @@ public: } case EVENT_SCENE_302: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_3_02); events.RescheduleEvent(EVENT_SCENE_303, 3000); @@ -1146,12 +1146,12 @@ public: case EVENT_SCENE_303: { HandleGameObject(GO_EnterGateGUID, false); - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { HandleGameObject(GO_MainGateGUID, true); - if( Creature* t = c->SummonCreature(NPC_LIGHTBANE, Locs[LOC_VALKYR_RIGHT].GetPositionX(), Locs[LOC_VALKYR_RIGHT].GetPositionY(), Locs[LOC_VALKYR_RIGHT].GetPositionZ(), Locs[LOC_VALKYR_RIGHT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) + if (Creature* t = c->SummonCreature(NPC_LIGHTBANE, Locs[LOC_VALKYR_RIGHT].GetPositionX(), Locs[LOC_VALKYR_RIGHT].GetPositionY(), Locs[LOC_VALKYR_RIGHT].GetPositionZ(), Locs[LOC_VALKYR_RIGHT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000)) t->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_RIGHT].GetPositionX(), Locs[LOC_VALKYR_DEST_RIGHT].GetPositionY(), Locs[LOC_VALKYR_DEST_RIGHT].GetPositionZ()); - if( Creature* t = c->SummonCreature(NPC_DARKBANE, Locs[LOC_VALKYR_LEFT].GetPositionX(), Locs[LOC_VALKYR_LEFT].GetPositionY(), Locs[LOC_VALKYR_LEFT].GetPositionZ(), Locs[LOC_VALKYR_LEFT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) + if (Creature* t = c->SummonCreature(NPC_DARKBANE, Locs[LOC_VALKYR_LEFT].GetPositionX(), Locs[LOC_VALKYR_LEFT].GetPositionY(), Locs[LOC_VALKYR_LEFT].GetPositionZ(), Locs[LOC_VALKYR_LEFT].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000)) t->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_LEFT].GetPositionX(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionY(), Locs[LOC_VALKYR_DEST_LEFT].GetPositionZ()); } @@ -1162,9 +1162,9 @@ public: { HandleGameObject(GO_MainGateGUID, false); EncounterStatus = IN_PROGRESS; - if( Creature* c = instance->GetCreature(NPC_LightbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_LightbaneGUID)) c->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_2_RIGHT].GetPositionX(), Locs[LOC_VALKYR_DEST_2_RIGHT].GetPositionY(), Locs[LOC_VALKYR_DEST_2_RIGHT].GetPositionZ()); - if( Creature* c = instance->GetCreature(NPC_DarkbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_DarkbaneGUID)) c->GetMotionMaster()->MovePoint(0, Locs[LOC_VALKYR_DEST_2_LEFT].GetPositionX(), Locs[LOC_VALKYR_DEST_2_LEFT].GetPositionY(), Locs[LOC_VALKYR_DEST_2_LEFT].GetPositionZ()); events.RescheduleEvent(EVENT_VALKYRIES_ATTACK, 3250); @@ -1172,21 +1172,21 @@ public: } case EVENT_VALKYRIES_ATTACK: { - if( Creature* c = instance->GetCreature(NPC_LightbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_LightbaneGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - /*if( Unit* target = c->SelectNearestTarget(200.0f) ) + /*if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); }*/ } - if( Creature* c = instance->GetCreature(NPC_DarkbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_DarkbaneGUID)) { c->SetReactState(REACT_AGGRESSIVE); c->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - /*if( Unit* target = c->SelectNearestTarget(200.0f) ) + /*if (Unit* target = c->SelectNearestTarget(200.0f)) { c->AI()->AttackStart(target); c->AI()->DoZoneInCombat(); @@ -1200,14 +1200,14 @@ public: { Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( !plr->IsGameMaster() ) + if (Player* plr = itr->GetSource()) + if (!plr->IsGameMaster()) { TeamIdInInstance = plr->GetTeamId(); break; } } - if( Creature* c = instance->GetCreature(TeamIdInInstance == TEAM_ALLIANCE ? NPC_VarianGUID : NPC_GarroshGUID) ) + if (Creature* c = instance->GetCreature(TeamIdInInstance == TEAM_ALLIANCE ? NPC_VarianGUID : NPC_GarroshGUID)) c->AI()->Talk((TeamIdInInstance == TEAM_ALLIANCE ? SAY_STAGE_3_03a : SAY_STAGE_3_03h)); events.RescheduleEvent(EVENT_SCENE_401, 60000); @@ -1215,7 +1215,7 @@ public: } case EVENT_SCENE_401: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_4_01); events.RescheduleEvent(EVENT_SCENE_402, 20000); @@ -1225,8 +1225,8 @@ public: { HandleGameObject(GO_EnterGateGUID, false); EncounterStatus = IN_PROGRESS; - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) - if( Creature* t = c->SummonCreature(NPC_LICH_KING, Locs[LOC_ARTHAS_PORTAL]) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) + if (Creature* t = c->SummonCreature(NPC_LICH_KING, Locs[LOC_ARTHAS_PORTAL])) { t->SetReactState(REACT_PASSIVE); t->AddUnitMovementFlag(MOVEMENTFLAG_WALKING); @@ -1240,8 +1240,8 @@ public: } case EVENT_SCENE_403: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) - if( Creature* t = c->SummonCreature(NPC_WORLD_TRIGGER, Locs[LOC_ARTHAS_PORTAL], TEMPSUMMON_TIMED_DESPAWN, 60000) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) + if (Creature* t = c->SummonCreature(NPC_WORLD_TRIGGER, Locs[LOC_ARTHAS_PORTAL], TEMPSUMMON_TIMED_DESPAWN, 60000)) { t->SetReactState(REACT_PASSIVE); t->CastSpell(t, 51807, true); @@ -1252,7 +1252,7 @@ public: } case EVENT_SCENE_404: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { c->SetDisplayId(c->GetNativeDisplayId()); c->SetVisible(true); @@ -1264,7 +1264,7 @@ public: } case EVENT_SCENE_405: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) c->AI()->Talk(SAY_STAGE_4_03); events.RescheduleEvent(EVENT_SCENE_406, 7000); @@ -1272,7 +1272,7 @@ public: } case EVENT_SCENE_406: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { c->AI()->Talk(SAY_STAGE_4_04); c->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); @@ -1284,7 +1284,7 @@ public: } case EVENT_SCENE_406_2: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { c->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_TALK); } @@ -1294,7 +1294,7 @@ public: case EVENT_SCENE_407: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) c->HandleEmoteCommand(EMOTE_ONESHOT_EXCLAMATION); events.RescheduleEvent(EVENT_SCENE_408, 4000); @@ -1302,7 +1302,7 @@ public: } case EVENT_SCENE_408: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { c->HandleEmoteCommand(EMOTE_ONESHOT_KNEEL); } @@ -1312,14 +1312,14 @@ public: } case EVENT_SCENE_409: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { - if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) + if (GameObject* floor = instance->GetGameObject(GO_FloorGUID)) floor->SetDestructibleState(GO_DESTRUCTIBLE_DAMAGED);//floor->ModifyHealth(-10000000, c); c->CastSpell((Unit*)nullptr, 68193, true); c->SetVisible(false); c->SetDisplayId(11686); - if( Creature* t = c->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f, true) ) + if (Creature* t = c->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f, true)) t->DespawnOrUnsummon(); InstanceProgress = INSTANCE_PROGRESS_ANUB_ARAK; @@ -1331,7 +1331,7 @@ public: } case EVENT_SCENE_410: { - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) { c->SetVisible(true); c->AI()->Talk(SAY_STAGE_4_05); @@ -1342,7 +1342,7 @@ public: } case EVENT_SCENE_501: { - if( Creature* c = instance->GetCreature(NPC_TirionGUID) ) + if (Creature* c = instance->GetCreature(NPC_TirionGUID)) { c->AI()->Talk(SAY_STAGE_4_06); c->SummonCreature(NPC_ARGENT_MAGE, Locs[LOC_MAGE].GetPositionX(), Locs[LOC_MAGE].GetPositionY(), Locs[LOC_MAGE].GetPositionZ(), Locs[LOC_MAGE].GetOrientation()); @@ -1354,10 +1354,10 @@ public: } case EVENT_SCENE_502: { - if( instance->IsHeroic() ) + if (instance->IsHeroic()) { uint32 tributeChest = 0; - if( instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC ) + if (instance->GetSpawnMode() == RAID_DIFFICULTY_10MAN_HEROIC ) { if (AttemptsLeft >= 50) tributeChest = GO_TRIBUTE_CHEST_10H_99; @@ -1368,7 +1368,7 @@ public: else tributeChest = GO_TRIBUTE_CHEST_10H_25; } - else if( instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC ) + else if (instance->GetSpawnMode() == RAID_DIFFICULTY_25MAN_HEROIC ) { if (AttemptsLeft >= 50) tributeChest = GO_TRIBUTE_CHEST_25H_99; @@ -1397,7 +1397,7 @@ public: void OnPlayerEnter(Player* plr) override { - if( instance->IsHeroic() ) + if (instance->IsHeroic()) { plr->SendUpdateWorldState(UPDATE_STATE_UI_SHOW, 1); plr->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, AttemptsLeft); @@ -1441,59 +1441,59 @@ public: void InstanceCleanup(bool fromFailed = false) { - if( CLEANED ) + if (CLEANED) return; CLEANED = true; - switch( InstanceProgress ) + switch (InstanceProgress) { case INSTANCE_PROGRESS_INITIAL: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); break; case INSTANCE_PROGRESS_INTRO_DONE: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); - if( Creature* c = instance->GetCreature(NPC_GormokGUID) ) + if (Creature* c = instance->GetCreature(NPC_GormokGUID)) { c->AI()->DoAction(-1); // despawn summons c->DespawnOrUnsummon(); } NPC_GormokGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_AcidmawGUID) ) + if (Creature* c = instance->GetCreature(NPC_AcidmawGUID)) c->DespawnOrUnsummon(); NPC_AcidmawGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_DreadscaleGUID) ) + if (Creature* c = instance->GetCreature(NPC_DreadscaleGUID)) c->DespawnOrUnsummon(); NPC_DreadscaleGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_IcehowlGUID) ) + if (Creature* c = instance->GetCreature(NPC_IcehowlGUID)) c->DespawnOrUnsummon(); NPC_IcehowlGUID.Clear(); northrendBeastsMask = 0; break; case INSTANCE_PROGRESS_BEASTS_DEAD: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); - if( Creature* c = instance->GetCreature(NPC_FizzlebangGUID) ) + if (Creature* c = instance->GetCreature(NPC_FizzlebangGUID)) c->DespawnOrUnsummon(); NPC_FizzlebangGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) c->DespawnOrUnsummon(); NPC_JaraxxusGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_PurpleGroundGUID) ) + if (Creature* c = instance->GetCreature(NPC_PurpleGroundGUID)) c->DespawnOrUnsummon(); NPC_PurpleGroundGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_PortalGUID) ) + if (Creature* c = instance->GetCreature(NPC_PortalGUID)) c->DespawnOrUnsummon(); NPC_PortalGUID.Clear(); break; case INSTANCE_PROGRESS_JARAXXUS_INTRO_DONE: - if( Creature* c = instance->GetCreature(NPC_JaraxxusGUID) ) + if (Creature* c = instance->GetCreature(NPC_JaraxxusGUID)) c->DespawnOrUnsummon(); - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { c->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); - if( Creature* jaraxxus = c->SummonCreature(NPC_JARAXXUS, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000) ) + if (Creature* jaraxxus = c->SummonCreature(NPC_JARAXXUS, Locs[LOC_CENTER].GetPositionX(), Locs[LOC_CENTER].GetPositionY(), Locs[LOC_CENTER].GetPositionZ(), Locs[LOC_CENTER].GetOrientation(), TEMPSUMMON_CORPSE_TIMED_DESPAWN, 630000000)) { jaraxxus->CastSpell(jaraxxus, 67924, true); jaraxxus->SetReactState(REACT_AGGRESSIVE); @@ -1503,7 +1503,7 @@ public: } break; case INSTANCE_PROGRESS_JARAXXUS_DEAD: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); for (ObjectGuid const& guid : NPC_ChampionGUIDs) if (Creature* c = instance->GetCreature(guid)) @@ -1511,15 +1511,15 @@ public: NPC_ChampionGUIDs.clear(); break; case INSTANCE_PROGRESS_FACTION_CHAMPIONS_DEAD: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP); - if( Creature* c = instance->GetCreature(NPC_DarkbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_DarkbaneGUID)) { c->AI()->DoAction(-1); c->DespawnOrUnsummon(); } NPC_DarkbaneGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_LightbaneGUID) ) + if (Creature* c = instance->GetCreature(NPC_LightbaneGUID)) { c->AI()->DoAction(-1); c->DespawnOrUnsummon(); @@ -1528,7 +1528,7 @@ public: break; case INSTANCE_PROGRESS_VALKYR_DEAD: case INSTANCE_PROGRESS_ANUB_ARAK: - /*if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) + /*if (GameObject* floor = instance->GetGameObject(GO_FloorGUID)) floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true);*/ if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { @@ -1546,11 +1546,11 @@ public: if (Creature* t = c->FindNearestCreature(NPC_WORLD_TRIGGER, 500.0f, true)) t->DespawnOrUnsummon(); } - if( Creature* c = instance->GetCreature(NPC_LichKingGUID) ) + if (Creature* c = instance->GetCreature(NPC_LichKingGUID)) c->DespawnOrUnsummon(); NPC_LichKingGUID.Clear(); - if( Creature* c = instance->GetCreature(NPC_AnubarakGUID) ) + if (Creature* c = instance->GetCreature(NPC_AnubarakGUID)) { c->AI()->DoAction(-1); c->DespawnOrUnsummon(); @@ -1559,9 +1559,9 @@ public: break; case INSTANCE_PROGRESS_DONE: - if( GameObject* floor = instance->GetGameObject(GO_FloorGUID) ) + if (GameObject* floor = instance->GetGameObject(GO_FloorGUID)) floor->SetDestructibleState(GO_DESTRUCTIBLE_REBUILDING, nullptr, true); - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { c->SetVisible(false); c->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); @@ -1574,12 +1574,12 @@ public: --AttemptsLeft; Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) + if (Player* plr = itr->GetSource()) plr->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, AttemptsLeft); } - if( instance->IsHeroic() && AttemptsLeft == 0 ) - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (instance->IsHeroic() && AttemptsLeft == 0 ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) c->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); HandleGameObject(GO_MainGateGUID, false); @@ -1621,30 +1621,30 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_UPPER_BACK_PAIN_10_N: case ACHIEV_CRITERIA_UPPER_BACK_PAIN_10_H: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { std::list<Creature*> L; uint8 count = 0; c->GetCreaturesWithEntryInRange(L, 200.0f, 34800); // find all snobolds for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr ) - if( (*itr)->GetVehicle() ) + if ((*itr)->GetVehicle()) ++count; return (count >= 2); } break; case ACHIEV_CRITERIA_UPPER_BACK_PAIN_25_N: case ACHIEV_CRITERIA_UPPER_BACK_PAIN_25_H: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { std::list<Creature*> L; uint8 count = 0; c->GetCreaturesWithEntryInRange(L, 200.0f, 34800); // find all snobolds for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr ) - if( (*itr)->GetVehicle() ) + if ((*itr)->GetVehicle()) ++count; return (count >= 4); } @@ -1653,13 +1653,13 @@ public: case ACHIEV_CRITERIA_THREE_SIXTY_PAIN_SPIKE_10_H: case ACHIEV_CRITERIA_THREE_SIXTY_PAIN_SPIKE_25_N: case ACHIEV_CRITERIA_THREE_SIXTY_PAIN_SPIKE_25_H: - if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) + if (Creature* c = instance->GetCreature(NPC_BarrettGUID)) { std::list<Creature*> L; uint8 count = 0; c->GetCreaturesWithEntryInRange(L, 200.0f, 34826); // find all mistress of pain for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr ) - if( (*itr)->IsAlive() ) + if ((*itr)->IsAlive()) ++count; return (count >= 2); } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 697aba6d0d..475708cce5 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -36,15 +36,15 @@ public: bool OnGossipHello(Player* player, Creature* creature) override { - if(!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) + if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) return true; InstanceScript* pInstance = creature->GetInstanceScript(); - if(!pInstance) + if (!pInstance) return true; uint32 gossipTextId = 0; - switch(pInstance->GetData(TYPE_INSTANCE_PROGRESS)) + switch (pInstance->GetData(TYPE_INSTANCE_PROGRESS)) { case INSTANCE_PROGRESS_INITIAL: gossipTextId = MSG_TESTED; @@ -72,14 +72,14 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 uiAction) override { - if( !creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP) ) + if (!creature->HasNpcFlag(UNIT_NPC_FLAG_GOSSIP)) return true; InstanceScript* pInstance = creature->GetInstanceScript(); - if( !pInstance ) + if (!pInstance) return true; - if( uiAction == GOSSIP_ACTION_INFO_DEF + 1337 ) + if (uiAction == GOSSIP_ACTION_INFO_DEF + 1337) { pInstance->SetData(TYPE_ANNOUNCER_GOSSIP_SELECT, 0); creature->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 3c82020a0a..fd8f4fda7d 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -133,7 +133,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_SPELL_INFECTED_WOUND: me->CastSpell(me->GetVictim(), SPELL_INFECTED_WOUND, false); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index d08cddca6b..c8d14deaa9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -143,7 +143,7 @@ public: if (me->isAttackReady()) me->SetFacingToObject(me->GetVictim()); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index 076d0c4ac8..b848dd2850 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -204,7 +204,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index d94ea64d47..619fa90a36 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -81,7 +81,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -206,7 +206,7 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override { ClearGossipMenuFor(player); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: CloseGossipMenuFor(player); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp index 156a405c7a..dda74b74de 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp @@ -151,7 +151,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_BRONJAHM: m_auiEncounter[type] = data; @@ -180,22 +180,22 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 12752: // Soul Power - if( Creature* c = instance->GetCreature(NPC_BronjahmGUID) ) + if (Creature* c = instance->GetCreature(NPC_BronjahmGUID)) { std::list<Creature*> L; uint8 count = 0; c->GetCreaturesWithEntryInRange(L, 200.0f, 36535); // find all Corrupted Soul Fragment (36535) for( std::list<Creature*>::const_iterator itr = L.begin(); itr != L.end(); ++itr ) - if( (*itr)->IsAlive() ) + if ((*itr)->IsAlive()) ++count; return (count >= 4); } break; case 12976: - if( Creature* c = instance->GetCreature(NPC_DevourerGUID) ) + if (Creature* c = instance->GetCreature(NPC_DevourerGUID)) return (bool)c->AI()->GetData(1); break; } diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 2c5d00e369..6af907e2d4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -245,7 +245,7 @@ public: void DoAction(int32 actionId) override { - switch(actionId) + switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_START_INTRO, 0ms); @@ -1767,7 +1767,7 @@ public: if (me->IsNonMeleeSpellCast(false, true, true)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_LK_CHECK_COMBAT: if (me->isActiveObject()) // during fight @@ -1953,7 +1953,7 @@ public: void DoAction(int32 actionId) override { - switch(actionId) + switch (actionId) { case ACTION_START_INTRO: events.ScheduleEvent(EVENT_LK_SAY_AGGRO, 0ms); @@ -2001,7 +2001,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_LK_SAY_AGGRO: if (Creature* lkboss = pInstance->instance->GetCreature(pInstance->GetGuidData(NPC_LICH_KING_BOSS))) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp index a9ee857880..14d01fe942 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp @@ -228,7 +228,7 @@ public: } } - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SYLVANAS_PART1: creature->SetVisible(false); @@ -372,7 +372,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_FROSTMOURNE: GO_FrostmourneGUID = go->GetGUID(); @@ -408,7 +408,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_INTRO: EncounterMask |= (1 << DATA_INTRO); @@ -597,7 +597,7 @@ public: if (EncounterMask & (1 << DATA_BATTERED_HILT)) return; - switch(data) + switch (data) { case 1: // talked to leader EncounterMask |= (1 << DATA_BATTERED_HILT); @@ -667,7 +667,7 @@ public: uint32 GetData(uint32 type) const override { - switch(type) + switch (type) { case DATA_INTRO: case DATA_FALRIC: @@ -687,7 +687,7 @@ public: ObjectGuid GetGuidData(uint32 type) const override { - switch(type) + switch (type) { case NPC_DARK_RANGER_LORALEN: return NPC_GuardGUID; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index 12eb4361cb..8d60280251 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -233,7 +233,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 3148377a63..c5d341dc9f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -175,7 +175,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING | UNIT_STATE_STUNNED)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -212,7 +212,7 @@ public: break; case EVENT_SPECIAL: - switch(urand(0, 2)) + switch (urand(0, 2)) { case 0: // Pursuit if (Creature* k = GetKrick()) @@ -305,7 +305,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index e49c9ee7a7..675ff39f1d 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -150,7 +150,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp index 3c4c0e7cf5..d7210151fe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp @@ -261,7 +261,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_INSTANCE_PROGRESS: if (InstanceProgress < data) @@ -306,7 +306,7 @@ public: void SetGuidData(uint32 type, ObjectGuid data) override { - switch(type) + switch (type) { case DATA_NECROLYTE_1_GUID: NPC_Necrolyte1GUID = data; @@ -374,7 +374,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 12993: // Doesn't Go to Eleven (4524) return bAchievEleven; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 578a4e3af8..a83777d45f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -73,7 +73,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -469,7 +469,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -521,7 +521,7 @@ public: { if (type != POINT_MOTION_TYPE) return; - switch(id) + switch (id) { case 1: events.RescheduleEvent(id, 0ms); @@ -532,7 +532,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -1013,7 +1013,7 @@ public: { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -1198,7 +1198,7 @@ public: if (type != WAYPOINT_MOTION_TYPE) return; - switch(id) + switch (id) { case 0: Talk(me->GetEntry() == NPC_JAINA_PART2 ? SAY_JAINA_OUTRO_2 : SAY_SYLVANAS_OUTRO_2); @@ -1221,7 +1221,7 @@ public: { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 85a564b398..0b18293003 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -813,7 +813,7 @@ class spell_sindragosa_s_fury : public SpellScript if (ResistFactor > 0.9f) ResistFactor = 0.9f; - uint32 damage = uint32( (GetEffectValue() / _targetCount) * (1.0f - ResistFactor) ); + uint32 damage = uint32( (GetEffectValue() / _targetCount) * (1.0f - ResistFactor)); SpellNonMeleeDamage damageInfo(GetCaster(), GetHitUnit(), GetSpellInfo(), GetSpellInfo()->SchoolMask); damageInfo.damage = damage; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 556371bb2d..0308ab3168 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -157,7 +157,7 @@ public: void MoveToCorner() { - switch(me->GetEntry()) + switch (me->GetEntry()) { case NPC_THANE_KORTHAZZ: currentWaypoint = 0; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index ba1e94e1a3..fd4bb92e72 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -357,7 +357,7 @@ public: void SummonHelpers(uint32 entry) { - switch(entry) + switch (entry) { case NPC_LIVING_TRAINEE: me->SummonCreature(NPC_LIVING_TRAINEE, PosSummonLiving[0].GetPositionX(), PosSummonLiving[0].GetPositionY(), PosSummonLiving[0].GetPositionZ(), PosSummonLiving[0].GetOrientation()); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 72588d466f..2fab24707e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -231,7 +231,7 @@ public: } if (GameObject* go = me->GetMap()->GetGameObject(pInstance->GetGuidData(DATA_KELTHUZAD_GATE))) { - if(!_justSpawned) // Don't open the door if we just spawned and are still doing the conversation + if (!_justSpawned) // Don't open the door if we just spawned and are still doing the conversation { go->SetGoState(GO_STATE_ACTIVE); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 77a6875728..b3cac8840a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -222,7 +222,7 @@ public: void DamageTaken(Unit* who, uint32& damage, DamageEffectType, SpellSchoolMask) override { // Damage done by the controlled Death Knight understudies should also count toward damage done by players - if(who && who->IsCreature() && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY) + if (who && who->IsCreature() && who->GetEntry() == NPC_DEATH_KNIGHT_UNDERSTUDY) { me->LowerPlayerDamageReq(damage); } diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 79fd6c7876..3709a766b1 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -206,7 +206,7 @@ public: void OnCreatureCreate(Creature* creature) override { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_PATCHWERK: _patchwerkGUID = creature->GetGUID(); @@ -277,7 +277,7 @@ public: return; } - switch(pGo->GetEntry()) + switch (pGo->GetEntry()) { case GO_PATCHWERK_GATE: _patchwerkGateGUID = pGo->GetGUID(); @@ -621,7 +621,7 @@ public: void SetData(uint32 id, uint32 data) override { - switch(id) + switch (id) { case DATA_ABOMINATION_KILLED: abominationsKilled++; @@ -768,7 +768,7 @@ public: return false; // Bosses data - switch(bossId) + switch (bossId) { case BOSS_KELTHUZAD: if (state == NOT_STARTED) diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 68491abc57..eb39ef71b6 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -382,7 +382,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -799,7 +799,7 @@ public: if (!summon) return; summons.Summon(summon); - switch(summon->GetEntry()) + switch (summon->GetEntry()) { case NPC_ARCANE_OVERLOAD: summon->CastSpell(summon, SPELL_ARCANE_OVERLOAD_DMG, true); @@ -989,7 +989,7 @@ public: void DoAction(int32 param) override { - switch(param) + switch (param) { case 1: MoveTimer = 1; @@ -1123,7 +1123,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -1183,7 +1183,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -1321,12 +1321,12 @@ public: void DoAction(int32 param) override { - switch(param) + switch (param) { case 1: // move to next point if (Vehicle* v = me->GetVehicleKit()) if (Unit* pass = v->GetPassenger(0)) - switch(pass->GetEntry()) + switch (pass->GetEntry()) { case NPC_NEXUS_LORD: { @@ -1357,7 +1357,7 @@ public: { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -1397,7 +1397,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp index 62b425431d..6419f3b44c 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp @@ -97,7 +97,7 @@ public: void OnCreatureCreate(Creature* creature) override { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_MALYGOS: NPC_MalygosGUID = creature->GetGUID(); @@ -107,7 +107,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_IRIS_N: case GO_IRIS_H: @@ -124,7 +124,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_IRIS_ACTIVATED: if (EncounterStatus == NOT_STARTED) @@ -134,7 +134,7 @@ public: break; case DATA_ENCOUNTER_STATUS: EncounterStatus = data; - switch(data) + switch (data) { case NOT_STARTED: bPokeAchiev = false; @@ -184,7 +184,7 @@ public: ObjectGuid GetGuidData(uint32 type) const override { - switch(type) + switch (type) { case DATA_MALYGOS_GUID: return NPC_MalygosGUID; @@ -195,7 +195,7 @@ public: void ProcessEvent(WorldObject* /*unit*/, uint32 eventId) override { - switch(eventId) + switch (eventId) { case 20158: if (GameObject* go = instance->GetGameObject(GO_PlatformGUID)) @@ -233,7 +233,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_10: case ACHIEV_CRITERIA_A_POKE_IN_THE_EYE_25: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index e6c9d06a8d..3781b4799d 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -105,9 +105,9 @@ public: { pInstance->SetData(DATA_DRAKOS, DONE); for( uint8 i = 0; i < 3; ++i ) - if( ObjectGuid guid = pInstance->GetGuidData(DATA_DCD_1 + i) ) - if( GameObject* pGo = ObjectAccessor::GetGameObject(*me, guid) ) - if( pGo->GetGoState() != GO_STATE_ACTIVE ) + if (ObjectGuid guid = pInstance->GetGuidData(DATA_DCD_1 + i)) + if (GameObject* pGo = ObjectAccessor::GetGameObject(*me, guid)) + if (pGo->GetGoState() != GO_STATE_ACTIVE ) { pGo->SetLootState(GO_READY); pGo->UseDoorOrButton(0, false); @@ -125,17 +125,17 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; DoMeleeAttackIfReady(); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -206,10 +206,10 @@ public: void MovementInform(uint32 type, uint32 id) override { - if( type != POINT_MOTION_TYPE || id != 1 ) + if (type != POINT_MOTION_TYPE || id != 1) return; - if( !located ) + if (!located) gonext = true; } @@ -231,21 +231,21 @@ public: void UpdateAI(uint32 diff) override { - if( timer == 0 ) + if (timer == 0) me->CastSpell(me, SPELL_TELEPORT_VISUAL, true); timer += diff; - if( timer > 10000 ) + if (timer > 10000) { - if( !located ) + if (!located) me->GetMotionMaster()->MoveIdle(); located = true; me->CastSpell(me, SPELL_UNSTABLE_SPHERE_PULSE, true); timer -= 2000; } - if( !located && gonext ) + if (!located && gonext) { PickNewLocation(); gonext = false; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 00d6348603..2a26a8492f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -93,7 +93,7 @@ public: if (pInstance) { pInstance->SetData(DATA_EREGOS, NOT_STARTED); - if( pInstance->GetData(DATA_UROM) != DONE ) + if (pInstance->GetData(DATA_UROM) != DONE ) me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); else me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); @@ -110,17 +110,17 @@ public: { pInstance->SetData(DATA_EREGOS, IN_PROGRESS); - if( me->FindNearestCreature(NPC_AMBER_DRAKE, 750.0f, true) ) + if (me->FindNearestCreature(NPC_AMBER_DRAKE, 750.0f, true)) pInstance->SetData(DATA_AMBER_VOID, 0); else pInstance->SetData(DATA_AMBER_VOID, 1); - if( me->FindNearestCreature(NPC_EMERALD_DRAKE, 750.0f, true) ) + if (me->FindNearestCreature(NPC_EMERALD_DRAKE, 750.0f, true)) pInstance->SetData(DATA_EMERALD_VOID, 0); else pInstance->SetData(DATA_EMERALD_VOID, 1); - if( me->FindNearestCreature(NPC_RUBY_DRAKE, 750.0f, true) ) + if (me->FindNearestCreature(NPC_RUBY_DRAKE, 750.0f, true)) pInstance->SetData(DATA_RUBY_VOID, 0); else pInstance->SetData(DATA_RUBY_VOID, 1); @@ -148,10 +148,10 @@ public: void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override { - if( !me->GetMap()->IsHeroic() ) + if (!me->GetMap()->IsHeroic()) return; - if( shiftNumber <= uint32(1) && uint32(me->GetHealth() * 100 / me->GetMaxHealth()) <= uint32(60 - shiftNumber * 40) ) + if (shiftNumber <= uint32(1) && uint32(me->GetHealth() * 100 / me->GetMaxHealth()) <= uint32(60 - shiftNumber * 40)) { ++shiftNumber; events.RescheduleEvent(EVENT_SPELL_PLANAR_SHIFT, 0ms); @@ -167,7 +167,7 @@ public: void JustSummoned(Creature* pSummon) override { - if( pSummon->GetEntry() != NPC_LEY_GUARDIAN_WHELP ) + if (pSummon->GetEntry() != NPC_LEY_GUARDIAN_WHELP ) return; DoZoneInCombat(pSummon, 300.0f); @@ -175,25 +175,25 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; - if( me->HasAura(SPELL_PLANAR_SHIFT) || me->HasAura(SPELL_DRAKE_STOP_TIME) ) + if (me->HasAura(SPELL_PLANAR_SHIFT) || me->HasAura(SPELL_DRAKE_STOP_TIME)) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; DoMeleeAttackIfReady(); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_ARCANE_BARRAGE: - if( Unit* v = me->GetVictim() ) + if (Unit* v = me->GetVictim()) me->CastSpell(v, SPELL_ARCANE_BARRAGE, false); events.Repeat(2500ms); break; @@ -224,8 +224,8 @@ public: Talk(SAY_SHIELD); me->CastSpell(me, SPELL_PLANAR_SHIFT, false); for( uint8 i = 0; i < 3; ++i ) - if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 300.0f, false) ) - if( Creature* pa = me->SummonCreature(NPC_PLANAR_ANOMALY, *me, TEMPSUMMON_TIMED_DESPAWN, 17000) ) + if (Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 300.0f, false)) + if (Creature* pa = me->SummonCreature(NPC_PLANAR_ANOMALY, *me, TEMPSUMMON_TIMED_DESPAWN, 17000)) { pa->SetCanFly(true); pa->SetDisableGravity(true); @@ -234,7 +234,7 @@ public: pa->CastSpell(pa, SPELL_PLANAR_AURA_DAMAGE, true); if (Aura* a = pa->GetAura(SPELL_PLANAR_AURA_DAMAGE)) a->SetDuration(15000); - if( pa->AI() ) + if (pa->AI()) { pa->AI()->AttackStart(t); pa->GetMotionMaster()->MoveChase(t, 0.01f); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index f5547129e5..9807f0244a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -125,7 +125,7 @@ public: if (pInstance) { pInstance->SetData(DATA_UROM, NOT_STARTED); - if( pInstance->GetData(DATA_VAROS) != DONE ) + if (pInstance->GetData(DATA_VAROS) != DONE ) me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); else me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); @@ -143,20 +143,20 @@ public: void JustEngagedWith(Unit* /*who*/) override { - if( lock ) + if (lock) return; uint8 phase = GetPhaseByCurrentPosition(); - if( phase == 3 ) + if (phase == 3) { Talk(SAY_AGGRO); - if( pInstance ) + if (pInstance) pInstance->SetData(DATA_UROM, IN_PROGRESS); me->SetInCombatWithZone(); me->SetHomePosition(cords[0][0], cords[0][1], cords[0][2], cords[0][3]); - if( me->FindCurrentSpellBySpellId(SPELL_EVOCATION) ) + if (me->FindCurrentSpellBySpellId(SPELL_EVOCATION)) me->InterruptNonMeleeSpells(false); events.RescheduleEvent(EVENT_FROSTBOMB, 7s, 11s); @@ -167,7 +167,7 @@ public: { lock = true; - switch( phase ) + switch (phase) { case 0: Talk(SAY_SUMMON_1); @@ -190,7 +190,7 @@ public: void AttackStart(Unit* who) override { - if( lock ) + if (lock) return; if (me->GetDistance(1103.0f, 1049.0f, 510.0f) < 55.0f) @@ -200,8 +200,8 @@ public: void JustSummoned(Creature* pSummon) override { pSummon->SetInCombatWithZone(); - if( Unit* v = pSummon->SelectVictim() ) - if( pSummon->AI() ) + if (Unit* v = pSummon->SelectVictim()) + if (pSummon->AI()) pSummon->AI()->AttackStart(v); } @@ -234,7 +234,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case SPELL_SUMMON_MENAGERIE_1: { @@ -299,9 +299,9 @@ public: void UpdateAI(uint32 diff) override { - if( releaseLockTimer ) + if (releaseLockTimer) { - if( releaseLockTimer >= 5000 ) + if (releaseLockTimer >= 5000) { lock = false; if (me->IsInCombat()) @@ -315,27 +315,27 @@ public: releaseLockTimer += diff; } - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; DoMeleeAttackIfReady(); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_FROSTBOMB: - if( Unit* v = me->GetVictim() ) + if (Unit* v = me->GetVictim()) me->CastSpell(v, SPELL_FROSTBOMB, false); events.Repeat(7s, 11s); break; case EVENT_TIME_BOMB: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, DUNGEON_MODE(SPELL_TIME_BOMB_N, SPELL_TIME_BOMB_H)); events.Repeat(20s, 25s); break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 58e3f4c905..1fa4615940 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -100,7 +100,7 @@ public: if (pInstance) { pInstance->SetData(DATA_VAROS, NOT_STARTED); - if( pInstance->GetData(DATA_CC_COUNT) < 10 ) + if (pInstance->GetData(DATA_CC_COUNT) < 10 ) { me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->CastSpell(me, 50053, true); @@ -157,23 +157,23 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; DoMeleeAttackIfReady(); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_AMPLIFY_MAGIC: { - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_AMPLIFY_MAGIC, false); events.Repeat(17s + 500ms, 22s + 500ms); } @@ -185,7 +185,7 @@ public: { Talk(SAY_AZURE); Talk(SAY_AZURE_EMOTE); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case EVENT_CALL_AZURE_RING_CAPTAIN_1: me->CastSpell(me, SPELL_CALL_AZURE_RING_CAPTAIN_1, true); @@ -204,11 +204,11 @@ public: events.ScheduleEvent(EVENT_CALL_AZURE_RING_CAPTAIN_1, 16s); break; } - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { - if( Creature* trigger = me->SummonCreature(NPC_ARCANE_BEAM, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 13000) ) + if (Creature* trigger = me->SummonCreature(NPC_ARCANE_BEAM, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 13000)) { - if( Creature* c = me->FindNearestCreature(NPC_AZURE_RING_CAPTAIN, 500.0f, true) ) + if (Creature* c = me->FindNearestCreature(NPC_AZURE_RING_CAPTAIN, 500.0f, true)) c->CastSpell(trigger, SPELL_ARCANE_BEAM_VISUAL, true); trigger->GetMotionMaster()->MoveChase(target, 0.1f); trigger->CastSpell(me, SPELL_ARCANE_BEAM_PERIODIC_DAMAGE, true); @@ -234,7 +234,7 @@ public: me->SetControlled(true, UNIT_STATE_ROOT); me->CastSpell((Unit*)nullptr, SPELL_ENERGIZE_CORES, false); ZapAngle += M_PI / 2; - if( ZapAngle >= 2 * M_PI ) + if (ZapAngle >= 2 * M_PI) ZapAngle -= 2 * M_PI; events.ScheduleEvent(EVENT_ENERGIZE_CORES_THIN, 2s); } diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 0aa6de4f42..33069679bc 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -63,7 +63,7 @@ public: void OnCreatureCreate(Creature* pCreature) override { - switch( pCreature->GetEntry() ) + switch (pCreature->GetEntry()) { case NPC_DRAKOS: uiDrakosGUID = pCreature->GetGUID(); @@ -82,19 +82,19 @@ public: void OnGameObjectCreate(GameObject* pGo) override { - switch( pGo->GetEntry() ) + switch (pGo->GetEntry()) { case GO_DRAGON_CAGE_DOOR: for( uint8 i = 0; i < 3; ++i ) { - if( DragonCageDoorGUID[i] ) + if (DragonCageDoorGUID[i]) continue; DragonCageDoorGUID[i] = pGo->GetGUID(); break; } - if( m_auiEncounter[DATA_DRAKOS] == DONE ) - if( pGo->GetGoState() != GO_STATE_ACTIVE ) + if (m_auiEncounter[DATA_DRAKOS] == DONE) + if (pGo->GetGoState() != GO_STATE_ACTIVE ) { pGo->SetLootState(GO_READY); pGo->UseDoorOrButton(0, false); @@ -129,11 +129,11 @@ public: void SetData(uint32 type, uint32 data) override { - switch( type ) + switch (type) { case DATA_DRAKOS: m_auiEncounter[DATA_DRAKOS] = data; - if( data == DONE ) + if (data == DONE) { DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1); DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount); @@ -144,18 +144,18 @@ public: break; case DATA_VAROS: m_auiEncounter[DATA_VAROS] = data; - if( data == DONE ) + if (data == DONE) { DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0); - if( Creature* urom = instance->GetCreature(uiUromGUID) ) + if (Creature* urom = instance->GetCreature(uiUromGUID)) urom->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); } break; case DATA_UROM: m_auiEncounter[DATA_UROM] = data; - if( data == DONE ) - if( Creature* eregos = instance->GetCreature(uiEregosGUID) ) + if (data == DONE) + if (Creature* eregos = instance->GetCreature(uiEregosGUID)) eregos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); break; case DATA_EREGOS: @@ -174,13 +174,13 @@ public: } break; case DATA_CC_COUNT: - if( CentrifugeCount < 10 ) + if (CentrifugeCount < 10) { ++CentrifugeCount; DoUpdateWorldState(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 10 - CentrifugeCount); } - if( CentrifugeCount >= 10 ) - if( Creature* varos = instance->GetCreature(uiVarosGUID) ) + if (CentrifugeCount >= 10) + if (Creature* varos = instance->GetCreature(uiVarosGUID)) { varos->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); varos->InterruptNonMeleeSpells(false); @@ -198,13 +198,13 @@ public: break; } - if( data == DONE ) + if (data == DONE) SaveToDB(); } uint32 GetData(uint32 type) const override { - switch( type ) + switch (type) { case DATA_DRAKOS: case DATA_VAROS: @@ -220,7 +220,7 @@ public: ObjectGuid GetGuidData(uint32 identifier) const override { - switch( identifier ) + switch (identifier) { case DATA_DRAKOS: return uiDrakosGUID; @@ -259,24 +259,24 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* source, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case CRITERIA_EXPERIENCED_AMBER: - if( source ) - if( Unit* drake = source->GetVehicleBase() ) - if( drake->GetEntry() == NPC_AMBER_DRAKE ) + if (source) + if (Unit* drake = source->GetVehicleBase()) + if (drake->GetEntry() == NPC_AMBER_DRAKE ) return true; break; case CRITERIA_EXPERIENCED_EMERALD: - if( source ) - if( Unit* drake = source->GetVehicleBase() ) - if( drake->GetEntry() == NPC_EMERALD_DRAKE ) + if (source) + if (Unit* drake = source->GetVehicleBase()) + if (drake->GetEntry() == NPC_EMERALD_DRAKE ) return true; break; case CRITERIA_EXPERIENCED_RUBY: - if( source ) - if( Unit* drake = source->GetVehicleBase() ) - if( drake->GetEntry() == NPC_RUBY_DRAKE ) + if (source) + if (Unit* drake = source->GetVehicleBase()) + if (drake->GetEntry() == NPC_RUBY_DRAKE ) return true; break; case CRITERIA_AMBER_VOID: diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 0e54a5e370..3f785b6b06 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -157,7 +157,7 @@ public: return; } - if(me->GetEntry() == NPC_BELGARISTRASZ) + if (me->GetEntry() == NPC_BELGARISTRASZ) { Talk(SAY_BELGARISTRASZ); } @@ -167,10 +167,10 @@ public: bool OnGossipHello(Player* player, Creature* creature) override { - if(creature->IsQuestGiver()) + if (creature->IsQuestGiver()) player->PrepareQuestMenu(creature->GetGUID()); - if(creature->GetInstanceScript()->GetData(DATA_DRAKOS) == DONE) + if (creature->GetInstanceScript()->GetData(DATA_DRAKOS) == DONE) { switch (creature->GetEntry()) { @@ -251,10 +251,10 @@ public: bool OnGossipSelect(Player* player, Creature* creature, uint32 /*uiSender*/, uint32 uiAction) override { ClearGossipMenuFor(player); - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_VERDISA: - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: SendGossipMenuFor(player, GOSSIP_TEXTID_VERDISA2, creature->GetGUID()); @@ -273,7 +273,7 @@ public: CloseGossipMenuFor(player); break; case NPC_BELGARISTRASZ: - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF: openedMenu[player->GetGUID()] = true; @@ -415,11 +415,11 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { for( uint8 i = 0; i < 8; ++i ) - if( me->m_spells[i] == spell->Id ) + if (me->m_spells[i] == spell->Id) { - if( target && target->IsAlive() && !target->CanFly() && target->IsHostileTo(me) && !spell->IsTargetingArea()) + if (target && target->IsAlive() && !target->CanFly() && target->IsHostileTo(me) && !spell->IsTargetingArea()) { - if( Unit* charmer = me->GetCharmer() ) + if (Unit* charmer = me->GetCharmer()) Unit::Kill(charmer, charmer, false); } break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 0ad61d242d..376c55cf61 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -143,7 +143,7 @@ public: { if (hp) { - switch(HealthCheck) + switch (HealthCheck) { case 75: Talk(SAY_75HEALTH); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp index 96b1e1a2a9..b6212a1acf 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp @@ -73,7 +73,7 @@ public: void OnCreatureCreate(Creature* pCreature) override { - switch(pCreature->GetEntry()) + switch (pCreature->GetEntry()) { case NPC_BJARNGRIM: m_uiGeneralBjarngrimGUID = pCreature->GetGUID(); @@ -92,7 +92,7 @@ public: void OnGameObjectCreate(GameObject* pGo) override { - switch(pGo->GetEntry()) + switch (pGo->GetEntry()) { case GO_BJARNGRIM_DOOR: m_uiBjarngrimDoorGUID = pGo->GetGUID(); @@ -126,7 +126,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 7321: //Shatter Resistant (2042) return volkhanAchievement; @@ -139,7 +139,7 @@ public: void SetData(uint32 uiType, uint32 uiData) override { m_auiEncounter[uiType] = uiData; - if( uiType == TYPE_LOKEN_INTRO ) + if (uiType == TYPE_LOKEN_INTRO) SaveToDB(); // Achievements @@ -148,10 +148,10 @@ public: else if (uiType == DATA_VOLKHAN_ACHIEVEMENT) volkhanAchievement = (bool)uiData; - if( uiData != DONE ) + if (uiData != DONE) return; - switch(uiType) + switch (uiType) { case TYPE_BJARNGRIM: HandleGameObject(m_uiBjarngrimDoorGUID, true); @@ -197,7 +197,7 @@ public: ObjectGuid GetGuidData(uint32 uiData) const override { - switch(uiData) + switch (uiData) { case TYPE_BJARNGRIM: return m_uiGeneralBjarngrimGUID; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp index 231504ad44..814daf759a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_maiden_of_grief.cpp @@ -95,15 +95,15 @@ public: void UpdateAI(uint32 diff) override { - if(!UpdateVictim()) + if (!UpdateVictim()) return; events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case EVENT_STORM: { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index b4ee33e669..ae209689c4 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -319,7 +319,7 @@ public: me->SetReactState(REACT_PASSIVE); me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); - if(pInstance) + if (pInstance) { pInstance->SetData(BRANN_BRONZEBEARD, 1); pInstance->SetData(DATA_BRANN_ACHIEVEMENT, true); @@ -586,7 +586,7 @@ public: for (int i = 0; i < count; ++i) { Creature* cr = me->SummonCreature(entry, 946.5971f + urand(0, 6), 383.5330f + urand(0, 6), 205.9943f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000); - if(cr) + if (cr) { cr->AI()->AttackStart(me); cr->AddThreat(me, 100.0f); @@ -598,7 +598,7 @@ public: void JustDied(Unit* /*killer*/) override { ResetEvent(); - if(pInstance) + if (pInstance) { if (Creature* brann = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(NPC_BRANN))) { @@ -662,7 +662,7 @@ void brann_bronzebeard::brann_bronzebeardAI::WaypointReached(uint32 id) // In front of Console case 11: SetEscortPaused(true); - if(pInstance) + if (pInstance) { pInstance->SetData(BOSS_TRIBUNAL_OF_AGES, IN_PROGRESS); if (GameObject* tribunal = ObjectAccessor::GetGameObject(*me, pInstance->GetGuidData(GO_TRIBUNAL_CONSOLE))) @@ -672,7 +672,7 @@ void brann_bronzebeard::brann_bronzebeardAI::WaypointReached(uint32 id) // Before Sjonnir's door case 27: SetEscortPaused(true); - if(pInstance) + if (pInstance) { pInstance->SetData(BRANN_BRONZEBEARD, 5); me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp index 8449a7795f..619d5e724e 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp @@ -80,7 +80,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_KADDRAK: goKaddrakGUID = go->GetGUID(); @@ -124,7 +124,7 @@ public: void OnCreatureCreate(Creature* creature) override { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SJONNIR: SjonnirGUID = creature->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 8007e94d94..c56188547b 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -340,7 +340,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_FUSION_PUNCH: me->CastSpell(me->GetVictim(), SPELL_FUSION_PUNCH, false); @@ -509,7 +509,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_RUNE_OF_POWER: { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 7b1ebde906..a3869ededa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -432,7 +432,7 @@ public: events.Repeat(20s); return; case EVENT_SUMMON: - if(summons.size() < 20) + if (summons.size() < 20) if (Creature* lift = DoSummonFlyer(NPC_MECHANOLIFT, me, 30.0f, 50.0f, 0)) lift->GetMotionMaster()->MoveRandom(100); @@ -474,9 +474,9 @@ public: return; } - if(me->isAttackReady() && !me->HasUnitState(UNIT_STATE_STUNNED)) + if (me->isAttackReady() && !me->HasUnitState(UNIT_STATE_STUNNED)) { - if(me->IsWithinCombatRange(me->GetVictim(), 15.0f)) + if (me->IsWithinCombatRange(me->GetVictim(), 15.0f)) { me->CastSpell(me->GetVictim(), SPELL_BATTERING_RAM, false); me->resetAttackTimer(); @@ -1036,7 +1036,7 @@ public: _switchTargetTimer += diff; if (_switchTargetTimer >= 30000) { - if(Unit* target = me->SelectNearbyTarget(nullptr, 200.0f)) + if (Unit* target = me->SelectNearbyTarget(nullptr, 200.0f)) { if (target->GetVehicleBase() && target->GetVehicleBase()->GetEntry() == NPC_SEAT) { diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index aa44195409..df194ce325 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -502,7 +502,7 @@ public: events.ScheduleEvent(EVENT_FREYA_BERSERK, 10min); events.SetPhase(EVENT_PHASE_ADDS); - if( !m_pInstance ) + if (!m_pInstance) return; if (m_pInstance->GetData(TYPE_FREYA) != DONE) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index be71517da3..a04be87777 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -177,7 +177,7 @@ public: void DoAction(int32 param) override { - switch( param ) + switch (param) { case 1: hardmodeAvailable = false; @@ -209,18 +209,18 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; - if( !berserk && (me->GetPositionX() < 1720.0f || me->GetPositionX() > 1940.0f || me->GetPositionY() < 20.0f || me->GetPositionY() > 210.0f) ) + if (!berserk && (me->GetPositionX() < 1720.0f || me->GetPositionX() > 1940.0f || me->GetPositionY() < 20.0f || me->GetPositionY() > 210.0f)) events.RescheduleEvent(EVENT_BERSERK, 1ms); events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -238,7 +238,7 @@ public: for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { Player* temp = itr->GetSource(); - if( temp->IsAlive() && temp->GetDistance(me) > 15.0f ) + if (temp->IsAlive() && temp->GetDistance(me) > 15.0f ) players.push_back(temp); } if (!players.empty()) @@ -256,7 +256,7 @@ public: me->SetGuidValue(UNIT_FIELD_TARGET, me->GetVictim()->GetGUID()); break; case EVENT_SPELL_SEARING_FLAMES: - if(!me->HasAura(SPELL_SARONITE_BARRIER)) + if (!me->HasAura(SPELL_SARONITE_BARRIER)) me->CastSpell(me->GetVictim(), SPELL_SEARING_FLAMES, false); events.Repeat(me->GetMap()->Is25ManRaid() ? 8s : 15s); break; @@ -273,19 +273,19 @@ public: std::vector<Player*> inside; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* tmp = itr->GetSource() ) - if( tmp->IsAlive() ) + if (Player* tmp = itr->GetSource()) + if (tmp->IsAlive()) { - if( tmp->GetDistance(me) > 15.0f ) + if (tmp->GetDistance(me) > 15.0f ) outside.push_back(tmp); else inside.push_back(tmp); } Player* t = nullptr; - if( outside.size() >= uint8(me->GetMap()->Is25ManRaid() ? 9 : 4) ) + if (outside.size() >= uint8(me->GetMap()->Is25ManRaid() ? 9 : 4)) t = outside.at(urand(0, outside.size() - 1)); - else if( !inside.empty() ) + else if (!inside.empty()) t = inside.at(urand(0, inside.size() - 1)); if (t) @@ -299,7 +299,7 @@ public: vaporsCount++; me->CastSpell(me, SPELL_SUMMON_SARONITE_VAPORS, false); - if( vaporsCount < 6 || !hardmodeAvailable ) + if (vaporsCount < 6 || !hardmodeAvailable) events.Repeat(30s); else { @@ -321,7 +321,7 @@ public: if (summons.size()) { Talk(SAY_EMOTE_ANIMUS); - if( Creature* sv = ObjectAccessor::GetCreature(*me, *(summons.begin())) ) + if (Creature* sv = ObjectAccessor::GetCreature(*me, *(summons.begin()))) sv->CastSpell(sv, SPELL_SARONITE_ANIMUS_FORMATION_VISUAL, true); events.ScheduleEvent(EVENT_SPELL_SUMMON_SARONITE_ANIMUS, 2s); @@ -334,7 +334,7 @@ public: Talk(SAY_HARDMODE); Talk(SAY_EMOTE_BARRIER); me->CastSpell(me, SPELL_SARONITE_BARRIER, true); - if( Creature* sv = ObjectAccessor::GetCreature(*me, *(summons.begin())) ) + if (Creature* sv = ObjectAccessor::GetCreature(*me, *(summons.begin()))) sv->CastSpell(sv, SPELL_SUMMON_SARONITE_ANIMUS, true); events.ScheduleEvent(EVENT_DESPAWN_SARONITE_VAPORS, 2500ms); @@ -357,8 +357,8 @@ public: Talk(SAY_DEATH); - if( GameObject* door = me->FindNearestGameObject(GO_VEZAX_DOOR, 500.0f) ) - if( door->GetGoState() != GO_STATE_ACTIVE ) + if (GameObject* door = me->FindNearestGameObject(GO_VEZAX_DOOR, 500.0f)) + if (door->GetGoState() != GO_STATE_ACTIVE ) { door->SetLootState(GO_READY); door->UseDoorOrButton(0, false); @@ -367,7 +367,7 @@ public: void KilledUnit(Unit* who) override { - if( who->IsPlayer() ) + if (who->IsPlayer()) Talk(SAY_SLAY); } @@ -410,8 +410,8 @@ public: me->CastSpell(me, SPELL_SARONITE_VAPORS_AURA, true); // killed saronite vapors, hard mode unavailable - if( pInstance ) - if( Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX)) ) + if (pInstance) + if (Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX))) vezax->AI()->DoAction(1); } @@ -437,8 +437,8 @@ public: npc_ulduar_saronite_animusAI(Creature* pCreature) : ScriptedAI(pCreature) { pInstance = pCreature->GetInstanceScript(); - if( pInstance ) - if( Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX)) ) + if (pInstance) + if (Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX))) vezax->AI()->JustSummoned(me); timer = 0; me->SetInCombatWithZone(); @@ -451,8 +451,8 @@ public: { me->DespawnOrUnsummon(3000); - if( pInstance ) - if( Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX)) ) + if (pInstance) + if (Creature* vezax = ObjectAccessor::GetCreature(*me, pInstance->GetGuidData(TYPE_VEZAX))) vezax->AI()->DoAction(2); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 7c1dbd1364..956763df85 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -310,7 +310,7 @@ public: void SmallIcicles(bool enable) { - if( enable ) + if (enable) me->CastSpell(me, SPELL_ICICLE_BOSS_AURA, true); else me->RemoveAura(SPELL_ICICLE_BOSS_AURA); @@ -318,7 +318,7 @@ public: void SpellHitTarget(Unit* target, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case SPELL_ICICLE_TBBA: me->CastSpell(target, SPELL_ICICLE_VISUAL_UNPACKED, true); @@ -360,9 +360,9 @@ public: events.Reset(); summons.DespawnAll(); - if( GameObject* d = me->FindNearestGameObject(GO_HODIR_FROZEN_DOOR, 250.0f)) + if (GameObject* d = me->FindNearestGameObject(GO_HODIR_FROZEN_DOOR, 250.0f)) { - if( d->GetGoState() != GO_STATE_ACTIVE ) + if (d->GetGoState() != GO_STATE_ACTIVE ) { d->SetLootState(GO_READY); d->UseDoorOrButton(0, false); @@ -370,7 +370,7 @@ public: } if (GameObject* d = me->FindNearestGameObject(GO_HODIR_DOOR, 250.0f)) { - if( d->GetGoState() != GO_STATE_ACTIVE ) + if (d->GetGoState() != GO_STATE_ACTIVE ) { d->SetLootState(GO_READY); d->UseDoorOrButton(0, false); @@ -414,7 +414,7 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; switch (events.ExecuteEvent()) @@ -518,7 +518,7 @@ public: void SpawnHelpers() { char faction = 'A'; - if( hhd[0][0].id ) + if (hhd[0][0].id) { Map::PlayerList const& cl = me->GetMap()->GetPlayers(); for (Map::PlayerList::const_iterator itr = cl.begin(); itr != cl.end(); ++itr) @@ -530,25 +530,25 @@ public: } uint8 cnt = 0; - if( faction ) + if (faction) for( uint8 k = 0; k < 4; ++k ) { - if( (faction == 'A' && ( k > 1 || (k == 1 && RAID_MODE(1, 0)) )) || - (faction == 'H' && ( k < 2 || (k == 3 && RAID_MODE(1, 0)) )) ) + if ((faction == 'A' && ( k > 1 || (k == 1 && RAID_MODE(1, 0)))) || + (faction == 'H' && ( k < 2 || (k == 3 && RAID_MODE(1, 0))))) continue; for( uint8 i = 0; i < 4; ++i ) { - if( !hhd[k][i].id ) + if (!hhd[k][i].id) continue; - if( Creature* h_p = me->SummonCreature(hhd[k][i].id, hhd[k][i].x, hhd[k][i].y, 432.69f, M_PI / 2) ) + if (Creature* h_p = me->SummonCreature(hhd[k][i].id, hhd[k][i].x, hhd[k][i].y, 432.69f, M_PI / 2)) { h_p->SetFaction(1665); - if( cnt < 8 ) + if (cnt < 8) Helpers[cnt++] = h_p->GetGUID(); - if( Creature* c = h_p->SummonCreature(NPC_FLASH_FREEZE_NPC, h_p->GetPositionX(), h_p->GetPositionY(), h_p->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000) ) + if (Creature* c = h_p->SummonCreature(NPC_FLASH_FREEZE_NPC, h_p->GetPositionX(), h_p->GetPositionY(), h_p->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000)) { c->CastSpell(h_p, SPELL_FLASH_FREEZE_TRAPPED_NPC, true); JustSummoned(c); @@ -644,7 +644,7 @@ public: void UpdateAI(uint32 diff) override { - if( timer1 <= diff ) + if (timer1 <= diff) { me->CastSpell(me, (me->GetEntry() == 33169 ? SPELL_ICICLE_FALL_EFFECT_UNPACKED : SPELL_ICICLE_FALL_EFFECT_PACKED), true); me->CastSpell(me, SPELL_ICICLE_VISUAL_FALLING, false); @@ -745,7 +745,7 @@ public: { if (a == 1) { - if( GameObject* fire = me->FindNearestGameObject(194300, 1.0f) ) + if (GameObject* fire = me->FindNearestGameObject(194300, 1.0f)) { fire->SetOwnerGUID(ObjectGuid::Empty); fire->Delete(); @@ -756,7 +756,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case SPELL_ICE_SHARDS_SMALL: case SPELL_ICE_SHARDS_BIG: @@ -803,7 +803,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) + if (spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { events.Reset(); events.ScheduleEvent(EVENT_TRY_FREE_HELPER, 2s); @@ -814,19 +814,19 @@ public: { events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_TRY_FREE_HELPER: { - if( !me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC) ) - if( pInstance ) - if( ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR) ) - if( Creature* hodir = ObjectAccessor::GetCreature(*me, g) ) + if (!me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) + if (pInstance) + if (ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR)) + if (Creature* hodir = ObjectAccessor::GetCreature(*me, g)) { AttackStart(hodir); ScheduleAbilities(); @@ -900,7 +900,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) + if (spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { events.Reset(); events.ScheduleEvent(EVENT_TRY_FREE_HELPER, 2s); @@ -911,19 +911,19 @@ public: { events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_TRY_FREE_HELPER: { - if( !me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC) ) - if( pInstance ) - if( ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR) ) - if( Creature* hodir = ObjectAccessor::GetCreature(*me, g) ) + if (!me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) + if (pInstance) + if (ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR)) + if (Creature* hodir = ObjectAccessor::GetCreature(*me, g)) { AttackStart(hodir); ScheduleAbilities(); @@ -998,7 +998,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) + if (spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { events.Reset(); events.ScheduleEvent(EVENT_TRY_FREE_HELPER, 2s); @@ -1016,19 +1016,19 @@ public: { events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_TRY_FREE_HELPER: { - if( !me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC) ) - if( pInstance ) - if( ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR) ) - if( Creature* hodir = ObjectAccessor::GetCreature(*me, g) ) + if (!me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) + if (pInstance) + if (ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR)) + if (Creature* hodir = ObjectAccessor::GetCreature(*me, g)) { AttackStart(hodir); ScheduleAbilities(); @@ -1100,7 +1100,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if(spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) + if (spell->Id == SPELL_FLASH_FREEZE_TRAPPED_NPC) { events.Reset(); events.ScheduleEvent(EVENT_TRY_FREE_HELPER, 2s); @@ -1111,19 +1111,19 @@ public: { events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_TRY_FREE_HELPER: { - if( !me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC) ) - if( pInstance ) - if( ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR) ) - if( Creature* hodir = ObjectAccessor::GetCreature(*me, g) ) + if (!me->HasAura(SPELL_FLASH_FREEZE_TRAPPED_NPC)) + if (pInstance) + if (ObjectGuid g = pInstance->GetGuidData(TYPE_HODIR)) + if (Creature* hodir = ObjectAccessor::GetCreature(*me, g)) { AttackStart(hodir); ScheduleAbilities(); @@ -1147,14 +1147,14 @@ public: bool found = false; me->GetCreaturesWithEntryInRange(FB, 150.0f, NPC_FLASH_FREEZE_NPC); for( std::list<Creature*>::const_iterator itr = FB.begin(); itr != FB.end(); ++itr ) - if( !((*itr)->HasAura(SPELL_MAGE_MELT_ICE)) ) + if (!((*itr)->HasAura(SPELL_MAGE_MELT_ICE))) { me->CastSpell((*itr), SPELL_MAGE_MELT_ICE, false); found = true; break; } - if( found ) + if (found) { events.DelayEvents(2s); events.Repeat(2s); @@ -1372,7 +1372,7 @@ class spell_hodir_flash_freeze_aura : public AuraScript if (target->IsPlayer()) { caster->ToCreature()->AI()->SetData(1, 1); - if( Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_PLR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 5 * 60 * 1000) ) + if (Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_PLR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 5 * 60 * 1000)) { c->CastSpell(target, SPELL_FLASH_FREEZE_TRAPPED_PLAYER, true); caster->ToCreature()->AI()->JustSummoned(c); @@ -1380,7 +1380,7 @@ class spell_hodir_flash_freeze_aura : public AuraScript } else if (target->IsCreature()) { - if( Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_NPC, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000) ) + if (Creature* c = target->SummonCreature(NPC_FLASH_FREEZE_NPC, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 2000)) { c->CastSpell(target, SPELL_FLASH_FREEZE_TRAPPED_NPC, true); caster->ToCreature()->AI()->JustSummoned(c); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index f44e278d4b..a19b91a95c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -148,7 +148,7 @@ public: void DamageTaken(Unit* attacker, uint32& damage, DamageEffectType, SpellSchoolMask) override { - if( damage >= RAID_MODE(3000U, 5000U) && me->GetAura(S_BRITTLE) ) + if (damage >= RAID_MODE(3000U, 5000U) && me->GetAura(S_BRITTLE)) { me->CastSpell(me, SPELL_SHATTER, true); Unit::Kill(attacker, me); @@ -219,7 +219,7 @@ public: bShattered = false; lastShatterMSTime = 0; - if( InstanceScript* m_pInstance = me->GetInstanceScript() ) + if (InstanceScript* m_pInstance = me->GetInstanceScript()) { m_pInstance->SetData(TYPE_IGNIS, NOT_STARTED); m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_STOKIN_THE_FURNACE_EVENT); @@ -256,7 +256,7 @@ public: Talk(SAY_AGGRO); DoZoneInCombat(); - if( InstanceScript* m_pInstance = me->GetInstanceScript() ) + if (InstanceScript* m_pInstance = me->GetInstanceScript()) { m_pInstance->SetData(TYPE_IGNIS, IN_PROGRESS); m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_STOKIN_THE_FURNACE_EVENT); @@ -298,7 +298,7 @@ public: { Talk(SAY_DEATH); - if( me->GetInstanceScript() ) + if (me->GetInstanceScript()) me->GetInstanceScript()->SetData(TYPE_IGNIS, DONE); std::list<Creature*> icl; @@ -324,7 +324,7 @@ public: if (!UpdateVictim()) return; - if( me->GetPositionX() < 490.0f || me->GetPositionX() > 690.0f || me->GetPositionY() < 130.0f || me->GetPositionY() > 410.0f ) + if (me->GetPositionX() < 490.0f || me->GetPositionX() > 690.0f || me->GetPositionY() < 130.0f || me->GetPositionY() > 410.0f ) { EnterEvadeMode(EVADE_REASON_OTHER); return; @@ -380,9 +380,9 @@ public: for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) { temp = itr->GetSource(); - if( !temp->IsAlive() || temp->GetExactDist2d(me) > 90.0f ) + if (!temp->IsAlive() || temp->GetExactDist2d(me) > 90.0f ) continue; - if( me->GetVictim() && temp->GetGUID() == me->GetVictim()->GetGUID() ) + if (me->GetVictim() && temp->GetGUID() == me->GetVictim()->GetGUID()) continue; bool found = false; for (std::list<Creature*>::iterator iterator = icl.begin(); iterator != icl.end(); ++iterator) @@ -394,14 +394,14 @@ public: } } - if( !found ) + if (!found) playerGUIDs.push_back(temp->GetGUID()); } - if( !playerGUIDs.empty() ) + if (!playerGUIDs.empty()) { int8 pos = urand(0, playerGUIDs.size() - 1); - if( Player* pTarget = ObjectAccessor::GetPlayer(*me, playerGUIDs.at(pos)) ) + if (Player* pTarget = ObjectAccessor::GetPlayer(*me, playerGUIDs.at(pos))) { Talk(SAY_SLAG_POT); me->CastSpell(pTarget, SPELL_GRAB, false); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index fdbebae70d..ae7d9d955c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -573,7 +573,7 @@ public: { float x, y, z; // left arm - if( me->GetEntry() == NPC_LEFT_ARM ) + if (me->GetEntry() == NPC_LEFT_ARM ) { x = 1776.97f; y = -44.8396f; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 5ced2828d8..d306053870 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -417,16 +417,16 @@ public: events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_COMPUTER_SAY_INITIATED: - if( Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000) ) + if (Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) computer->AI()->Talk(TALK_COMPUTER_INITIATED); break; case EVENT_COMPUTER_SAY_MINUTES: - if( Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000) ) + if (Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) computer->AI()->Talk(minutesTalkNum++); break; case EVENT_MIMIRON_SAY_HARDMODE: @@ -442,12 +442,12 @@ public: std::vector<Player*> pg; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( plr->IsAlive() && plr->GetExactDist2d(me) < 150.0f && !plr->IsGameMaster() ) + if (Player* plr = itr->GetSource()) + if (plr->IsAlive() && plr->GetExactDist2d(me) < 150.0f && !plr->IsGameMaster()) pg.push_back(plr); for( uint8 i = 0; i < 3; ++i ) - if( !pg.empty() ) + if (!pg.empty()) { uint8 index = urand(0, pg.size() - 1); Player* player = pg[index]; @@ -467,7 +467,7 @@ public: case EVENT_BERSERK: berserk = true; Talk(SAY_BERSERK); - if( hardmode ) + if (hardmode) me->SummonCreature(33576, 2744.78f, 2569.47f, 364.32f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 120000); events.ScheduleEvent(EVENT_BERSERK_2, 0ms); break; @@ -486,7 +486,7 @@ public: } break; case EVENT_SIT_LMK2: - if(Creature* LMK2 = GetLMK2()) + if (Creature* LMK2 = GetLMK2()) { me->EnterVehicle(LMK2, 6); events.ScheduleEvent(EVENT_SIT_LMK2_INTERVAL, 2s); @@ -500,8 +500,8 @@ public: if (hardmode) { LMK2->CastSpell(LMK2, SPELL_EMERGENCY_MODE, true); - if( Vehicle* veh = LMK2->GetVehicleKit() ) - if( Unit* cannon = veh->GetPassenger(3) ) + if (Vehicle* veh = LMK2->GetVehicleKit()) + if (Unit* cannon = veh->GetPassenger(3)) cannon->CastSpell(cannon, SPELL_EMERGENCY_MODE, true); } LMK2->AI()->SetData(1, 1); @@ -521,7 +521,7 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); break; case EVENT_ELEVATOR_INTERVAL_0: - if( GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 100.0f) ) + if (GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 100.0f)) { elevator->SetLootState(GO_READY); elevator->UseDoorOrButton(0, false); @@ -530,9 +530,9 @@ public: events.ScheduleEvent(EVENT_ELEVATOR_INTERVAL_1, 6s); break; case EVENT_ELEVATOR_INTERVAL_1: - if(me->SummonCreature(NPC_VX001, 2744.65f, 2569.46f, 364.40f, 3.14f, TEMPSUMMON_MANUAL_DESPAWN)) + if (me->SummonCreature(NPC_VX001, 2744.65f, 2569.46f, 364.40f, 3.14f, TEMPSUMMON_MANUAL_DESPAWN)) { - if( GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 100.0f) ) + if (GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 100.0f)) { elevator->SetLootState(GO_READY); elevator->UseDoorOrButton(0, true); @@ -557,7 +557,7 @@ public: events.ScheduleEvent(EVENT_ENTER_VX001, 5s); break; case EVENT_ENTER_VX001: - if( Creature* VX001 = GetVX001() ) + if (Creature* VX001 = GetVX001()) { me->EnterVehicle(VX001, 1); events.ScheduleEvent(EVENT_EMOTE_VX001, 2s); @@ -566,7 +566,7 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); break; case EVENT_EMOTE_VX001: - if( Creature* VX001 = GetVX001() ) + if (Creature* VX001 = GetVX001()) { VX001->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE); events.ScheduleEvent(EVENT_VX001_START_FIGHT, 1750ms); @@ -575,9 +575,9 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); break; case EVENT_VX001_START_FIGHT: - if( Creature* VX001 = GetVX001() ) + if (Creature* VX001 = GetVX001()) { - if( hardmode ) + if (hardmode) VX001->CastSpell(VX001, SPELL_EMERGENCY_MODE, true); VX001->AI()->SetData(1, 2); me->SetInCombatWithZone(); @@ -586,7 +586,7 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); break; case EVENT_VX001_EMOTESTATE_DEATH: - if( Creature* VX001 = GetVX001() ) + if (Creature* VX001 = GetVX001()) { VX001->HandleEmoteCommand(EMOTE_STATE_DROWNED); VX001->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DROWNED); @@ -596,8 +596,8 @@ public: EnterEvadeMode(EVADE_REASON_OTHER); break; case EVENT_GET_OUT_VX001: - if( Creature* VX001 = GetVX001() ) - if( Creature* ACU = me->SummonCreature(NPC_AERIAL_COMMAND_UNIT, 2743.91f, 2568.78f, 391.34f, M_PI, TEMPSUMMON_MANUAL_DESPAWN) ) + if (Creature* VX001 = GetVX001()) + if (Creature* ACU = me->SummonCreature(NPC_AERIAL_COMMAND_UNIT, 2743.91f, 2568.78f, 391.34f, M_PI, TEMPSUMMON_MANUAL_DESPAWN)) { me->EnterVehicle(VX001, 4); float speed = ACU->GetDistance(2737.75f, 2574.22f, 381.34f) / 2.0f; @@ -614,7 +614,7 @@ public: events.ScheduleEvent(EVENT_ENTER_ACU, 7s); break; case EVENT_ENTER_ACU: - if( Creature* ACU = GetACU() ) + if (Creature* ACU = GetACU()) { me->EnterVehicle(ACU, 0); events.ScheduleEvent(EVENT_SAY_ACU_ACTIVATE, 6s); @@ -627,9 +627,9 @@ public: events.ScheduleEvent(EVENT_ACU_START_ATTACK, 4s); break; case EVENT_ACU_START_ATTACK: - if( Creature* ACU = GetACU() ) + if (Creature* ACU = GetACU()) { - if( hardmode ) + if (hardmode) ACU->CastSpell(ACU, SPELL_EMERGENCY_MODE, true); ACU->AI()->SetData(1, 3); me->SetInCombatWithZone(); @@ -654,7 +654,7 @@ public: { Creature* LMK2 = GetLMK2(); Creature* VX001 = GetVX001(); - if( !VX001 || !LMK2 ) + if (!VX001 || !LMK2) { EnterEvadeMode(EVADE_REASON_OTHER); return; @@ -670,7 +670,7 @@ public: { Creature* VX001 = GetVX001(); Creature* LMK2 = GetLMK2(); - if( !VX001 || !LMK2 ) + if (!VX001 || !LMK2) { EnterEvadeMode(EVADE_REASON_OTHER); return; @@ -687,7 +687,7 @@ public: { Creature* ACU = GetACU(); Creature* VX001 = GetVX001(); - if( !VX001 || !ACU ) + if (!VX001 || !ACU) { EnterEvadeMode(EVADE_REASON_OTHER); return; @@ -705,7 +705,7 @@ public: Creature* VX001 = GetVX001(); Creature* LMK2 = GetLMK2(); Creature* ACU = GetACU(); - if( !VX001 || !LMK2 || !ACU ) + if (!VX001 || !LMK2 || !ACU) { EnterEvadeMode(EVADE_REASON_OTHER); return; @@ -717,7 +717,7 @@ public: LMK2->CastSpell(LMK2, SPELL_SELF_REPAIR, true); //LMK2->SetHealth( LMK2->GetMaxHealth()/2 ); VX001->CastSpell(VX001, SPELL_SELF_REPAIR, true); //VX001->SetHealth( VX001->GetMaxHealth()/2 ); ACU->CastSpell(ACU, SPELL_SELF_REPAIR, true); //ACU->SetHealth( ACU->GetMaxHealth()/2 ); - if( hardmode ) + if (hardmode) { LMK2->CastSpell(LMK2, SPELL_EMERGENCY_MODE, true); VX001->CastSpell(VX001, SPELL_EMERGENCY_MODE, true); @@ -770,11 +770,11 @@ public: DoCastSelf(SPELL_SLEEP_VISUAL_1); - if( pInstance ) + if (pInstance) for( uint16 i = 0; i < 3; ++i ) - if( ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i) ) - if( GameObject* door = ObjectAccessor::GetGameObject(*me, guid) ) - if( door->GetGoState() != GO_STATE_ACTIVE ) + if (ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i)) + if (GameObject* door = ObjectAccessor::GetGameObject(*me, guid)) + if (door->GetGoState() != GO_STATE_ACTIVE ) { door->SetLootState(GO_READY); door->UseDoorOrButton(0, false); @@ -784,7 +784,7 @@ public: pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, NPC_LEVIATHAN_MKII, 1, me); if (hardmode) - if( Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000) ) + if (Creature* computer = me->SummonCreature(NPC_COMPUTER, 2746.7f, 2569.44f, 410.39f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) computer->AI()->Talk(TALK_COMPUTER_TERMINATED); events.Reset(); @@ -873,19 +873,19 @@ public: void ResetGameObjects() { - if( pInstance ) + if (pInstance) for( uint16 i = 0; i < 3; ++i ) - if( ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i) ) - if( GameObject* door = ObjectAccessor::GetGameObject(*me, guid) ) - if( door->GetGoState() != GO_STATE_ACTIVE ) + if (ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i)) + if (GameObject* door = ObjectAccessor::GetGameObject(*me, guid)) + if (door->GetGoState() != GO_STATE_ACTIVE ) { door->SetLootState(GO_READY); door->UseDoorOrButton(0, false); } - if( GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 200.0f) ) + if (GameObject* elevator = me->FindNearestGameObject(GO_MIMIRON_ELEVATOR, 200.0f)) { - if( elevator->GetGoState() != GO_STATE_ACTIVE ) + if (elevator->GetGoState() != GO_STATE_ACTIVE ) { elevator->SetLootState(GO_READY); elevator->SetByteValue(GAMEOBJECT_BYTES_1, 0, GO_STATE_ACTIVE); @@ -893,8 +893,8 @@ public: elevator->EnableCollision(false); } - if( GameObject* button = me->FindNearestGameObject(GO_BUTTON, 200.0f) ) - if( button->GetGoState() != GO_STATE_READY ) + if (GameObject* button = me->FindNearestGameObject(GO_BUTTON, 200.0f)) + if (button->GetGoState() != GO_STATE_READY ) { button->SetLootState(GO_READY); button->UseDoorOrButton(0, false); @@ -904,18 +904,18 @@ public: void CloseDoorAndButton() { - if( pInstance ) + if (pInstance) for( uint16 i = 0; i < 3; ++i ) - if( ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i) ) - if( GameObject* door = ObjectAccessor::GetGameObject(*me, guid) ) - if( door->GetGoState() != GO_STATE_READY ) + if (ObjectGuid guid = pInstance->GetGuidData(DATA_GO_MIMIRON_DOOR_1 + i)) + if (GameObject* door = ObjectAccessor::GetGameObject(*me, guid)) + if (door->GetGoState() != GO_STATE_READY ) { door->SetLootState(GO_READY); door->UseDoorOrButton(0, false); } - if( GameObject* button = me->FindNearestGameObject(GO_BUTTON, 200.0f) ) - if( button->GetGoState() != GO_STATE_ACTIVE ) + if (GameObject* button = me->FindNearestGameObject(GO_BUTTON, 200.0f)) + if (button->GetGoState() != GO_STATE_ACTIVE ) { button->SetLootState(GO_READY); button->UseDoorOrButton(0, false); @@ -1143,7 +1143,7 @@ public: Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) if (Player* plr = itr->GetSource()) - if( plr->IsAlive() && plr->GetDistance2d(me) > 15.0f ) + if (plr->IsAlive() && plr->GetDistance2d(me) > 15.0f ) pList.push_back(plr); if (!pList.empty()) @@ -1151,7 +1151,7 @@ public: else pTarget = (Player*)SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true); - if( pTarget ) + if (pTarget) cannon->CastSpell(pTarget, SPELL_NAPALM_SHELL, false); events.Repeat(14s); @@ -1236,7 +1236,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if( spell->Id == SPELL_SELF_REPAIR ) + if (spell->Id == SPELL_SELF_REPAIR) { me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); @@ -1339,7 +1339,7 @@ public: void DoAction(int32 action) override { if (action == 1337) - if( Vehicle* vk = me->GetVehicleKit() ) + if (Vehicle* vk = me->GetVehicleKit()) for (uint8 i = 0; i < 2; ++i) if (Unit* r = vk->GetPassenger(5 + i)) if (r->IsCreature()) @@ -1422,15 +1422,15 @@ public: events.Repeat(10s); break; case EVENT_SPELL_ROCKET_STRIKE: - if( Vehicle* vk = me->GetVehicleKit() ) + if (Vehicle* vk = me->GetVehicleKit()) { for( int i = 0; i < (Phase / 2); ++i ) { uint8 index = (Phase == 2 ? rand() % 2 : i); - if( Unit* r = vk->GetPassenger(5 + index) ) + if (Unit* r = vk->GetPassenger(5 + index)) if (Player* temp = SelectTargetFromPlayerList(100.0f)) { - if( Creature* trigger = me->SummonCreature(NPC_ROCKET_STRIKE_N, temp->GetPositionX(), temp->GetPositionY(), temp->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 6000) ) + if (Creature* trigger = me->SummonCreature(NPC_ROCKET_STRIKE_N, temp->GetPositionX(), temp->GetPositionY(), temp->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 6000)) trigger->CastSpell(trigger, SPELL_ROCKET_STRIKE_AURA, true); Position exitPos = r->GetPosition(); exitPos.m_positionX += cos(me->GetOrientation()) * 2.35f; @@ -1473,7 +1473,7 @@ public: vb->SendMeleeAttackStop(); vb->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE); - if( !leftarm ) + if (!leftarm) { vb->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOM_SPELL_03); me->CastSpell(p, SPELL_HAND_PULSE_R, false); @@ -1560,7 +1560,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if( spell->Id == SPELL_SELF_REPAIR ) + if (spell->Id == SPELL_SELF_REPAIR) { me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); @@ -1715,12 +1715,12 @@ public: return; // following :D - if( Phase == 3 && !immobilized ) - if( Unit* victim = me->GetVictim() ) - if( me->GetExactDist2d(victim) > 25.0f ) + if (Phase == 3 && !immobilized) + if (Unit* victim = me->GetVictim()) + if (me->GetExactDist2d(victim) > 25.0f ) { float angle = victim->GetAngle(me->GetPositionX(), me->GetPositionY()); - me->SetOrientation( me->GetAngle(victim->GetPositionX(), victim->GetPositionY()) ); + me->SetOrientation( me->GetAngle(victim->GetPositionX(), victim->GetPositionY())); float x = victim->GetPositionX() + 15.0f * cos(angle); float y = victim->GetPositionY() + 15.0f * std::sin(angle); @@ -1759,11 +1759,11 @@ public: case 0: break; case EVENT_SPELL_PLASMA_BALL: - if( !immobilized ) + if (!immobilized) { if (Phase == 3) { - if( Unit* victim = me->GetVictim() ) + if (Unit* victim = me->GetVictim()) me->CastSpell(victim, SPELL_PLASMA_BALL, false); } else @@ -1778,18 +1778,18 @@ public: events.Repeat(3s); break; case EVENT_SUMMON_BOMB_BOT: - if( !immobilized ) + if (!immobilized) me->CastSpell(me, SPELL_SUMMON_BOMB_BOT, false); events.Repeat(15s); break; case EVENT_SUMMON_ASSAULT_BOT: - if( GameObject* pad = me->FindNearestGameObject(RAND(194742, 194746, 194745), 200.0f) ) + if (GameObject* pad = me->FindNearestGameObject(RAND(194742, 194746, 194745), 200.0f)) if (Creature* trigger = me->SummonCreature(NPC_BOT_SUMMON_TRIGGER, *pad, TEMPSUMMON_TIMED_DESPAWN, 15000)) trigger->AI()->DoAction(2); events.Repeat(30s); break; case EVENT_SUMMON_JUNK_BOT: - if( GameObject* pad = me->FindNearestGameObject(RAND(194741, 194744, 194747), 200.0f) ) + if (GameObject* pad = me->FindNearestGameObject(RAND(194741, 194744, 194747), 200.0f)) if (Creature* trigger = me->SummonCreature(NPC_BOT_SUMMON_TRIGGER, *pad, TEMPSUMMON_TIMED_DESPAWN, 15000)) trigger->AI()->DoAction(1); events.Repeat(10s); @@ -1798,7 +1798,7 @@ public: { uint32 ids[3] = {194740, 194743, 194748}; for( uint8 i = 0; i < 3; ++i ) - if( GameObject* pad = me->FindNearestGameObject(ids[i], 200.0f) ) + if (GameObject* pad = me->FindNearestGameObject(ids[i], 200.0f)) if (Creature* trigger = me->SummonCreature(NPC_BOT_SUMMON_TRIGGER, *pad, TEMPSUMMON_MANUAL_DESPAWN)) trigger->AI()->DoAction(3); events.Repeat(45s); @@ -1871,7 +1871,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - if( spell->Id == SPELL_SELF_REPAIR ) + if (spell->Id == SPELL_SELF_REPAIR) { me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); me->SetReactState(REACT_AGGRESSIVE); @@ -2062,7 +2062,7 @@ public: void DoAction(int32 param) override { - switch( param ) + switch (param) { case 1: me->CastSpell(me, SPELL_BEAM_GREEN, true); @@ -2081,14 +2081,14 @@ public: void UpdateAI(uint32 diff) override { - if( timer <= diff ) + if (timer <= diff) { uint32 option_npcid[3] = {NPC_JUNK_BOT, NPC_ASSAULT_BOT, NPC_EMERGENCY_FIRE_BOT}; InstanceScript* pInstance = me->GetInstanceScript(); if (Creature* ACU = GetACU()) // ACU summons for easy removing - if( Creature* bot = ACU->SummonCreature( option_npcid[option - 1], *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000 ) ) + if (Creature* bot = ACU->SummonCreature( option_npcid[option - 1], *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 25000)) { - if( option < 3 ) + if (option < 3) bot->SetInCombatWithZone(); if (Creature* m = GetMimiron()) if (m->AI()->GetData(1)) // hardmode @@ -2190,12 +2190,12 @@ public: bool OnGossipHello(Player* player, GameObject* go) override { - if(!player || !go) + if (!player || !go) return true; if (InstanceScript* instance = go->GetInstanceScript()) { - if(instance->GetData(TYPE_MIMIRON) != NOT_STARTED) + if (instance->GetData(TYPE_MIMIRON) != NOT_STARTED) return false; if (Creature* c = ObjectAccessor::GetCreature(*go, instance->GetGuidData(TYPE_MIMIRON))) @@ -2226,7 +2226,7 @@ public: CreateTime = GameTime::GetGameTime().count(); events.Reset(); events.ScheduleEvent(EVENT_FLAMES_SPREAD, 5750ms); - if( Creature* flame = me->SummonCreature(NPC_FLAMES_SPREAD, me->GetPositionX(), me->GetPositionY(), 364.32f, 0.0f) ) + if (Creature* flame = me->SummonCreature(NPC_FLAMES_SPREAD, me->GetPositionX(), me->GetPositionY(), 364.32f, 0.0f)) { FlameList.push_back(flame->GetGUID()); flame->CastSpell(flame, SPELL_FLAMES_AURA, true); @@ -2245,7 +2245,7 @@ public: void SpreadFlame(float x, float y) { - if( Creature* flame = me->SummonCreature(NPC_FLAMES_SPREAD, x, y, 364.32f, 0.0f) ) + if (Creature* flame = me->SummonCreature(NPC_FLAMES_SPREAD, x, y, 364.32f, 0.0f)) { FlameList.push_back(flame->GetGUID()); if (Creature* c = me->FindNearestCreature(NPC_FLAMES_SPREAD, 10.0f)) @@ -2280,13 +2280,13 @@ public: events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_FLAMES_SPREAD: { - if( FlameList.empty() ) + if (FlameList.empty()) { me->DespawnOrUnsummon(); return; @@ -2300,15 +2300,15 @@ public: } Creature* last = ObjectAccessor::GetCreature(*me, FlameList.back()); - if( last ) + if (last) { float prevdist = 100.0f; Player* target = nullptr; Map::PlayerList const& pl = me->GetMap()->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( plr->IsAlive() && plr->GetExactDist2d(last) < prevdist && !plr->IsGameMaster() ) + if (Player* plr = itr->GetSource()) + if (plr->IsAlive() && plr->GetExactDist2d(last) < prevdist && !plr->IsGameMaster()) { target = plr; prevdist = plr->GetExactDist2d(last); @@ -2345,7 +2345,7 @@ public: void SpellHit(Unit* /*caster*/, SpellInfo const* spell) override { - switch( spell->Id ) + switch (spell->Id) { case SPELL_FROST_BOMB_EXPLOSION_10: case SPELL_FROST_BOMB_EXPLOSION_25: @@ -2403,7 +2403,7 @@ public: void UpdateAI(uint32 diff) override { events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 985c014da5..8d9dae387f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -197,7 +197,7 @@ public: bGroundPhase = false; flyTimes = 0; - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_RAZORSCALE, NOT_STARTED); } @@ -223,7 +223,7 @@ public: uint8 i = 0; for( std::list<Creature*>::iterator itr = eeList.begin(); itr != eeList.end(); ++itr ) { - if( i > 2 ) + if (i > 2) break; ExpeditionEngineerGUIDs[i] = (*itr)->GetGUID(); if (!i) @@ -233,7 +233,7 @@ public: if (Creature* c = me->FindNearestCreature(NPC_EXPEDITION_COMMANDER, 300.0f, true)) CommanderGUID = c->GetGUID(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_RAZORSCALE, IN_PROGRESS); } @@ -241,7 +241,7 @@ public: { summons.DespawnAll(); - if( pInstance ) + if (pInstance) pInstance->SetData(TYPE_RAZORSCALE, DONE); } @@ -278,18 +278,18 @@ public: case SPELL_CHAIN_4: { uint8 count = 0; - if( me->HasAura(SPELL_CHAIN_1) ) + if (me->HasAura(SPELL_CHAIN_1)) count++; - if( me->HasAura(SPELL_CHAIN_3) ) + if (me->HasAura(SPELL_CHAIN_3)) count++; if (RAID_MODE(0, 1)) { - if( me->HasAura(SPELL_CHAIN_2) ) + if (me->HasAura(SPELL_CHAIN_2)) count++; - if( me->HasAura(SPELL_CHAIN_4) ) + if (me->HasAura(SPELL_CHAIN_4)) count++; } - if( count >= REQ_CHAIN_COUNT ) + if (count >= REQ_CHAIN_COUNT) { if (Creature* commander = ObjectAccessor::GetCreature(*me, CommanderGUID)) commander->AI()->Talk(SAY_COMMANDER_GROUND_PHASE); @@ -397,25 +397,25 @@ public: } break; case EVENT_SPELL_FIREBALL: - if( Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true) ) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true)) me->CastSpell(pTarget, SPELL_FIREBALL, false); events.Repeat(4s); break; case EVENT_SPELL_DEVOURING_FLAME: - if( Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true) ) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true)) me->CastSpell(pTarget, SPELL_DEVOURINGFLAME, false); events.Repeat(13s); break; case EVENT_SUMMON_MOLE_MACHINES: { memset(cords, '\0', sizeof(cords)); - uint8 num = RAID_MODE( urand(2, 3), urand(2, 4) ); + uint8 num = RAID_MODE( urand(2, 3), urand(2, 4)); for( int i = 0; i < num; ++i ) { // X: (550, 625) Y: (-185, -230) cords[i][0] = urand(550, 625); cords[i][1] = -230 + rand() % 45; - if( GameObject* drill = me->SummonGameObject(GO_DRILL, cords[i][0], cords[i][1], 391.1f, M_PI / 4, 0.0f, 0.0f, 0.0f, 0.0f, 8) ) + if (GameObject* drill = me->SummonGameObject(GO_DRILL, cords[i][0], cords[i][1], 391.1f, M_PI / 4, 0.0f, 0.0f, 0.0f, 0.0f, 8)) { //drill->SetGoAnimProgress(0); //drill->SetLootState(GO_READY); @@ -432,13 +432,13 @@ public: case EVENT_SUMMON_ADDS: for( int i = 0; i < 4; ++i ) { - if( !cords[i][0] ) + if (!cords[i][0]) break; uint8 opt; uint8 r = urand(1, 100); - if( r <= 30 ) opt = 1; - else if( r <= 65 ) opt = 2; + if (r <= 30) opt = 1; + else if (r <= 65) opt = 2; else opt = 3; for( int j = 0; j < 4; ++j ) @@ -447,13 +447,13 @@ public: float y = cords[i][1] + 4.0f * std::sin(j * M_PI / 2); uint32 npc_entry = 0; - switch( opt ) + switch (opt) { case 1: - if( j == 1 ) npc_entry = NPC_DARK_RUNE_SENTINEL; + if (j == 1) npc_entry = NPC_DARK_RUNE_SENTINEL; break; case 2: - switch( j ) + switch (j) { case 1: npc_entry = NPC_DARK_RUNE_WATCHER; @@ -464,7 +464,7 @@ public: } break; default: // case 3: - switch( j ) + switch (j) { case 1: npc_entry = NPC_DARK_RUNE_WATCHER; @@ -479,7 +479,7 @@ public: break; } - if( npc_entry ) + if (npc_entry) if (Creature* c = me->SummonCreature(npc_entry, x, y, 391.1f, j * M_PI / 2, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000)) DoZoneInCombat(c); } @@ -498,8 +498,8 @@ public: me->SetInCombatWithZone(); // just in case if (pInstance) for( int i = 0; i < 4; ++i ) - if( ObjectGuid guid = pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1 + i) ) - if( Creature* hfs = ObjectAccessor::GetCreature(*me, guid) ) + if (ObjectGuid guid = pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1 + i)) + if (Creature* hfs = ObjectAccessor::GetCreature(*me, guid)) { me->SummonCreature(34188, hfs->GetPositionX(), hfs->GetPositionY(), hfs->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 22000); hfs->AI()->SetData(1, 0); @@ -515,7 +515,7 @@ public: } me->CastSpell(me, SPELL_WINGBUFFET, true); - if( (me->GetHealth() * 100) / me->GetMaxHealth() < 50 ) // start phase 3 + if ((me->GetHealth() * 100) / me->GetMaxHealth() < 50 ) // start phase 3 { Talk(EMOTE_PERMA_GROUND); me->SetControlled(false, UNIT_STATE_ROOT); @@ -753,11 +753,11 @@ public: { if (pInstance) { - if( me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1) ) + if (me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1)) return GO_HARPOON_GUN_1; - else if( me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_2) ) + else if (me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_2)) return GO_HARPOON_GUN_2; - else if( me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_3) ) + else if (me->GetGUID() == pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_3)) return GO_HARPOON_GUN_3; else return GO_HARPOON_GUN_4; @@ -773,12 +773,12 @@ public: if (pInstance) { uint32 h_entry = GetHarpoonGunIdForThisHFS(); - if( GameObject* wh = me->FindNearestGameObject(h_entry, 5.0f) ) + if (GameObject* wh = me->FindNearestGameObject(h_entry, 5.0f)) { wh->SetRespawnTime(0); wh->Delete(); } - if( GameObject* bh = me->FindNearestGameObject(GO_BROKEN_HARPOON, 5.0f) ) + if (GameObject* bh = me->FindNearestGameObject(GO_BROKEN_HARPOON, 5.0f)) if (bh->GetPhaseMask() != 1) bh->SetPhaseMask(1, true); } @@ -789,9 +789,9 @@ public: { if (++repairPoints >= REPAIR_POINTS) { - if( GameObject* bh = me->FindNearestGameObject(GO_BROKEN_HARPOON, 4.0f) ) + if (GameObject* bh = me->FindNearestGameObject(GO_BROKEN_HARPOON, 4.0f)) bh->SetPhaseMask(2, true); - if( GameObject* wh = me->SummonGameObject(GetHarpoonGunIdForThisHFS(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 3 * M_PI / 2, 0.0f, 0.0f, 0.0f, 0.0f, 0) ) + if (GameObject* wh = me->SummonGameObject(GetHarpoonGunIdForThisHFS(), me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 3 * M_PI / 2, 0.0f, 0.0f, 0.0f, 0.0f, 0)) { me->RemoveGameObject(wh, false); if (Creature* cr = me->SummonCreature(NPC_RAZORSCALE_CONTROLLER, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 5000)) @@ -884,7 +884,7 @@ public: if (Creature* c = ObjectAccessor::GetCreature(*me, fixingGUID)) if (me->GetExactDist2dSq(c) <= 25.0f) { - if( me->GetUInt32Value(UNIT_NPC_EMOTESTATE) != EMOTE_STATE_WORK ) + if (me->GetUInt32Value(UNIT_NPC_EMOTESTATE) != EMOTE_STATE_WORK ) me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_WORK); if (std::fabs(me->GetOrientation() - me->GetAngle(c)) > M_PI / 4) @@ -899,10 +899,10 @@ public: if (!fixingGUID) { Creature* razorscale = nullptr; - if( ObjectGuid rsGUID = pInstance->GetGuidData(TYPE_RAZORSCALE) ) + if (ObjectGuid rsGUID = pInstance->GetGuidData(TYPE_RAZORSCALE)) razorscale = ObjectAccessor::GetCreature(*me, rsGUID); - if( !razorscale || !razorscale->IsInCombat() ) + if (!razorscale || !razorscale->IsInCombat()) { Reset(); me->GetMotionMaster()->MoveTargetedHome(); @@ -910,8 +910,8 @@ public: } for( int i = 0; i < 4; ++i ) - if( ObjectGuid fs_GUID = pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1 + i) ) - if( Creature* fs = ObjectAccessor::GetCreature(*me, fs_GUID) ) + if (ObjectGuid fs_GUID = pInstance->GetGuidData(DATA_HARPOON_FIRE_STATE_1 + i)) + if (Creature* fs = ObjectAccessor::GetCreature(*me, fs_GUID)) if (!fs->AI()->GetData(2)) { float a = rand_norm() * M_PI; @@ -940,18 +940,18 @@ public: bool OnGossipHello(Player* user, GameObject* go) override { - if( !user || !go ) + if (!user || !go) return true; InstanceScript* pInstance = go->GetInstanceScript(); - if( !pInstance ) + if (!pInstance) return true; Creature* rs = nullptr; - if( ObjectGuid rsGUID = pInstance->GetGuidData(TYPE_RAZORSCALE) ) + if (ObjectGuid rsGUID = pInstance->GetGuidData(TYPE_RAZORSCALE)) rs = ObjectAccessor::GetCreature(*go, rsGUID); - if( !rs || !rs->IsInCombat() ) + if (!rs || !rs->IsInCombat()) { go->SetRespawnTime(0); go->Delete(); @@ -960,7 +960,7 @@ public: uint32 npc = 0; uint32 spell = 0; - switch( go->GetEntry() ) + switch (go->GetEntry()) { case GO_HARPOON_GUN_1: npc = DATA_HARPOON_FIRE_STATE_1; @@ -980,8 +980,8 @@ public: break; } - if( ObjectGuid g = pInstance->GetGuidData(npc) ) - if( Creature* hfs = ObjectAccessor::GetCreature(*go, g) ) + if (ObjectGuid g = pInstance->GetGuidData(npc)) + if (Creature* hfs = ObjectAccessor::GetCreature(*go, g)) hfs->AI()->SetData(3, spell); go->SetLootState(GO_JUST_DEACTIVATED); @@ -1017,7 +1017,7 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; if (timer2 <= diff) timer2 = 0; @@ -1066,10 +1066,10 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; - if( timer1 <= diff ) + if (timer1 <= diff) { me->CastSpell(me->GetVictim(), SPELL_CHAINLIGHTNING, false); timer1 = urand(10000, 12000); @@ -1122,10 +1122,10 @@ public: void UpdateAI(uint32 diff) override { - if( !UpdateVictim() ) + if (!UpdateVictim()) return; - if( timer1 <= diff ) + if (timer1 <= diff) { me->CastSpell(me, SPELL_BATTLE_SHOUT, false); timer1 = urand(15000, 20000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index f516bfc845..6be19da410 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1416,14 +1416,14 @@ public: void RunRunicSmash(bool cast) { - if (Creature* cr = ObjectAccessor::GetCreature(*me, _leftHand ? _triggerLeftGUID[0] : _triggerRightGUID[0]) ) + if (Creature* cr = ObjectAccessor::GetCreature(*me, _leftHand ? _triggerLeftGUID[0] : _triggerRightGUID[0])) { if (cast) cr->CastSpell(cr, SPELL_RUNIC_SMASH_DAMAGE, true); cr->SetPosition(_leftHand ? 2235.0f : 2221.0f, _nextTriggerPos, cr->GetPositionZ(), 0.0f); cr->StopMovingOnCurrentPos(); } - if( Creature* cr = ObjectAccessor::GetCreature(*me, _leftHand ? _triggerLeftGUID[1] : _triggerRightGUID[1]) ) + if (Creature* cr = ObjectAccessor::GetCreature(*me, _leftHand ? _triggerLeftGUID[1] : _triggerRightGUID[1])) { if (cast) cr->CastSpell(cr, SPELL_RUNIC_SMASH_DAMAGE, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index c67299d861..750df991f1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -308,7 +308,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { // Control events case EVENT_HEALTH_CHECK: @@ -509,7 +509,7 @@ public: _spawnSelection++; break; case 3: - if(_pummelerCount < 2) + if (_pummelerCount < 2) me->SummonCreature(NPC_XM024_PUMMELLER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + 2, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); _pummelerCount++; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp index dc2e9c641b..68702d3138 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yoggsaron.cpp @@ -791,7 +791,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case EVENT_SARA_P1_DOORS_CLOSE: // Whispers of YS @@ -1405,7 +1405,7 @@ public: { // Stun if (me->GetInstanceScript()) - if(Creature* sara = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(NPC_SARA))) + if (Creature* sara = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(NPC_SARA))) sara->AI()->DoAction(MINUTE * IN_MILLISECONDS - std::min((uint32)MINUTE * IN_MILLISECONDS, _induceTimer)); _induceTimer = 0; @@ -1419,7 +1419,7 @@ public: return; summons.DespawnAll(); - switch(param) + switch (param) { case ACTION_ILLUSION_STORMWIND: PrepareStormwindIllusion(); @@ -1472,7 +1472,7 @@ public: me->CastSpell(me, SPELL_BRAIN_HURT_VISUAL, true); if (me->GetInstanceScript()) - if(Creature* sara = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(NPC_SARA))) + if (Creature* sara = ObjectAccessor::GetCreature(*me, me->GetInstanceScript()->GetGuidData(NPC_SARA))) sara->AI()->DoAction(ACTION_BRAIN_DAMAGED); } } @@ -1905,7 +1905,7 @@ public: if (_visualTimer) { _visualTimer += diff; - if (_visualTimer >= 100 && _visualTimer < 10000 ) + if (_visualTimer >= 100 && _visualTimer < 10000) { me->CastSpell(me, SPELL_SIMPLE_TELEPORT, false); _visualTimer = 10000; @@ -1989,7 +1989,7 @@ public: if (_checkTimer != 0) { _checkTimer -= diff; - if (_checkTimer < 0 ) + if (_checkTimer < 0) _checkTimer = 0; } else @@ -2076,7 +2076,7 @@ public: if (_checkTimer != 0) { _checkTimer -= diff; - if (_checkTimer < 0 ) + if (_checkTimer < 0) _checkTimer = 0; } else @@ -2171,7 +2171,7 @@ public: if (_checkTimer != 0) { _checkTimer -= diff; - if (_checkTimer < 0 ) + if (_checkTimer < 0) _checkTimer = 0; } else diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index bf51c0556d..300acd1e28 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -310,7 +310,7 @@ public: void OnCreatureCreate(Creature* creature) override { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_LEVIATHAN: m_uiLeviathanGUID = creature->GetGUID(); @@ -373,11 +373,11 @@ public: break; case NPC_HARPOON_FIRE_STATE: { - if( creature->GetPositionX() > 595 ) + if (creature->GetPositionX() > 595 ) m_RazorscaleHarpoonFireStateGUID[3] = creature->GetGUID(); - else if( creature->GetPositionX() > 585 ) + else if (creature->GetPositionX() > 585 ) m_RazorscaleHarpoonFireStateGUID[2] = creature->GetGUID(); - else if( creature->GetPositionX() > 575 ) + else if (creature->GetPositionX() > 575 ) m_RazorscaleHarpoonFireStateGUID[1] = creature->GetGUID(); else m_RazorscaleHarpoonFireStateGUID[0] = creature->GetGUID(); @@ -446,7 +446,7 @@ public: // Flame Leviathan case GO_REPAIR_STATION_TRAP: { - if(m_RepairSGUID[0]) + if (m_RepairSGUID[0]) m_RepairSGUID[1] = gameObject->GetGUID(); else m_RepairSGUID[0] = gameObject->GetGUID(); @@ -558,15 +558,15 @@ public: case GO_HODIR_FROZEN_DOOR: case GO_HODIR_DOOR: if (GetData(TYPE_HODIR) == DONE) - if( gameObject->GetGoState() != GO_STATE_ACTIVE ) + if (gameObject->GetGoState() != GO_STATE_ACTIVE ) { gameObject->SetLootState(GO_READY); gameObject->UseDoorOrButton(0, false); } break; case GO_VEZAX_DOOR: - if( GetData(TYPE_VEZAX) == DONE ) - if( gameObject->GetGoState() != GO_STATE_ACTIVE ) + if (GetData(TYPE_VEZAX) == DONE ) + if (gameObject->GetGoState() != GO_STATE_ACTIVE ) { gameObject->SetLootState(GO_READY); gameObject->UseDoorOrButton(0, false); @@ -669,7 +669,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case TYPE_LEVIATHAN: m_auiEncounter[type] = data; @@ -1056,7 +1056,7 @@ public: uint32 GetData(uint32 type) const override { - switch(type) + switch (type) { case TYPE_LEVIATHAN: case TYPE_IGNIS: diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 56734e1400..7b44e22c63 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -189,7 +189,7 @@ public: else if (s->GetEntry() == NPC_THROW) { ThrowGUID = s->GetGUID(); - if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 70.0f, true) ) + if (Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 70.0f, true)) s->GetMotionMaster()->MovePoint(0, t->GetPositionX(), t->GetPositionY(), t->GetPositionZ()); } } @@ -246,10 +246,10 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -263,16 +263,16 @@ public: events.RescheduleEvent(EVENT_ANNHYLDE_YELL, 3s); break; case EVENT_VALKYR_MOVE: - if( Creature* s = ObjectAccessor::GetCreature(*me, ValkyrGUID) ) + if (Creature* s = ObjectAccessor::GetCreature(*me, ValkyrGUID)) s->GetMotionMaster()->MovePoint(1, s->GetPositionX(), s->GetPositionY(), s->GetPositionZ() - 15.0f); break; case EVENT_ANNHYLDE_YELL: - if( Creature* s = ObjectAccessor::GetCreature(*me, ValkyrGUID) ) + if (Creature* s = ObjectAccessor::GetCreature(*me, ValkyrGUID)) s->AI()->Talk(YELL_ANHYLDE_2); break; case EVENT_VALKYR_BEAM: me->RemoveAura(SPELL_SUMMON_VALKYR); - if( Creature* c = ObjectAccessor::GetCreature(*me, ValkyrGUID) ) + if (Creature* c = ObjectAccessor::GetCreature(*me, ValkyrGUID)) c->CastSpell(me, SPELL_RESURRECTION_BEAM, false); events.RescheduleEvent(EVENT_RESURRECTION_BALL, 4s); break; @@ -291,7 +291,7 @@ public: events.RescheduleEvent(EVENT_START_PHASE_2, 1s); break; case EVENT_START_PHASE_2: - if( Creature* c = ObjectAccessor::GetCreature(*me, ValkyrGUID) ) + if (Creature* c = ObjectAccessor::GetCreature(*me, ValkyrGUID)) { c->DespawnOrUnsummon(); summons.DespawnAll(); @@ -327,7 +327,7 @@ public: events.Repeat(15s, 20s); break; case EVENT_SPELL_CLEAVE_OR_WOE_STRIKE: - if( me->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID) == 0 ) + if (me->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID) == 0 ) { events.Repeat(3s); break; @@ -339,7 +339,7 @@ public: events.Repeat(3s, 7s); break; case EVENT_SPELL_SMASH: - if( me->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID) == 0 ) + if (me->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID) == 0 ) { events.Repeat(3s); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 56582fdc58..e03daa35b0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -76,7 +76,7 @@ public: if (Unit* s = t->GetSummonerUnit()) { PrisonerGUID = s->GetGUID(); - if( me->GetInstanceScript() && me->GetInstanceScript()->instance->IsHeroic() ) + if (me->GetInstanceScript() && me->GetInstanceScript()->instance->IsHeroic()) { const int32 dmg = 2000; c->CastCustomSpell(s, SPELL_FROST_TOMB_AURA, nullptr, &dmg, nullptr, true); @@ -105,7 +105,7 @@ public: { if (Unit* p = ObjectAccessor::GetUnit(*me, PrisonerGUID)) { - if( !p->HasAura(SPELL_FROST_TOMB_AURA) ) + if (!p->HasAura(SPELL_FROST_TOMB_AURA)) me->KillSelf(); } else @@ -173,7 +173,7 @@ public: void AttackStart(Unit* who) override { - if( !who ) + if (!who) return; UnitAI::AttackStartCaster(who, 12.0f); @@ -186,10 +186,10 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; @@ -198,8 +198,8 @@ public: events.Repeat(4s, 5s); break; case EVENT_FROST_TOMB: - if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true) ) - if( !target->HasAura(SPELL_FROST_TOMB_AURA) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true)) + if (!target->HasAura(SPELL_FROST_TOMB_AURA)) { Talk(SAY_FROST_TOMB_EMOTE, target); Talk(SAY_FROST_TOMB); @@ -215,8 +215,8 @@ public: { float dist = rand_norm() * 4 + 3.0f; float angle = rand_norm() * 2 * M_PI; - if( Creature* c = me->SummonCreature(NPC_SKELETON, 156.2f + cos(angle) * dist, 259.1f + std::sin(angle) * dist, 42.9f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000) ) - if( Unit* target = c->SelectNearestTarget(250.0f) ) + if (Creature* c = me->SummonCreature(NPC_SKELETON, 156.2f + cos(angle) * dist, 259.1f + std::sin(angle) * dist, 42.9f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 20000)) + if (Unit* target = c->SelectNearestTarget(250.0f)) { c->AddThreat(target, 5.0f); DoZoneInCombat(c); @@ -266,7 +266,7 @@ public: { events.Reset(); events.RescheduleEvent(EVENT_SPELL_DECREPIFY, 10s, 20s); - if( IsHeroic() ) + if (IsHeroic()) events.RescheduleEvent(EVENT_SPELL_BONE_ARMOR, 25s, 120s); } @@ -292,9 +292,9 @@ public: void UpdateAI(uint32 diff) override { - if( pInstance && pInstance->GetData(DATA_KELESETH) != IN_PROGRESS ) + if (pInstance && pInstance->GetData(DATA_KELESETH) != IN_PROGRESS ) { - if( me->IsAlive() ) + if (me->IsAlive()) me->KillSelf(); return; } @@ -304,20 +304,20 @@ public: events.Update(diff); - if( me->HasUnitState(UNIT_STATE_CASTING) ) + if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_SPELL_DECREPIFY: - if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) me->CastSpell(me->GetVictim(), SPELL_DECREPIFY, false); events.Repeat(15s, 25s); break; case EVENT_SPELL_BONE_ARMOR: - if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) me->CastSpell((Unit*)nullptr, SPELL_BONE_ARMOR, false); events.Repeat(40s, 120s); break; @@ -337,7 +337,7 @@ public: break; } - if( !me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE) ) + if (!me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)) DoMeleeAttackIfReady(); } }; @@ -356,7 +356,7 @@ class spell_frost_tomb_aura : public AuraScript { PreventDefaultAction(); if (aurEff->GetTickNumber() == 1) - if( Unit* target = GetTarget() ) + if (Unit* target = GetTarget()) target->CastSpell((Unit*)nullptr, SPELL_FROST_TOMB_SUMMON, true); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp index e7cdbee371..475fa0c2e9 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp @@ -107,7 +107,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_BELLOW_1: GO_ForgeBellowGUID[0] = go->GetGUID(); @@ -158,7 +158,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_KELESETH: m_auiEncounter[0] = data; @@ -307,7 +307,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 7231: // On The Rocks return bRocksAchiev; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 5222dcae79..3229d8c96c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -174,11 +174,11 @@ public: // Reset mini bosses for(uint8 i = 0; i < 4; ++i) { - if(Creature* Animal = ObjectAccessor::GetCreature(*me, m_pInstance->GetGuidData(DATA_NPC_FRENZIED_WORGEN + i))) + if (Creature* Animal = ObjectAccessor::GetCreature(*me, m_pInstance->GetGuidData(DATA_NPC_FRENZIED_WORGEN + i))) { Animal->SetPosition(Animal->GetHomePosition()); Animal->StopMovingOnCurrentPos(); - if(Animal->isDead()) + if (Animal->isDead()) Animal->Respawn(true); Animal->CastSpell(Animal, SPELL_FREEZE, true); @@ -322,7 +322,7 @@ public: void JustDied(Unit* /*pKiller*/) override { me->PlayDirectSound(SOUND_DEATH); - if(m_pInstance) + if (m_pInstance) m_pInstance->SetData(DATA_GORTOK_PALEHOOF, DONE); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 221d462c25..c67253561e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -148,7 +148,7 @@ public: me->UpdatePosition(343.02f, -507.325f, 104.567f, M_PI, true); me->StopMovingOnCurrentPos(); - if(m_pInstance) + if (m_pInstance) { m_pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_LODI_DODI); m_pInstance->SetData(DATA_SKADI_THE_RUTHLESS, NOT_STARTED); @@ -355,7 +355,7 @@ public: void MovementInform(uint32 /*uiType*/, uint32 Id) override { - switch(Id) + switch (Id) { case 0: case 1: diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 35409dd8b5..ffb35c90a0 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -193,7 +193,7 @@ public: { summons.DespawnAll(); Talk(SAY_DEATH); - if(instance) + if (instance) instance->SetData(DATA_SVALA_SORROWGRAVE, DONE); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index aacaf7f8eb..c922640ee9 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -148,7 +148,7 @@ public: me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE); - if(pInstance) + if (pInstance) { pInstance->SetData(DATA_KING_YMIRON, NOT_STARTED); pInstance->SetData(DATA_YMIRON_ACHIEVEMENT, true); @@ -168,7 +168,7 @@ public: void JustEngagedWith(Unit* /*pWho*/) override { Talk(SAY_AGGRO); - if(pInstance) + if (pInstance) { pInstance->SetData(DATA_KING_YMIRON, IN_PROGRESS); if (pInstance->GetData(DATA_SKADI_THE_RUTHLESS) == DONE) @@ -183,7 +183,7 @@ public: void MovementInform(uint32 uiType, uint32 point) override { - if(uiType != POINT_MOTION_TYPE) + if (uiType != POINT_MOTION_TYPE) return; if (point == 0) @@ -271,7 +271,7 @@ public: king->SetDisableGravity(true); me->RemoveUnitFlag(UNIT_FLAG_DISABLE_MOVE); me->GetMotionMaster()->MoveChase(me->GetVictim()); - switch(BoatOrder[BoatNum - 1]) + switch (BoatOrder[BoatNum - 1]) { case 0: events.ScheduleEvent(EVENT_YMIRON_RANULF_ABILITY, 3s, 1); @@ -338,7 +338,7 @@ public: summons.DespawnAll(); summons2.DespawnAll(); - if(pInstance) + if (pInstance) pInstance->SetData(DATA_KING_YMIRON, DONE); } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp index 4d9ac638c3..0b03703106 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp @@ -73,14 +73,14 @@ public: bool IsEncounterInProgress() const override { for(uint8 i = 0; i < MAX_ENCOUNTERS; ++i) - if(Encounters[i] == IN_PROGRESS) + if (Encounters[i] == IN_PROGRESS) return true; return false; } void OnCreatureCreate(Creature* pCreature) override { - switch(pCreature->GetEntry()) + switch (pCreature->GetEntry()) { case NPC_SVALA_SORROWGRAVE: SvalaSorrowgrave = pCreature->GetGUID(); @@ -114,7 +114,7 @@ public: void OnGameObjectCreate(GameObject* pGo) override { - switch(pGo->GetEntry()) + switch (pGo->GetEntry()) { case GO_SKADI_THE_RUTHLESS_DOOR: SkadiRuthlessDoor = pGo->GetGUID(); @@ -137,7 +137,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case 7322: // The Incredible Hulk (2043) return svalaAchievement; @@ -151,7 +151,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE: case DATA_GORTOK_PALEHOOF: @@ -212,7 +212,7 @@ public: uint32 GetData(uint32 type) const override { - switch(type) + switch (type) { case DATA_SVALA_SORROWGRAVE: return Encounters[0]; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp index 782748d69e..f69f5b7f4f 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp @@ -176,7 +176,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case EVENT_ARCHAVON: case EVENT_EMALON: diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 3aa2cf6e66..da67718717 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -99,7 +99,7 @@ public: { if (!target || !spell) return; - switch(spell->Id) + switch (spell->Id) { case SPELL_ARCANE_VACUUM: target->NearTeleportTo(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ() + 10.0f, target->GetOrientation()); @@ -117,7 +117,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index ad6986e8ad..2d34027916 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -116,7 +116,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -280,7 +280,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 6a078ba64e..affe37877c 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -110,7 +110,7 @@ public: if (!me->IsAlive()) return; - switch(param) + switch (param) { case ACTION_WATER_ELEMENT_HIT: if (pInstance) diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index b609e4a368..a16341ced3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -88,7 +88,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 231b1270dd..0b517c0c23 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -91,7 +91,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index bd2cf323ec..69eb1b7be4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -104,7 +104,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index b5ec591976..96eed54b9f 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -103,7 +103,7 @@ public: if (me->HasUnitState(UNIT_STATE_CASTING)) return; - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index 83f9126053..ba1f65e5ea 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -107,7 +107,7 @@ public: void OnCreatureCreate(Creature* creature) override { - switch(creature->GetEntry()) + switch (creature->GetEntry()) { case NPC_SINCLARI: NPC_SinclariGUID = creature->GetGUID(); @@ -162,7 +162,7 @@ public: void OnGameObjectCreate(GameObject* go) override { - switch(go->GetEntry()) + switch (go->GetEntry()) { case GO_ACTIVATION_CRYSTAL: HandleGameObject(ObjectGuid::Empty, false, go); // make go not used yet @@ -202,7 +202,7 @@ public: void SetData(uint32 type, uint32 data) override { - switch(type) + switch (type) { case DATA_ACTIVATE_DEFENSE_SYSTEM: { @@ -277,7 +277,7 @@ public: void SetGuidData(uint32 type, ObjectGuid data) override { - switch(type) + switch (type) { case DATA_ADD_TRASH_MOB: trashMobs.insert(data); @@ -291,7 +291,7 @@ public: uint32 GetData(uint32 type) const override { - switch(type) + switch (type) { case DATA_ENCOUNTER_STATUS: return (uint32)EncounterStatus; @@ -333,7 +333,7 @@ public: { Creature* pBoss = nullptr; - switch(uiBoss) + switch (uiBoss) { case BOSS_MORAGG: HandleGameObject(GO_MoraggCellGUID, true); @@ -403,13 +403,13 @@ public: void Update(uint32 diff) override { events.Update(diff); - switch( events.ExecuteEvent() ) + switch (events.ExecuteEvent()) { case 0: break; case EVENT_CHECK_PLAYERS: { - if( DoNeedCleanup(false) ) + if (DoNeedCleanup(false)) InstanceCleanup(); events.Repeat(5s); } @@ -522,7 +522,7 @@ public: void OnPlayerEnter(Player* plr) override { - if( DoNeedCleanup(plr->IsAlive()) ) + if (DoNeedCleanup(plr->IsAlive())) InstanceCleanup(); if (EncounterStatus == IN_PROGRESS) @@ -542,19 +542,19 @@ public: uint8 aliveCount = 0; Map::PlayerList const& pl = instance->GetPlayers(); for( Map::PlayerList::const_iterator itr = pl.begin(); itr != pl.end(); ++itr ) - if( Player* plr = itr->GetSource() ) - if( plr->IsAlive() && !plr->IsGameMaster() && !plr->HasAura(27827)/*spirit of redemption aura*/ ) + if (Player* plr = itr->GetSource()) + if (plr->IsAlive() && !plr->IsGameMaster() && !plr->HasAura(27827)/*spirit of redemption aura*/ ) ++aliveCount; bool need = enter ? aliveCount <= 1 : aliveCount == 0; - if( !need && CLEANED ) + if (!need && CLEANED) CLEANED = false; return need; } void InstanceCleanup() { - if( CLEANED ) + if (CLEANED) return; CLEANED = true; @@ -638,7 +638,7 @@ public: bool CheckAchievementCriteriaMeet(uint32 criteria_id, Player const* /*source*/, Unit const* /*target*/, uint32 /*miscvalue1*/) override { - switch(criteria_id) + switch (criteria_id) { case CRITERIA_DEFENSELESS: return GateHealth == 100 && !bDefensesUsed; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index ba2e92fd96..21fe3a013b 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -91,7 +91,7 @@ public: { ClearGossipMenuFor(player); - switch(uiAction) + switch (uiAction) { case GOSSIP_ACTION_INFO_DEF+1: CloseGossipMenuFor(player); @@ -172,7 +172,7 @@ public: events.Update(diff); - switch(events.ExecuteEvent()) + switch (events.ExecuteEvent()) { case 0: break; @@ -325,7 +325,7 @@ struct violet_hold_trashAI : public npc_escortAI if (!bAddedWP) { bAddedWP = true; - switch(PLoc) + switch (PLoc) { case 0: for(int i = 0; i < 6; i++) @@ -1040,30 +1040,30 @@ public: if (!pInstance) return; - switch(uiBoss) + switch (uiBoss) { case 1: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 2: - if(uiWPointId == 2) + if (uiWPointId == 2) FinishPointReached(); break; case 3: - if(uiWPointId == 1) + if (uiWPointId == 1) FinishPointReached(); break; case 4: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 5: - if(uiWPointId == 0) + if (uiWPointId == 0) FinishPointReached(); break; case 6: - if(uiWPointId == 4) + if (uiWPointId == 4) FinishPointReached(); break; } @@ -1073,10 +1073,10 @@ public: { npc_escortAI::UpdateAI(diff); - if(!bAddedWPs) + if (!bAddedWPs) { bAddedWPs = true; - switch(uiBoss) + switch (uiBoss) { case 1: for(int i = 0; i < 3; i++) diff --git a/src/server/scripts/Northrend/zone_dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index 274748225e..3c23fe2a98 100644 --- a/src/server/scripts/Northrend/zone_dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp @@ -148,7 +148,7 @@ public: void SetData(uint32 type, uint32 /*data*/) override { - switch(type) + switch (type) { case ACTION_SHANDY_INTRO: if (Creature* aquanos = me->FindNearestCreature(NPC_AQUANOS_ENTRY, 30, true)) @@ -163,7 +163,7 @@ public: _events.ScheduleEvent(EVENT_OUTRO_DH, 10min); break; default: - if(_lSource == type && _canWash) + if (_lSource == type && _canWash) { _canWash = false; _events.ScheduleEvent(EVENT_INTRO_DH2, type == ACTION_UNMENTIONABLES ? 4s : 10s); @@ -243,7 +243,7 @@ public: if (player->GetQuestStatus(QUEST_SUITABLE_DISGUISE_A) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(QUEST_SUITABLE_DISGUISE_H) == QUEST_STATUS_INCOMPLETE) { - if(player->GetTeamId() == TEAM_ALLIANCE) + if (player->GetTeamId() == TEAM_ALLIANCE) AddGossipItemFor(player, GOSSIP_MENU_AQUANOS, GOSSIP_AQUANOS_ALLIANCE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); else AddGossipItemFor(player, GOSSIP_MENU_AQUANOS, GOSSIP_AQUANOS_HORDE, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF); diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index c3525a4cd6..4f7d18fd9f 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -283,12 +283,12 @@ public: bool OnGossipHello(Player* player, GameObject* go) override { - if(!player || !go) + if (!player || !go) return true; Creature* t = player->FindNearestCreature(NPC_CONVERSING_WITH_THE_DEPTHS_TRIGGER, 10.0f, true); - if(t && t->AI() && CAST_AI(npc_conversing_with_the_depths_trigger::npc_conversing_with_the_depths_triggerAI, t->AI())) - if(!CAST_AI(npc_conversing_with_the_depths_trigger::npc_conversing_with_the_depths_triggerAI, t->AI())->running) + if (t && t->AI() && CAST_AI(npc_conversing_with_the_depths_trigger::npc_conversing_with_the_depths_triggerAI, t->AI())) + if (!CAST_AI(npc_conversing_with_the_depths_trigger::npc_conversing_with_the_depths_triggerAI, t->AI())->running) CAST_AI(npc_conversing_with_the_depths_trigger::npc_conversing_with_the_depths_triggerAI, t->AI())->Start(player->GetGUID()); return true; diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index ab3e632956..43ca3c21b6 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -138,7 +138,7 @@ public: void PrepareSummons() { - switch(currentQuest) + switch (currentQuest) { case QUEST_BFV_FALLEN_HEROES: me->SummonCreature(NPC_ELDRETH, 8245.5f, 3522.7f, 627.67f, 3.11f, TEMPSUMMON_MANUAL_DESPAWN, 30000); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 8e49b983ed..7f969b8143 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -400,7 +400,7 @@ public: if (timer) { timer -= diff; - if( timer < 0 ) + if (timer < 0) timer = 0; } else if (success) diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 5c82da7a9b..df5621f74b 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -700,11 +700,11 @@ public: player->PrepareQuestMenu(creature->GetGUID()); //Trainer Menu - if ( creature->IsTrainer() ) + if (creature->IsTrainer()) AddGossipItemFor(player, GOSSIP_ICON_TRAINER, GOSSIP_TEXT_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRAIN); //Vendor Menu - if ( creature->IsVendor() ) + if (creature->IsVendor()) if (player->HasSpell(SPELL_MECHANO_HOG) || player->HasSpell(SPELL_MEKGINEERS_CHOPPER)) AddGossipItemFor(player, GOSSIP_ICON_VENDOR, GOSSIP_TEXT_BROWSE_GOODS, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_TRADE); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp index 1e1933d195..474f7306ad 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp @@ -38,12 +38,12 @@ OPvPCapturePointEP_EWT::OPvPCapturePointEP_EWT(OutdoorPvP* pvp) void OPvPCapturePointEP_EWT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if ( _oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state ) + if (_oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_A)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_EWT, TEAM_NEUTRAL); } - else if ( _oldState == OBJECTIVESTATE_HORDE && _oldState != _state ) + else if (_oldState == OBJECTIVESTATE_HORDE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_EWT_H)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_EWT, TEAM_NEUTRAL); @@ -170,12 +170,12 @@ OPvPCapturePointEP_NPT::OPvPCapturePointEP_NPT(OutdoorPvP* pvp) void OPvPCapturePointEP_NPT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if ( _oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state ) + if (_oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_A)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_NPT, TEAM_NEUTRAL); } - else if ( _oldState == OBJECTIVESTATE_HORDE && _oldState != _state ) + else if (_oldState == OBJECTIVESTATE_HORDE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_NPT_H)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_NPT, TEAM_NEUTRAL); @@ -312,12 +312,12 @@ OPvPCapturePointEP_CGT::OPvPCapturePointEP_CGT(OutdoorPvP* pvp) void OPvPCapturePointEP_CGT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if ( _oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state ) + if (_oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_A)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_CGT, TEAM_NEUTRAL); } - else if ( _oldState == OBJECTIVESTATE_HORDE && _oldState != _state ) + else if (_oldState == OBJECTIVESTATE_HORDE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_CGT_H)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_CGT, TEAM_NEUTRAL); @@ -439,12 +439,12 @@ OPvPCapturePointEP_PWT::OPvPCapturePointEP_PWT(OutdoorPvP* pvp) void OPvPCapturePointEP_PWT::ChangeState() { // if changing from controlling alliance to horde or vice versa - if ( _oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state ) + if (_oldState == OBJECTIVESTATE_ALLIANCE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_A)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_PWT, TEAM_NEUTRAL); } - else if ( _oldState == OBJECTIVESTATE_HORDE && _oldState != _state ) + else if (_oldState == OBJECTIVESTATE_HORDE && _oldState != _state) { sWorld->SendZoneText(EP_GraveYardZone, sObjectMgr->GetAcoreStringForDBCLocale(LANG_OPVP_EP_LOSE_PWT_H)); ((OutdoorPvPEP*)_pvp)->SetControlledState(EP_PWT, TEAM_NEUTRAL); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index 6db94e2877..a411f43a6e 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -791,7 +791,7 @@ void OPvPCapturePointNA::ChangeState() break; case OBJECTIVESTATE_ALLIANCE: m_HalaaState = HALAA_A; - if(m_canRecap) + if (m_canRecap) FactionTakeOver(TEAM_ALLIANCE); artkit = 2; break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index c557b59d02..8ec98b72fb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -358,7 +358,7 @@ struct boss_fathomguard_tidalvess : public ScriptedAI int32 action = 0; uint8 group = 0; - switch(entry) + switch (entry) { case NPC_SPITFIRE_TOTEM: timer = 59s; @@ -407,7 +407,7 @@ struct boss_fathomguard_tidalvess : public ScriptedAI void SummonTotem(uint32 entry) { - switch(entry) + switch (entry) { case NPC_SPITFIRE_TOTEM: DoCastSelf(SPELL_SPITFIRE_TOTEM); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp index 7207b28411..bcfbcc0e6e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -103,7 +103,7 @@ struct boss_lady_vashj : public BossAI void KilledUnit(Unit* /*victim*/) override { - if(!_recentlySpoken) + if (!_recentlySpoken) { Talk(SAY_SLAY); _recentlySpoken = true; @@ -132,7 +132,7 @@ struct boss_lady_vashj : public BossAI void JustSummoned(Creature* summon) override { summons.Summon(summon); - switch(summon->GetEntry()) { + switch (summon->GetEntry()) { case(WORLD_TRIGGER): summon->CastSpell(summon, SPELL_MAGIC_BARRIER); break; diff --git a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp index 011e26c29d..d6248c6f2c 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -93,7 +93,7 @@ struct boss_high_king_maulgar : public BossAI void KilledUnit(Unit* /*victim*/) override { - if(!_recentlySpoken) + if (!_recentlySpoken) { Talk(SAY_SLAY); _recentlySpoken = true; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index 18dda706a5..654e2b232b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -87,7 +87,7 @@ struct boss_omor_the_unscarred : public BossAI void KilledUnit(Unit*) override { - if(!_hasSpoken) + if (!_hasSpoken) { _hasSpoken = true; Talk(SAY_KILL); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 37b3a95b15..897d01c1bd 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -215,7 +215,7 @@ struct boss_magtheridon : public BossAI }); } } - else if (action == ACTION_BANISH_SELF ) + else if (action == ACTION_BANISH_SELF) { Talk(SAY_BANISH); me->CastSpell(me, SPELL_SHADOW_CAGE_STUN, true); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index e5723aee5a..4fc5adef6f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -271,7 +271,7 @@ struct boss_grand_warlock_nethekurse : public BossAI { // check if door is openened //this should only happen before the intro, if the door is picked by someone - if(nethekursedoor->GetGoState() == 0) + if (nethekursedoor->GetGoState() == 0) { DoAction(ACTION_START_INTRO); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 5195c8bbe2..db246c77e3 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -337,7 +337,7 @@ struct boss_alar : public BossAI return; } - switch(id) + switch (id) { case POINT_QUILL: scheduler.CancelGroup(GROUP_FLAME_BUFFET); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 4f881ff03b..fce208869c 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -338,7 +338,7 @@ struct boss_kaelthas : public BossAI void DoAction(int32 action) override { - switch(action) + switch (action) { case ACTION_START_SANGUINAR: IntroduceNewAdvisor(SAY_INTRO_SANGUINAR, ACTION_START_SANGUINAR); @@ -610,7 +610,7 @@ struct boss_kaelthas : public BossAI Talk(talkIntroduction); }); //switch because talk times are different - switch(kaelAction) + switch (kaelAction) { case ACTION_START_SANGUINAR: attackStartTimer = 14500ms; @@ -685,7 +685,7 @@ struct boss_kaelthas : public BossAI AttackStart(target); } ScheduleHealthCheckEvent(50, [&]{ - if(!_transitionSceneReached) + if (!_transitionSceneReached) { _transitionSceneReached = true; scheduler.CancelAll(); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 284e526542..637b355abc 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -181,7 +181,7 @@ class spell_hun_generic_scaling : public AuraScript int32 modifier = 45; // xinef: Wild Hunt bonus for stamina - if (AuraEffect* wildHuntEff = GetUnitOwner()->GetDummyAuraEffect(SPELLFAMILY_PET, 3748, EFFECT_0)) + if (AuraEffect* wildHuntEff = GetUnitOwner()->GetDummyAuraEffect(SPELLFAMILY_PET, 3748, EFFECT_0)) AddPct(modifier, wildHuntEff->GetAmount()); amount = CalculatePct(std::max<int32>(0, owner->GetStat(Stats(aurEff->GetSpellInfo()->Effects[aurEff->GetEffIndex()].MiscValue))), modifier); diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 5bf697b960..4a92e2a13c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -620,7 +620,7 @@ class spell_item_feast : public SpellScript { LocaleConstant loc_idx = player->GetSession()->GetSessionDbLocaleIndex(); - switch(GetSpellInfo()->Id) + switch (GetSpellInfo()->Id) { case SPELL_GREAT_FEAST: if (BroadcastText const* bct = sObjectMgr->GetBroadcastText(GREAT_FEAST_BROADCAST_TEXT_ID_PREPARE)) diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 94b2f6dd76..c0a18506b4 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -623,9 +623,9 @@ class spell_q12274_a_fall_from_grace_costume : public SpellScript void HandleScript(SpellEffIndex /*effIndex*/) { - if(Unit* target = GetHitUnit()) + if (Unit* target = GetHitUnit()) { - if(Player* p = target->ToPlayer()) + if (Player* p = target->ToPlayer()) { p->CastSpell(p, p->getGender() == GENDER_FEMALE ? SPELL_SCARLET_RAVEN_PRIEST_IMAGE_FEMALE : SPELL_SCARLET_RAVEN_PRIEST_IMAGE_MALE, false); } @@ -2325,8 +2325,8 @@ class spell_q12919_gymers_throw : public SpellScript void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if(GetOwner()) - if(Player* player = GetOwner()->ToPlayer()) + if (GetOwner()) + if (Player* player = GetOwner()->ToPlayer()) player->CompleteQuest(QUEST_CROW_TRANSFORM); } diff --git a/src/server/scripts/World/areatrigger_scripts.cpp b/src/server/scripts/World/areatrigger_scripts.cpp index 7f4d766875..7d995e6a95 100644 --- a/src/server/scripts/World/areatrigger_scripts.cpp +++ b/src/server/scripts/World/areatrigger_scripts.cpp @@ -302,7 +302,7 @@ public: if (!player->FindNearestCreature(NPC_TERVOSH, 100.0f)) { - if(Creature* tervosh = player->SummonCreature(NPC_TERVOSH, -3476.51f, -4105.94f, 17.1f, 5.3816f, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* tervosh = player->SummonCreature(NPC_TERVOSH, -3476.51f, -4105.94f, 17.1f, 5.3816f, TEMPSUMMON_TIMED_DESPAWN, 60000)) tervosh->CastSpell(tervosh, SPELL_TELEPORT_VISUAL, true); } diff --git a/src/server/scripts/World/npc_professions.cpp b/src/server/scripts/World/npc_professions.cpp index e98676dcff..c0c30a13ed 100644 --- a/src/server/scripts/World/npc_professions.cpp +++ b/src/server/scripts/World/npc_professions.cpp @@ -1283,7 +1283,7 @@ public: void SendActionMenu(Player* player, GameObject* /*gameobject*/, uint32 uiAction) { - switch(uiAction) + switch (uiAction) { // Learn Goblin case GOSSIP_ACTION_INFO_DEF + 1: @@ -1353,7 +1353,7 @@ public: bool OnGossipSelect(Player* player, GameObject* gameobject, uint32 uiSender, uint32 uiAction) override { ClearGossipMenuFor(player); - switch(uiSender) + switch (uiSender) { case GOSSIP_SENDER_LEARN: SendActionMenu(player, gameobject, uiAction); diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index e83daf1fe2..3a066a33c7 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -461,7 +461,7 @@ namespace MMAP /**************************************************************************/ void TileBuilder::buildTile(uint32 mapID, uint32 tileX, uint32 tileY, dtNavMesh* navMesh) { - if(shouldSkipTile(mapID, tileX, tileY)) + if (shouldSkipTile(mapID, tileX, tileY)) { ++m_mapBuilder->m_totalTilesProcessed; return; diff --git a/src/tools/vmap4_extractor/wmo.cpp b/src/tools/vmap4_extractor/wmo.cpp index 963038099e..af34818c7a 100644 --- a/src/tools/vmap4_extractor/wmo.cpp +++ b/src/tools/vmap4_extractor/wmo.cpp @@ -568,5 +568,4 @@ void MapObject::Extract(ADT::MODF const& mapObjDef, char const* WmoInstName, uin uint32 nlen = strlen(WmoInstName); fwrite(&nlen, sizeof(uint32), 1, pDirfile); fwrite(WmoInstName, sizeof(char), nlen, pDirfile); - } |