diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 0922a4f29..8c6b133e3 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -90,12 +90,12 @@ bool UnitAI::DoSpellAttackIfReady(uint32 spell) return false; } -Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float dist, bool playerOnly, int32 aura) +Unit* UnitAI::SelectTarget(SelectTargetMethod targetType, uint32 position, float dist, bool playerOnly, int32 aura) { return SelectTarget(targetType, position, DefaultTargetSelector(me, dist, playerOnly, aura)); } -void UnitAI::SelectTargetList(std::list& targetList, uint32 num, SelectAggroTarget targetType, float dist, bool playerOnly, int32 aura) +void UnitAI::SelectTargetList(std::list& targetList, uint32 num, SelectTargetMethod targetType, float dist, bool playerOnly, int32 aura) { SelectTargetList(targetList, DefaultTargetSelector(me, dist, playerOnly, aura), num, targetType); } @@ -152,7 +152,7 @@ void UnitAI::DoCast(uint32 spellId) const SpellInfo* spellInfo = sSpellMgr->GetSpellInfo(spellId); bool playerOnly = spellInfo->HasAttribute(SPELL_ATTR3_ONLY_ON_PLAYER); //float range = GetSpellMaxRange(spellInfo, false); - target = SelectTarget(SELECT_TARGET_RANDOM, 0, spellInfo->GetMaxRange(false), playerOnly); + target = SelectTarget(SelectTargetMethod::Random, 0, spellInfo->GetMaxRange(false), playerOnly); break; } case AITARGET_ALLY: @@ -172,7 +172,7 @@ void UnitAI::DoCast(uint32 spellId) && targetSelector(me->GetVictim())) target = me->GetVictim(); else - target = SelectTarget(SELECT_TARGET_RANDOM, 0, targetSelector); + target = SelectTarget(SelectTargetMethod::Random, 0, targetSelector); break; } } @@ -212,7 +212,7 @@ void UnitAI::DoCastRandomTarget(uint32 spellId, uint32 threatTablePosition, floa return; } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, threatTablePosition, dist, playerOnly)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, threatTablePosition, dist, playerOnly)) { me->CastSpell(target, spellId, triggered); } diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index ebc490caf..4fa8f568e 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -28,14 +28,14 @@ class Quest; class Unit; struct AISpellInfoType; -//Selection method used by SelectTarget -enum SelectAggroTarget +// Selection method used by SelectTarget +enum class SelectTargetMethod { - SELECT_TARGET_RANDOM = 0, //Just selects a random target - SELECT_TARGET_TOPAGGRO, //Selects targes from top aggro to bottom - SELECT_TARGET_BOTTOMAGGRO, //Selects targets from bottom aggro to top - SELECT_TARGET_NEAREST, - SELECT_TARGET_FARTHEST, + Random, // just pick a random target + MaxThreat, // prefer targets higher in the threat list + MinThreat, // prefer targets lower in the threat list + MaxDistance, // prefer targets further from us + MinDistance // prefer targets closer to us }; // default predicate function to select target based on distance, player and/or aura criteria @@ -199,10 +199,22 @@ public: virtual void SetGUID(ObjectGuid /*guid*/, int32 /*id*/ = 0) {} virtual ObjectGuid GetGUID(int32 /*id*/ = 0) const { return ObjectGuid::Empty; } - Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); - // Select the targets satifying the predicate. - // predicate shall extend Acore::unary_function - template Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE const& predicate) + // Select the best target (in order) from the threat list that fulfill the following: + // - Not among the first entries in order (or SelectTargetMethod::MaxThreat order, + // if is SelectTargetMethod::Random). + // - Within at most yards (if dist > 0.0f) + // - At least - yards away (if dist < 0.0f) + // - Is a player (if playerOnly = true) + // - Not the current tank (if withTank = false) + // - Has aura with ID (if aura > 0) + // - Does not have aura with ID - (if aura < 0) + Unit* SelectTarget(SelectTargetMethod targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); + + // Select the best target (in order) satisfying from the threat list. + // If is nonzero, the first entries in order (or SelectTargetMethod::MaxThreat + // order, if is SelectTargetMethod::Random) are skipped. + template + Unit* SelectTarget(SelectTargetMethod targetType, uint32 position, PREDICATE const& predicate) { ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); if (position >= threatlist.size()) @@ -216,26 +228,26 @@ public: if (position >= targetList.size()) return nullptr; - if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST) + if (targetType == SelectTargetMethod::MaxDistance || targetType == SelectTargetMethod::MinDistance) targetList.sort(Acore::ObjectDistanceOrderPred(me)); switch (targetType) { - case SELECT_TARGET_NEAREST: - case SELECT_TARGET_TOPAGGRO: + case SelectTargetMethod::MaxDistance: + case SelectTargetMethod::MaxThreat: { std::list::iterator itr = targetList.begin(); std::advance(itr, position); return *itr; } - case SELECT_TARGET_FARTHEST: - case SELECT_TARGET_BOTTOMAGGRO: + case SelectTargetMethod::MinDistance: + case SelectTargetMethod::MinThreat: { std::list::reverse_iterator ritr = targetList.rbegin(); std::advance(ritr, position); return *ritr; } - case SELECT_TARGET_RANDOM: + case SelectTargetMethod::Random: { std::list::iterator itr = targetList.begin(); std::advance(itr, urand(position, targetList.size() - 1)); @@ -248,11 +260,23 @@ public: return nullptr; } - void SelectTargetList(std::list& targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); + // Select the best (up to) targets (in order) from the threat list that fulfill the following: + // - Not among the first entries in order (or SelectTargetMethod::MaxThreat order, + // if is SelectTargetMethod::Random). + // - Within at most yards (if dist > 0.0f) + // - At least - yards away (if dist < 0.0f) + // - Is a player (if playerOnly = true) + // - Not the current tank (if withTank = false) + // - Has aura with ID (if aura > 0) + // - Does not have aura with ID - (if aura < 0) + // The resulting targets are stored in (which is cleared first). + void SelectTargetList(std::list& targetList, uint32 num, SelectTargetMethod targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0); - // Select the targets satifying the predicate. - // predicate shall extend Acore::unary_function - template void SelectTargetList(std::list& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectAggroTarget targetType) + // Select the best (up to) targets (in order) satisfying from the threat list and stores them in (which is cleared first). + // If is nonzero, the first entries in order (or SelectTargetMethod::MaxThreat + // order, if is SelectTargetMethod::Random) are skipped. + template + void SelectTargetList(std::list& targetList, PREDICATE const& predicate, uint32 maxTargets, SelectTargetMethod targetType) { ThreatContainer::StorageType const& threatlist = me->getThreatMgr().getThreatList(); if (threatlist.empty()) @@ -265,13 +289,13 @@ public: if (targetList.size() < maxTargets) return; - if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST) + if (targetType == SelectTargetMethod::MaxDistance || targetType == SelectTargetMethod::MinDistance) targetList.sort(Acore::ObjectDistanceOrderPred(me)); - if (targetType == SELECT_TARGET_FARTHEST || targetType == SELECT_TARGET_BOTTOMAGGRO) + if (targetType == SelectTargetMethod::MinDistance || targetType == SelectTargetMethod::MinThreat) targetList.reverse(); - if (targetType == SELECT_TARGET_RANDOM) + if (targetType == SelectTargetMethod::Random) Acore::Containers::RandomResize(targetList, maxTargets); else targetList.resize(maxTargets); diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 4aa630162..a77cd9fe9 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -702,7 +702,7 @@ void WorldBossAI::_JustDied() void WorldBossAI::_EnterCombat() { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (target) AttackStart(target); } @@ -710,7 +710,7 @@ void WorldBossAI::_EnterCombat() void WorldBossAI::JustSummoned(Creature* summon) { summons.Summon(summon); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (target) summon->AI()->AttackStart(target); } diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f04a9690a..093e0d89e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3442,10 +3442,10 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_TOPAGGRO, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_TOPAGGRO, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) l->push_back(u); } break; @@ -3454,10 +3454,10 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) l->push_back(u); } break; @@ -3466,10 +3466,10 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) l->push_back(u); } break; @@ -3478,17 +3478,17 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly))) l->push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, (float)e.target.hostilRandom.maxDist, e.target.hostilRandom.playerOnly)) l->push_back(u); } break; case SMART_TARGET_FARTHEST: if (me) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_FARTHEST, 0, FarthestTargetSelector(me, e.target.farthest.maxDist, e.target.farthest.playerOnly, e.target.farthest.isInLos))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinDistance, 0, FarthestTargetSelector(me, e.target.farthest.maxDist, e.target.farthest.playerOnly, e.target.farthest.isInLos))) l->push_back(u); } break; diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp index d2c22a516..b5f26c596 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -138,7 +138,7 @@ public: void JustSummoned(Creature* summoned) override { CAST_AI(npc_water_elemental::npc_water_elementalAI, summoned->AI())->balindaGUID = me->GetGUID(); - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0, 50, true)); summoned->SetFaction(me->GetFaction()); summons.Summon(summoned); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp index 38bb6971e..104799fcb 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp @@ -83,14 +83,14 @@ public: events.ScheduleEvent(SPELL_SHADOWBOLT, urand(TIMER_SHADOWBOLT - 2000, TIMER_SHADOWBOLT + 2000)); break; case SPELL_CURSE_TONGUES: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_CURSE_TONGUES); } events.ScheduleEvent(SPELL_CURSE_TONGUES, urand(TIMER_CURSE_TONGUES - 2000, TIMER_CURSE_TONGUES + 2000)); break; case SPELL_CURSE_WEAKNESS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_CURSE_WEAKNESS); } @@ -101,7 +101,7 @@ public: events.ScheduleEvent(SPELL_DEMON_ARMOR, TIMER_DEMON_ARMOR); break; case SPELL_ENVELOPING_WEB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_ENVELOPING_WEB); events.ScheduleEvent(SPELL_ENVELOPING_WEB, urand(TIMER_ENVELOPING_WEB - 2000, TIMER_ENVELOPING_WEB + 2000)); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp index 63ad65c57..f018a9f13 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp @@ -113,7 +113,7 @@ public: switch (eventId) { case SPELL_HANDOFTHAURISSAN: - DoCast(SelectTarget(SELECT_TARGET_RANDOM), SPELL_HANDOFTHAURISSAN); + DoCast(SelectTarget(SelectTargetMethod::Random), SPELL_HANDOFTHAURISSAN); //DoCastVictim(SPELL_HANDOFTHAURISSAN); events.ScheduleEvent(SPELL_HANDOFTHAURISSAN, urand(4000, 7000)); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp index 7549d6527..007e8d6be 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp @@ -65,7 +65,7 @@ public: //ShadowWordPain_Timer if (ShadowWordPain_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_SHADOWWORDPAIN); ShadowWordPain_Timer = 7000; } @@ -74,7 +74,7 @@ public: //ManaBurn_Timer if (ManaBurn_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_MANABURN); ManaBurn_Timer = 10000; } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp index 609eb9b43..e96eec3f0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_okthor.cpp @@ -78,7 +78,7 @@ public: switch (eventId) { case SPELL_ARCANE_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_ARCANE_BOLT); } @@ -97,7 +97,7 @@ public: events.ScheduleEvent(SPELL_ARCANE_EXPLOSION, nextArcaneExplosionTime); break; case SPELL_POLYMORPH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_POLYMORPH); } 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 9f3e33ea9..f921b0ed8 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 @@ -227,7 +227,7 @@ public: _events.ScheduleEvent(EVENT_SPELL_SHADOWBOLTVOLLEY, 12000); break; case EVENT_SPELL_IMMOLATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_IMMOLATE); _events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 25000); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp index 5651e276b..49c100bef 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mor_grayhoof.cpp @@ -116,7 +116,7 @@ struct boss_mor_grayhoof : public BossAI spell = Acore::Containers::SelectRandomContainerElement(faerieSpells); if (spell == SPELL_SLEEP) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.f, true)) { me->CastSpell(target, SPELL_SLEEP); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp index c47cdb6e5..c2b3e8196 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -90,7 +90,7 @@ public: if (!Summoned && HealthBelowPct(51)) { Talk(CALL_HELP); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (Creature* warlord = me->SummonCreature(NPC_SPIRESTONE_WARLORD, SummonLocation1, TEMPSUMMON_TIMED_DESPAWN, 300 * IN_MILLISECONDS)) warlord->AI()->AttackStart(target); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp index 7f5f9eb73..5f77ee559 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -427,7 +427,7 @@ public: _events.ScheduleEvent(EVENT_STRIKE, urand(14000, 23000)); break; case EVENT_ENCAGE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), EVENT_ENCAGE, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), EVENT_ENCAGE, true); _events.ScheduleEvent(EVENT_ENCAGE, urand(6000, 12000)); break; default: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp index ee6c239ee..4df115edf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -217,7 +217,7 @@ public: events.ScheduleEvent(EVENT_TERRIFYING_ROAR, 20 * IN_MILLISECONDS); break; case EVENT_BERSERKER_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 38.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 38.f, true)) { DoCast(target, SPELL_BERSERKER_CHARGE); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 4cbe9f0e2..fbc5e6fe9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -318,7 +318,7 @@ public: DoCastVictim(SPELL_SHADOWBOLT_VOLLEY); break; case 1: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40, true)) DoCast(target, SPELL_SHADOWBOLT); break; } @@ -326,12 +326,12 @@ public: events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(3000, 10000)); break; case EVENT_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40, true)) DoCast(target, SPELL_FEAR); events.ScheduleEvent(EVENT_FEAR, urand(10000, 20000)); break; case EVENT_MIND_CONTROL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40, true)) DoCast(target, SPELL_SHADOW_COMMAND); events.ScheduleEvent(EVENT_MIND_CONTROL, urand(30000, 35000)); break; @@ -521,7 +521,7 @@ public: events.ScheduleEvent(EVENT_TAILLASH, 10000); break; case EVENT_CLASSCALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) switch (target->getClass()) { case CLASS_MAGE: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index 9365c510e..b37ed9857 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -141,7 +141,7 @@ public: case EVENT_CONFLAGRATION: DoCastVictim(SPELL_CONFLAGRATION); if (me->GetVictim() && me->GetVictim()->HasAura(SPELL_CONFLAGRATION)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) me->TauntApply(target); events.ScheduleEvent(EVENT_CONFLAGRATION, 30000); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index 1bcda807a..951776d90 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -222,7 +222,7 @@ public: { //selects a random target that isn't the current victim and is a mana user (selects mana users) but not pets //it also ignores targets who have the aura. We don't want to place the debuff on the same target twice. - if (Unit *target = SelectTarget(SELECT_TARGET_RANDOM, 1, [&](Unit* u) { return u && !u->IsPet() && u->getPowerType() == POWER_MANA && !u->HasAura(SPELL_BURNINGADRENALINE); })) + if (Unit *target = SelectTarget(SelectTargetMethod::Random, 1, [&](Unit* u) { return u && !u->IsPet() && u->getPowerType() == POWER_MANA && !u->HasAura(SPELL_BURNINGADRENALINE); })) { me->CastSpell(target, SPELL_BURNINGADRENALINE, true); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index 21e9b76b1..306d12a43 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -95,7 +95,7 @@ public: } case EVENT_IGNITE_MANA: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, -SPELL_IGNITE_MANA)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, -SPELL_IGNITE_MANA)) { DoCast(target, SPELL_IGNITE_MANA); } @@ -105,7 +105,7 @@ public: } case EVENT_LIVING_BOMB: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_LIVING_BOMB); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index 4272fdb05..fe35e13b5 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -63,7 +63,7 @@ public: } case EVENT_RAIN_OF_FIRE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_RAIN_OF_FIRE, true); } @@ -74,7 +74,7 @@ public: { if (urand(0, 1)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { DoCast(target, SPELL_SHADOW_BOLT_RANDOM); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index 14fa986b6..951c86d49 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -83,7 +83,7 @@ public: } case EVENT_LAVA_BOMB: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, MELEE_TARGET_LOOKUP_DIST, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, MELEE_TARGET_LOOKUP_DIST, true)) { DoCast(target, SPELL_LAVA_BOMB); } @@ -97,7 +97,7 @@ public: SelectTargetList(targets, [this](Unit* target) { return target && target->IsPlayer() && target->GetDistance(me) > MELEE_TARGET_LOOKUP_DIST && target->GetDistance(me) < 100.0f; - }, 1, SELECT_TARGET_RANDOM); + }, 1, SelectTargetMethod::Random); if (!targets.empty()) { diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp index 01e06acee..d5297a128 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -322,7 +322,7 @@ public: } case EVENT_TELEPORT_RANDOM: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { DoCastSelf(SPELL_HATE_TO_ZERO, true); DoCast(target, SPELL_TELEPORT_RANDOM); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 95627a29d..d72d29d6d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -344,7 +344,7 @@ public: if (!IsVictimWithinMeleeRange()) { - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, [&](Unit* u) { return u && u->IsPlayer() && me->IsWithinMeleeRange(u); })) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, [&](Unit* u) { return u && u->IsPlayer() && me->IsWithinMeleeRange(u); })) { me->AttackerStateUpdate(target); me->SetTarget(target->GetGUID()); @@ -380,7 +380,7 @@ public: } case EVENT_MIGHT_OF_RAGNAROS: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, [](Unit const* target) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [](Unit const* target) { return target->IsPlayer() && target->getPowerType() == POWER_MANA; })) @@ -460,7 +460,7 @@ public: me->RemoveAurasDueToSpell(SPELL_RAGNA_SUBMERGE_VISUAL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { AttackStart(target); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 9bc0cf626..9ef1246a1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -71,7 +71,7 @@ public: } case EVENT_SHAZZRAH_CURSE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, -SPELL_SHAZZRAH_CURSE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, -SPELL_SHAZZRAH_CURSE)) { DoCast(target, SPELL_SHAZZRAH_CURSE); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp index 876e666ed..516291820 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -174,7 +174,7 @@ public: } case EVENT_SHADOW_WORD_PAIN: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, -SPELL_SHADOW_WORD_PAIN)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, -SPELL_SHADOW_WORD_PAIN)) { DoCast(target, SPELL_SHADOW_WORD_PAIN); } @@ -183,7 +183,7 @@ public: } case EVENT_IMMOLATE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, -SPELL_IMMOLATE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, -SPELL_IMMOLATE)) { DoCast(target, SPELL_IMMOLATE); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index a9d19d369..1c4b6b313 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -130,7 +130,7 @@ public: me->CastSpell(me, SPELL_ASTRAL_DECONSTRUCTION, true); break; case EVENT_SPELL_HATEFUL_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, urand(1, 2), 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, urand(1, 2), 40.0f)) me->CastSpell(target, SPELL_HATEFUL_BOLT, false); events.ScheduleEvent(EVENT_SPELL_HATEFUL_BOLT, urand(5000, 7500) * (events.GetNextEventTime(EVENT_SPELL_BERSERK) == 0 ? 1 : 2)); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp index e00717cc0..33894fa4d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_maiden_of_virtue.cpp @@ -97,12 +97,12 @@ public: events.ScheduleEvent(EVENT_SPELL_REPENTANCE, urand(25000, 35000)); break; case EVENT_SPELL_HOLY_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_HOLY_FIRE, true); events.ScheduleEvent(EVENT_SPELL_HOLY_FIRE, urand(8000, 18000)); break; case EVENT_SPELL_HOLY_WRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_HOLY_WRATH, true); events.ScheduleEvent(EVENT_SPELL_HOLY_WRATH, urand(20000, 25000)); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index a4508d985..d7829074a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -398,7 +398,7 @@ public: _events.ScheduleEvent(EVENT_RANDOM_YELL, urand(30000, 70000)); break; case EVENT_SPELL_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 24.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 24.0f, true)) me->CastSpell(target, SPELL_CHARGE_MIDNIGHT, false); _events.ScheduleEvent(EVENT_SPELL_CHARGE, 20000); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index e10681240..48aa30fd8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -218,7 +218,7 @@ public: me->CastSpell(me, SPELL_BERSERK, true); break; case EVENT_SPELL_BLIND: - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 10.0f, true)) me->CastSpell(target, SPELL_BLIND, false); events.ScheduleEvent(EVENT_SPELL_BLIND, urand(25000, 40000)); break; @@ -235,7 +235,7 @@ public: return; case EVENT_SPELL_GARROTE: Talk(SAY_SPECIAL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) target->CastSpell(target, SPELL_GARROTE, true); me->CastSpell(me, SPELL_VANISH_TELEPORT, false); events.SetPhase(0); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 5696ff47f..9e8eff1e8 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -270,7 +270,7 @@ public: // Void Zone if (VoidZoneTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true), SPELL_VOIDZONE, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 1, 45, true), SPELL_VOIDZONE, true); VoidZoneTimer = 15000; } else @@ -323,7 +323,7 @@ public: // Netherbreath if (NetherbreathTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40, true)) DoCast(target, SPELL_NETHERBREATH); NetherbreathTimer = urand(5000, 7000); } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 6cb14a9f7..c30c48f59 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -320,7 +320,7 @@ public: if (CharredEarthTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_CHARRED_EARTH); CharredEarthTimer = 20000; } @@ -329,7 +329,7 @@ public: if (TailSweepTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) if (!me->HasInArc(M_PI, target)) DoCast(target, SPELL_TAIL_SWEEP); TailSweepTimer = 15000; @@ -339,7 +339,7 @@ public: if (SearingCindersTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_SEARING_CINDERS); SearingCindersTimer = 10000; } @@ -385,7 +385,7 @@ public: if (DistractingAshTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_DISTRACTING_ASH); DistractingAshTimer = 2000; //timer wrong } @@ -406,7 +406,7 @@ public: if (FireballBarrageTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0)) DoCast(target, SPELL_FIREBALL_BARRAGE); FireballBarrageTimer = 20000; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 02a26e729..980b6721f 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -373,7 +373,7 @@ public: // if phase == 1 target the tank, otherwise anyone but the tank Unit* target = phase == 1 ? me->GetVictim() - : SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + : SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target) { @@ -422,7 +422,7 @@ public: { if (AmplifyDamageTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target) { @@ -492,7 +492,7 @@ public: void changetarget() { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (me->GetVictim()) { diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp index bc592f5ab..60d920f64 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp @@ -133,7 +133,7 @@ public: events.ScheduleEvent(EVENT_SPELL_ACIDIC_FANG, urand(12000, 18000)); break; case EVENT_SPELL_HYAKISS_WEB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, SPELL_HYAKISS_WEB, false); events.ScheduleEvent(EVENT_SPELL_HYAKISS_WEB, 15000); break; @@ -146,7 +146,7 @@ public: events.ScheduleEvent(EVENT_SPELL_WING_BUFFET, urand(12000, 18000)); break; case EVENT_SPELL_DIVE: - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, FarthestTargetSelector(me, 40.0f, false, true))) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, FarthestTargetSelector(me, 40.0f, false, true))) me->CastSpell(target, SPELL_DIVE, false); events.ScheduleEvent(EVENT_SPELL_DIVE, 20000); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp index 697a9a634..5e2e12270 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -286,7 +286,7 @@ public: { if (!me->IsNonMeleeSpellCast(false)) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); if (!target) return; @@ -330,7 +330,7 @@ public: DoCast(me, SPELL_AOE_CS); break; case 1: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_CHAINSOFICE); break; } @@ -412,7 +412,7 @@ public: if (ElementalOne) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (!target) return; @@ -426,7 +426,7 @@ public: if (ElementalTwo) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (!target) return; @@ -440,7 +440,7 @@ public: if (ElementalThree) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (!target) return; @@ -454,7 +454,7 @@ public: if (ElementalFour) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (!target) return; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index cf8a30391..c29dd16da 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -380,7 +380,7 @@ public: if (SacrificeTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target && target->IsAlive()) { DoCast(target, SPELL_SACRIFICE, true); @@ -401,7 +401,7 @@ public: if (ShadowboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT); + DoCast(SelectTarget(SelectTargetMethod::MaxThreat, 0), SPELL_SHADOW_BOLT); ShadowboltTimer = 10000; } else diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index bc1d46c7e..1e71c72e1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -212,7 +212,7 @@ public: if (WaterBoltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_WATERBOLT); WaterBoltTimer = TitoDied ? 1500 : 5000; } else @@ -419,7 +419,7 @@ public: if (BrainWipeTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_BRAIN_WIPE); BrainWipeTimer = 20000; } @@ -909,7 +909,7 @@ public: { if (!IsChasing) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { Talk(SAY_WOLF_HOOD); DoCast(target, SPELL_LITTLE_RED_RIDING_HOOD, true); @@ -1324,7 +1324,7 @@ public: if (BackwardLungeTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target && !me->HasInArc(M_PI, target)) { DoCast(target, SPELL_BACKWARD_LUNGE); @@ -1344,7 +1344,7 @@ public: if (DeadlySwatheTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_DEADLY_SWATHE); DeadlySwatheTimer = urand(15000, 25000); } @@ -1464,7 +1464,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff) if (BlindingPassionTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_BLINDING_PASSION); BlindingPassionTimer = urand(30000, 45000); } @@ -1481,7 +1481,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(uint32 diff) if (PowerfulAttractionTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_POWERFUL_ATTRACTION); PowerfulAttractionTimer = urand(5000, 30000); } else diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 62f12da03..7b648b91b 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -223,7 +223,7 @@ public: events.ScheduleEvent(EVENT_SPELL_FIREBALL, urand(3000, 4500)); break; case EVENT_SPELL_FLAMESTRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { me->CastSpell(target, SPELL_FLAMESTRIKE_SUMMON, true); Talk(SAY_FLAMESTRIKE); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index cc6305adf..651454b60 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -223,7 +223,7 @@ public: switch (urand(0, 2)) { case 0: - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 30, true); break; case 1: target = me; @@ -248,7 +248,7 @@ public: events.ScheduleEvent(EVENT_SPELL_IMMUNITY, 1000); break; case EVENT_SPELL_SW_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, DUNGEON_MODE(SPELL_SHADOW_WORD_PAIN_N, SPELL_SHADOW_WORD_PAIN_H), false); events.ScheduleEvent(EVENT_SPELL_SW_PAIN, 10000); break; @@ -463,7 +463,7 @@ public: case EVENT_SPELL_VANISH: me->CastSpell(me, SPELL_VANISH, false); DoResetThreat(); - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) me->AddThreat(unit, 1000.0f); events.ScheduleEvent(EVENT_SPELL_VANISH, 30000); @@ -556,7 +556,7 @@ public: switch (actualEventId) { case EVENT_SPELL_IMMOLATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, DUNGEON_MODE(SPELL_IMMOLATE_N, SPELL_IMMOLATE_H), false); events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 12000); break; @@ -565,17 +565,17 @@ public: events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 5000); break; case EVENT_SPELL_SEED_OF_CORRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, SPELL_SEED_OF_CORRUPTION, false); events.ScheduleEvent(EVENT_SPELL_SEED_OF_CORRUPTION, 18000); break; case EVENT_SPELL_CURSE_OF_AGONY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, DUNGEON_MODE(SPELL_CURSE_OF_AGONY_N, SPELL_CURSE_OF_AGONY_H), false); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_AGONY, 13000); break; case EVENT_SPELL_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f)) me->CastSpell(target, SPELL_FEAR, false); events.ScheduleEvent(EVENT_SPELL_FEAR, 15000); break; @@ -709,7 +709,7 @@ public: switch (actualEventId) { case EVENT_SPELL_POLYMORPH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_POLYMORPH, false); events.ScheduleEvent(EVENT_SPELL_POLYMORPH, 20000); break; @@ -722,7 +722,7 @@ public: events.ScheduleEvent(EVENT_SPELL_ICE_BLOCK, 1000); break; case EVENT_SPELL_BLIZZARD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_BLIZZARD_N, SPELL_BLIZZARD_H), false); events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 20000); break; @@ -1015,7 +1015,7 @@ public: events.ScheduleEvent(EVENT_SPELL_WAR_STOMP, 120000); break; case EVENT_SPELL_PURGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) me->CastSpell(target, SPELL_PURGE, false); events.ScheduleEvent(EVENT_SPELL_PURGE, 15000); break; @@ -1096,7 +1096,7 @@ public: events.ScheduleEvent(EVENT_SPELL_ROCKET_LAUNCH, 20000); break; case EVENT_SPELL_IRON_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0f)) me->CastSpell(target, DUNGEON_MODE(SPELL_FEL_IRON_BOMB_N, SPELL_FEL_IRON_BOMB_H), false); events.ScheduleEvent(EVENT_SPELL_IRON_BOMB, 20000); break; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index e39511f7d..78376bcfb 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -190,12 +190,12 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_DRAIN_LIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_DRAIN_LIFE_N, SPELL_DRAIN_LIFE_H), false); events.ScheduleEvent(EVENT_SPELL_DRAIN_LIFE, 10000, 1); return; case EVENT_SPELL_DRAIN_MANA: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) me->CastSpell(target, SPELL_DRAIN_MANA, false); events.ScheduleEvent(EVENT_SPELL_DRAIN_MANA, 10000, 1); return; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 41fb661e1..2f086eedf 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -116,7 +116,7 @@ public: void JustSummoned(Creature* summon) override { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); summon->CastSpell(target, SPELL_ENERGY_FEEDBACK_CHANNEL, false); @@ -168,12 +168,12 @@ public: events.ScheduleEvent(EVENT_HEALTH_CHECK, 0); break; case EVENT_SPELL_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_CHAIN_LIGHTNING_N, SPELL_CHAIN_LIGHTNING_H), false); events.ScheduleEvent(EVENT_SPELL_CHAIN_LIGHTNING, 8000); break; case EVENT_SPELL_ARCANE_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f)) me->CastSpell(target, DUNGEON_MODE(SPELL_ARCANE_SHOCK_N, SPELL_ARCANE_SHOCK_H), false); events.ScheduleEvent(EVENT_SPELL_ARCANE_SHOCK, 8000); break; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index d13dddf4a..3fcce4231 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -305,7 +305,7 @@ public: if (target->GetGUID() == me->GetVictim()->GetGUID()) { me->AddThreat(me->GetVictim(), -1000000); // drop current player, add a ton to second. This should guarantee that we don't end up with both 1 and 2 in a cage... - if (Unit* newTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 200.0f)) // search in whole room + if (Unit* newTarget = SelectTarget(SelectTargetMethod::MaxThreat, 1, 200.0f)) // search in whole room { me->AddThreat(newTarget, 1000000); } @@ -336,7 +336,7 @@ public: events.ScheduleEvent(SPELL_ARCANE_MISSILES, urand(TIMER_ARCANE_MIN, TIMER_ARCANE_MAX)); break; case SPELL_CURSE_DARKMASTER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_CURSE_DARKMASTER); } @@ -348,7 +348,7 @@ public: break; case SPELL_SHADOW_PORTAL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0, true)) { room = FindRoom(); if (room < 6) diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp index 7028dfa92..f0ebc41b8 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kirtonos_the_herald.cpp @@ -204,7 +204,7 @@ public: events.ScheduleEvent(EVENT_CURSE_OF_TONGUES, 20000); break; case EVENT_DOMINATE_MIND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.0f, true)) { me->CastSpell(target, SPELL_DOMINATE_MIND, false); } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp index 272f24e93..c738fb08d 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp @@ -442,7 +442,7 @@ public: } break; case 3: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 20.0f, false))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 20.0f, false))) { me->CastSpell(target, DRAIN_MANA_SPELL, false); } diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 25402e239..e02c894b8 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -86,7 +86,7 @@ public: void SchedulePossession() { _scheduler.Schedule(20s, 30s, [this](TaskContext context){ - if (Unit* possessTarget = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, false)) + if (Unit* possessTarget = SelectTarget(SelectTargetMethod::Random, 1, 0, true, false)) { DoCast(possessTarget, SPELL_POSSESS, true); DoCast(possessTarget, SPELL_POSSESSED, true); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 3e3dff011..61da891d7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -140,7 +140,7 @@ public: events.ScheduleEvent(EVENT_SPELL_STOMP, 30000); break; case EVENT_SPELL_BURN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, -SPELL_BURN_DAMAGE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, -SPELL_BURN_DAMAGE)) me->CastSpell(target, SPELL_BURN, false); events.ScheduleEvent(EVENT_SPELL_BURN, 60000); break; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index 242cf617f..f281dec0f 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -160,7 +160,7 @@ public: void JustSummoned(Creature* summon) override { summons.Summon(summon); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) { summon->AI()->AttackStart(target); summon->AddThreat(target, 10000000); @@ -192,7 +192,7 @@ public: break; case EVENT_SPELL_SHADOW_NOVA: { - Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 100.0f); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 100.0f); if (!target) target = me->GetVictim(); Talk(EMOTE_SHADOW_NOVA, target); @@ -207,7 +207,7 @@ public: break; case EVENT_SPELL_CONFLAGRATION: { - Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 100.0f); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 100.0f); if (!target) target = me->GetVictim(); me->CastSpell(target, SPELL_CONFLAGRATION, false); @@ -334,7 +334,7 @@ public: break; case EVENT_SPELL_SHADOW_NOVA: { - Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 100.0f); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 100.0f); if (!target) target = me->GetVictim(); me->CastSpell(target, SPELL_SHADOW_NOVA, false); @@ -343,7 +343,7 @@ public: } case EVENT_SPELL_CONFLAGRATION: { - Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 100.0f); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 100.0f); if (!target) target = me->GetVictim(); Talk(EMOTE_CONFLAGRATION, target); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 077969190..5353ccfbc 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -307,7 +307,7 @@ public: events.ScheduleEvent(EVENT_SPELL_GAS_NOVA, 20000, 1); break; case EVENT_SPELL_ENCAPSULATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_ENCAPSULATE_CHANNEL, false); events.ScheduleEvent(EVENT_SPELL_ENCAPSULATE, 25000, 1); break; @@ -470,7 +470,7 @@ public: void JustSummoned(Creature* summon) override { summon->SetInCombatWithZone(); - summon->AI()->AttackStart(summon->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)); + summon->AI()->AttackStart(summon->AI()->SelectTarget(SelectTargetMethod::Random, 0, 100.0f)); } }; }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 857034002..48f4eb6b9 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -570,7 +570,7 @@ public: events.ScheduleEvent(EVENT_SPELL_SOUL_FLAY, urand(4000, 5000)); break; case EVENT_SPELL_LEGION_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_LEGION_LIGHTNING, false); events.ScheduleEvent(EVENT_SPELL_LEGION_LIGHTNING, phase == PHASE_SACRIFICE ? 15000 : 30000); events.RescheduleEvent(EVENT_SPELL_SOUL_FLAY, 2000); @@ -1038,7 +1038,7 @@ public: void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) GetUnitOwner()->CastSpell(target, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); } @@ -1258,7 +1258,7 @@ public: void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) GetUnitOwner()->CastSpell(target, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true); } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index f41a607f4..c42834005 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -244,12 +244,12 @@ public: me->CastSpell(me, SPELL_ENRAGE, true); break; case EVENT_SPAWN_DARKNESS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_DARKNESS, true); events.ScheduleEvent(EVENT_SPAWN_DARKNESS, 15000); break; case EVENT_SPAWN_BLACK_HOLE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_BLACK_HOLE, true); events.ScheduleEvent(EVENT_SPAWN_BLACK_HOLE, 15000); break; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index d61c5681b..634cd6f77 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -225,7 +225,7 @@ public: { case EVENT_STATIC_DISRUPTION: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (!target) target = me->GetVictim(); if (target) @@ -241,7 +241,7 @@ public: } case EVENT_GUST_OF_WIND: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (!target) target = me->GetVictim(); if (target) @@ -255,7 +255,7 @@ public: break; case EVENT_ELECTRICAL_STORM: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50, true); if (!target) { EnterEvadeMode(); @@ -324,7 +324,7 @@ public: Unit* bird = ObjectAccessor::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { x = target->GetPositionX() + irand(-10, 10); y = target->GetPositionY() + irand(-10, 10); @@ -420,7 +420,7 @@ public: if (arrived) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { float x, y, z; if (EagleSwoop_Timer) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index 6efac7b52..1f6bdbab0 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -245,7 +245,7 @@ public: if (ShockTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->IsNonMeleeSpellCast(false)) DoCast(target, SPELL_EARTHSHOCK); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 619c8db6d..490ce88a5 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -428,7 +428,7 @@ public: if (SiphonSoul_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 70, true); Unit* trigger = DoSpawnCreature(NPC_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (!target || !trigger) { @@ -488,7 +488,7 @@ public: break; case ABILITY_TARGET_ENEMY: default: - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); break; case ABILITY_TARGET_HEAL: target = DoSelectLowestHpFriendly(50, 0); @@ -634,7 +634,7 @@ public: if (urand(0, 1)) target = DoSelectLowestHpFriendly(50, 0); else - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); if (target) DoCast(target, SPELL_DISPEL_MAGIC, false); } @@ -651,7 +651,7 @@ public: DoCast(target, SPELL_DISPEL_MAGIC, false); } else - me->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); + me->CastSpell(SelectUnit(SelectTargetMethod::Random, 0), SPELL_DISPEL_MAGIC, false); dispelmagic_timer = 12000; } else dispelmagic_timer -= diff;*/ @@ -843,7 +843,7 @@ public: if (venomspit_timer <= diff) { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(victim, SPELL_VENOM_SPIT, false); venomspit_timer = 2500; } @@ -934,7 +934,7 @@ public: } if (coldstare_timer <= diff) { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(victim, SPELL_COLD_STARE, false); coldstare_timer = 12000; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index 33d63de41..ec1c8b893 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -408,7 +408,7 @@ public: if (FireBreathTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index ab394c309..9ceed96de 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -425,7 +425,7 @@ public: if (Surge_Timer <= diff) { Talk(SAY_SURGE); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 45, true); if (target) DoCast(target, SPELL_SURGE); Surge_Timer = urand(15000, 20000); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 5b56e15b7..20a0b1e5a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -338,7 +338,7 @@ public: Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true); Vortex->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Vortex->SetSpeed(MOVE_RUN, 1.0f); - Vortex->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + Vortex->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); DoZoneInCombat(Vortex); } } @@ -399,7 +399,7 @@ public: if (Grievous_Throw_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_GRIEVOUS_THROW, false); Grievous_Throw_Timer = 10000; } @@ -430,7 +430,7 @@ public: { if (!TankGUID) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { TankGUID = me->GetVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); @@ -446,7 +446,7 @@ public: { Unit* target = me->GetVictim(); if (!target || !target->isTargetableForAttack()) target = ObjectAccessor::GetUnit(*me, TankGUID); - if (!target || !target->isTargetableForAttack()) target = SelectTarget(SELECT_TARGET_RANDOM, 0); + if (!target || !target->isTargetableForAttack()) target = SelectTarget(SelectTargetMethod::Random, 0); if (target) { AttackStart(target); @@ -481,7 +481,7 @@ public: { if (!TankGUID) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { TankGUID = me->GetVictim()->GetGUID(); me->SetSpeed(MOVE_RUN, 5.0f); @@ -495,7 +495,7 @@ public: Unit* target = me->GetVictim(); if (!target || !target->isTargetableForAttack()) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); AttackStart(target); } if (target) @@ -512,7 +512,7 @@ public: TankGUID.Clear(); } else - AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); } } else @@ -535,7 +535,7 @@ public: if (Pillar_Of_Fire_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SUMMON_PILLAR); Pillar_Of_Fire_Timer = 10000; } @@ -543,7 +543,7 @@ public: if (Flame_Breath_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->SetInFront(target); DoCast(me, SPELL_FLAME_BREATH); Flame_Breath_Timer = 10000; @@ -592,7 +592,7 @@ public: { //if the vortex reach the target, it change his target to another player if (me->IsWithinMeleeRange(me->GetVictim())) - AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index e6d1ed3ff..6f28e80ff 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -208,7 +208,7 @@ public: break; case EVENT_MARK_OF_ARLOKK: { - Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, urand(1, 3), 0.0f, false, -SPELL_MARK_OF_ARLOKK); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, urand(1, 3), 0.0f, false, -SPELL_MARK_OF_ARLOKK); if (!target) target = me->GetVictim(); if (target) @@ -253,7 +253,7 @@ public: case EVENT_VISIBLE: me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); me->RemoveAura(SPELL_SUPER_INVIS); me->RemoveAura(SPELL_VANISH); @@ -389,7 +389,7 @@ public: switch (eventId) { case EVENT_ATTACK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0.0f, 100, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0.0f, 100, false)) me->Attack(target, true); break; default: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index 9ca0b572e..74be364eb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -86,7 +86,7 @@ public: DoModifyThreatPercent(victim, -50); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) AttackStart(target); events.ScheduleEvent(EVENT_AVATAR, urand(25000, 35000)); break; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 40085ad1f..cdbd9e830 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -128,12 +128,12 @@ public: events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, urand(30000, 45000)); break; case EVENT_CAUSE_INSANITY: - // DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CAUSE_INSANITY); + // DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_CAUSE_INSANITY); // events.ScheduleEvent(EVENT_CAUSE_INSANITY, urand(35000, 45000)); break; case EVENT_WILL_OF_HAKKAR: // Xinef: Skip Tank - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_WILL_OF_HAKKAR); + DoCast(SelectTarget(SelectTargetMethod::Random, 1, 100, true), SPELL_WILL_OF_HAKKAR); events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, urand(25000, 35000)); break; case EVENT_ENRAGE: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index a94fb1246..136cd18be 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -93,7 +93,7 @@ public: // We will just use one model for the beginning for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Creature* Illusion = me->SummonCreature(NPC_NIGHTMARE_ILLUSION, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000); if (Illusion) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 37d410028..3c1746a49 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -143,7 +143,7 @@ public: switch (eventId) { case EVENT_CHARGE_JEKLIK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_CHARGE); AttackStart(target); @@ -159,14 +159,14 @@ public: events.ScheduleEvent(EVENT_SCREECH, urand(18000, 26000), 0, PHASE_ONE); break; case EVENT_SPAWN_BATS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) for (uint8 i = 0; i < 6; ++i) if (Creature* bat = me->SummonCreature(NPC_BLOODSEEKER_BAT, SpawnBat[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000)) bat->AI()->AttackStart(target); events.ScheduleEvent(EVENT_SPAWN_BATS, 60000, 0, PHASE_ONE); break; case EVENT_SHADOW_WORD_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_WORD_PAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(12000, 18000), 0, PHASE_TWO); break; @@ -185,7 +185,7 @@ public: events.ScheduleEvent(EVENT_GREATER_HEAL, urand(25000, 35000), 0, PHASE_TWO); break; case EVENT_SPAWN_FLYING_BATS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Creature* flyingBat = me->SummonCreature(NPC_FRENZIED_BAT, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + 15.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000)) flyingBat->AI()->AttackStart(target); events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, urand(10000, 15000), 0, PHASE_TWO); @@ -234,7 +234,7 @@ public: if (Bomb_Timer <= diff) { std::list targets; - SelectTargetList(targets, 1, SELECT_TARGET_RANDOM, 500.0f, true); + SelectTargetList(targets, 1, SelectTargetMethod::Random, 500.0f, true); if (!targets.empty()) { if (targets.size() > 1) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 69992f499..3fa79eee1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -120,7 +120,7 @@ public: break; case EVENT_DELUSIONSOFJINDO: // HACK // Casting the delusion curse with a shade so shade will attack the same target with the curse. - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_DELUSIONSOFJINDO); Creature* Shade = me->SummonCreature(NPC_SHADE_OF_JINDO, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -131,7 +131,7 @@ public: break; case EVENT_TELEPORT: // Possible HACK // Teleports a random player and spawns 9 Sacrificed Trolls to attack player - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoTeleportPlayer(target, TeleportLoc.m_positionX, TeleportLoc.m_positionY, TeleportLoc.m_positionZ, TeleportLoc.m_orientation); if (DoGetThreat(me->GetVictim())) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 371329b7b..917eec2c7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -254,7 +254,7 @@ public: events.ScheduleEvent(EVENT_CHECK_OHGAN, 1000); break; case EVENT_WATCH_PLAYER: - if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* player = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(player, SPELL_WATCH); Talk(SAY_WATCH, player); @@ -262,7 +262,7 @@ public: events.ScheduleEvent(EVENT_WATCH_PLAYER, urand(12000, 15000)); break; case EVENT_CHARGE_PLAYER: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_CHARGE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 40, true), SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE_PLAYER, urand(22000, 30000)); break; default: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 886a7c86d..140c99c23 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -108,7 +108,7 @@ public: { case EVENT_SPAWN_START_SPIDERS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Talk(SAY_SPIDER_SPAWN); Creature* Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); @@ -140,7 +140,7 @@ public: events.ScheduleEvent(EVENT_ASPECT_OF_MARLI, urand(13000, 18000), 0, PHASE_TWO); break; case EVENT_SPAWN_SPIDER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Creature* Spider = me->SummonCreature(15041, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000); if (Spider) @@ -173,7 +173,7 @@ public: int i = 0; while (i++ < 3) // max 3 tries to get a random target with power_mana { - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader + target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); // not aggro leader if (target && target->getPowerType() == POWER_MANA) break; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index 7dc920552..f637dc7af 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -102,7 +102,7 @@ public: { if (Ambush_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target) { me->NearTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), me->GetOrientation()); @@ -137,7 +137,7 @@ public: { if (Aggro_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (DoGetThreat(me->GetVictim())) { diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 8b5ad9836..4a309d323 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -205,7 +205,7 @@ public: events.ScheduleEvent(EVENT_FORCEPUNCH, urand(16000, 21000), 0, PHASE_TWO); break; case EVENT_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_CHARGE); DoResetThreat(); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index 0a82824cf..f63072138 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -210,7 +210,7 @@ public: for (uint8 i = 0; i < 10; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, i)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, i)) // check if target is within melee-distance if (me->IsWithinMeleeRange(target)) ++_inMeleeRange; @@ -223,12 +223,12 @@ public: events.ScheduleEvent(EVENT_HOLY_NOVA, urand(45000, 75000), 0, PHASE_ONE); break; case EVENT_HOLY_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_HOLY_FIRE); events.ScheduleEvent(EVENT_HOLY_FIRE, urand(45000, 60000), 0, PHASE_ONE); break; case EVENT_HOLY_WRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_HOLY_WRATH); events.ScheduleEvent(EVENT_HOLY_WRATH, urand(45000, 60000), 0, PHASE_ONE); break; @@ -238,17 +238,17 @@ public: // case EVENT_VENOM_SPIT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_VENOM_SPIT); events.ScheduleEvent(EVENT_VENOM_SPIT, urand(5000, 15000), 0, PHASE_TWO); break; case EVENT_POISON_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_POISON_CLOUD); events.ScheduleEvent(EVENT_POISON_CLOUD, urand(15000, 20000), 0, PHASE_TWO); break; case EVENT_PARASITIC_SERPENT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_SUMMON_PARASITIC_SERPENT); events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15000, 0, PHASE_TWO); break; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 6cae4f573..6f4cbaf78 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -83,7 +83,7 @@ public: events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, urand(15000, 20000)); break; case EVENT_LIGHTNINGWAVE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_LIGHTNINGWAVE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_LIGHTNINGWAVE); events.ScheduleEvent(EVENT_LIGHTNINGWAVE, urand(12000, 16000)); break; default: diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index cf1ec7508..923350f82 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -126,7 +126,7 @@ public: _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, rand() % 4000 + 15000); break; case EVENT_CREATURE_OF_NIGHTMARE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) DoCast(target, SPELL_CREATURE_OF_NIGHTMARE); _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 45000); break; diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 7f2e5deba..cb9512818 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -2123,7 +2123,7 @@ public: switch (eventId) { case EVENT_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FIREBALL); _events.ScheduleEvent(EVENT_FIREBALL, 3 * IN_MILLISECONDS); break; @@ -2194,7 +2194,7 @@ public: switch (eventId) { case EVENT_INFEST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0, true)) DoCast(target, SPELL_INGEST); _events.ScheduleEvent(EVENT_INFEST, 20 * IN_MILLISECONDS); break; diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index 05d205364..eea6e32d0 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -1772,7 +1772,7 @@ struct npc_coren_direbrew_sisters : public ScriptedAI }) .Schedule(Seconds(2), [this](TaskContext mugChuck) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, false, -SPELL_HAS_DARK_BREWMAIDENS_BREW)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, false, -SPELL_HAS_DARK_BREWMAIDENS_BREW)) { DoCast(target, SPELL_CHUCK_MUG); } diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 3a9ec6886..bb302a828 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -571,7 +571,7 @@ struct npc_hallows_end_soh : public ScriptedAI { scheduler.Schedule(6s, [this](TaskContext context) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.f, true)) { me->CastSpell(target, SPELL_HORSEMAN_CONFLAGRATION, false); target->CastSpell(target, SPELL_HORSEMAN_CONFLAGRATION_SOUND, true); @@ -1185,7 +1185,7 @@ struct boss_headless_horseman : public ScriptedAI } case EVENT_HORSEMAN_CONFLAGRATION: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->CastSpell(target, SPELL_HORSEMAN_CONFLAGRATION, false); target->CastSpell(target, SPELL_HORSEMAN_CONFLAGRATION_SOUND, true); diff --git a/src/server/scripts/Events/love_in_air.cpp b/src/server/scripts/Events/love_in_air.cpp index 7ef1a1814..1952d85be 100644 --- a/src/server/scripts/Events/love_in_air.cpp +++ b/src/server/scripts/Events/love_in_air.cpp @@ -490,7 +490,7 @@ struct npc_love_in_air_hummel_helper : public ScriptedAI events.RepeatEvent(12000); break; case EVENT_SPELL_THROW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { Position pos(*me); me->Relocate(target); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index d8746b809..a87452598 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -138,7 +138,7 @@ public: if (SwarmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(target, SPELL_CARRION_SWARM); } @@ -152,7 +152,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) target->CastSpell(target, SPELL_SLEEP, true); } SleepTimer = 60000; @@ -167,7 +167,7 @@ public: else AuraTimer -= diff; if (InfernoTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; Talk(SAY_INFERNO); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 9ac32f99e..8bc05bbab 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -490,7 +490,7 @@ public: { // Three doomfire can be up at the same time Talk(SAY_DOOMFIRE); - Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* temp = SelectTarget(SelectTargetMethod::Random, 1); if (!temp) temp = me->GetVictim(); @@ -647,19 +647,19 @@ public: case EVENT_SPELL_FINGER_OF_DEATH: if (CanUseFingerOfDeath()) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); DoCast(target, SPELL_FINGER_OF_DEATH); DoCastVictim(SPELL_RED_SKY_EFFECT); } events.ScheduleEvent(EVENT_SPELL_FINGER_OF_DEATH, 3500); break; case EVENT_SPELL_GRIP_OF_THE_LEGION: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_GRIP_OF_THE_LEGION); events.ScheduleEvent(EVENT_SPELL_GRIP_OF_THE_LEGION, urand(5000, 25000)); break; case EVENT_SPELL_AIR_BURST: Talk(SAY_AIR_BURST); - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_AIR_BURST); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_AIR_BURST); events.ScheduleEvent(EVENT_SPELL_AIR_BURST, urand(25000, 40000)); break; case EVENT_SPELL_FEAR: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index d8587e38e..27b6f1489 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -141,14 +141,14 @@ public: if (RainTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true), SPELL_RAIN_OF_FIRE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 30, true), SPELL_RAIN_OF_FIRE); RainTimer = 20000 + rand() % 15000; } else RainTimer -= diff; if (DoomTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_DOOM);//never on tank + DoCast(SelectTarget(SelectTargetMethod::Random, 1, 100, true), SPELL_DOOM);//never on tank DoomTimer = 45000 + rand() % 5000; } else DoomTimer -= diff; @@ -269,7 +269,7 @@ public: if (CrippleTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CRIPPLE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_CRIPPLE); CrippleTimer = 25000 + rand() % 5000; } else CrippleTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index afa6fe745..c23d5b71b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -151,7 +151,7 @@ public: else NovaTimer -= diff; if (IceboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_ICEBOLT); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 40, true), SPELL_ICEBOLT); IceboltTimer = 11000 + rand() % 20000; } else IceboltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 073158a80..03ef508e4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -854,7 +854,7 @@ void hyjalAI::UpdateAI(uint32 diff) break; case TARGETTYPE_RANDOM: - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); break; case TARGETTYPE_VICTIM: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index f9790d142..a14cf3dfc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -764,7 +764,7 @@ public: void JustSummoned(Creature* summon) override { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30, true); if (target) summon->Attack(target, false); summons.Summon(summon); @@ -1365,7 +1365,7 @@ public: forcemove = false; if (forcemove) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->Attack(target, false); } if (MoveTimer <= diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 9319290f7..0676e4c94 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -114,7 +114,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_CURSE_OF_EXERTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_CURSE_OF_EXERTION, false); events.RepeatEvent(9000); break; @@ -129,7 +129,7 @@ public: case EVENT_SPELL_TIME_WARP: Talk(SAY_TIME_WARP); me->CastSpell(me, SPELL_TIME_WARP, false); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, DUNGEON_MODE(SPELL_TIME_STEP_N, SPELL_TIME_STEP_H), true); events.RepeatEvent(25000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 0ffe8e193..240dfea15 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -149,7 +149,7 @@ public: events.RepeatEvent(8000); break; case EVENT_SPELL_CORRUPTING_BLIGHT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_CORRUPTING_BLIGHT, false); events.RepeatEvent(12000); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 05d732b62..c23bbdff3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -149,13 +149,13 @@ public: events.RepeatEvent(7000); break; case EVENT_SPELL_MIND_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, DUNGEON_MODE(SPELL_MIND_BLAST_N, SPELL_MIND_BLAST_H), false); events.RepeatEvent(6000); break; case EVENT_SPELL_SLEEP: Talk(SAY_SLEEP); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, DUNGEON_MODE(SPELL_SLEEP_N, SPELL_SLEEP_H), false); events.RepeatEvent(17000); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 5a17d7b4e..4f29766e7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -105,7 +105,7 @@ public: events.RepeatEvent(20000); break; case EVENT_SPELL_CONSTRICTING_CHAINS: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0, 50.0f, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::MinThreat, 0, 50.0f, true)) me->CastSpell(pTarget, DUNGEON_MODE(SPELL_CONSTRICTING_CHAINS_N, SPELL_CONSTRICTING_CHAINS_H), false); events.RepeatEvent(14000); break; 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 e9668ec6f..bc3e60f41 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1177,7 +1177,7 @@ public: switch (combatEvents.ExecuteEvent()) { case EVENT_COMBAT_EXORCISM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_ARTHAS_EXORCISM_N, SPELL_ARTHAS_EXORCISM_H), false); combatEvents.RepeatEvent(7300); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp index ed7610f62..6f7013f21 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_lieutenant_drake.cpp @@ -134,7 +134,7 @@ public: events.ScheduleEvent(EVENT_WHIRLWIND, 25000); break; case EVENT_EXPLODING_SHOT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 40.0f)) me->CastSpell(target, SPELL_EXPLODING_SHOT, false); events.ScheduleEvent(EVENT_EXPLODING_SHOT, 25000); break; diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 31c57deba..e39f99081 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -390,7 +390,7 @@ public: } case EVENT_SPELL_FIREBALL_FIRST: { - if (Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true)) + if (Unit* v = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true)) { me->SetFacingToObject(v); DoCast(v, SPELL_FIREBALL); @@ -401,7 +401,7 @@ public: } case EVENT_SPELL_FIREBALL_SECOND: { - if (Unit* v = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true)) + if (Unit* v = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true)) { me->SetFacingToObject(v); DoCast(v, SPELL_FIREBALL); @@ -467,7 +467,7 @@ public: { me->SetReactState(REACT_AGGRESSIVE); - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 0, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 0, false)) { AttackStart(target); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index e9d49314c..fca59234f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -100,7 +100,7 @@ public: who->GetMotionMaster()->MovePoint(POINT_PARALYZE, AltarPos); break; case NPC_HORNET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) who->AI()->AttackStart(target); break; } @@ -187,7 +187,7 @@ public: events.ScheduleEvent(EVENT_POISON_STINGER, urand(2000, 3000)); break; case EVENT_PARALYZE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0, true)) { DoCast(target, SPELL_PARALYZE); instance->SetGuidData(DATA_PARALYZED, target->GetGUID()); @@ -199,7 +199,7 @@ public: case EVENT_SWARMER_ATTACK: for (ObjectGuid const& guid : _swarmers) if (Creature* swarmer = me->GetMap()->GetCreature(guid)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) swarmer->AI()->AttackStart(target); _swarmers.clear(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index e0c4ff8e4..2f725cfe4 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -117,7 +117,7 @@ public: events.ScheduleEvent(EVENT_GATHERING_SPEED, 9000); events.ScheduleEvent(EVENT_FULL_SPEED, 60000); - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoResetThreat(); AttackStart(victim); @@ -215,7 +215,7 @@ public: { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = me->GetMap()->GetCreature(_instance->GetGuidData(DATA_BURU))) - if (Unit* target = buru->AI()->SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = buru->AI()->SelectTarget(SelectTargetMethod::Random)) who->AI()->AttackStart(target); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 437dfdda7..6d4ab62d5 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -99,7 +99,7 @@ public: events.ScheduleEvent(EVENT_MORTAL_WOUND, 8000); break; case EVENT_SANDTRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) target->CastSpell(target, SPELL_SANDTRAP, true); else if (Unit* victim = me->GetVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 72b9c1b7b..db9fa269c 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -190,7 +190,7 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target) { DoCast(target, SPELL_CHARGE); @@ -267,7 +267,7 @@ public: for (uint8 i = 0; i < 10; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Summoned->AI()->AttackStart(target); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 73467f57c..d176f732f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -220,7 +220,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(target); } @@ -260,7 +260,7 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->InterruptNonMeleeSpells(false); DoCast(target, SPELL_GREEN_BEAM); @@ -277,7 +277,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { //Spawn claw tentacle on the random target Creature* spawned = me->SummonCreature(NPC_CLAW_TENTACLE, *target, TEMPSUMMON_CORPSE_DESPAWN, 500); @@ -306,7 +306,7 @@ public: me->SetTarget(); //Select random target for dark beam to start on - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { //Face our target DarkGlareAngle = me->GetAngle(target); @@ -967,7 +967,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(target, SPELL_MIND_FLAY); @@ -1043,7 +1043,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target) { Unit::Kill(me, me); @@ -1157,7 +1157,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target) { Unit::Kill(me, me); @@ -1265,7 +1265,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(target, SPELL_GREEN_BEAM); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 99cf5ac9a..e7fd78ea6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -128,16 +128,16 @@ public: switch (urand(0, 2)) { case 0: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; case 1: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; case 2: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; } SpawnSpawns_Timer = urand(30000, 60000); @@ -150,7 +150,7 @@ public: { if (SpawnHatchlings_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_ROOT); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 8e70ab8b4..3b5be7146 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -100,7 +100,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WYVERNSTING); Wyvern_Timer = urand(15000, 32000); } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index b0f951e49..0effad174 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -168,7 +168,7 @@ public: //ChangeTarget_Timer if (Submerged && ChangeTarget_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target) me->NearTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), me->GetOrientation()); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 85ab7166c..be3cc13fb 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -108,7 +108,7 @@ public: if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { me->AddThreat(target, 1.0f); me->TauntApply(target); @@ -139,7 +139,7 @@ public: if (AggroReset_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { me->AddThreat(target, 1.0f); me->TauntApply(target); @@ -249,7 +249,7 @@ public: if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { me->AddThreat(target, 1.0f); me->TauntApply(target); @@ -272,7 +272,7 @@ public: if (AggroReset_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { me->AddThreat(target, 1.0f); me->TauntApply(target); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 70ee7f4ba..2d9d22a1d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -96,7 +96,7 @@ public: if (_flag & (1 << 7)) _flag = 0; - if (Unit* Target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* Target = SelectTarget(SelectTargetMethod::Random)) creature->AI()->AttackStart(Target); float ImageHealthPct; @@ -151,7 +151,7 @@ public: case EVENT_FULLFILMENT: /// @todo For some weird reason boss does not cast this // Spell actually works, tested in duel - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true), SPELL_TRUE_FULFILLMENT, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true), SPELL_TRUE_FULFILLMENT, true); events.ScheduleEvent(EVENT_FULLFILMENT, urand(20000, 30000)); break; case EVENT_BLINK: diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 35af5666a..56019cea9 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -439,7 +439,7 @@ public: if (UpperCut_Timer <= diff) { - Unit* randomMelee = SelectTarget(SELECT_TARGET_RANDOM, 0, NOMINAL_MELEE_RANGE, true); + Unit* randomMelee = SelectTarget(SelectTargetMethod::Random, 0, NOMINAL_MELEE_RANGE, true); if (randomMelee) DoCast(randomMelee, SPELL_UPPERCUT); UpperCut_Timer = 15000 + rand() % 15000; @@ -536,7 +536,7 @@ public: //Blizzard_Timer if (Blizzard_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45, true); if (target) { DoCast(target, SPELL_BLIZZARD); @@ -548,7 +548,7 @@ public: if (ArcaneBurst_Timer <= diff) { Unit* mvic; - if ((mvic = SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true)) != nullptr) + if ((mvic = SelectTarget(SelectTargetMethod::MaxDistance, 0, NOMINAL_MELEE_RANGE, true)) != nullptr) { DoCast(mvic, SPELL_ARCANEBURST); ArcaneBurst_Timer = 5000; diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 7ebebd525..7988b0be4 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -130,7 +130,7 @@ public: //ManaStormTimer if (ManaStormTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_MANASTORM); ManaStormTimer = urand(7500, 12500); } diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index dbea39a6f..9fe799c0f 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -640,7 +640,7 @@ public: events.ScheduleEvent(EVENT_CAST_CLEAVE, urand(8000, 10000)); break; case EVENT_CAST_STARFALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_OMEN_STARFALL); events.ScheduleEvent(EVENT_CAST_STARFALL, urand(14000, 16000)); break; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 5ea1dc34a..0c19c1248 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -70,7 +70,7 @@ public: if (_berserkerChargeTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_BERSERKER_CHARGE); } diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 9d6158586..2d0826e55 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -172,7 +172,7 @@ class boss_anub_arak : public CreatureScript events.ScheduleEvent(EVENT_LEECHING_SWARM, 20000); break; case EVENT_POUND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f)) { me->CastSpell(me, SPELL_SELF_ROOT, true); me->DisableRotate(true); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index e8573949c..99c7d0625 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -172,7 +172,7 @@ public: events.ScheduleEvent(EVENT_HADRONOX_PIERCE, 8000); break; case EVENT_HADRONOX_ACID: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, false)) me->CastSpell(target, SPELL_ACID_CLOUD, false); events.ScheduleEvent(EVENT_HADRONOX_ACID, 25000); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 319270b84..47efd6820 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -209,7 +209,7 @@ public: events.ScheduleEvent(EVENT_KRIK_MIND_FLAY, 15000); break; case EVENT_KRIK_CURSE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) me->CastSpell(target, SPELL_CURSE_OF_FATIGUE, true); events.ScheduleEvent(EVENT_KRIK_CURSE, 10000); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp index 3720d82a5..5c83164ba 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp @@ -163,7 +163,7 @@ struct boss_amanitar : public BossAI } case EVENT_ROOTS: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(pTarget, SPELL_ENTANGLING_ROOTS, false); } @@ -179,7 +179,7 @@ struct boss_amanitar : public BossAI } case EVENT_BOLT: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(pTarget, SPELL_VENOM_BOLT_VOLLEY, false); } @@ -204,7 +204,7 @@ struct boss_amanitar : public BossAI } } - if (SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, -SPELL_MINI)) + if (SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, -SPELL_MINI)) { DoCastSelf(SPELL_REMOVE_MUSHROOM_POWER, true); DoCastAOE(SPELL_MINI); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp index 86e71d9e8..1b386a27f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp @@ -252,7 +252,7 @@ struct boss_volazj : public BossAI } case EVENT_HERALD_SHIVER: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(pTarget, SPELL_SHIVER, false); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp index 0359208ca..d181f0a27 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_jedoga_shadowseeker.cpp @@ -463,7 +463,7 @@ struct boss_jedoga_shadowseeker : public BossAI } case EVENT_JEDOGA_LIGHTNING_BOLT: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(pTarget, DUNGEON_MODE(SPELL_LIGHTNING_BOLT, SPELL_LIGHTNING_BOLT_H), false); } @@ -472,7 +472,7 @@ struct boss_jedoga_shadowseeker : public BossAI } case EVENT_JEDOGA_THUNDERSHOCK: { - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(pTarget, DUNGEON_MODE(SPELL_THUNDERSHOCK, SPELL_THUNDERSHOCK_H), false); } diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp index 7af166776..b1faacd1d 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_prince_taldaram.cpp @@ -430,7 +430,7 @@ struct boss_taldaram : public BossAI { Talk(SAY_VANISH); DoCastSelf(SPELL_VANISH, false); - if (Unit* pEmbraceTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* pEmbraceTarget = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { vanishTarget_GUID = pEmbraceTarget->GetGUID(); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index 4fda339bc..096a0ed3d 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -849,7 +849,7 @@ struct boss_sartharion_dragonAI : public BossAI if (isCalledBySartharion) { - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 500, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 500, true)) { AttackStart(target); } @@ -1088,7 +1088,7 @@ public: } case EVENT_MINIBOSS_SHADOW_FISSURE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { DoCast(target, SPELL_SHADOW_FISSURE, false); } @@ -1272,7 +1272,7 @@ public: } case EVENT_MINIBOSS_SHADOW_FISSURE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { DoCast(target, SPELL_SHADOW_FISSURE, false); } @@ -1388,7 +1388,7 @@ public: } case EVENT_MINIBOSS_SHADOW_FISSURE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { DoCast(target, SPELL_SHADOW_FISSURE, false); } diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 4d714d94a..f129b9ebd 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -224,7 +224,7 @@ public: break; case EVENT_ENERVATING_BRAND: for (uint8 i = 0; i < RAID_MODE(2, 4, 2, 4); i++) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true, -SPELL_ENERVATING_BRAND)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, -SPELL_ENERVATING_BRAND)) me->CastSpell(target, SPELL_ENERVATING_BRAND, true); events.ScheduleEvent(EVENT_ENERVATING_BRAND, 26000); break; @@ -311,7 +311,7 @@ public: break; case EVENT_ENERVATING_BRAND: for (uint8 i = 0; i < RAID_MODE(4, 10, 4, 10); i++) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true, -SPELL_ENERVATING_BRAND)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, -SPELL_ENERVATING_BRAND)) me->CastSpell(target, SPELL_ENERVATING_BRAND, true); _events.ScheduleEvent(EVENT_ENERVATING_BRAND, 26000); break; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 0ac8cab79..db936cec5 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -399,7 +399,7 @@ public: events.ScheduleEvent(EVENT_METEOR_STRIKE, 40000); break; case EVENT_FIERY_COMBUSTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, -SPELL_TWILIGHT_REALM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, -SPELL_TWILIGHT_REALM)) me->CastSpell(target, SPELL_FIERY_COMBUSTION, false); events.ScheduleEvent(EVENT_FIERY_COMBUSTION, 25000); break; @@ -542,7 +542,7 @@ public: _events.ScheduleEvent(EVENT_BREATH, urand(10000, 12000)); break; case EVENT_SOUL_CONSUMPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, SPELL_TWILIGHT_REALM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, SPELL_TWILIGHT_REALM)) me->CastSpell(target, SPELL_SOUL_CONSUMPTION, false); _events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 20000); break; 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 7b1ae0e94..76dab6217 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -185,7 +185,7 @@ public: events.RepeatEvent(16000); break; case EVENT_SPELL_HAMMER_RIGHTEOUS: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 55.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 55.0f, true) ) { char buffer[100]; sprintf(buffer, "Eadric the Pure targets %s with the Hammer of the Righteous!", target->GetName().c_str()); @@ -358,12 +358,12 @@ public: case 0: break; case EVENT_SPELL_SMITE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) me->CastSpell(target, SPELL_SMITE, false); events.RepeatEvent(urand(3000, 4000)); break; case EVENT_SPELL_HOLY_FIRE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_HOLY_FIRE, false); events.RepeatEvent(urand(9000, 12000)); break; @@ -451,12 +451,12 @@ public: events.ScheduleEvent(EVENT_SPELL_WAKING_NIGHTMARE, urand(20000, 30000)); break; case EVENT_SPELL_OLD_WOUNDS: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true) ) me->CastSpell(target, SPELL_OLD_WOUNDS, true); events.RepeatEvent(12000); break; case EVENT_SPELL_SHADOWS_PAST: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true) ) me->CastSpell(target, SPELL_SHADOWS_PAST, false); events.RepeatEvent(urand(15000, 20000)); break; @@ -695,7 +695,7 @@ public: events.RepeatEvent(urand(35000, 45000)); break; case EVENT_PRIESTESS_SPELL_MIND_CONTROL_H: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_MIND_CONTROL_H, false); events.RepeatEvent(urand(22000, 30000)); break; 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 b16ddaa0d..3e1ef1601 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -263,7 +263,7 @@ public: events.RepeatEvent(urand(5000, 6000)); break; case EVENT_SPELL_DEATH_RESPITE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) me->CastSpell(target, SPELL_DEATH_RESPITE, false); events.RepeatEvent(urand(13000, 15000)); break; @@ -273,7 +273,7 @@ public: events.RepeatEvent(urand(15000, 17000)); break; case EVENT_SPELL_DESECRATION: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) me->CastSpell(target, SPELL_DESECRATION, false); events.RepeatEvent(urand(14000, 17000)); break; @@ -282,7 +282,7 @@ public: events.RepeatEvent(urand(2000, 4000)); break; case EVENT_SPELL_MARKED_DEATH: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.000000f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.000000f, true) ) me->CastSpell(target, SPELL_MARKED_DEATH, false); events.RepeatEvent(9000); break; @@ -426,7 +426,7 @@ public: case SPELL_CLAW_N: case SPELL_CLAW_H: DoResetThreat(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) { me->AddThreat(target, 100.0f); AttackStart(target); 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 4705e9dc9..ad04bfb48 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -802,7 +802,7 @@ public: events.RepeatEvent(22000); break; case EVEMT_MAGE_SPELL_POLYMORPH: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_POLYMORPH, false); events.RepeatEvent(8000); break; @@ -810,7 +810,7 @@ public: /****************** SHAMAN ******************/ case EVENT_SHAMAN_SPELL_CHAIN_LIGHTNING: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); events.RepeatEvent(16000); break; @@ -852,7 +852,7 @@ public: { if( !UnitTargetGUID ) { - if( Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true) ) { me->CastSpell(target, SPELL_SHOOT, false); UnitTargetGUID = target->GetGUID(); @@ -896,7 +896,7 @@ public: events.RepeatEvent(14000); break; case EVENT_ROGUE_SPELL_POISON_BOTTLE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_POISON_BOTTLE, false); events.RepeatEvent(19000); break; 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 b3a64132f..a8bccb826 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -457,7 +457,7 @@ public: { AttackStart(target); DoZoneInCombat(); - if( Unit* t = SelectTarget(SELECT_TARGET_RANDOM, 0, 250.0f, true) ) + if( Unit* t = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) { me->AddThreat(t, 20000.0f); AttackStart(t); @@ -674,7 +674,7 @@ public: case 0: break; case EVENT_SPELL_SHADOW_STRIKE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) me->CastSpell(target, SPELL_SHADOW_STRIKE, false); events.RepeatEvent(urand(30000, 45000)); break; @@ -768,7 +768,7 @@ public: } DoZoneInCombat(); DoResetThreat(); - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true) ) { if (!next) { 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 6ffa95003..f857d2a1c 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -466,7 +466,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_HEX: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true) ) me->CastSpell(target, SPELL_HEX, false); events.RepeatEvent(45000); EventMapGCD(events, 1500); @@ -613,7 +613,7 @@ public: events.RepeatEvent(10000); break; case EVENT_SPELL_HAMMER_OF_JUSTICE: - if( Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 15.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 15.0f, true) ) { me->CastSpell(target, SPELL_HAMMER_OF_JUSTICE, false); events.RepeatEvent(40000); @@ -714,7 +714,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_DISPEL: - if( Unit* target = (urand(0, 1) ? SelectTarget(SELECT_TARGET_TOPAGGRO, 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.RepeatEvent(urand(10000, 15000)); EventMapGCD(events, 1500); @@ -874,7 +874,7 @@ public: events.RepeatEvent(6000); break; case EVENT_SPELL_DISPEL: - if( Unit* target = (urand(0, 1) ? SelectTarget(SELECT_TARGET_TOPAGGRO, 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.RepeatEvent(urand(10000, 15000)); EventMapGCD(events, 1500); @@ -1011,7 +1011,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_FEAR: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true) ) me->CastSpell(target, SPELL_FEAR, false); events.RepeatEvent(urand(10000, 15000)); EventMapGCD(events, 1500); @@ -1175,7 +1175,7 @@ public: events.RepeatEvent(6000); break; case EVENT_SPELL_POLYMORPH: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_POLYMORPH, false); events.RepeatEvent(15000); EventMapGCD(events, 1500); @@ -1323,7 +1323,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_WYVERN_STING: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true) ) { me->CastSpell(target, SPELL_WYVERN_STING, false); events.RepeatEvent(60000); @@ -1457,7 +1457,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_ENTANGLING_ROOTS: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) ) me->CastSpell(target, SPELL_ENTANGLING_ROOTS, false); events.RepeatEvent(urand(10000, 15000)); EventMapGCD(events, 1500); @@ -1469,7 +1469,7 @@ public: EventMapGCD(events, 1500); break; case EVENT_SPELL_CYCLONE: - if( Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 20.0f, true) ) me->CastSpell(target, SPELL_CYCLONE, false); events.RepeatEvent(urand(25000, 40000)); EventMapGCD(events, 1500); @@ -1926,7 +1926,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_BLIND: - if( Unit* target = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true) ) { me->CastSpell(target, SPELL_BLIND, false); events.RepeatEvent(120000); @@ -2074,7 +2074,7 @@ public: events.RepeatEvent(5000); break; } - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 25.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 25.0f, true) ) { me->CastSpell(target, SPELL_EARTH_SHOCK_ENH, false); events.RepeatEvent(urand(6000, 8000)); @@ -2089,7 +2089,7 @@ public: events.RepeatEvent(5000); break; } - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 5.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) { me->CastSpell(target, SPELL_LAVA_LASH, false); events.RepeatEvent(urand(6000, 8000)); @@ -2104,7 +2104,7 @@ public: events.RepeatEvent(5000); break; } - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 5.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) { me->CastSpell(target, SPELL_STORMSTRIKE, false); events.RepeatEvent(urand(8000, 9000)); @@ -2217,7 +2217,7 @@ public: events.RepeatEvent(5000); break; } - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 5.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 5.0f, true) ) { me->CastSpell(target, SPELL_CRUSADER_STRIKE, false); events.RepeatEvent(urand(6000, 8000)); @@ -2252,7 +2252,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_HAMMER_OF_JUSTICE_RET: - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 15.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 15.0f, true) ) { me->CastSpell(target, SPELL_HAMMER_OF_JUSTICE_RET, false); events.RepeatEvent(40000); @@ -2272,7 +2272,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_JUDGEMENT_OF_COMMAND: - if( Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 20.0f, true) ) { me->CastSpell(target, SPELL_JUDGEMENT_OF_COMMAND, false); events.RepeatEvent(urand(10000, 15000)); @@ -2282,7 +2282,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_REPENTANCE: - if( Unit* target = SelectTarget(SELECT_TARGET_BOTTOMAGGRO, 0, 20.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::MinThreat, 0, 20.0f, true) ) { me->CastSpell(target, SPELL_REPENTANCE, false); events.RepeatEvent(60000); 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 f4dfa41d6..b35f72251 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -211,12 +211,12 @@ public: events.RepeatEvent(urand(10000, 15000)); break; case EVENT_SPELL_FEL_LIGHTNING: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) me->CastSpell(target, SPELL_FEL_LIGHTNING, false); events.RepeatEvent(urand(10000, 15000)); break; case EVENT_SPELL_INCINERATE_FLESH: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) { Talk(EMOTE_INCINERATE, target); Talk(SAY_INCINERATE); @@ -230,7 +230,7 @@ public: events.RepeatEvent(urand(25000, 45000)); break; case EVENT_SPELL_LEGION_FLAME: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) { Talk(EMOTE_LEGION_FLAME, target); me->CastSpell(target, SPELL_LEGION_FLAME, false); @@ -238,7 +238,7 @@ public: events.RepeatEvent(30000); break; case EVENT_SPELL_TOUCH_OF_JARAXXUS: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) me->CastSpell(target, SPELL_TOUCH_OF_JARAXXUS, false); events.RepeatEvent(urand(10000, 15000)); break; @@ -334,7 +334,7 @@ public: case 0: break; case EVENT_SPELL_FEL_STEAK: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 44.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 44.0f, true) ) { DoResetThreat(); me->AddThreat(target, 50000.0f); @@ -418,7 +418,7 @@ public: events.RepeatEvent(urand(15000, 25000)); break; case EVENT_SPELL_SPINNING_PAIN_SPIKE: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 140.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true) ) me->CastSpell(target, SPELL_SPINNING_PAIN_SPIKE, false); events.RepeatEvent(urand(25000, 30000)); break; 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 39b0c1837..20b10d057 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -623,7 +623,7 @@ struct boss_jormungarAI : public ScriptedAI } break; case EVENT_SPELL_SPRAY: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true) ) me->CastSpell(target, _SPELL_SPRAY, false); events.RepeatEvent(20000); break; @@ -884,7 +884,7 @@ public: events.RepeatEvent(urand(15000, 20000)); break; case EVENT_SPELL_ARCTIC_BREATH: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 90.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true) ) me->CastSpell(target, SPELL_ARCTIC_BREATH, false); events.RepeatEvent(urand(20000, 30000)); break; @@ -906,7 +906,7 @@ public: events.RescheduleEvent(EVENT_GAZE, 2000); break; case EVENT_GAZE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 500.0f, true) ) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 500.0f, true) ) { TargetGUID = target->GetGUID(); me->SetGuidValue(UNIT_FIELD_TARGET, TargetGUID); 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 5b357230b..d21e63674 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -383,7 +383,7 @@ struct boss_twin_valkyrAI : public ScriptedAI } /* - if( Unit* target = SelectTarget(SELECT_TARGET_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)); */ diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index acde0dd2c..8199a7b09 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -229,7 +229,7 @@ public: break; case EVENT_CAST_OFFENSIVE_SPELL: if (!me->HasUnitState(UNIT_STATE_CASTING)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) me->CastSpell(target, RAND(SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_TOUCH_OF_MISERY), false); events.ScheduleEvent(EVENT_CAST_OFFENSIVE_SPELL, 500); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 670526336..e94f1d655 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -144,12 +144,12 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_CURSE_OF_LIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_CURSE_OF_LIFE, false); events.ScheduleEvent(EVENT_SPELL_CURSE_OF_LIFE, 13000); break; case EVENT_SPELL_RAIN_OF_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_RAIN_OF_FIRE, false); events.ScheduleEvent(EVENT_SPELL_RAIN_OF_FIRE, 16000); break; @@ -179,7 +179,7 @@ public: events.ScheduleEvent(EVENT_SPELL_POISON_CLOUD, 6000); break; case EVENT_SPELL_EYE_BEAM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) me->CastSpell(target, SPELL_EYE_BEAM, false); break; case EVENT_SPELL_LIGHTNING_BREATH: @@ -187,7 +187,7 @@ public: events.ScheduleEvent(EVENT_SPELL_LIGHTNING_BREATH, 8000); break; case EVENT_SPELL_POISON_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) me->CastSpell(target, SPELL_POISON_CLOUD, false); events.ScheduleEvent(EVENT_SPELL_POISON_CLOUD, 10000); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index f3234af66..682406ccf 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -151,7 +151,7 @@ public: events.RepeatEvent(2000); break; case EVENT_SPELL_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true)) me->CastCustomSpell(SPELL_FEAR, SPELLVALUE_MAX_TARGETS, 1, target, false); events.RepeatEvent(urand(8000, 12000)); break; @@ -160,7 +160,7 @@ public: events.RepeatEvent(urand(10000, 15000)); break; case EVENT_SPELL_CORRUPT_SOUL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { Talk(SAY_CORRUPT_SOUL); me->CastSpell(target, SPELL_CORRUPT_SOUL, false); 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 e58674f89..b74f7c153 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 @@ -212,7 +212,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_MIRRORED_SOUL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 90.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true)) { me->CastSpell(target, SPELL_MIRRORED_SOUL, false); me->setAttackTimer(BASE_ATTACK, 2500); @@ -221,7 +221,7 @@ public: events.RepeatEvent(urand(20000, 30000)); break; case EVENT_SPELL_WELL_OF_SOULS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_WELL_OF_SOULS, false); events.RepeatEvent(urand(25000, 30000)); events.DelayEventsToMax(4000, 0); @@ -237,7 +237,7 @@ public: case EVENT_SPELL_WAILING_SOULS: Talk(SAY_FACE_WAILING_SOUL); Talk(EMOTE_WAILING_SOUL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) me->CastCustomSpell(SPELL_WAILING_SOULS_TARGETING, SPELLVALUE_MAX_TARGETS, 1, target, false); events.RepeatEvent(80000); events.DelayEventsToMax(20000, 0); 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 6a62c947a..fbe67c550 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -685,7 +685,7 @@ public: if (a == 1) { me->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0f, true)) AttackStart(target); } } @@ -781,7 +781,7 @@ public: if (a == 1) { me->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0f, true)) AttackStart(target); } } @@ -925,7 +925,7 @@ public: if (a == 1) { me->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0f, true)) AttackStart(target); } } @@ -1020,7 +1020,7 @@ public: if (a == 1) { me->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0f, true)) AttackStart(target); } } @@ -1103,7 +1103,7 @@ public: if (a == 1) { me->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0f, true)) AttackStart(target); } } 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 6ddffadf3..b212fc0d3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -242,7 +242,7 @@ public: break; case EVENT_SPELL_THROW_SARONITE: bCanSayBoulderHit = true; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 140.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 140.0f, true)) { WorldPacket data; ChatHandler::BuildChatPacket(data, CHAT_MSG_RAID_BOSS_EMOTE, LANG_UNIVERSAL, me, nullptr, EMOTE_THROW_SARONITE); @@ -264,7 +264,7 @@ public: events.RepeatEvent(35000); break; case EVENT_SPELL_DEEP_FREEZE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { Talk(EMOTE_DEEP_FREEZE, target); me->CastSpell(target, SPELL_DEEP_FREEZE, false); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 1b789a0e3..8b36f7a91 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -188,7 +188,7 @@ public: case EVENT_SPELL_TOXIC_WASTE: if (Creature* k = GetKrick()) if (!k->HasUnitState(UNIT_STATE_CASTING)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) { k->CastSpell(target, SPELL_TOXIC_WASTE); events.RepeatEvent(urand(7000, 10000)); @@ -203,7 +203,7 @@ public: case EVENT_SPELL_SHADOW_BOLT: if (Creature* k = GetKrick()) if (!k->HasUnitState(UNIT_STATE_CASTING)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) { k->CastSpell(target, SPELL_SHADOW_BOLT); events.RepeatEvent(14000); @@ -223,7 +223,7 @@ public: case 0: // Pursuit if (Creature* k = GetKrick()) k->AI()->Talk(RAND(SAY_TARGET_1, SAY_TARGET_2, SAY_TARGET_3)); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 70.0f, true)) me->CastSpell(target, SPELL_PURSUIT, false); break; case 1: // Poison Nova 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 be8f81e38..5fc78a345 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -173,18 +173,18 @@ public: events.ScheduleEvent(EVENT_SPELL_FORCEFUL_SMASH, urand(40000, 48000)); break; case EVENT_SPELL_OVERLORDS_BRAND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 95.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 95.0f, true)) me->CastSpell(target, SPELL_OVERLORDS_BRAND, false); events.RepeatEvent(urand(11000, 12000)); break; case EVENT_RIMEFANG_SPELL_ICY_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 190.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 190.0f, true)) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_RIMEFANG_GUID))) c->CastSpell(target, RIMEFANG_SPELL_ICY_BLAST, false); events.RepeatEvent(5000); break; case EVENT_SPELL_MARK_OF_RIMEFANG: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 190.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 190.0f, true)) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_RIMEFANG_GUID))) { Talk(SAY_MARK); 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 c1e591d56..562b83efe 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -476,7 +476,7 @@ public: events.RepeatEvent(4000); break; case 2: // Conversion Beam - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, 69578, false); events.RepeatEvent(urand(20000, 25000)); break; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index ffd298587..87d18bc0e 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -123,7 +123,7 @@ public: events.ScheduleEvent(EVENT_ECK_SPIT, 10000); break; case EVENT_ECK_SPRING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f, true)) { me->getThreatMgr().resetAllAggro(); me->AddThreat(target, 500.0f); diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 6f65a6bc8..730994771 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -124,7 +124,7 @@ public: void JustSummoned(Creature* summon) override { uint32 despawnTime = 0; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) { summon->CastSpell(target, SPELL_STAMPEDE_DMG, true); despawnTime = (summon->GetDistance(target) / 40.0f * 1000) + 500; @@ -190,7 +190,7 @@ public: events.ScheduleEvent(EVENT_ENRAGE, 20000); break; case EVENT_STOMP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_STOMP, false); events.ScheduleEvent(EVENT_STOMP, 20000); break; @@ -204,7 +204,7 @@ public: return; } events.ScheduleEvent(EVENT_IMPALING_CHARGE, 21000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { me->CastSpell(target, SPELL_IMPALING_CHARGE, false); impaledList.insert(target->GetGUID()); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index f9533522f..34852e652 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -583,9 +583,9 @@ public: { summons.Summon(summon); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -10.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -10.0f, true); if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (target) { if (summon->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) @@ -1015,7 +1015,7 @@ public: Talk(SAY_VALANAR_BERSERK); break; case EVENT_KINETIC_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { me->CastSpell(target, SPELL_KINETIC_BOMB_TARGET, false); Talk(SAY_VALANAR_SPECIAL); @@ -1031,7 +1031,7 @@ public: } else { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) me->CastSpell(target, SPELL_SHOCK_VORTEX, false); events.ScheduleEvent(EVENT_SHOCK_VORTEX, urand(18000, 23000)); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 85bb64b0e..a0df3b943 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -355,7 +355,7 @@ public: void JustSummoned(Creature* summon) override { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) summon->AI()->AttackStart(target); //if (IsHeroic()) @@ -465,7 +465,7 @@ public: switch (action) { case ACTION_MARK_OF_THE_FALLEN_CHAMPION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_MARK_OF_THE_FALLEN_CHAMPION)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, -SPELL_MARK_OF_THE_FALLEN_CHAMPION)) { ++_fallenChampionCastCount; me->CastSpell(target, SPELL_MARK_OF_THE_FALLEN_CHAMPION, false); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 278854bec..a78b613fd 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -235,12 +235,12 @@ public: { std::list targets; uint32 minTargets = RAID_MODE(3, 8, 3, 8); - SelectTargetList(targets, minTargets, SELECT_TARGET_RANDOM, -5.0f, true); + SelectTargetList(targets, minTargets, SelectTargetMethod::Random, -5.0f, true); float minDist = 0.0f; if (targets.size() >= minTargets) minDist = -5.0f; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, minDist, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, minDist, true)) me->CastSpell(target, SPELL_VILE_GAS, false); events.ScheduleEvent(EVENT_VILE_GAS, urand(28000, 35000), 1); break; @@ -250,7 +250,7 @@ public: events.ScheduleEvent(EVENT_GASTRIC_BLOAT, urand(15000, 17500)); break; case EVENT_FESTERGUT_GOO: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PROFESSOR_PUTRICIDE))) professor->CastSpell(target, SPELL_MALLABLE_GOO_H, true); events.ScheduleEvent(EVENT_FESTERGUT_GOO, urand(15000, 20000)); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 7e9e8a625..eb8ed23cb 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -365,7 +365,7 @@ public: Talk(SAY_BERSERK); break; case EVENT_SPELL_DEATH_AND_DECAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, SPELL_DEATH_AND_DECAY, false); events.RepeatEvent(urand(22000, 30000)); break; @@ -408,7 +408,7 @@ public: } break; case EVENT_SPELL_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, SPELL_SHADOW_BOLT, false); events.RepeatEvent(2100); break; @@ -445,7 +445,7 @@ public: count = 3; std::list targets; - SelectTargetList(targets, NonTankTargetSelector(me, true), count, SELECT_TARGET_RANDOM); + SelectTargetList(targets, NonTankTargetSelector(me, true), count, SelectTargetMethod::Random); if (!targets.empty()) for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) me->CastSpell(*itr, SPELL_SUMMON_SHADE, true); @@ -484,7 +484,7 @@ public: } else { - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); } summon->AI()->AttackStart(target); @@ -855,7 +855,7 @@ public: events.RepeatEvent(urand(9000, 13000)); break; case EVENT_SPELL_ADHERENT_CURSE_OF_TORPOR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) me->CastSpell(target, SPELL_CURSE_OF_TORPOR, false); events.RepeatEvent(urand(9000, 13000)); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 48f5672fa..aa50c5781 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -216,10 +216,10 @@ public: break; } events.RepeatEvent(5000); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0, BoneStormMoveTargetSelector(me)); + Unit* unit = SelectTarget(SelectTargetMethod::Random, 0, BoneStormMoveTargetSelector(me)); if (!unit) { - if ((unit = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, 175.0f, true))) + if ((unit = SelectTarget(SelectTargetMethod::MaxThreat, 0, 175.0f, true))) if (unit->GetPositionX() > -337.0f) { EnterEvadeMode(); @@ -479,9 +479,9 @@ public: void SelectTarget(std::list& targets) { targets.clear(); - Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 1, -1.0f, true, -SPELL_IMPALED); // -1.0f as it takes into account object size + Unit* target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 1, -1.0f, true, -SPELL_IMPALED); // -1.0f as it takes into account object size if (!target) - target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); // if only tank or noone outside of boss' model + target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); // if only tank or noone outside of boss' model if (!target) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index eee32e5e0..82e7f42e2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -548,7 +548,7 @@ public: case EVENT_SLIME_PUDDLE: { std::list targets; - SelectTargetList(targets, 2, SELECT_TARGET_RANDOM, 0.0f, true); + SelectTargetList(targets, 2, SelectTargetMethod::Random, 0.0f, true); if (!targets.empty()) for (std::list::iterator itr = targets.begin(); itr != targets.end(); ++itr) me->CastSpell(*itr, SPELL_SLIME_PUDDLE_TRIGGER, true); @@ -621,7 +621,7 @@ public: instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_OOZE_VARIABLE); break; case EVENT_UNBOUND_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, UnboundPlagueTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, UnboundPlagueTargetSelector(me))) { me->CastSpell(target, SPELL_UNBOUND_PLAGUE, false); me->CastSpell(target, SPELL_UNBOUND_PLAGUE_SEARCHER, false); @@ -634,7 +634,7 @@ public: if (Is25ManRaid()) { std::list targets; - SelectTargetList(targets, MalleableGooSelector(me), (IsHeroic() ? 3 : 2), SELECT_TARGET_RANDOM); + SelectTargetList(targets, MalleableGooSelector(me), (IsHeroic() ? 3 : 2), SelectTargetMethod::Random); if (!targets.empty()) { @@ -645,7 +645,7 @@ public: } else { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, MalleableGooSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, MalleableGooSelector(me))) { Talk(EMOTE_MALLEABLE_GOO); me->CastSpell(target, SPELL_MALLEABLE_GOO, true); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 202c35706..e4ee572b9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -273,7 +273,7 @@ public: me->DisableRotate(false); break; case EVENT_SLIME_SPRAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) { if (Creature* c = me->SummonCreature(NPC_OOZE_SPRAY_STALKER, *target, TEMPSUMMON_TIMED_DESPAWN, 8000)) { @@ -315,12 +315,12 @@ public: { std::list targets; uint32 minTargets = RAID_MODE(3, 8, 3, 8); - SelectTargetList(targets, minTargets, SELECT_TARGET_RANDOM, -5.0f, true); + SelectTargetList(targets, minTargets, SelectTargetMethod::Random, -5.0f, true); float minDist = 0.0f; if (targets.size() >= minTargets) minDist = -5.0f; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, minDist, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, minDist, true)) if (Creature* professor = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_PROFESSOR_PUTRICIDE))) professor->CastSpell(target, SPELL_VILE_GAS_H, true); // triggered, to skip LoS check } @@ -897,7 +897,7 @@ public: void JustSummoned(Creature* summon) override { summons.Summon(summon); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->AI()->AttackStart(target); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 4f6d8a711..11ba5a989 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -671,7 +671,7 @@ public: events.ScheduleEvent(EVENT_THIRD_PHASE_CHECK, 5000); break; case EVENT_ICE_TOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, LastPhaseIceTombTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, LastPhaseIceTombTargetSelector(me))) { Talk(EMOTE_WARN_FROZEN_ORB, target); me->CastSpell(target, SPELL_ICE_TOMB_DUMMY, true); @@ -1643,7 +1643,7 @@ public: case EVENT_ICY_BLAST_CAST: if (--_icyBlastCounter) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { me->SetFacingToObject(target); me->CastSpell(target, SPELL_ICY_BLAST, false); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index e704a7606..9641bf5d3 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -502,7 +502,7 @@ public: if (Unit* target = _owner->SelectVictim()) _owner->AI()->AttackStart(target); if (!_owner->GetVictim()) - if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankLKTargetSelector(_summoner))) + if (Unit* target = _summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, NonTankLKTargetSelector(_summoner))) _owner->AI()->AttackStart(target); _owner->AI()->DoZoneInCombat(); return true; @@ -1055,7 +1055,7 @@ public: events.ScheduleEvent(EVENT_INFEST, 22500, EVENT_GROUP_ABILITIES); break; case EVENT_NECROTIC_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) { Talk(EMOTE_NECROTIC_PLAGUE_WARNING, target); me->CastSpell(target, SPELL_NECROTIC_PLAGUE, false); @@ -1065,12 +1065,12 @@ public: events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, 5000, EVENT_GROUP_ABILITIES); break; case EVENT_SHADOW_TRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, ShadowTrapLKTargetSelector(me, true, true, 100.0f))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, ShadowTrapLKTargetSelector(me, true, true, 100.0f))) me->CastSpell(target, SPELL_SHADOW_TRAP, false); events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, EVENT_GROUP_ABILITIES); break; case EVENT_PAIN_AND_SUFFERING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { //events.DelayEventsToMax(500, EVENT_GROUP_ABILITIES); me->SetFacingTo(me->GetAngle(target)); @@ -1083,7 +1083,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, 7500, EVENT_GROUP_ABILITIES); break; case EVENT_SUMMON_RAGING_SPIRIT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_RAGING_SPIRIT, false); events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, (!HealthAbovePct(40) ? 15000 : 20000), EVENT_GROUP_ABILITIES); break; @@ -1108,7 +1108,7 @@ public: events.RescheduleEvent(EVENT_SUMMON_VALKYR, 5000, EVENT_GROUP_ABILITIES); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, DefileTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, DefileTargetSelector(me))) { Talk(EMOTE_DEFILE_WARNING); me->CastSpell(target, SPELL_DEFILE, false); @@ -1155,7 +1155,7 @@ public: events.ScheduleEvent(EVENT_VILE_SPIRITS, 30000, EVENT_GROUP_VILE_SPIRITS); break; case EVENT_HARVEST_SOUL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankLKTargetSelector(me, true, true, 55.0f))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankLKTargetSelector(me, true, true, 55.0f))) { Talk(SAY_LK_HARVEST_SOUL); me->CastSpell(target, SPELL_HARVEST_SOUL, false); @@ -2700,7 +2700,7 @@ public: } if (!target) if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING))) - target = lichKing->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankLKTargetSelector(lichKing, true, false, 100.0f)); + target = lichKing->AI()->SelectTarget(SelectTargetMethod::Random, 0, NonTankLKTargetSelector(lichKing, true, false, 100.0f)); if (target) me->CastSpell(target, SPELL_LIFE_SIPHON, false); _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index d41b002ed..c6798371b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -775,12 +775,12 @@ public: _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, urand(8000, 15000)); break; case EVENT_MANA_VOID: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, ManaVoidSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, ManaVoidSelector(me))) me->CastSpell(target, SPELL_MANA_VOID, false); _events.ScheduleEvent(EVENT_MANA_VOID, urand(20000, 25000)); break; case EVENT_COLUMN_OF_FROST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -10.0f, true)) me->CastSpell(target, SPELL_COLUMN_OF_FROST, false); _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, urand(15000, 25000)); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 55b90a479..4dccaed58 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -625,7 +625,7 @@ public: switch (eventId) { case EVENT_DEATH_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_RECENTLY_INFECTED)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, -SPELL_RECENTLY_INFECTED)) { Talk(EMOTE_DEATH_PLAGUE_WARNING, target); DoCast(target, SPELL_DEATH_PLAGUE); @@ -1173,7 +1173,7 @@ public: Talk(SAY_SVALNA_AGGRO); break; case EVENT_IMPALING_SPEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_IMPALING_SPEAR)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, -SPELL_IMPALING_SPEAR)) { DoCast(me, SPELL_AETHER_SHIELD); me->AddAura(70203, me); @@ -1359,7 +1359,7 @@ public: Events.ScheduleEvent(EVENT_ARNATH_SMITE, urand(4000, 7000)); break; case EVENT_ARNATH_DOMINATE_MIND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, -SPELL_DOMINATE_MIND)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, -SPELL_DOMINATE_MIND)) DoCast(target, SPELL_DOMINATE_MIND); Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, urand(28000, 37000)); break; @@ -1437,7 +1437,7 @@ public: Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, urand(8000, 13000)); break; case EVENT_BRANDON_HAMMER_OF_BETRAYAL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_HAMMER_OF_BETRAYAL); Events.ScheduleEvent(EVENT_BRANDON_HAMMER_OF_BETRAYAL, urand(45000, 60000)); break; @@ -1505,7 +1505,7 @@ public: Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, urand(5000, 17000)); break; case EVENT_GRONDEL_CONFLAGRATION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_CONFLAGRATION); Events.ScheduleEvent(EVENT_GRONDEL_CONFLAGRATION, urand(10000, 15000)); break; @@ -1559,17 +1559,17 @@ public: switch (eventId) { case EVENT_RUPERT_FEL_IRON_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FEL_IRON_BOMB); Events.ScheduleEvent(EVENT_RUPERT_FEL_IRON_BOMB, urand(15000, 20000)); break; case EVENT_RUPERT_MACHINE_GUN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_MACHINE_GUN); Events.ScheduleEvent(EVENT_RUPERT_MACHINE_GUN, urand(25000, 30000)); break; case EVENT_RUPERT_ROCKET_LAUNCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_ROCKET_LAUNCH); Events.ScheduleEvent(EVENT_RUPERT_ROCKET_LAUNCH, urand(10000, 15000)); break; @@ -1711,7 +1711,7 @@ public: break; case 3: // Volley { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true); if (target && me->GetDistance(target) > 10.0f) { me->CastSpell(target, 71252, false); @@ -1740,7 +1740,7 @@ public: me->CastSpell(me, 71270, true); break; case 32: // Frozen Orb - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true)) me->CastSpell(target, 71274, false); events.RepeatEvent(urand(40000, 50000)); break; @@ -2901,7 +2901,7 @@ public: uint8 count = me->GetMap()->Is25ManRaid() ? 4 : 2; bool casted = false; for (uint8 i = 0; i < count; ++i) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 37.5f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 37.5f, true)) { casted = true; me->CastSpell(target, 71906, true); // Severed Essence @@ -3114,7 +3114,7 @@ public: switch (events.ExecuteEvent()) { case 1: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, 70362, false); events.RepeatEvent(urand(25000, 35000)); break; @@ -3408,7 +3408,7 @@ public: events.RepeatEvent(urand(20000, 30000)); break; case 3: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, 70980, false); events.RepeatEvent(urand(20000, 30000)); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index d744c7744..0411bccd1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -219,7 +219,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_IMPALE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->CastSpell(target, RAID_MODE(SPELL_IMPALE_10, SPELL_IMPALE_25), false); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index dc1225451..660d9bc96 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -203,7 +203,7 @@ public: events.RepeatEvent(urand(7000, 15000)); break; case EVENT_RAIN_OF_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->CastSpell(target, RAID_MODE(SPELL_RAIN_OF_FIRE_10, SPELL_RAIN_OF_FIRE_25), false); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e4ed8481f..358faca71 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -346,7 +346,7 @@ public: events.RepeatEvent(15000); return; case EVENT_PUNISH: - if (!SelectTarget(SELECT_TARGET_NEAREST, 0, 45.0f, true)) + if (!SelectTarget(SelectTargetMethod::MaxDistance, 0, 45.0f, true)) { me->CastSpell(me, TABLE_SPELL_PUNISH[horsemanId], false); Talk(EMOTE_RAGECAST); @@ -361,7 +361,7 @@ public: if ((me->GetEntry() == NPC_LADY_BLAUMEUX || me->GetEntry() == NPC_SIR_ZELIEK)) { - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 45.0f, true)) { me->CastSpell(target, RAID_MODE(TABLE_SPELL_PRIMARY_10[horsemanId], TABLE_SPELL_PRIMARY_25[horsemanId]), false); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 4081eadad..67c1ffd05 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -453,7 +453,7 @@ public: me->CastSpell(me, SPELL_TELEPORT_LIVE, false); } me->getThreatMgr().resetAggro(NotOnSameSide(me)); - if (Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::MaxDistance, 0)) { me->getThreatMgr().addThreat(pTarget, 100.0f); AttackStart(pTarget); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index fb8d9ddfd..2974ece3f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -177,7 +177,7 @@ public: events.RepeatEvent(20000); break; case EVENT_MUTATING_INJECTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, -SPELL_MUTATING_INJECTION)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, -SPELL_MUTATING_INJECTION)) { me->CastSpell(target, SPELL_MUTATING_INJECTION, false); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index b424ab4bf..96bbc00e8 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -410,14 +410,14 @@ public: events.RepeatEvent(urand(15000, 30000)); break; case EVENT_SHADOW_FISSURE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { me->CastSpell(target, SPELL_SHADOW_FISURE, false); } events.RepeatEvent(25000); break; case EVENT_FROST_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, RAID_MODE(1, 0), 0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, RAID_MODE(1, 0), 0, true)) { me->CastSpell(target, SPELL_FROST_BLAST, false); } @@ -427,7 +427,7 @@ public: case EVENT_CHAINS: for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200, true, -SPELL_CHAINS_OF_KELTHUZAD)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 200, true, -SPELL_CHAINS_OF_KELTHUZAD)) { me->CastSpell(target, SPELL_CHAINS_OF_KELTHUZAD, true); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 427d5b0f1..3ea610a5a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -132,7 +132,7 @@ public: if (cr->GetEntry() == NPC_MAEXXNA_SPIDERLING) { cr->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { cr->AI()->AttackStart(target); } @@ -201,7 +201,7 @@ public: Talk(EMOTE_WEB_WRAP); for (uint8 i = 0; i < RAID_MODE(1, 2); ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0, true, -SPELL_WEB_WRAP)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0, true, -SPELL_WEB_WRAP)) { target->RemoveAura(RAID_MODE(SPELL_WEB_SPRAY_10, SPELL_WEB_SPRAY_25)); uint8 pos = urand(0, 2); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 7e8abfd92..0d6e0285c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -162,7 +162,7 @@ public: events.RepeatEvent(15000); break; case EVENT_JAGGED_KNIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f)) { me->CastSpell(target, SPELL_JAGGED_KNIFE, false); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 62b07057c..a14e7999d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -272,7 +272,7 @@ public: case EVENT_BLIZZARD: { Creature* cr; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) { cr = me->SummonCreature(NPC_BLIZZARD, *target, TEMPSUMMON_TIMED_DESPAWN, 16000); } diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 4381e3c97..4aec789b0 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -359,7 +359,7 @@ public: } else if (ballLightningEnabled) { - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat)) { me->CastSpell(target, SPELL_BALL_LIGHTNING, false); } @@ -582,7 +582,7 @@ public: me->RemoveAurasDueToSpell(me->GetEntry() == NPC_STALAGG ? SPELL_STALAGG_CHAIN : SPELL_FEUGEN_CHAIN); cr->InterruptNonMeleeSpells(true); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 1000.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 1000.f, true)) { cr->CastStop(SPELL_TESLA_SHOCK); cr->CastSpell(target, SPELL_TESLA_SHOCK, true); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index aad4a6148..bb05297ad 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -756,7 +756,7 @@ public: events.RepeatEvent(3000); break; case EVENT_SPELL_STATIC_FIELD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, false)) { me->SetFacingToObject(target); me->CastSpell(target, SPELL_STATIC_FIELD_MAIN, true); @@ -1497,7 +1497,7 @@ public: { uint8 i = 0; std::list drakes; - c->AI()->SelectTargetList(drakes, (c->GetMap()->GetSpawnMode() == 0 ? 1 : 3), SELECT_TARGET_RANDOM, 0.0f, false, 57403 /*only drakes have this aura*/); + c->AI()->SelectTargetList(drakes, (c->GetMap()->GetSpawnMode() == 0 ? 1 : 3), SelectTargetMethod::Random, 0.0f, false, 57403 /*only drakes have this aura*/); for (std::list::iterator itr = drakes.begin(); itr != drakes.end() && i < 3; ++itr) { DrakeGUID[i++] = (*itr)->GetGUID(); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index bc7e03ff7..35d02aa2d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -167,7 +167,7 @@ public: events.ScheduleEvent(EVENT_ANOMALUS_HEALTH, 1000); break; case EVENT_ANOMALUS_ARCANE_ATTRACTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_ARCANE_ATTRACTION, false); events.ScheduleEvent(EVENT_ANOMALUS_ARCANE_ATTRACTION, 15000); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp index 12b549d6a..1431f5e71 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard_kolurg.cpp @@ -115,7 +115,7 @@ public: events.ScheduleEvent(EVENT_WHIRLWIND, 16000); break; case EVENT_COMMANDER_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 25.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 25.0f)) me->CastSpell(target, SPELL_CHARGE, false); events.ScheduleEvent(EVENT_COMMANDER_CHARGE, 20000); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 6d2f5be38..e976c8923 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -181,7 +181,7 @@ public: Talk(SAY_CRYSTAL_NOVA); if (IsHeroic()) me->CastSpell(me, SPELL_CRYSTALIZE, false); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_CRYSTAL_CHAINS, false); events.ScheduleEvent(EVENT_CRYSTAL_CHAINS, DUNGEON_MODE(20000, 11000)); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 6418ac84a..1f9624163 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -198,7 +198,7 @@ public: events.ScheduleEvent(EVENT_MAGUS_HEALTH2, 1000); break; case EVENT_MAGUS_FIREBOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_FIREBOMB, false); events.ScheduleEvent(EVENT_MAGUS_FIREBOMB, 3000); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 2441ffa19..333fb9828 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -146,7 +146,7 @@ public: events.ScheduleEvent(EVENT_ORMOROK_SPELL_REFLECTION, 30000); break; case EVENT_ORMOROK_SUMMON: - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 50.0f, true)) me->CastSpell(target, SPELL_SUMMON_CRYSTALLINE_TANGLER, true); events.ScheduleEvent(EVENT_ORMOROK_SUMMON, 17000); break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index 71ed678bd..7f21b1e00 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -223,7 +223,7 @@ public: Talk(SAY_SHIELD); me->CastSpell(me, SPELL_PLANAR_SHIFT, false); for( uint8 i = 0; i < 3; ++i ) - if( Unit* t = SelectTarget(SELECT_TARGET_RANDOM, 0, 300.0f, false) ) + 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); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index e7fdacaee..80a0f8ba1 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -335,7 +335,7 @@ public: events.RepeatEvent(urand(7000, 11000)); break; case EVENT_TIME_BOMB: - if( Unit* target = SelectTarget(SELECT_TARGET_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.RepeatEvent(urand(20000, 25000)); break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 5c7515429..ed6dd6881 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -173,7 +173,7 @@ public: break; case EVENT_AMPLIFY_MAGIC: { - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true) ) me->CastSpell(target, SPELL_AMPLIFY_MAGIC, false); events.RepeatEvent(urand(17500, 22500)); } @@ -204,7 +204,7 @@ public: events.ScheduleEvent(EVENT_CALL_AZURE_RING_CAPTAIN_1, 16000); break; } - if( Unit* target = SelectTarget(SELECT_TARGET_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) ) { diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp index ba8c9de95..6671b36cc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp @@ -350,7 +350,7 @@ public: ///// BATTLE STANCE /////////////////////////////////////////////////////// case EVENT_BJARNGRIM_INTERCEPT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, SPELL_INTERCEPT, true); events.RepeatEvent(30000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 013004664..a8f695548 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -187,13 +187,13 @@ public: switch (events.ExecuteEvent()) { case EVENT_BALL_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, me->GetMap()->IsHeroic() ? SPELL_BALL_LIGHTNING_H : SPELL_BALL_LIGHTNING_N, false); events.RepeatEvent(10000 + rand() % 1000); break; case EVENT_STATIC_OVERLOAD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, me->GetMap()->IsHeroic() ? SPELL_STATIC_OVERLOAD_H : SPELL_STATIC_OVERLOAD_N, false); events.RepeatEvent(5000 + rand() % 1000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 258ce3a5c..93ca510f2 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -205,7 +205,7 @@ public: { summon->SetFaction(me->GetFaction()); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) summon->AI()->AttackStart(target); } } @@ -557,11 +557,11 @@ public: events.RepeatEvent(12000); break; case EVENT_THROW: - me->CastSpell(SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0), me->GetMap()->IsHeroic() ? SPELL_THROW_H : SPELL_THROW_N, true); + me->CastSpell(SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0), me->GetMap()->IsHeroic() ? SPELL_THROW_H : SPELL_THROW_N, true); events.RepeatEvent(10000 + rand() % 15000); break; case EVENT_DEADLY_THROW: - me->CastSpell(SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0), me->GetMap()->IsHeroic() ? SPELL_DEADLY_THROW_H : SPELL_DEADLY_THROW_N, true); + me->CastSpell(SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0), me->GetMap()->IsHeroic() ? SPELL_DEADLY_THROW_H : SPELL_DEADLY_THROW_N, true); events.RepeatEvent(15000 + rand() % 15000); break; case EVENT_DEFLECTION: diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 9142e3d0f..43573d4dc 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -122,7 +122,7 @@ public: { case EVENT_BOULDER: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0)) me->CastSpell(target, DUNGEON_MODE(BOULDER_TOSS, BOULDER_TOSS_H), false); events.RepeatEvent(5000 + rand() % 2000); 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 d3d662409..13ca54629 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 @@ -121,7 +121,7 @@ public: } case EVENT_PILLAR: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0)) me->CastSpell(target, DUNGEON_MODE(PILLAR_OF_WOE, PILLAR_OF_WOE_H), false); events.RepeatEvent(12000 + rand() % 8000); @@ -129,7 +129,7 @@ public: } case EVENT_PARTING: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0)) me->CastSpell(target, PARTING_SORROW, false); events.RepeatEvent(6000 + rand() % 10000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 94aaa32dc..2d5d3278f 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -251,7 +251,7 @@ public: } case EVENT_CHAIN_LIGHTNING: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_CHAIN_LIGHTNING, SPELL_CHAIN_LIGHTNING_H), false); events.RepeatEvent(6000 + rand() % 6000); @@ -259,7 +259,7 @@ public: } case EVENT_STATIC_CHARGE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_STATIC_CHARGE, SPELL_STATIC_CHARGE_H), false); events.RepeatEvent(20000); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp index 2264e9f85..bc1169775 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/brann_bronzebeard.cpp @@ -734,7 +734,7 @@ public: { case EVENT_DRP_CHARGE: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, SPELL_DRP_CHARGE, false); events.RepeatEvent(10000); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index a18effa32..42909f6d6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -567,7 +567,7 @@ public: break; } case NPC_UNLEASHED_DARK_MATTER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) if (summon->Attack(target, true)) summon->GetMotionMaster()->MoveChase(target); break; 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 f65e710d2..02ce89dab 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 @@ -344,7 +344,7 @@ public: events.RepeatEvent(urand(15000, 20000)); break; case EVENT_STATIC_DISRUPTION: - if (Unit* pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 0, true)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::MinDistance, 0, 0, true)) me->CastSpell(pTarget, SPELL_STATIC_DISRUPTION, false); events.RepeatEvent(urand(20000, 40000)); @@ -523,7 +523,7 @@ public: events.RescheduleEvent(EVENT_SHIELD_OF_RUNES, urand(27000, 34000)); break; case EVENT_RUNE_OF_DEATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, SPELL_RUNE_OF_DEATH, true); Talk(SAY_MOLGEIM_RUNE_DEATH); @@ -531,7 +531,7 @@ public: break; case EVENT_RUNE_OF_SUMMONING: Talk(SAY_MOLGEIM_SUMMON); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_RUNE_OF_SUMMONING); events.RepeatEvent(urand(30000, 45000)); break; @@ -771,7 +771,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); events.RepeatEvent(urand(9000, 17000)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 05b3ce9db..04bade9ef 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -610,7 +610,7 @@ public: break; } case EVENT_FREYA_SUNBEAM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(target, SPELL_SUNBEAM, false); events.RepeatEvent(15000 + urand(0, 5000)); break; @@ -986,7 +986,7 @@ public: events.RepeatEvent(20000); break; case EVENT_IRONBRANCH_THORN_SWARM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), SPELL_THORN_SWARM, false); events.RepeatEvent(14000); break; @@ -1225,7 +1225,7 @@ public: me->CastSpell(me, SPELL_TIDAL_WAVE_DAMAGE, false); break; case EVENT_STORM_LASHER_LIGHTNING_LASH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_LIGHTNING_LASH, false); events.RepeatEvent(10000); break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 9753bca6a..336165d91 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -477,7 +477,7 @@ public: { me->CastSpell(plr, SPELL_FREEZE, false); } - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) { me->CastSpell(target, SPELL_FREEZE, false); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 3b6e910eb..1619b72c4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -448,7 +448,7 @@ public: { events.ScheduleEvent(EVENT_FOCUSED_EYEBEAM, 20000); - if ((eyebeamTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0, 0, true))) + if ((eyebeamTarget = SelectTarget(SelectTargetMethod::MinDistance, 0, 0, true))) { me->CastSpell(eyebeamTarget, SPELL_FOCUSED_EYEBEAM_SUMMON, false); } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index fd4357261..8d4b6ceea 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1151,7 +1151,7 @@ public: if (!pList.empty()) pTarget = pList[urand(0, pList.size() - 1)]; else - pTarget = (Player*)SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true); + pTarget = (Player*)SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true); if( pTarget ) cannon->CastSpell(pTarget, SPELL_NAPALM_SHELL, false); @@ -1806,7 +1806,7 @@ public: } else { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 27.5f, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 27.5f, true)) { me->SetFacingToObject(victim); me->CastSpell(victim, SPELL_PLASMA_BALL, false); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 84d67803f..ee7773f29 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -365,12 +365,12 @@ public: } break; case EVENT_SPELL_FIREBALL: - if( Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true) ) + if( Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true) ) me->CastSpell(pTarget, SPELL_FIREBALL, false); events.RepeatEvent(4000); break; case EVENT_SPELL_DEVOURING_FLAME: - if( Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true) ) + if( Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true) ) me->CastSpell(pTarget, SPELL_DEVOURINGFLAME, false); events.RepeatEvent(13000); break; @@ -488,7 +488,7 @@ public: me->SetControlled(false, UNIT_STATE_ROOT); me->DisableRotate(false); DoResetThreat(); - Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 0.0, true); + Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0.0, true); if (!target) target = me->SelectNearestPlayer(200.0f); if (target) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index c5861c7f0..4acefb454 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -759,7 +759,7 @@ public: me->CastSpell(me, SPELL_LIGHTNING_PILLAR_P2, true); break; case EVENT_THORIM_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); events.RepeatEvent(15000); break; @@ -1218,7 +1218,7 @@ public: events.RepeatEvent(10000); break; case EVENT_DR_ACOLYTE_HS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_HOLY_SMITE, false); events.RepeatEvent(1600); break; @@ -1343,7 +1343,7 @@ public: events.RepeatEvent(10000); break; case EVENT_DR_ACOLYTE_HS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_HOLY_SMITE, false); events.RepeatEvent(1600); break; @@ -1499,7 +1499,7 @@ public: events.RepeatEvent(10000); break; case EVENT_RC_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHARGE, false); events.RepeatEvent(15000); break; @@ -1574,7 +1574,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_ARG_RD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_RUNE_DETONATION, false); events.RepeatEvent(12000); break; @@ -1696,7 +1696,7 @@ public: events.RepeatEvent(8000); break; case EVENT_DR_EVOKER_RL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_RUNIC_LIGHTNING, false); events.RepeatEvent(2500); break; @@ -1712,7 +1712,7 @@ public: events.RepeatEvent(10000); break; case EVENT_DR_CHAMPION_CH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHARGE, false); events.RepeatEvent(12000); break; 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 bae863021..c5da1082f 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(SELECT_TARGET_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()); } } diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 54bb5fb10..ad9c68d89 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -197,7 +197,7 @@ public: events.RepeatEvent(urand(4000, 5000)); break; case EVENT_FROST_TOMB: - if( Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true) ) + if( Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true) ) if( !target->HasAura(SPELL_FROST_TOMB_AURA) ) { Talk(SAY_FROST_TOMB_EMOTE, target); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp index 0606cd4fc..d9d31d4bd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -196,7 +196,7 @@ public: Talk(YELL_SKARVALD_DAL_DIEDFIRST); break; case EVENT_SHARVALD_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, (IsHeroic() ? 100.0f : 30.0f), true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, (IsHeroic() ? 100.0f : 30.0f), true)) { ScriptedAI::DoResetThreat(); me->AddThreat(target, 10000.0f); @@ -372,14 +372,14 @@ public: Talk(YELL_DALRONN_SKA_DIEDFIRST); break; case EVENT_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) { me->CastSpell(target, DUNGEON_MODE(SPELL_SHADOW_BOLT_N, SPELL_SHADOW_BOLT_H), false); } events.RepeatEvent(2050); break; case EVENT_DEBILITATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) { me->CastSpell(target, SPELL_DEBILITATE, false); events.RepeatEvent(urand(5000, 10000)); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index bc487a837..9bafdcb38 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -301,7 +301,7 @@ public: } case EVENT_PALEHOOF_IMPALE: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, IsHeroic() ? SPELL_IMPALE_H : SPELL_IMPALE_N, false); events.RepeatEvent(8000 + rand() % 4000); @@ -415,7 +415,7 @@ public: { case EVENT_JORMUNGAR_ACID_SPIT: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, SPELL_ACID_SPIT, false); events.RepeatEvent(2000 + rand() % 2000); @@ -441,7 +441,7 @@ public: } case EVENT_JORMUNGAR_POISON_BREATH: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, IsHeroic() ? SPELL_POISON_BREATH_H : SPELL_POISON_BREATH_N, false); events.RepeatEvent(8000 + rand() % 4000); @@ -551,7 +551,7 @@ public: } case EVENT_RHINO_WOUND: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, IsHeroic() ? SPELL_GRIEVOUS_WOUND_H : SPELL_GRIEVOUS_WOUND_N, false); events.RepeatEvent(18000 + rand() % 4000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index f4bbb5b88..307308b05 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -226,7 +226,7 @@ public: } case EVENT_SKADI_SPEAR: { - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(tgt, IsHeroic() ? SPELL_POISONED_SPEAR_H : SPELL_POISONED_SPEAR_N, false); events.RepeatEvent(10000); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index a28ed7e20..3be3fd43e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -323,7 +323,7 @@ public: break; } case EVENT_SORROWGRAVE_RITUAL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Talk(SAY_SACRIFICE_PLAYER); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index b593659ff..1f2b507d7 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -134,7 +134,7 @@ class boss_archavon : public CreatureScript switch (events.ExecuteEvent()) { case EVENT_ROCK_SHARDS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_ROCK_SHARDS); } @@ -142,7 +142,7 @@ class boss_archavon : public CreatureScript events.RepeatEvent(15000); break; case EVENT_CHOKING_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { DoCast(target, RAID_MODE(SPELL_CRUSHING_LEAP_10, SPELL_CRUSHING_LEAP_25), true); //10y ~ 80y, ignore range } diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 0c888ee0a..40b5586c2 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -169,7 +169,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, RAID_MODE(SPELL_CHAIN_LIGHTNING_10, SPELL_CHAIN_LIGHTNING_25), false); events.RepeatEvent(25000); break; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 2d9f8deb5..b7279b6ed 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -131,7 +131,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_FREEZING_GROUND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_FREEZING_GROUND, false); events.RepeatEvent(20000); break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 71956b98d..a41dae1c4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -134,12 +134,12 @@ public: break; case EVENT_SPELL_BLIZZARD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) me->CastSpell(target, SPELL_BLIZZARD, false); events.RepeatEvent(15000); break; case EVENT_SPELL_MANA_DESTRUCTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_MANA_DESTRUCTION, false); events.RepeatEvent(20000); break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index 834b5c69e..fb658b9d1 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -154,7 +154,7 @@ public: events.RepeatEvent(urand(8000, 13000)); break; case EVENT_SPELL_LIGHTNING_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) me->CastSpell(target, SPELL_LIGHTNING_BOLT, false); events.RepeatEvent(urand(15000, 25000)); break; diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 29b6c5e40..336f9970d 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -99,7 +99,7 @@ public: events.RepeatEvent(urand(8000, 10000)); break; case EVENT_SPELL_OPTIC_LINK: - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 40.0f, true)) { me->CastSpell(target, SPELL_OPTIC_LINK, false); events.RepeatEvent(urand(18000, 21000)); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index b0be3da7a..57105e9bf 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -113,7 +113,7 @@ public: events.RepeatEvent(20000); break; case EVENT_SPELL_VOID_SHIFT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) { me->CastSpell(target, SPELL_VOID_SHIFT, false); me->Whisper("Gaze... into the void.", LANG_UNIVERSAL, target->ToPlayer()); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index ccf11d836..7ad5910de 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -525,7 +525,7 @@ public: if (uiImpaleTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 5.0f, true); if (pTarget) DoCast(pTarget, SPELL_IMPALE); uiImpaleTimer = 4000; @@ -600,7 +600,7 @@ public: if (uiArcainBarrageTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true); if (pTarget) DoCast(pTarget, SPELL_ARCANE_BARRAGE); uiArcainBarrageTimer = 6000; @@ -619,7 +619,7 @@ public: if (uiFrostboltTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true); if (pTarget) DoCast(pTarget, SPELL_FROSTBOLT); uiFrostboltTimer = 6000; @@ -676,7 +676,7 @@ public: { if (uiSpellLockTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true); if (pTarget) DoCast(pTarget, SPELL_SPELL_LOCK); uiSpellLockTimer = 9000; @@ -774,7 +774,7 @@ public: { if (uiTacticalBlinkTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true); if (pTarget) DoCast(pTarget, SPELL_TACTICAL_BLINK); uiTacticalBlinkTimer = 10000; @@ -786,7 +786,7 @@ public: { if (uiBackstabTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 5.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::MaxDistance, 0, 5.0f, true); if (pTarget && !pTarget->HasInArc(M_PI, me)) DoCast(pTarget, SPELL_BACKSTAB); TacticalBlinkCasted = false; @@ -838,7 +838,7 @@ public: { if (uiArcaneBlastTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true); if (pTarget) DoCast(pTarget, SPELL_ARCANE_BLAST); uiArcaneBlastTimer = 6000; @@ -847,7 +847,7 @@ public: if (uiSlowTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true); if (pTarget) DoCast(pTarget, SPELL_SLOW); uiSlowTimer = 5000; @@ -859,7 +859,7 @@ public: { if (uiChainsOfIceTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true); if (pTarget) DoCast(pTarget, SPELL_CHAINS_OF_ICE); uiChainsOfIceTimer = 7000; @@ -962,7 +962,7 @@ public: if (uiArcaneStreamTimer <= diff) { - Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true); + Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true); if (pTarget) DoCast(pTarget, SPELL_ARCANE_STREAM); uiArcaneStreamTimer = urand(0, 5000) + 5000; diff --git a/src/server/scripts/Northrend/isle_of_conquest.cpp b/src/server/scripts/Northrend/isle_of_conquest.cpp index 25c641516..5a3592efd 100644 --- a/src/server/scripts/Northrend/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/isle_of_conquest.cpp @@ -285,7 +285,7 @@ public: events.RepeatEvent(22000); break; case EVENT_DAGGER_THROW: - if (Unit* tgt = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* tgt = SelectTarget(SelectTargetMethod::Random)) me->CastSpell(tgt, SPELL_IOCBOSS_DAGGER_THROW, false); events.RepeatEvent(10000); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 9b1dd3c49..c85d1a1fd 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -123,7 +123,7 @@ public: events.RepeatEvent(2000); break; case EVENT_SPELL_SOUL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { Talk(SAY_ROAR); me->CastSpell(target, SPELL_STOLEN_SOUL, false); @@ -138,7 +138,7 @@ public: events.RepeatEvent(urand(25000, 30000)); break; case EVENT_SPELL_RIBBON: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_RIBBON_OF_SOULS, false); events.RepeatEvent(urand(10000, 20000)); break; diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp index d66ca5e72..3c6126f1b 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp @@ -153,7 +153,7 @@ public: events.RepeatEvent(10000); break; case EVENT_SPELL_FOCUS_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) { if (Creature* cr = me->SummonCreature(ENTRY_FOCUS_FIRE, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 7000)) focusGUID = cr->GetGUID(); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index 7c7bcdcc2..044668273 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -95,7 +95,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_VOID_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoCast(target, SPELL_VOID_BLAST); ++VoidBlastCounter; diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index dd547eed8..4e35ca1ac 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -125,7 +125,7 @@ public: events.RepeatEvent(urand(7000, 12000)); break; case EVENT_SPELL_POLYMORPH: - if (Unit* target = (IsHeroic() ? SelectTarget(SELECT_TARGET_RANDOM, 0) : SelectTarget(SELECT_TARGET_TOPAGGRO, 1))) + if (Unit* target = (IsHeroic() ? SelectTarget(SelectTargetMethod::Random, 0) : SelectTarget(SelectTargetMethod::MaxThreat, 1))) me->CastSpell(target, SPELL_POLYMORPH_N, false); events.RepeatEvent(urand(15000, 17500)); break; @@ -143,7 +143,7 @@ public: break; case EVENT_SPELL_BLINK: Talk(EMOTE_ARCANE_EXP); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->CastSpell(target, SPELL_BLINK, false); me->NearTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), target->GetOrientation()); @@ -290,13 +290,13 @@ public: events.DelayEvents(3000); break; case EVENT_SPELL_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_SPELL_BOMB, false); events.RepeatEvent(urand(16000, 24500)); events.DelayEvents(3000); break; case EVENT_SPELL_CYCLONE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 45.0f, true)) me->CastSpell(target, SPELL_CYCLONE, false); events.RepeatEvent(urand(22000, 27000)); events.DelayEvents(3000); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index e1417b6ad..e0e433eae 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -132,7 +132,7 @@ public: break; } case EVENT_SPELL_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHARGE, false); events.RepeatEvent(urand(15000, 25000)); break; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp index 615a1d097..a81c518b0 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -175,7 +175,7 @@ public: events.RepeatEvent(urand(15000, 30000)); break; case EVENT_SPELL_BANISH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30, false)) me->CastSpell(target, SPELL_BANISH, false); events.RepeatEvent(16000); break; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index e469a4be9..36c43c957 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -117,7 +117,7 @@ public: me->CastSpell(me, DUNGEON_MODE(SPELL_SONIC_BOOM_EFFECT_N, SPELL_SONIC_BOOM_EFFECT_H), true); break; case EVENT_SPELL_MURMURS_TOUCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80.0f, true)) me->CastSpell(target, DUNGEON_MODE(SPELL_MURMURS_TOUCH_N, SPELL_MURMURS_TOUCH_H), false); events.RepeatEvent(urand(25000, 35000)); break; @@ -127,7 +127,7 @@ public: events.RepeatEvent(5000); break; case EVENT_SPELL_MAGNETIC: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80.0f, true)) { me->CastSpell(target, SPELL_MAGNETIC_PULL, false); events.RepeatEvent(urand(15000, 30000)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp index eef66696d..3d64c6b2a 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp @@ -164,7 +164,7 @@ public: events.ScheduleEvent(EVENT_SPELL_ARCING_SMASH, 15000); break; case EVENT_SPELL_FEL_GEYSER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 40.0f, true)) { me->RemoveAurasByType(SPELL_AURA_MOD_TAUNT); me->CastSpell(me, SPELL_FEL_RAGE_SELF, true); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 95df72625..6404323d5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -498,7 +498,7 @@ public: events.ScheduleEvent(EVENT_SPELL_DRAW_SOUL, 40000); break; case EVENT_SPELL_PARASITIC_SHADOWFIEND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_PARASITIC_SHADOWFIEND, false); events.ScheduleEvent(EVENT_SPELL_PARASITIC_SHADOWFIEND, 30000); break; @@ -511,7 +511,7 @@ public: me->CastSpell(me, SPELL_FRENZY, false); break; case EVENT_SPELL_AGONIZING_FLAMES: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_AGONIZING_FLAMES, false); break; case EVENT_PHASE_5_START: @@ -606,12 +606,12 @@ public: events2.ScheduleEvent(EVENT_PHASE_2_INTERRUPT, 20000); break; case EVENT_SPELL_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_FIREBALL, false); events.ScheduleEvent(EVENT_SPELL_FIREBALL, 2200, GROUP_PHASE_2_ABILITY); break; case EVENT_SPELL_DARK_BARRAGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_DARK_BARRAGE, false); events.ScheduleEvent(EVENT_SPELL_DARK_BARRAGE, 30000, GROUP_PHASE_2_ABILITY); break; @@ -680,7 +680,7 @@ public: if (events.GetNextEventTime(EVENT_REMOVE_DEMON_FORM) != 0) { maiev->AI()->DoAction(ACTION_MAIEV_SET_DIST30); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -25.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -25.0f, true)) maiev->GetMotionMaster()->MoveCharge(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 7.0f, 0); else maiev->GetMotionMaster()->MoveCharge(678.04f, 378.34f, 353.0f, 7.0f, 0); diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b31f438eb..b354d7e52 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -210,7 +210,7 @@ public: void Update(AuraEffect const* effect) { PreventDefaultAction(); - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0)) GetUnitOwner()->CastSpell(target, GetSpellInfo()->Effects[effect->GetEffIndex()].TriggerSpell, true); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 7ae777286..cd7edb619 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -111,7 +111,7 @@ public: if (summon->GetEntry() == NPC_SUPREMUS_PUNCH_STALKER) { summon->ToTempSummon()->InitStats(20000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f, MOTION_SLOT_CONTROLLED); } else @@ -165,7 +165,7 @@ public: SchedulePhase(!me->HasAura(SPELL_SNARE_SELF)); break; case EVENT_SWITCH_TARGET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoResetThreat(); me->AddThreat(target, 5000000.0f); @@ -184,7 +184,7 @@ public: events.ScheduleEvent(EVENT_CHECK_DIST, 1, EVENT_GROUP_ABILITIES); break; case EVENT_SPELL_VOLCANIC_ERUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { me->CastSpell(target, SPELL_VOLCANIC_ERUPTION, true); Talk(EMOTE_GROUND_CRACK); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index a52ab53b8..e4a1766be 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -149,7 +149,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_INCINERATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (roll_chance_i(50)) Talk(SAY_INCINERATE); @@ -171,7 +171,7 @@ public: events.ScheduleEvent(EVENT_SPELL_CRUSHING_SHADOWS, 15000); break; case EVENT_SPELL_SHADOW_OF_DEATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, ShadowOfDeathSelector())) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, ShadowOfDeathSelector())) me->CastSpell(target, SPELL_SHADOW_OF_DEATH, false); events.ScheduleEvent(EVENT_SPELL_SHADOW_OF_DEATH, 30000); break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 8cd549da6..47da1a2bf 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -122,7 +122,7 @@ public: events.ScheduleEvent(EVENT_SPELL_NEEDLE, 15000); break; case EVENT_SPELL_SPINE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { me->CastSpell(target, SPELL_IMPALING_SPINE, false); target->CastSpell(target, SPELL_SUMMON_IMPALING_SPINE, true); diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp index 99bf58b72..f01e45741 100644 --- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp @@ -342,7 +342,7 @@ public: events.ScheduleEvent(EVENT_SPELL_AURA, 30000); break; case EVENT_SPELL_HAMMER_OF_JUSTICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, HammerOfJusticeSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, HammerOfJusticeSelector(me))) { me->CastSpell(target, SPELL_HAMMER_OF_JUSTICE, false); events.ScheduleEvent(EVENT_SPELL_HAMMER_OF_JUSTICE, 20000); @@ -417,17 +417,17 @@ public: case EVENT_SPELL_FLAMESTRIKE: if (roll_chance_i(50)) Talk(SAY_COUNCIL_SPECIAL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) me->CastSpell(target, SPELL_FLAMESTRIKE, false); events.ScheduleEvent(EVENT_SPELL_FLAMESTRIKE, 40000); break; case EVENT_SPELL_BLIZZARD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) me->CastSpell(target, SPELL_BLIZZARD, false); events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 40000); break; case EVENT_SPELL_ARCANE_EXPLOSION: - if (SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f)) + if (SelectTarget(SelectTargetMethod::Random, 0, 10.0f)) me->CastSpell(me, SPELL_ARCANE_EXPLOSION, false); events.ScheduleEvent(EVENT_SPELL_ARCANE_EXPLOSION, 10000); break; @@ -489,7 +489,7 @@ public: events.ScheduleEvent(EVENT_SPELL_REFLECTIVE_SHIELD, 40000); break; case EVENT_SPELL_DIVINE_WRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) me->CastSpell(target, SPELL_DIVINE_WRATH, false); events.ScheduleEvent(EVENT_SPELL_DIVINE_WRATH, 20000); break; @@ -733,7 +733,7 @@ public: void Update(AuraEffect const* effect) { PreventDefaultAction(); - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { GetUnitOwner()->CastSpell(target, GetSpellInfo()->Effects[effect->GetEffIndex()].TriggerSpell, true); GetUnitOwner()->m_Events.AddEvent(new VerasEnvenom(*GetUnitOwner(), target->GetGUID()), GetUnitOwner()->m_Events.CalculateTime(urand(1500, 3500))); 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 a5ee3b961..be83e2829 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -154,7 +154,7 @@ public: me->CastSpell(me, SPELL_ENRAGE, true); break; case EVENT_SPELL_CATACLYSMIC_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 50.0f, true))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 50.0f, true))) me->CastSpell(target, SPELL_CATACLYSMIC_BOLT, false); events.ScheduleEvent(EVENT_SPELL_CATACLYSMIC_BOLT, 6000); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp index 0584e7498..9f4025652 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp @@ -268,12 +268,12 @@ public: events.ScheduleEvent(EVENT_SPELL_MARK_OF_CORRUPTION6, 15000, GROUP_ABILITIES); break; case EVENT_SPELL_WATER_TOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) me->CastSpell(target, SPELL_WATER_TOMB, false); events.ScheduleEvent(EVENT_SPELL_WATER_TOMB, 7000, GROUP_ABILITIES); break; case EVENT_SPELL_VILE_SLUDGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) me->CastSpell(target, SPELL_VILE_SLUDGE, false); events.ScheduleEvent(EVENT_SPELL_VILE_SLUDGE, 15000, GROUP_ABILITIES); break; 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 07095f366..c739340a0 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -210,7 +210,7 @@ public: events.ScheduleEvent(EVENT_SPELL_SHOCK_BLAST, urand(10000, 20000)); break; case EVENT_SPELL_STATIC_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f)) me->CastSpell(target, SPELL_STATIC_CHARGE, false); events.ScheduleEvent(EVENT_SPELL_STATIC_CHARGE, 20000); break; @@ -229,7 +229,7 @@ public: events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); break; case EVENT_SPELL_FORKED_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f)) me->CastSpell(target, SPELL_FORKED_LIGHTNING, false); events.ScheduleEvent(EVENT_SPELL_FORKED_LIGHTNING, urand(2500, 5000)); break; @@ -360,7 +360,7 @@ public: // toxic spores if (BoltTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Creature* trig = me->SummonCreature(TOXIC_SPORES_TRIGGER, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 30000)) { diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp index a709cf992..f65a23c4e 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp @@ -358,7 +358,7 @@ public: GetCaster()->getThreatMgr().resetAllAggro(); if (roll_chance_i(33)) - if (Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) target->CastSpell(GetCaster(), SPELL_TAUNT, true); } diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp index aa6697e4a..57eb1b4ef 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -141,7 +141,7 @@ public: events.ScheduleEvent(EVENT_SPELL_WHIRL, 18000); break; case EVENT_SPELL_GEYSER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_GEYSER, false); events.ScheduleEvent(EVENT_SPELL_GEYSER, 10000); break; @@ -199,7 +199,7 @@ public: if (target) me->AttackerStateUpdate(target); - else if ((target = SelectTarget(SELECT_TARGET_RANDOM, 0))) + else if ((target = SelectTarget(SelectTargetMethod::Random, 0))) me->CastSpell(target, SPELL_WATER_BOLT, false); me->resetAttackTimer(); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp index 875d46576..e8f3986c5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp @@ -217,7 +217,7 @@ public: break; case EVENT_SPELL_COLD_SLAP: - if (Unit* target = SelectTarget(SELECT_TARGET_NEAREST, 0, 5.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 5.0f, true)) if (target->GetPositionZ() < me->GetPositionZ() + 6.0f) { int32 dmg = urand(5500, 6000); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp index ae459d8ef..3b5a7ffcc 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -96,18 +96,18 @@ public: { case EVENT_SPELL_LIGHTNING: for (uint8 i = 0; i < DUNGEON_MODE(1, 2); ++i) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_LIGHTNING_CLOUD, false); events.RepeatEvent(urand(15000, 25000)); break; case EVENT_SPELL_LUNG: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_LUNG_BURST); events.RepeatEvent(urand(7000, 12000)); break; case EVENT_SPELL_ENVELOPING: for (uint8 i = 0; i < DUNGEON_MODE(1, 2); ++i) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_ENVELOPING_WINDS, false); events.RepeatEvent(urand(10000, 15000)); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp index f54a19e8f..95ff6c83f 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -125,14 +125,14 @@ public: events.RepeatEvent(20000); break; case EVENT_SPELL_SAW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) me->CastSpell(target, SPELL_SAW_BLADE, false); else me->CastSpell(me->GetVictim(), SPELL_SAW_BLADE, false); events.RepeatEvent(15000); break; case EVENT_SPELL_NET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_ELECTRIFIED_NET, false); events.RepeatEvent(10000); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp index 27ec6e579..74ec17a5d 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -105,7 +105,7 @@ public: events.RepeatEvent(urand(15000, 20000)); break; case EVENT_SPELL_IMPALE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true)) me->CastSpell(target, SPELL_IMPALE, false); events.RepeatEvent(urand(7500, 12500)); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp index b99af06c0..6d3344c9a 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp @@ -88,7 +88,7 @@ public: void JustSummoned(Creature* summon) override { summons.Summon(summon); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) summon->AI()->AttackStart(target); else if (me->GetVictim()) summon->AI()->AttackStart(me->GetVictim()); @@ -129,19 +129,19 @@ public: events.RepeatEvent(urand(10000, 15000)); break; case EVENT_SPELL_CHAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CHAIN_LIGHTNING, false); events.DelayEvents(3000); events.RepeatEvent(9000); break; case EVENT_SPELL_STATIC: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30, true)) me->CastSpell(target, SPELL_STATIC_CHARGE, false); events.RepeatEvent(10000); break; case EVENT_LEVITATE: events.RepeatEvent(15000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { me->CastSpell(target, SPELL_LEVITATE, false); lTarget = target->GetGUID(); diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index d4f5adeb0..f9c387a64 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -114,7 +114,7 @@ public: events.ScheduleEvent(EVENT_GROWTH, 30000); break; case EVENT_CAVE_IN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_CAVE_IN, false); if (_caveInTimer >= 4000) _caveInTimer -= 1500; @@ -125,7 +125,7 @@ public: events.ScheduleEvent(EVENT_REVERBERATION, 22000); break; case EVENT_HURTFUL_STRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 1, 5.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1, 5.0f)) { me->CastSpell(target, SPELL_HURTFUL_STRIKE, false); } 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 cc8da5f0b..197c3ade0 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -174,7 +174,7 @@ public: events.ScheduleEvent(EVENT_ROAR, 40000); break; case EVENT_CHARGING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) me->CastSpell(target, SPELL_BERSERKER_C, false); events.ScheduleEvent(EVENT_CHARGING, 35000); break; @@ -262,7 +262,7 @@ public: events.ScheduleEvent(EVENT_ADD_ABILITY2, 30000); break; case EVENT_ADD_ABILITY3: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_DEATH_COIL, false); events.ScheduleEvent(EVENT_ADD_ABILITY3, 20000); break; @@ -327,12 +327,12 @@ public: switch (events.ExecuteEvent()) { case EVENT_ADD_ABILITY1: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) me->CastSpell(target, SPELL_GREATER_POLYMORPH, false); events.ScheduleEvent(EVENT_ADD_ABILITY1, 20000); break; case EVENT_ADD_ABILITY2: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) me->CastSpell(target, SPELL_LIGHTNING_BOLT, false); events.ScheduleEvent(EVENT_ADD_ABILITY2, 15000); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index af31a2316..98dff49f1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -94,7 +94,7 @@ public: events.RepeatEvent(urand(7000, 12000)); break; case EVENT_SPELL_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_POISON_BOLT, false); events.RepeatEvent(urand(6000, 11000)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp index 5e0486a76..7205d7138 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp @@ -336,7 +336,7 @@ public: events.RepeatEvent(urand(6000, 7500)); break; case EVENT_SPELL_MARK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_MARK_OF_SHADOW, false); events.RepeatEvent(urand(16000, 17500)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp index e169c8f97..8a3f9f5f3 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -112,12 +112,12 @@ public: events.RepeatEvent(urand(15000, 23000)); break; case EVENT_SPELL_EXPLODING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_EXPLODING_BREAKER, false); events.RepeatEvent(urand(7000, 11000)); break; case EVENT_SPELL_DOMINATION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_DOMINATION, false); events.RepeatEvent(120000); break; 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 68e810db8..d442decef 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 @@ -124,7 +124,7 @@ public: case EVENT_TREACHEROUS_AURA: if (roll_chance_i(33)) Talk(SAY_CURSE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_TREACHEROUS_AURA, false); events.ScheduleEvent(EVENT_TREACHEROUS_AURA, urand(12000, 18000)); break; @@ -138,7 +138,7 @@ public: events.ScheduleEvent(EVENT_DEMONIC_SHIELD, 1000); break; case EVENT_ORBITAL_STRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0f, true)) { _targetGUID = target->GetGUID(); me->CastSpell(target, SPELL_ORBITAL_STRIKE, false); diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp index 88b961eca..ac288cf9f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp @@ -217,7 +217,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_FIREBALL, false); events.ScheduleEvent(EVENT_SPELL_FIREBALL, urand(4000, 6000)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 50b4754f7..e15fd01ce 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -120,7 +120,7 @@ public: break; case EVENT_SURGE: Talk(SAY_SURGE); - if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0)) me->CastSpell(target, SPELL_SURGE, false); events.ScheduleEvent(EVENT_SURGE, 11000); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index f767a4b83..c1231d3ee 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -243,7 +243,7 @@ public: events.ScheduleEvent(EVENT_DEBRIS, 20000); break; case EVENT_DEBRIS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { target->CastSpell(target, SPELL_DEBRIS_VISUAL, true, nullptr, nullptr, me->GetGUID()); me->m_Events.AddEvent(new DealDebrisDamage(*me, target->GetGUID()), me->m_Events.CalculateTime(5000)); diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index e8eb54581..769b69dea 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -215,12 +215,12 @@ public: switch (events.ExecuteEvent()) { case EVENT_SPELL_SHADOW_FISSURE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_SHADOW_FISSURE, false); events.RescheduleEvent(EVENT_SPELL_SHADOW_FISSURE, urand(7500, 10000)); break; case EVENT_SPELL_DEATH_COIL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, DUNGEON_MODE(SPELL_DEATH_COIL_N, SPELL_DEATH_COIL_H), false); events.RescheduleEvent(EVENT_SPELL_DEATH_COIL, urand(15000, 20000)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 9194fadbb..f7d0046b0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -194,7 +194,7 @@ public: events.ScheduleEvent(EVENT_SPELL_THUNDER_CLAP, 25000); break; case EVENT_RESET_THREAT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { uint8 threatYell = urand(EVENT_THREAT_YELL_L_1, EVENT_THREAT_YELL_R_1); if (Creature* head = threatYell == EVENT_THREAT_YELL_R_1 ? GetRightHead() : GetLeftHead()) diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp index 4de8755fc..b94f28806 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp @@ -98,7 +98,7 @@ public: void JustSummoned(Creature* summon) override { if (summon->GetEntry() != NPC_SHATTERED_ASSASSIN) - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); summons.Summon(summon); } diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 37adabc40..54c75585d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -263,12 +263,12 @@ public: events.ScheduleEvent(EVENT_SPELL_MELT_ARMOR, 60000); break; case EVENT_SPELL_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->CastSpell(target, SPELL_CHARGE, false); events.ScheduleEvent(EVENT_SPELL_CHARGE, 30000); break; case EVENT_SPELL_FLAME_PATCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) me->SummonCreature(NPC_FLAME_PATCH, *target, TEMPSUMMON_TIMED_DESPAWN, 2 * MINUTE * IN_MILLISECONDS); events.ScheduleEvent(EVENT_SPELL_FLAME_PATCH, 30000); break; @@ -285,7 +285,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_DIVE_PHOENIX, 2000); events.ScheduleEvent(EVENT_REBIRTH_DIVE, 6000); events.ScheduleEvent(EVENT_FINISH_DIVE, 10000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 90.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 90.0f, true)) { me->CastSpell(target, SPELL_DIVE_BOMB, false); me->SetPosition(*target); @@ -296,7 +296,7 @@ public: break; case EVENT_SUMMON_DIVE_PHOENIX: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true); me->SummonCreature(NPC_EMBER_OF_ALAR, target ? *target : *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); me->SummonCreature(NPC_EMBER_OF_ALAR, target ? *target : *me, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 6000); break; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 83d2a58ab..d8d93e631 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -146,12 +146,12 @@ public: events.ScheduleEvent(EVENT_CHECK_HEALTH, 1000); break; case EVENT_SPELL_ARCANE_MISSILES: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) me->CastSpell(target, SPELL_ARCANE_MISSILES, false); events.ScheduleEvent(EVENT_SPELL_ARCANE_MISSILES, 3000); break; case EVENT_SPELL_WRATH_OF_ASTROMANCER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_WRATH_OF_THE_ASTROMANCER, false); events.ScheduleEvent(EVENT_SPELL_WRATH_OF_ASTROMANCER, 22000); break; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index cd717b1d6..1e8f8cf4e 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -390,7 +390,7 @@ public: { advisor->SetReactState(REACT_AGGRESSIVE); advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); advisor->SetInCombatWithZone(); advisor->AI()->Talk(SAY_THALADRED_AGGRO); @@ -404,7 +404,7 @@ public: { advisor->SetReactState(REACT_AGGRESSIVE); advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); advisor->SetInCombatWithZone(); advisor->AI()->Talk(SAY_SANGUINAR_AGGRO); @@ -418,7 +418,7 @@ public: { advisor->SetReactState(REACT_AGGRESSIVE); advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); advisor->SetInCombatWithZone(); advisor->AI()->Talk(SAY_CAPERNIAN_AGGRO); @@ -432,7 +432,7 @@ public: { advisor->SetReactState(REACT_AGGRESSIVE); advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); advisor->SetInCombatWithZone(); advisor->AI()->Talk(SAY_TELONICUS_AGGRO); @@ -451,7 +451,7 @@ public: { summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); summon->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->AI()->AttackStart(target); } } @@ -474,7 +474,7 @@ public: summon->SetReactState(REACT_AGGRESSIVE); summon->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); summon->SetInCombatWithZone(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->AI()->AttackStart(target); } events2.ScheduleEvent(EVENT_PREFIGHT_PHASE71, 3 * MINUTE * IN_MILLISECONDS); @@ -485,7 +485,7 @@ public: phase = PHASE_FINAL; DoResetThreat(); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_DISABLE_MOVE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); events2.Reset(); @@ -648,7 +648,7 @@ public: me->CastSpell(me->GetVictim(), SPELL_PYROBLAST, false); break; case EVENT_SPELL_FLAMESTRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) me->CastSpell(target, SPELL_FLAME_STRIKE, false); events.ScheduleEvent(EVENT_SPELL_FLAMESTRIKE, 20000); break; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp index 03974ba62..8d93b0b4d 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp @@ -102,9 +102,9 @@ public: events.ScheduleEvent(EVENT_SPELL_POUNDING, 15000); break; case EVENT_SPELL_ARCANEORB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -18.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -18.0f, true)) me->CastSpell(target, SPELL_ARCANE_ORB, false); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) me->CastSpell(target, SPELL_ARCANE_ORB, false); events.ScheduleEvent(EVENT_SPELL_ARCANEORB, 4000); break; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp index c88c47dce..d0200deba 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_gatewatcher_gyrokill.cpp @@ -87,7 +87,7 @@ public: events.ScheduleEvent(EVENT_STREAM_OF_MACHINE_FLUID, urand(12000, 14000)); break; case EVENT_SAW_BLADE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f)) me->CastSpell(target, SPELL_SAW_BLADE, false); Talk(SAY_SAW_BLADE); events.ScheduleEvent(EVENT_SAW_BLADE, 25000); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp index 96a129b4a..ee0e23f0b 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp @@ -124,13 +124,13 @@ public: events.ScheduleEvent(EVENT_ARCANE_TORRENT, 15000); break; case EVENT_MANA_TAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) me->CastSpell(target, SPELL_MANA_TAP, false); events.ScheduleEvent(EVENT_MANA_TAP, 18000); break; case EVENT_DOMINATION: Talk(SAY_DOMINATION); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 50.0f)) me->CastSpell(target, SPELL_DOMINATION, false); events.ScheduleEvent(EVENT_DOMINATION, 30000); break; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp index 81247ecc5..da14cd473 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -143,12 +143,12 @@ public: events.ScheduleEvent(EVENT_SUMMON_IMAGE2, 1000); break; case EVENT_SPELL_MIND_REND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f)) me->CastSpell(target, SPELL_MIND_REND, false); events.ScheduleEvent(EVENT_SPELL_MIND_REND, 10000); break; case EVENT_SPELL_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 20.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.0f)) { Talk(SAY_FEAR); me->CastSpell(target, SPELL_FEAR, false); @@ -156,7 +156,7 @@ public: events.ScheduleEvent(EVENT_SPELL_FEAR, 25000); break; case EVENT_SPELL_DOMINATION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f)) { Talk(SAY_MIND); me->CastSpell(target, SPELL_DOMINATION, false); @@ -164,7 +164,7 @@ public: events.ScheduleEvent(EVENT_SPELL_DOMINATION, 30000); break; case EVENT_SPELL_MANA_BURN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false))) me->CastSpell(target, SPELL_MANA_BURN, false); events.ScheduleEvent(EVENT_SPELL_MANA_BURN, 30000); break; diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp index d93d72cd2..87044ef71 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_zereketh_the_unbound.cpp @@ -83,7 +83,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_VOID_ZONE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) me->CastSpell(target, SPELL_VOID_ZONE, false); events.ScheduleEvent(EVENT_VOID_ZONE, 15000); break; @@ -94,7 +94,7 @@ public: events.ScheduleEvent(EVENT_SHADOW_NOVA, 12000); break; case EVENT_SEED_OF_CORRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) me->CastSpell(target, SPELL_SEED_OF_CORRUPTION, false); events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 16000); break; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index 76f8c4355..7335ae460 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp @@ -111,7 +111,7 @@ public: switch (events.ExecuteEvent()) { case EVENT_SACRIFICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { Talk(SAY_CAST_SACRIFICE); me->CastSpell(target, SPELL_SACRIFICE, false); diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 1e9dae6d7..24145c39b 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -139,7 +139,7 @@ public: _events.ScheduleEvent(EVENT_VOID_BOLT, urand(15000, 18000)); break; case EVENT_MARK_OF_KAZZAK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 100.0f, true))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 100.0f, true))) DoCast(target, SPELL_MARK_OF_KAZZAK); _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20000); break; @@ -149,7 +149,7 @@ public: _events.ScheduleEvent(EVENT_ENRAGE, 30000); break; case EVENT_TWISTED_REFLECTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_TWISTED_REFLECTION); _events.ScheduleEvent(EVENT_TWISTED_REFLECTION, 15000); break; diff --git a/src/server/scripts/Outland/boss_doomwalker.cpp b/src/server/scripts/Outland/boss_doomwalker.cpp index 6f5863215..e2022bab6 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -137,7 +137,7 @@ public: _events.ScheduleEvent(EVENT_QUAKE, urand(30000, 55000)); break; case EVENT_CHAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_CHAIN_LIGHTNING); _events.ScheduleEvent(EVENT_CHAIN, urand(7000, 27000)); break; diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 7e22f23b4..9025ae70b 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1454,7 +1454,7 @@ public: { if (SpellTimer1 <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index de7a1e047..ef4f93b80 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -149,7 +149,7 @@ struct emerald_dragonAI : public WorldBossAI while (uint32 eventId = events.ExecuteEvent()) ExecuteEvent(eventId); - if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0, -50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, -50.0f, true)) DoCast(target, SPELL_SUMMON_PLAYER); DoMeleeAttackIfReady(); @@ -184,7 +184,7 @@ public: if (!_roamTimer) { // Chase target, but don't attack - otherwise just roam around - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { _roamTimer = urand(15000, 30000); me->GetMotionMaster()->Clear(false);