diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-06-16 23:08:56 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-06 21:53:27 +0100 |
| commit | c4098897a8d2f6cc55dd6434eb3b6f5468791f2a (patch) | |
| tree | 0acb69db4226dafc872dcd734c0d867d04718455 /src | |
| parent | aa409f8993f3ee5e90dd64511f34504ebafec7d1 (diff) | |
game/AI: Convert SelectAggroTarget to enum class (#24818)
* game/AI: Convert SelectAggroTarget to enum class
* game/AI: Rename SelectAggroTarget to SelectTargetMethod
(cherry picked from commit 418c3b1fd50664aad035bd975a65281e82ba2dea)
Diffstat (limited to 'src')
264 files changed, 713 insertions, 708 deletions
diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 642ac34a675..ee019e4e0a9 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -103,12 +103,12 @@ bool UnitAI::DoSpellAttackIfReady(uint32 spellId) return false; } -Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float dist, bool playerOnly, bool withTank, int32 aura) +Unit* UnitAI::SelectTarget(SelectTargetMethod targetType, uint32 position, float dist, bool playerOnly, bool withTank, int32 aura) { return SelectTarget(targetType, position, DefaultTargetSelector(me, dist, playerOnly, withTank, aura)); } -void UnitAI::SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, uint32 offset, float dist, bool playerOnly, bool withTank, int32 aura) +void UnitAI::SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectTargetMethod targetType, uint32 offset, float dist, bool playerOnly, bool withTank, int32 aura) { SelectTargetList(targetList, num, targetType, offset, DefaultTargetSelector(me, dist, playerOnly, withTank, aura)); } @@ -134,7 +134,7 @@ SpellCastResult UnitAI::DoCast(uint32 spellId) if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(spellId, me->GetMap()->GetDifficultyID())) { bool playerOnly = spellInfo->HasAttribute(SPELL_ATTR3_ONLY_TARGET_PLAYERS); - target = SelectTarget(SELECT_TARGET_RANDOM, 0, spellInfo->GetMaxRange(false), playerOnly); + target = SelectTarget(SelectTargetMethod::Random, 0, spellInfo->GetMaxRange(false), playerOnly); } break; } @@ -155,7 +155,7 @@ SpellCastResult UnitAI::DoCast(uint32 spellId) if (!spellInfo->HasAuraInterruptFlag(SpellAuraInterruptFlags::NOT_VICTIM) && targetSelector(me->GetVictim())) target = me->GetVictim(); else - target = SelectTarget(SELECT_TARGET_RANDOM, 0, targetSelector); + target = SelectTarget(SelectTargetMethod::Random, 0, targetSelector); } break; } diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index 0f9817cb5aa..4d660a4289d 100644 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -35,7 +35,7 @@ T* EnsureAI(U* ai) T* cast_ai = dynamic_cast<T*>(ai); ASSERT(cast_ai); return cast_ai; -}; +} class Player; class Quest; @@ -47,14 +47,14 @@ enum Difficulty : uint8; enum MovementGeneratorType : uint8; enum SpellEffIndex : uint8; -//Selection method used by SelectTarget -enum SelectAggroTarget +// Selection method used by SelectTarget +enum class SelectTargetMethod { - SELECT_TARGET_RANDOM = 0, // just pick a random target - SELECT_TARGET_MAXTHREAT, // prefer targets higher in the threat list - SELECT_TARGET_MINTHREAT, // prefer targets lower in the threat list - SELECT_TARGET_MAXDISTANCE, // prefer targets further from us - SELECT_TARGET_MINDISTANCE // prefer targets closer to us + 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 @@ -161,18 +161,21 @@ class TC_GAME_API UnitAI virtual ObjectGuid GetGUID(int32 /*id*/ = 0) const { return ObjectGuid::Empty; } // Select the best target (in <targetType> order) from the threat list that fulfill the following: - // - Not among the first <offset> entries in <targetType> order (or MAXTHREAT order, if <targetType> is RANDOM). + // - Not among the first <offset> entries in <targetType> order (or SelectTargetMethod::MaxThreat order, + // if <targetType> is SelectTargetMethod::Random). // - Within at most <dist> yards (if dist > 0.0f) // - At least -<dist> yards away (if dist < 0.0f) // - Is a player (if playerOnly = true) // - Not the current tank (if withTank = false) // - Has aura with ID <aura> (if aura > 0) // - Does not have aura with ID -<aura> (if aura < 0) - Unit* SelectTarget(SelectAggroTarget targetType, uint32 offset = 0, float dist = 0.0f, bool playerOnly = false, bool withTank = true, int32 aura = 0); + Unit* SelectTarget(SelectTargetMethod targetType, uint32 offset = 0, float dist = 0.0f, bool playerOnly = false, bool withTank = true, int32 aura = 0); + // Select the best target (in <targetType> order) satisfying <predicate> from the threat list. - // If <offset> is nonzero, the first <offset> entries in <targetType> order (or MAXTHREAT order, if <targetType> is RANDOM) are skipped. + // If <offset> is nonzero, the first <offset> entries in <targetType> order (or SelectTargetMethod::MaxThreat + // order, if <targetType> is SelectTargetMethod::Random) are skipped. template<class PREDICATE> - Unit* SelectTarget(SelectAggroTarget targetType, uint32 offset, PREDICATE const& predicate) + Unit* SelectTarget(SelectTargetMethod targetType, uint32 offset, PREDICATE const& predicate) { ThreatManager& mgr = GetThreatManager(); // shortcut: if we ignore the first <offset> elements, and there are at most <offset> elements, then we ignore ALL elements @@ -188,12 +191,12 @@ class TC_GAME_API UnitAI switch (targetType) { - case SELECT_TARGET_MAXTHREAT: - case SELECT_TARGET_MINTHREAT: - case SELECT_TARGET_MAXDISTANCE: - case SELECT_TARGET_MINDISTANCE: + case SelectTargetMethod::MaxThreat: + case SelectTargetMethod::MinThreat: + case SelectTargetMethod::MaxDistance: + case SelectTargetMethod::MinDistance: return targetList.front(); - case SELECT_TARGET_RANDOM: + case SelectTargetMethod::Random: return Trinity::Containers::SelectRandomContainerElement(targetList); default: return nullptr; @@ -201,7 +204,8 @@ class TC_GAME_API UnitAI } // Select the best (up to) <num> targets (in <targetType> order) from the threat list that fulfill the following: - // - Not among the first <offset> entries in <targetType> order (or MAXTHREAT order, if <targetType> is RANDOM). + // - Not among the first <offset> entries in <targetType> order (or SelectTargetMethod::MaxThreat order, + // if <targetType> is SelectTargetMethod::Random). // - Within at most <dist> yards (if dist > 0.0f) // - At least -<dist> yards away (if dist < 0.0f) // - Is a player (if playerOnly = true) @@ -209,12 +213,13 @@ class TC_GAME_API UnitAI // - Has aura with ID <aura> (if aura > 0) // - Does not have aura with ID -<aura> (if aura < 0) // The resulting targets are stored in <targetList> (which is cleared first). - void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, uint32 offset = 0, float dist = 0.0f, bool playerOnly = false, bool withTank = true, int32 aura = 0); + void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectTargetMethod targetType, uint32 offset = 0, float dist = 0.0f, bool playerOnly = false, bool withTank = true, int32 aura = 0); // Select the best (up to) <num> targets (in <targetType> order) satisfying <predicate> from the threat list and stores them in <targetList> (which is cleared first). - // If <offset> is nonzero, the first <offset> entries in <targetType> order (or MAXTHREAT order, if <targetType> is RANDOM) are skipped. + // If <offset> is nonzero, the first <offset> entries in <targetType> order (or SelectTargetMethod::MaxThreat + // order, if <targetType> is SelectTargetMethod::Random) are skipped. template <class PREDICATE> - void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectAggroTarget targetType, uint32 offset, PREDICATE const& predicate) + void SelectTargetList(std::list<Unit*>& targetList, uint32 num, SelectTargetMethod targetType, uint32 offset, PREDICATE const& predicate) { targetList.clear(); ThreatManager& mgr = GetThreatManager(); @@ -222,7 +227,7 @@ class TC_GAME_API UnitAI if (mgr.GetThreatListSize() <= offset) return; - if (targetType == SELECT_TARGET_MAXDISTANCE || targetType == SELECT_TARGET_MINDISTANCE) + if (targetType == SelectTargetMethod::MaxDistance || targetType == SelectTargetMethod::MinDistance) { for (ThreatReference const* ref : mgr.GetUnsortedThreatList()) { @@ -256,12 +261,12 @@ class TC_GAME_API UnitAI return; } - // right now, list is unsorted for DISTANCE types - re-sort by MAXDISTANCE - if (targetType == SELECT_TARGET_MAXDISTANCE || targetType == SELECT_TARGET_MINDISTANCE) - SortByDistance(targetList, targetType == SELECT_TARGET_MINDISTANCE); + // right now, list is unsorted for DISTANCE types - re-sort by SelectTargetMethod::MaxDistance + if (targetType == SelectTargetMethod::MaxDistance || targetType == SelectTargetMethod::MinDistance) + SortByDistance(targetList, targetType == SelectTargetMethod::MinDistance); // now the list is MAX sorted, reverse for MIN types - if (targetType == SELECT_TARGET_MINTHREAT) + if (targetType == SelectTargetMethod::MinThreat) targetList.reverse(); // ignore the first <offset> elements @@ -277,7 +282,7 @@ class TC_GAME_API UnitAI if (targetList.size() <= num) return; - if (targetType == SELECT_TARGET_RANDOM) + if (targetType == SelectTargetMethod::Random) Trinity::Containers::RandomResize(targetList, num); else targetList.resize(num); diff --git a/src/server/game/AI/PlayerAI/PlayerAI.cpp b/src/server/game/AI/PlayerAI/PlayerAI.cpp index d41a1292a19..8fe52f0226c 100644 --- a/src/server/game/AI/PlayerAI/PlayerAI.cpp +++ b/src/server/game/AI/PlayerAI/PlayerAI.cpp @@ -693,7 +693,7 @@ Unit* SimpleCharmedPlayerAI::SelectAttackTarget() const if (Unit* charmer = me->GetCharmer()) { if (UnitAI* charmerAI = charmer->GetAI()) - return charmerAI->SelectTarget(SELECT_TARGET_RANDOM, 0, ValidTargetSelectPredicate(this)); + return charmerAI->SelectTarget(SelectTargetMethod::Random, 0, ValidTargetSelectPredicate(this)); return charmer->GetVictim(); } return nullptr; diff --git a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp index 7b73dcc833c..c67b1ba81d4 100644 --- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp +++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp @@ -641,7 +641,7 @@ void WorldBossAI::_JustDied() void WorldBossAI::_JustEngagedWith() { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (target) AttackStart(target); } @@ -649,7 +649,7 @@ void WorldBossAI::_JustEngagedWith() 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 80397529bbf..d01ab7ab8c8 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2686,10 +2686,10 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e, { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_MAXTHREAT, 1, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0))) + 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 != 0))) targets.push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_MAXTHREAT, 1, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxThreat, 1, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) targets.push_back(u); } break; @@ -2698,10 +2698,10 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e, { if (e.target.hostilRandom.powerType) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_MINTHREAT, 0, PowerUsersSelector(me, Powers(e.target.hostilRandom.powerType - 1), float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0))) + 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 != 0))) targets.push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_MINTHREAT, 0, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinThreat, 0, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) targets.push_back(u); } break; @@ -2710,10 +2710,10 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e, { 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 != 0))) + 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 != 0))) targets.push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 0, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) targets.push_back(u); } break; @@ -2722,17 +2722,17 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e, { 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 != 0))) + 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 != 0))) targets.push_back(u); } - else if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) + else if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, float(e.target.hostilRandom.maxDist), e.target.hostilRandom.playerOnly != 0)) targets.push_back(u); } break; case SMART_TARGET_FARTHEST: if (me) { - if (Unit* u = me->AI()->SelectTarget(SELECT_TARGET_MAXDISTANCE, 0, FarthestTargetSelector(me, float(e.target.farthest.maxDist), e.target.farthest.playerOnly != 0, e.target.farthest.isInLos != 0))) + if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MaxDistance, 0, FarthestTargetSelector(me, float(e.target.farthest.maxDist), e.target.farthest.playerOnly != 0, e.target.farthest.isInLos != 0))) targets.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 27537b9fc86..b56c8689d62 100644 --- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp +++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp @@ -90,7 +90,7 @@ public: void JustSummoned(Creature* summoned) override { - summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)); + summoned->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0, 50, true)); summoned->SetFaction(me->GetFaction()); WaterElementalGUID = summoned->GetGUID(); summons.Summon(summoned); diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index 4fa75000eb7..0bf152412f7 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -161,7 +161,7 @@ class boss_alizabal : public CreatureScript case 0: if (!_skewer) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) { DoCast(target, SPELL_SKEWER, true); Talk(SAY_SKEWER); @@ -172,7 +172,7 @@ class boss_alizabal : public CreatureScript } else if (!_hate) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) { DoCast(target, SPELL_SEETHING_HATE, true); Talk(SAY_HATE); @@ -193,7 +193,7 @@ class boss_alizabal : public CreatureScript case 1: if (!_hate) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) { DoCast(target, SPELL_SEETHING_HATE, true); Talk(SAY_HATE); @@ -203,7 +203,7 @@ class boss_alizabal : public CreatureScript } else if (!_skewer) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) { DoCast(target, SPELL_SKEWER, true); Talk(SAY_SKEWER); @@ -227,7 +227,7 @@ class boss_alizabal : public CreatureScript case EVENT_MOVE_STORM: me->SetSpeedRate(MOVE_RUN, 4.0f); me->SetSpeedRate(MOVE_WALK, 4.0f); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) me->GetMotionMaster()->MovePoint(POINT_STORM, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); events.ScheduleEvent(EVENT_MOVE_STORM, 4050); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp index 453a452413d..867f1f1d19e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp @@ -87,11 +87,11 @@ class boss_beauty : public CreatureScript switch (eventId) { case SPELL_MAGMA_SPIT: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_MAGMA_SPIT, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_MAGMA_SPIT, true); events.ScheduleEvent(SPELL_MAGMA_SPIT, urand(7000, 10000)); break; case EVENT_BERSERKER_CHARGE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_BERSERKER_CHARGE, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_BERSERKER_CHARGE, true); events.ScheduleEvent(EVENT_BERSERKER_CHARGE, urand(16000, 19000)); break; case EVENT_FLAMEBREAK: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index 02a6949850a..5ddc48c5778 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -317,7 +317,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, true, -SPELL_HAS_DARK_BREWMAIDENS_BREW)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, false, true, -SPELL_HAS_DARK_BREWMAIDENS_BREW)) DoCast(target, SPELL_CHUCK_MUG); mugChuck.Repeat(Seconds(4)); }); 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 cf595e12398..b6176bd2548 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 @@ -97,7 +97,7 @@ class boss_emperor_dagran_thaurissan : public CreatureScript switch (eventId) { case EVENT_HANDOFTHAURISSAN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_HANDOFTHAURISSAN); _events.ScheduleEvent(EVENT_HANDOFTHAURISSAN, 5s); 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 2289b3e5aaf..1aafa41e2fb 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 @@ -69,7 +69,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript switch (eventId) { case EVENT_SHADOW_WORD_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SHADOWWORDPAIN); _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 7s); break; @@ -78,7 +78,7 @@ class boss_high_interrogator_gerstahn : public CreatureScript _events.ScheduleEvent(EVENT_PSYCHIC_SCREAM, 30s); break; case EVENT_MANABURN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_MANABURN); _events.ScheduleEvent(EVENT_MANABURN, 10s); break; 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 e8b5d06f8d1..245e0e6a527 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 @@ -209,7 +209,7 @@ class boss_doomrel : public CreatureScript _events.ScheduleEvent(EVENT_SHADOW_BOLT_VOLLEY, 12s); break; case EVENT_IMMOLATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_IMMOLATE); _events.ScheduleEvent(EVENT_IMMOLATE, 25s); break; 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 66d89c4276f..1fc9c32d5bd 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp @@ -96,7 +96,7 @@ public: if (!Summoned && HealthBelowPct(51)) { - 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 943484303f3..ec4a5702741 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp @@ -267,7 +267,7 @@ public: events.Repeat(Seconds(14)); break; case EVENT_PYROBLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_PYROBLAST); events.Repeat(Seconds(15)); break; @@ -353,7 +353,7 @@ public: _events.Repeat(Seconds(14), Seconds(23)); 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.Repeat(Seconds(6), Seconds(12)); break; default: diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp index b0cf8902f65..5cfc8d38f83 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp @@ -85,7 +85,7 @@ public: events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, 45s); break; case EVENT_HEX: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_HEX); events.ScheduleEvent(EVENT_HEX, 15s); break; 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 dc77b76cc19..55b9437497d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -84,7 +84,7 @@ public: events.ScheduleEvent(EVENT_FLAME_BREAK, 10 * IN_MILLISECONDS); break; case EVENT_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_IMMOLATE, 8 * IN_MILLISECONDS); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index 29ebef5cc18..24b44634d28 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -315,7 +315,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; } @@ -323,12 +323,12 @@ public: events.ScheduleEvent(EVENT_SHADOW_BOLT, 3s, 10s); 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, 10s, 20s); 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, 30s, 35s); break; @@ -512,7 +512,7 @@ public: events.ScheduleEvent(EVENT_TAILLASH, 10s); 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_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index ee6c055da52..a72b62776ef 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -193,7 +193,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 5e2b49ea9d9..cecda726d6d 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -96,12 +96,12 @@ class boss_baron_geddon : public CreatureScript events.ScheduleEvent(EVENT_INFERNO, 45s); break; case EVENT_IGNITE_MANA: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IGNITE_MANA)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_IGNITE_MANA)) DoCast(target, SPELL_IGNITE_MANA); events.ScheduleEvent(EVENT_IGNITE_MANA, 30s); break; 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); events.ScheduleEvent(EVENT_LIVING_BOMB, 35s); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp index bb0c5c0a5a8..1675fa79b0b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp @@ -100,7 +100,7 @@ struct npc_firesworn : public ScriptedAI // Timers for this are probably wrong _scheduler.Schedule(4s, [this](TaskContext context) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_IMMOLATE); context.Repeat(5s, 10s); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp index 3f9523e6065..6d8624e45fe 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp @@ -79,12 +79,12 @@ class boss_gehennas : public CreatureScript events.ScheduleEvent(EVENT_GEHENNAS_CURSE, 22s, 30s); break; case EVENT_RAIN_OF_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_RAIN_OF_FIRE); events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 4s, 12s); break; case EVENT_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_SHADOW_BOLT); events.ScheduleEvent(EVENT_SHADOW_BOLT, 7s); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp index ea994fd769d..c45e3e8eb8e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -99,7 +99,7 @@ class boss_golemagg : public CreatureScript switch (eventId) { case EVENT_PYROBLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_PYROBLAST); events.ScheduleEvent(EVENT_PYROBLAST, 7s); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp index bdfb7e12608..9ed03658119 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -95,7 +95,7 @@ class boss_magmadar : public CreatureScript events.ScheduleEvent(EVENT_PANIC, 35s); break; case EVENT_LAVA_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_LAVA_BOMB)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_LAVA_BOMB)) DoCast(target, SPELL_LAVA_BOMB); events.ScheduleEvent(EVENT_LAVA_BOMB, 12s); break; 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 08fc71d97a9..a20e49fe8fc 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -140,7 +140,7 @@ class boss_majordomo : public CreatureScript events.ScheduleEvent(EVENT_BLAST_WAVE, 10s); break; case EVENT_TELEPORT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_TELEPORT); events.ScheduleEvent(EVENT_TELEPORT, 20s); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp index 7f4942bb333..21474ee55ce 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp @@ -180,7 +180,7 @@ class boss_ragnaros : public CreatureScript me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->SetEmoteState(EMOTE_ONESHOT_NONE); me->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); instance->SetData(DATA_RAGNAROS_ADDS, 0); @@ -266,7 +266,7 @@ class boss_ragnaros : public CreatureScript // summon 8 elementals for (uint8 i = 0; i < 8; ++i) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Creature* summoned = me->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) summoned->AI()->AttackStart(target); @@ -281,7 +281,7 @@ class boss_ragnaros : public CreatureScript Talk(SAY_REINFORCEMENTS2); for (uint8 i = 0; i < 8; ++i) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Creature* summoned = me->SummonCreature(12143, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 900000)) summoned->AI()->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 437fc995684..cf1156e3299 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -82,7 +82,7 @@ class boss_shazzrah : public CreatureScript DoCastVictim(SPELL_ARCANE_EXPLOSION); break; case EVENT_SHAZZRAH_CURSE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHAZZRAH_CURSE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_SHAZZRAH_CURSE)) DoCast(target, SPELL_SHAZZRAH_CURSE); events.ScheduleEvent(EVENT_SHAZZRAH_CURSE, 25s, 30s); break; 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 83ff2f58680..16ffde7c475 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp @@ -113,7 +113,7 @@ class boss_sulfuron : public CreatureScript events.ScheduleEvent(EVENT_KNOCKDOWN, 12s, 15s); break; case EVENT_FLAMESPEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_FLAMESPEAR); events.ScheduleEvent(EVENT_FLAMESPEAR, 12s, 16s); break; @@ -184,12 +184,12 @@ class npc_flamewaker_priest : public CreatureScript events.ScheduleEvent(EVENT_HEAL, 15s, 20s); break; case EVENT_SHADOW_WORD_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_SHADOWWORDPAIN)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_SHADOWWORDPAIN)) DoCast(target, SPELL_SHADOWWORDPAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 18s, 26s); break; case EVENT_IMMOLATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_IMMOLATE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_IMMOLATE)) DoCast(target, SPELL_IMMOLATE); events.ScheduleEvent(EVENT_IMMOLATE, 15s, 25s); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp index c4454bfacb1..55f5fbb11cc 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp @@ -102,7 +102,7 @@ public: switch (eventId) { case EVENT_HATEFUL_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1)) DoCast(target, SPELL_HATEFUL_BOLT); events.Repeat(Seconds(7), Seconds(15)); 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 7500931ef63..a1848abb7c8 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.Repeat(Seconds(35)); break; case EVENT_HOLYFIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50, true)) DoCast(target, SPELL_HOLYFIRE); events.Repeat(Seconds(8), Seconds(19)); break; case EVENT_HOLYWRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80, true)) DoCast(target, SPELL_HOLYWRATH); events.Repeat(Seconds(15), Seconds(25)); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp index e05535fb9a4..a1ddc0f5470 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_midnight.cpp @@ -109,7 +109,7 @@ public: scheduler.Schedule(Seconds(25), Seconds(45), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target,SPELL_INTANGIBLE_PRESENCE); task.Repeat(Seconds(25), Seconds(45)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp index 17352d9b261..f88e076b557 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_moroes.cpp @@ -299,7 +299,7 @@ public: if (Blind_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 0.0f, true, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 0.0f, true, false)) DoCast(target, SPELL_BLIND); Blind_Timer = 40000; } else Blind_Timer -= diff; @@ -311,7 +311,7 @@ public: { 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); InVanish = false; @@ -428,7 +428,7 @@ public: if (ManaBurn_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) if (target->GetPowerType() == POWER_MANA) DoCast(target, SPELL_MANABURN); ManaBurn_Timer = 5000; // 3 sec cast @@ -436,7 +436,7 @@ public: 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_SWPAIN); ShadowWordPain_Timer = 7000; @@ -580,7 +580,7 @@ public: if (DispelMagic_Timer <= diff) { - if (Unit* target = RAND(SelectGuestTarget(), SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))) + if (Unit* target = RAND(SelectGuestTarget(), SelectTarget(SelectTargetMethod::Random, 0, 100, true))) DoCast(target, SPELL_DISPELMAGIC); DispelMagic_Timer = 25000; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp index 23458db8a55..3a265a43147 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_netherspite.cpp @@ -283,7 +283,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 VoidZoneTimer -= diff; @@ -326,7 +326,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); } else NetherbreathTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index 43bb3e06182..b8cba4ac922 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -276,7 +276,7 @@ public: DoCastAOE(SPELL_BELLOWING_ROAR); break; case EVENT_CHARRED_EARTH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_CHARRED_EARTH); events.Repeat(Seconds(18), Seconds(21)); break; @@ -285,7 +285,7 @@ public: events.Repeat(Seconds(6), Seconds(15)); break; case EVENT_DISTRACTING_ASH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_DISTRACTING_ASH); break; case EVENT_EMOTE_BREATH: @@ -323,7 +323,7 @@ public: break; case EVENT_RAIN_OF_BONES: ResetThreatList(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { me->SetFacingToObject(target); DoCast(target, SPELL_RAIN_OF_BONES); @@ -334,17 +334,17 @@ public: events.Repeat(Seconds(28), Seconds(40)); break; case EVENT_SMOKING_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SMOKING_BLAST); events.Repeat(Milliseconds(1400)); break; case EVENT_SMOKING_BLAST_T: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SMOKING_BLAST_T); events.Repeat(Seconds(5), Seconds(7)); break; case EVENT_TAIL_SWEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) if (!me->HasInArc(float(M_PI), target)) DoCast(target, SPELL_TAIL_SWEEP); events.Repeat(Seconds(20), Seconds(30)); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index 1446559daa5..a91165e7da1 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -444,7 +444,7 @@ public: Talk(SAY_AXE_TOSS2); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); for (uint8 i = 0; i < 2; ++i) { Creature* axe = me->SummonCreature(MALCHEZARS_AXE, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000); @@ -485,7 +485,7 @@ public: { AxesTargetSwitchTimer = urand(7500, 20000); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { for (uint8 i = 0; i < 2; ++i) { @@ -501,7 +501,7 @@ public: if (AmplifyDamageTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_AMPLIFY_DAMAGE); AmplifyDamageTimer = urand(20000, 30000); } else AmplifyDamageTimer -= diff; @@ -528,7 +528,7 @@ public: if (phase == 1) target = me->GetVictim(); // the tank else // anyone but the tank - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target) DoCast(target, SPELL_SW_PAIN); 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 640c9302239..dcf5f242ae5 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -317,7 +317,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; @@ -359,7 +359,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; } diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp index fdd33a4bca9..6ca698e307d 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp @@ -117,7 +117,7 @@ public: switch (eventId) { case EVENT_SACRIFICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoCast(target, SPELL_SACRIFICE, true); target->CastSpell(target, SPELL_SUMMON_DEMONCHAINS, true); @@ -126,7 +126,7 @@ public: events.Repeat(Seconds(42)); break; case EVENT_SHADOWBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) DoCast(target, SPELL_SHADOW_BOLT); events.Repeat(Seconds(4), Seconds(10)); break; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp index 29a879b49a3..6f3d6e884df 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp @@ -213,7 +213,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 WaterBoltTimer -= diff; @@ -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; } else BrainWipeTimer -= diff; @@ -920,7 +920,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); @@ -1333,7 +1333,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(float(M_PI), target)) { DoCast(target, SPELL_BACKWARD_LUNGE); @@ -1349,7 +1349,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); } else DeadlySwatheTimer -= diff; @@ -1453,7 +1453,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); } else BlindingPassionTimer -= diff; @@ -1466,7 +1466,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 PowerfulAttractionTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index d7747fa4676..b06cb993ee8 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -254,7 +254,7 @@ struct boss_felblood_kaelthas : public BossAI switch (summon->GetEntry()) { case NPC_ARCANE_SPHERE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 70.0f, true)) summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); break; case NPC_FLAME_STRIKE: @@ -303,7 +303,7 @@ struct boss_felblood_kaelthas : public BossAI break; case EVENT_FLAME_STRIKE: Talk(SAY_FLAME_STRIKE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FLAME_STRIKE); events.Repeat(44s); break; @@ -315,7 +315,7 @@ struct boss_felblood_kaelthas : public BossAI events.Repeat(1min); break; case EVENT_PYROBLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_PYROBLAST); break; case EVENT_PHOENIX: diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp index 5a0b5a6395f..673c9727141 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -310,7 +310,7 @@ public: Unit* target = nullptr; if (urand(0, 1)) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); else { if (urand(0, 1)) @@ -329,7 +329,7 @@ public: if (SWPainTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_SW_PAIN_NORMAL); SWPainTimer = 10000; @@ -523,7 +523,7 @@ public: { DoCast(me, SPELL_VANISH); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* unit = SelectTarget(SelectTargetMethod::Random, 0); ResetThreatList(); @@ -647,7 +647,7 @@ public: if (Seed_of_Corruption_Timer <= diff) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_SEED_OF_CORRUPTION); Seed_of_Corruption_Timer = 10000; @@ -655,7 +655,7 @@ public: if (Curse_of_Agony_Timer <= diff) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_CURSE_OF_AGONY); Curse_of_Agony_Timer = 13000; @@ -663,7 +663,7 @@ public: if (Fear_Timer <= diff) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_FEAR); Fear_Timer = 10000; @@ -808,7 +808,7 @@ public: if (Polymorph_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_POLYMORPH); Polymorph_Timer = 20000; @@ -823,7 +823,7 @@ public: if (Blizzard_Timer <= diff) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_BLIZZARD); Blizzard_Timer = 8000; @@ -951,7 +951,7 @@ public: //if nobody is in melee range than try to use Intercept if (!InMeleeRange) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_INTERCEPT_STUN); } @@ -1185,7 +1185,7 @@ public: if (Purge_Timer <= diff) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_PURGE); Purge_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp index 3ac8136344f..b5658718020 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp @@ -191,12 +191,12 @@ class boss_selin_fireheart : public CreatureScript _scheduledEvents = false; break; case EVENT_DRAIN_MANA: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_DRAIN_MANA); events.ScheduleEvent(EVENT_DRAIN_MANA, 10s, 0, PHASE_NORMAL); break; case EVENT_DRAIN_LIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) DoCast(target, SPELL_DRAIN_LIFE); events.ScheduleEvent(EVENT_DRAIN_LIFE, 10s, 0, PHASE_NORMAL); break; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 46a8fe59d2c..d048918591a 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -94,7 +94,7 @@ class boss_vexallus : public CreatureScript void JustSummoned(Creature* summoned) override { - if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* temp = SelectTarget(SelectTargetMethod::Random, 0)) summoned->GetMotionMaster()->MoveFollow(temp, 0, 0); summons.Summon(summoned); @@ -147,12 +147,12 @@ class boss_vexallus : public CreatureScript switch (eventId) { case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_CHAIN_LIGHTNING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 8s); break; case EVENT_ARCANE_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) DoCast(target, SPELL_ARCANE_SHOCK); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 8s); break; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp index ac89662c293..419efd2cb41 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1487,7 +1487,7 @@ public: { if (Creature* temp = ObjectAccessor::GetCreature(*me, ui_GUID)) if (temp->IsAlive()) - if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0)) if (pTarget->IsAlive()) { AddThreat(pTarget, 0.0f, temp); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp index 73d40e14f3b..239bdfb87c8 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp @@ -88,7 +88,7 @@ struct boss_arcanist_doan : public BossAI events.Repeat(8s); break; case EVENT_POLYMORPH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f, true)) DoCast(target, SPELL_POLYMORPH); events.Repeat(20s); break; diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 2effc6e0da3..abc4a119c03 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -687,7 +687,7 @@ struct boss_headless_horseman : public ScriptedAI cleaveContext.Repeat(2s, 6s); }).Schedule(15s, uint32(TASK_GROUP_COMBAT), [this](TaskContext clonfragateContext) { - if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true, false, -SPELL_CONFLAGRATION)) + if (Unit* player = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true, false, -SPELL_CONFLAGRATION)) DoCast(player, SPELL_CONFLAGRATION, false); clonfragateContext.Repeat(10s, 16s); }); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp index f5d91e404fd..64a5861db26 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp @@ -133,17 +133,17 @@ struct boss_high_inquisitor_fairbanks : public BossAI events.Repeat(25s); break; case EVENT_DIPEL_MAGIC: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, HighInquisitorFairbanksDispelMagicTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, HighInquisitorFairbanksDispelMagicTargetSelector(me))) DoCast(target, SPELL_DISPEL_MAGIC); events.Repeat(30s); break; case EVENT_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 20.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.f, true)) DoCast(target, SPELL_FEAR); events.Repeat(40s); break; case EVENT_SLEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0, 30.f, true, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 30.f, true, false)) DoCast(target, SPELL_SLEEP); events.Repeat(30s); default: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 8eeaeb6c1c5..04834fd354b 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -123,7 +123,7 @@ class boss_darkmaster_gandling : public CreatureScript case EVENT_SHADOW_PORTAL: if (HealthAbovePct(3)) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOW_PORTAL, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_SHADOW_PORTAL, true); events.ScheduleEvent(EVENT_SHADOW_PORTAL, 17s, 27s); } } diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp index fb82675d70a..1efb043fd00 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp @@ -79,7 +79,7 @@ class boss_illucia_barov : public CreatureScript events.ScheduleEvent(EVENT_CURSEOFAGONY, 30s); break; case EVENT_SHADOWSHOCK: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SHADOWSHOCK, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_SHADOWSHOCK, true); events.ScheduleEvent(EVENT_SHADOWSHOCK, 12s); break; case EVENT_SILENCE: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp index addc653b111..7318f05150e 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp @@ -99,7 +99,7 @@ class boss_instructor_malicia : public CreatureScript events.ScheduleEvent(EVENT_CALLOFGRAVES, 65s); break; case EVENT_CORRUPTION: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CORRUPTION, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_CORRUPTION, true); events.ScheduleEvent(EVENT_CORRUPTION, 24s); break; case EVENT_RENEW: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index 68462ee0f27..38d55797357 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -52,7 +52,7 @@ public: void JustSummoned(Creature* summoned) override { // Illusions should attack a random target. - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); summoned->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true); // Not sure if this is correct. diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp index 962f9b5dec7..20be79069ed 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp @@ -77,7 +77,7 @@ class boss_lord_alexei_barov : public CreatureScript switch (eventId) { case EVENT_IMMOLATE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_IMMOLATE, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_IMMOLATE, true); events.ScheduleEvent(EVENT_IMMOLATE, 12s); break; case EVENT_VEILOFSHADOW: diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp index 589f4fbcceb..2b85881e47f 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp @@ -82,7 +82,7 @@ public: events.ScheduleEvent(EVENT_ICE_ARMOR, 3min); break; case EVENT_FROSTBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FROSTBOLT); events.ScheduleEvent(EVENT_FROSTBOLT, 8s); break; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 5c18c1e1c6c..66855e5c182 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -285,7 +285,7 @@ class boss_archmage_arugal : public CreatureScript switch (eventId) { case EVENT_CURSE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 30.0f, true)) DoCast(target, SPELL_ARUGAL_CURSE); events.Repeat(Seconds(15)); break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp index 92da0c408a3..6d83a03d636 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp @@ -110,7 +110,7 @@ public: switch (eventId) { case EVENT_SHADOWBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOWBOLT); events.Repeat(10s); break; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp index 71218683781..241af832759 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_baroness_anastari.cpp @@ -100,7 +100,7 @@ struct boss_baroness_anastari : public BossAI events.Repeat(13s); break; case EVENT_SPELL_POSSESS: - 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/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp index 540fd77a378..51f45a4c634 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp @@ -198,7 +198,7 @@ public: //PsychicScream if (m_uiPsychicScream_Timer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_PSYCHICSCREAM); m_uiPsychicScream_Timer = 20000; @@ -207,7 +207,7 @@ public: //DeepSleep if (m_uiDeepSleep_Timer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SLEEP); m_uiDeepSleep_Timer = 15000; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 2634441d8b4..8cc283fb41e 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -276,7 +276,7 @@ public: //HauntingTimer if (HauntingTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_HAUNTING_PHANTOM); HauntingTimer = 11000; } @@ -285,7 +285,7 @@ public: //TouchTimer if (TouchTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_DEBILITATING_TOUCH); TouchTimer = 7000; } diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index a923757d281..3bfaac0602e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -321,7 +321,7 @@ public: if (BurnTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_BURN)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_BURN)) target->CastSpell(target, SPELL_BURN, true); BurnTimer = urand(60000, 180000); } else BurnTimer -= diff; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp index c47024e7f7d..cc02a299b7f 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp @@ -232,7 +232,7 @@ public: if (!me->IsNonMeleeSpellCast(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CONFLAGRATION); ConflagrationTimer = 30000 + (rand32() % 5000); } @@ -244,7 +244,7 @@ public: { if (!me->IsNonMeleeSpellCast(false)) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target) DoCast(target, SPELL_SHADOW_NOVA); @@ -263,7 +263,7 @@ public: { if (!me->IsNonMeleeSpellCast(false)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CONFOUNDING_BLOW); ConfoundingblowTimer = 20000 + (rand32() % 5000); } @@ -275,7 +275,7 @@ public: Creature* temp = nullptr; for (uint8 i = 0; i<3; ++i) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); temp = DoSpawnCreature(NPC_SHADOW_IMAGE, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 10000); if (temp && target) { @@ -573,7 +573,7 @@ public: { if (!me->IsNonMeleeSpellCast(false)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_NOVA); ShadownovaTimer = 30000 + (rand32() % 5000); } @@ -586,7 +586,7 @@ public: if (!me->IsNonMeleeSpellCast(false)) { me->InterruptSpell(CURRENT_GENERIC_SPELL); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target) DoCast(target, SPELL_CONFLAGRATION); ConflagrationTimer = 30000 + (rand32() % 5000); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp index 22bbe3f3a16..9ae97dc81b7 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp @@ -229,7 +229,7 @@ public: { if (summon->GetEntry() == NPC_DEAD) { - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random)); DoZoneInCombat(summon); summon->CastSpell(summon, SPELL_DEAD_PASSIVE, true); } @@ -292,7 +292,7 @@ public: break; case 2: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150, true); if (!target) target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_PLAYER_GUID)); @@ -318,7 +318,7 @@ public: DespawnSummons(NPC_VAPOR_TRAIL); //DoCast(me, SPELL_VAPOR_SELECT); need core support - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150, true); if (!target) target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_PLAYER_GUID)); @@ -347,7 +347,7 @@ public: break; case 5: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150, true); if (!target) target = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_PLAYER_GUID)); @@ -389,7 +389,7 @@ public: uiFlightCount = 4; break; case 9: - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat)) DoStartMovement(target); else { @@ -401,7 +401,7 @@ public: me->SetDisableGravity(false); me->HandleEmoteCommand(EMOTE_ONESHOT_LAND); EnterPhase(PHASE_GROUND); - AttackStart(SelectTarget(SELECT_TARGET_MAXTHREAT)); + AttackStart(SelectTarget(SelectTargetMethod::MaxThreat)); break; } ++uiFlightCount; @@ -443,7 +443,7 @@ public: events.ScheduleEvent(EVENT_GAS_NOVA, 20s, 25s); break; case EVENT_ENCAPSULATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150, true)) DoCast(target, SPELL_ENCAPSULATE_CHANNEL, false); events.ScheduleEvent(EVENT_ENCAPSULATE, 25s, 30s); break; @@ -542,7 +542,7 @@ public: void UpdateAI(uint32 /*diff*/) override { if (!me->GetVictim()) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) AttackStart(target); } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index d5d97000f8d..d38f451bd5b 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -526,7 +526,7 @@ struct boss_sathrovarr : public BossAI { CastSpellExtraArgs args(TRIGGERED_FULL_MASK); args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, CurseAgonySelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, CurseAgonySelector(me))) DoCast(target, SPELL_AGONY_CURSE, args); else DoCastVictim(SPELL_AGONY_CURSE, args); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp index 7922e09f436..cbeec0d6e8e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -675,7 +675,7 @@ public: Talk(SAY_KJ_REFLECTION); for (uint8 i = 0; i < 4; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true, true, -SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true, true, -SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)) { float x, y, z; target->GetPosition(x, y, z); @@ -759,7 +759,7 @@ public: me->RemoveAurasDueToSpell(SPELL_SOUL_FLAY); for (uint8 z = 0; z < 6; ++z) { - pRandomPlayer = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + pRandomPlayer = SelectTarget(SelectTargetMethod::Random, 0, 100, true); if (!pRandomPlayer || !pRandomPlayer->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)) break; } @@ -852,7 +852,7 @@ public: Unit* target = nullptr; for (uint8 z = 0; z < 6; ++z) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); if (!target || !target->HasAura(SPELL_VENGEANCE_OF_THE_BLUE_FLIGHT)) break; } if (target) @@ -1057,7 +1057,7 @@ public: if (uiSpawnFiendTimer <= diff) { if (Creature* pFiend = DoSpawnCreature(NPC_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000)) - AddThreat(SelectTarget(SELECT_TARGET_RANDOM, 0), 100000.0f, pFiend); + AddThreat(SelectTarget(SelectTargetMethod::Random, 0), 100000.0f, pFiend); uiSpawnFiendTimer = urand(4000, 8000); } else uiSpawnFiendTimer -= diff; } @@ -1401,7 +1401,7 @@ public: } if (uiTimer[2] <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_SR_CURSE_OF_AGONY, true); uiTimer[2] = urand(2000, 4000); } DoMeleeAttackIfReady(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 7bd73347679..302ed471876 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -412,7 +412,7 @@ public: me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); if (Creature* _summoner = ObjectAccessor::GetCreature(*me, _summonerGUID)) - if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = _summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); }); diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp index f806c091d54..b065d82e183 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_lord_overheat.cpp @@ -71,7 +71,7 @@ struct boss_lord_overheat : public BossAI events.Repeat(2s); break; case EVENT_OVERHEAT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_OVERHEAT); events.Repeat(9s, 10s); break; diff --git a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp index 573d3c6a4d5..71577ef7cb4 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp +++ b/src/server/scripts/EasternKingdoms/TheStockade/boss_randolph_moloch.cpp @@ -118,7 +118,7 @@ struct boss_randolph_moloch : public BossAI events.ScheduleEvent(EVENT_JUST_VANISHED, 2s); break; case EVENT_JUST_VANISHED: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SHADOWSTEP, true); me->SetReactState(REACT_AGGRESSIVE); break; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 141fce1f3ff..54ddedbc236 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -252,7 +252,7 @@ class boss_mandokir : public CreatureScript events.ScheduleEvent(EVENT_DECAPITATE, me->HasAura(SPELL_FRENZY) ? (17s + 500ms) : 35s); break; case EVENT_BLOODLETTING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { DoCast(target, SPELL_BLOODLETTING, true); me->ClearUnitState(UNIT_STATE_CASTING); diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 579cd1a7dc4..5e8b9eda4f5 100644 --- a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp @@ -112,7 +112,7 @@ public: _events.ScheduleEvent(EVENT_SOUL_CORRUPTION, 15s, 19s); break; case EVENT_CREATURE_OF_NIGHTMARE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_CREATURE_OF_NIGHTMARE); _events.ScheduleEvent(EVENT_CREATURE_OF_NIGHTMARE, 45000); break; diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 48ff363b0a6..213ca69c2f3 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -163,7 +163,7 @@ public: { if (frostBoltVolleyTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FROST_BOLT_VOLLEY); frostBoltVolleyTimer = urand(5000, 8000); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 68090fbc1d2..f0f1a31eee7 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -94,7 +94,7 @@ public: events.ScheduleEvent(EVENT_MIND_BLAST, 7s, 9s); break; case EVENT_SLEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { Talk(SAY_SLEEP); DoCast(target, SPELL_SLEEP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 400d200731a..31c76838940 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -145,7 +145,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); SwarmTimer = urand(45000, 60000); @@ -156,7 +156,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; @@ -169,7 +169,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); } else InfernoTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 83ca39ed52c..fa9d4b3164f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -349,22 +349,22 @@ public: } break; case EVENT_FINGER_OF_DEATH: - if (!SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f)) // Checks if there are no targets in melee range + if (!SelectTarget(SelectTargetMethod::Random, 0, 5.0f)) // Checks if there are no targets in melee range { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_FINGER_OF_DEATH); events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1s); } else events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5s); break; case EVENT_GRIP_OF_THE_LEGION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_GRIP_OF_THE_LEGION); events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s); break; case EVENT_AIR_BURST: Talk(SAY_AIR_BURST); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_AIR_BURST); //not on tank events.ScheduleEvent(EVENT_AIR_BURST, 25s, 40s); break; @@ -374,7 +374,7 @@ public: break; case EVENT_DOOMFIRE: Talk(SAY_DOOMFIRE); - if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* temp = SelectTarget(SelectTargetMethod::Random, 1)) SummonDoomfire(temp); else SummonDoomfire(me->GetVictim()); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 08a11b95449..5c94588fa8e 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -148,13 +148,13 @@ 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 + rand32() % 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 + rand32() % 5000; } else DoomTimer -= diff; @@ -264,7 +264,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 + rand32() % 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 7965934e3d8..47b1d5d3c84 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -155,7 +155,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 + rand32() % 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 87a6a1cba9d..a97360ec894 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -866,7 +866,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 c7cd8ca05c9..db477b36a6f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -755,7 +755,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); @@ -1353,7 +1353,7 @@ public: if (forcemove) { forcemove = false; - 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_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index 66916abf9fa..4f4df740093 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -82,7 +82,7 @@ class boss_epoch : public CreatureScript switch (eventId) { case EVENT_CURSE_OF_EXERTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CURSE_OF_EXERTION); events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index f2dbe13b2c0..ed8fd08153b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -103,7 +103,7 @@ class boss_infinite_corruptor : public CreatureScript switch (eventId) { case EVENT_CORRUPTING_BLIGHT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_CORRUPTING_BLIGHT); events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s); 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 41f4a865389..149c3765f84 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -151,7 +151,7 @@ class boss_mal_ganis : public CreatureScript events.Repeat(Seconds(6)); break; case EVENT_MIND_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, -int32(SPELL_SLEEP))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, -int32(SPELL_SLEEP))) DoCast(target, SPELL_MIND_BLAST); else DoCastVictim(SPELL_MIND_BLAST); @@ -162,7 +162,7 @@ class boss_mal_ganis : public CreatureScript events.Repeat(Seconds(30)); break; case EVENT_SLEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f)) DoCast(target, SPELL_SLEEP); else DoCastVictim(SPELL_SLEEP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index e30cc48d8b2..86fb33b6f95 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -73,9 +73,9 @@ class boss_meathook : public CreatureScript switch (eventId) { case EVENT_CHAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -20.0f, true)) DoCast(target, SPELL_CONSTRICTING_CHAINS); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) DoCast(target, SPELL_CONSTRICTING_CHAINS); else DoCastVictim(SPELL_CONSTRICTING_CHAINS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index 963fdc4749c..bf17d74e7ad 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -98,13 +98,13 @@ class boss_salramm : public CreatureScript events.ScheduleEvent(EVENT_EXPLODE_GHOUL2, Seconds(25), Seconds(29)); 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)) DoCast(target, SPELL_SHADOW_BOLT); events.Repeat(Seconds(3)); break; case EVENT_STEAL_FLESH: Talk(SAY_STEAL_FLESH); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 50.0f, true)) DoCast(target, SPELL_STEAL_FLESH); events.Repeat(Seconds(15), Seconds(20)); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index c7f116ff7c0..9a74bcb0fc7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -898,7 +898,7 @@ public: { if (me->HasUnitState(UNIT_STATE_CASTING)) _exorcismCooldown = 0; - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_EXORCISM); _exorcismCooldown = urandms(7, 14); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 105888eea31..93c035c5e89 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -128,7 +128,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WING_BUFFET); WingBuffet_Timer = 25000 + rand32() % 10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index f99076b445a..e68c8ce6e79 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -125,7 +125,7 @@ public: events.ScheduleEvent(EVENT_TIME_LAPSE, 15s, 25s); break; case EVENT_ARCANE_DISCHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARCANE_DISCHARGE); events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s); break; diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 01c3876446f..07df782f8cb 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -227,7 +227,7 @@ class npc_harbinger_of_flame : public CreatureScript switch (eventId) { case EVENT_FIEROBLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, false, true, -SPELL_RIDE_MONSTROSITY)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, false, true, -SPELL_RIDE_MONSTROSITY)) DoCast(target, SPELL_FIEROBLAST_TRASH); _events.RescheduleEvent(EVENT_FIEROBLAST, 500); // cast time is longer, but thanks to UNIT_STATE_CASTING check it won't trigger more often (need this because this creature gets a stacking haste aura) break; @@ -330,7 +330,7 @@ class npc_blazing_monstrosity : public CreatureScript switch (eventId) { case EVENT_START_SPITTING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, false, true, -SPELL_RIDE_MONSTROSITY)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, false, true, -SPELL_RIDE_MONSTROSITY)) DoCast(target, SPELL_MOLTEN_BARRAGE); break; case EVENT_CONTINUE_SPITTING: diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index d8f3db3d467..7d7e2419468 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -222,7 +222,7 @@ public: events.ScheduleEvent(EVENT_FLAME_BOLT, 15000, 0, PHASE_NORMAL); break; case EVENT_EARTH_SPIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_EARTH_SPIKE_WARN); events.ScheduleEvent(EVENT_EARTH_SPIKE, urand(16000, 21000), 0, PHASE_NORMAL); break; @@ -231,7 +231,7 @@ public: break; case EVENT_QUICKSAND: // Spell not in DBC, it is not cast either, according to sniffs - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) if (Creature* quicksand = me->SummonCreature(NPC_QUICKSAND, *target)) quicksand->SetCreatedBySpell(SPELL_SUMMON_QUICKSAND); events.ScheduleEvent(EVENT_QUICKSAND, 10000, 0, PHASE_DISPERSE); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index ccb1077f5df..d4f53f9afd3 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -224,9 +224,9 @@ public: break; case EVENT_BURNING_LIGHT: { - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)); + Unit* unit = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me)); if (!unit) - unit = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + unit = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); DoCast(unit, SPELL_BURNING_LIGHT); events.ScheduleEvent(EVENT_SEAR, 2000); events.ScheduleEvent(EVENT_BURNING_LIGHT, 12000); diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index fddef2e003f..f48988ff13d 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -81,7 +81,7 @@ public: //Wrath if (WrathTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WRATH); WrathTimer = 8000; } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 54d4f174cb6..cbd00e4f215 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -92,7 +92,7 @@ public: //BoulderTimer if (BoulderTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_BOULDER); BoulderTimer = 10000; } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 07ed8f3a359..f51415d6dd5 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -174,7 +174,7 @@ public: void JustSummoned(Creature* summoned) override { DoZoneInCombat(summoned); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); switch (summoned->GetEntry()) @@ -237,7 +237,7 @@ public: // tank selection based on phase one. If tank is not there i take nearest one if (Unit* tank = ObjectAccessor::GetUnit(*me, tankGUID)) me->GetMotionMaster()->MoveChase(tank); - else if (Unit* newtarget = SelectTarget(SELECT_TARGET_MINDISTANCE, 0)) + else if (Unit* newtarget = SelectTarget(SelectTargetMethod::MinDistance, 0)) me->GetMotionMaster()->MoveChase(newtarget); events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5s); events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s); @@ -451,7 +451,7 @@ public: case EVENT_FIREBALL: // Phase PHASE_BREATH if (!IsMoving) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FIREBALL); events.ScheduleEvent(EVENT_FIREBALL, 8s); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 0d9c5025a74..909085c2a7b 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -78,7 +78,7 @@ public: switch (eventId) { case EVENT_WEB_SPRAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, false)) { if (!target->HasAura(SPELL_WEB_SPRAY)) DoCast(target, SPELL_WEB_SPRAY); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 0b630c69cd3..927d8b077a1 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -108,7 +108,7 @@ class boss_ayamiss : public CreatureScript 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; } @@ -198,7 +198,7 @@ class boss_ayamiss : public CreatureScript events.ScheduleEvent(EVENT_POISON_STINGER, 2s, 3s); 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()); @@ -210,7 +210,7 @@ class boss_ayamiss : public CreatureScript case EVENT_SWARMER_ATTACK: for (GuidList::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i) if (Creature* swarmer = ObjectAccessor::GetCreature(*me, *i)) - 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 75c4554f613..1c70d3fa91f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -120,7 +120,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s); events.ScheduleEvent(EVENT_FULL_SPEED, 1min); - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { ResetThreatList(); AttackStart(victim); @@ -218,7 +218,7 @@ class npc_buru_egg : public CreatureScript { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = ObjectAccessor::GetCreature(*me, _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 270d4eb781e..397fc3b5093 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -107,7 +107,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s); 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 3e3a249fe19..371194929c0 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -192,7 +192,7 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_CHARGE); //me->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true, 1); @@ -269,7 +269,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 68ea6fc178a..1526ffd69b2 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -230,7 +230,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); } @@ -269,7 +269,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); @@ -285,7 +285,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Creature* Spawned = nullptr; @@ -313,7 +313,7 @@ public: me->SetTarget(ObjectGuid::Empty); //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->GetAbsoluteAngle(target); @@ -946,7 +946,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); @@ -1026,7 +1026,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) { me->KillSelf(); @@ -1143,7 +1143,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) { me->KillSelf(); @@ -1250,7 +1250,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 20b9aebe304..1bae3854a33 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -122,16 +122,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); @@ -143,7 +143,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 5503c4f80f2..101f5279a9b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -104,7 +104,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); } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index a710289af94..ce352b65636 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -123,7 +123,7 @@ public: //ChangeTarget_Timer if (Submerged && ChangeTarget_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); ChangeTarget_Timer = urand(10000, 20000); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 0362f85f572..d11116f2441 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -121,7 +121,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)) { AddThreat(target, 1.0f); AttackStart(target); @@ -148,7 +148,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)) { AddThreat(target, 1.0f); AttackStart(target); @@ -262,7 +262,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)) { AddThreat(target, 1.0f); AttackStart(target); @@ -282,7 +282,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)) { AddThreat(target, 1.0f); AttackStart(target); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 60104d07cf8..930568be559 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -106,7 +106,7 @@ class boss_skeram : public CreatureScript 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; @@ -164,7 +164,7 @@ class boss_skeram : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 18s); break; case EVENT_FULLFILMENT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 45.0f, true)) DoCast(target, SPELL_TRUE_FULFILLMENT); events.ScheduleEvent(EVENT_FULLFILMENT, 20s, 30s); break; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 23f21777528..eb829371e7b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -452,7 +452,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 + rand32() % 15000; @@ -551,14 +551,14 @@ public: //Blizzard_Timer if (Blizzard_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45, true)) DoCast(target, SPELL_BLIZZARD); Blizzard_Timer = 15000 + rand32() % 15000; } else Blizzard_Timer -= diff; if (ArcaneBurst_Timer <= diff) { - if (Unit* mvic = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, NOMINAL_MELEE_RANGE, true)) + if (Unit* mvic = SelectTarget(SelectTargetMethod::MinDistance, 0, NOMINAL_MELEE_RANGE, true)) { DoCast(mvic, SPELL_ARCANEBURST); ArcaneBurst_Timer = 5000; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp index 1e9164cebc2..7da92e05f4d 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp @@ -112,7 +112,7 @@ public: DoCast(me,SPELL_HEALING_WAVE); break; case EVENT_SHADOWBOLT_VOLLEY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOWBOLT_VOLLEY); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9s); break; diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index f01a8443c5f..168713ea0a6 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -109,7 +109,7 @@ public: events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s); 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, 14s, 16s); break; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 81b59952d20..d979e57e3eb 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -91,7 +91,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); BerserkerChargeTimer = 25000; } else BerserkerChargeTimer -= diff; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index fa06feae737..aa95e7be17e 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -182,7 +182,7 @@ class boss_corborus : public CreatureScript events.ScheduleEvent(EVENT_DAMPENING_WAVE, 15000); break; case EVENT_CRYSTAL_BARRAGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CRYSTAL_BARRAGE); events.ScheduleEvent(EVENT_CRYSTAL_BARRAGE, 10000); break; @@ -202,7 +202,7 @@ class boss_corborus : public CreatureScript events.ScheduleEvent(EVENT_TELEPORT, 500); break; case EVENT_TELEPORT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_TRASHING_CHARGE_TELEPORT); countTrashingCharge += 1; if (countTrashingCharge <= 4) diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 9aa1088f782..797c7b69eb0 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -224,7 +224,7 @@ class boss_high_priestess_azil : public CreatureScript me->GetMotionMaster()->MoveJump(GroundPos, me->GetSpeed(MOVE_FLIGHT), 1.918408f, POINT_INTRO_MOVE); break; case EVENT_CURSE_OF_BLOOD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CURSE_OF_BLOOD); events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(13000, 15000)); break; @@ -233,7 +233,7 @@ class boss_high_priestess_azil : public CreatureScript events.ScheduleEvent(EVENT_CURSE_OF_BLOOD, urand(13000, 15000)); break; case EVENT_SUMMON_GRAVITY_WELL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SUMMON_GRAVITY_WELL); events.ScheduleEvent(EVENT_SUMMON_GRAVITY_WELL, urand(13000, 15000)); break; @@ -260,7 +260,7 @@ class boss_high_priestess_azil : public CreatureScript events.ScheduleEvent(EVENT_EARTH_FURY_LAUNCH_SHARD, 1800); break; case EVENT_EARTH_FURY_LAUNCH_SHARD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { me->SetFacingToObject(target); DoCast(target, SPELL_SEISMIC_SHARD_TARGETING); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index cf903d77f7e..6ad15eebe2f 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -240,7 +240,7 @@ class boss_slabhide : public CreatureScript instance->SetData(DATA_SLABHIDE_ROCK_WALL, false); break; case EVENT_LAVA_FISSURE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_LAVA_FISSURE); events.ScheduleEvent(EVENT_LAVA_FISSURE, urand(6000, 8000)); break; diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index ed9ee7f953e..fafd15da0b7 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -226,12 +226,12 @@ class npc_sc_millhouse_manastorm : public CreatureScript events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 7000); break; case EVENT_SHADOWFURY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SHADOWFURY); events.ScheduleEvent(EVENT_SHADOWFURY, 7000); break; case EVENT_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_FEAR); events.ScheduleEvent(EVENT_FEAR, 18000); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 8db7e896423..80f85b92950 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -151,7 +151,7 @@ struct boss_amanitar : public BossAI SpawnMushroom(pos); break; case EVENT_MINI: - if (SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_MINI)) + if (SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_MINI)) { DoCastAOE(SPELL_MINI); events.Repeat(Seconds(30)); @@ -160,7 +160,7 @@ struct boss_amanitar : public BossAI events.Repeat(Seconds(1)); break; case EVENT_ROOT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) DoCast(target, SPELL_ENTANGLING_ROOTS, true); events.Repeat(Seconds(10), Seconds(15)); break; @@ -169,7 +169,7 @@ struct boss_amanitar : public BossAI events.Repeat(Seconds(7), Seconds(12)); break; case EVENT_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_VENOM_BOLT_VOLLEY, true); events.Repeat(Seconds(18), Seconds(22)); break; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 7dcebc75f5e..e79e1242571 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -131,7 +131,7 @@ class boss_elder_nadox : public CreatureScript switch (eventId) { case EVENT_PLAGUE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_BROOD_PLAGUE, true); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_BROOD_PLAGUE, true); events.ScheduleEvent(EVENT_PLAGUE, 15s); break; case EVENT_RAGE: 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 58b13ee4701..1220dbfabbb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -264,7 +264,7 @@ public: if (uiShiverTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHIVER); uiShiverTimer = 15*IN_MILLISECONDS; } else uiShiverTimer -= diff; 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 bb6d2c3a4ed..afb8c5eee69 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -372,12 +372,12 @@ struct boss_jedoga_shadowseeker : public BossAI events.Repeat(Seconds(15), Seconds(30)); break; case EVENT_LIGHTNING_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_LIGHTNING_BOLT); events.Repeat(Seconds(15), Seconds(30)); break; case EVENT_THUNDERSHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_THUNDERSHOCK); events.Repeat(Seconds(15), Seconds(30)); break; 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 fcc810f0c22..39eabdbaedb 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -192,7 +192,7 @@ class boss_prince_taldaram : public CreatureScript { if (me->GetThreatManager().GetThreatListSize() > 1) { - if (Unit* embraceTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* embraceTarget = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) _embraceTargetGUID = embraceTarget->GetGUID(); Talk(SAY_VANISH); DoCast(me, SPELL_VANISH); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 9b7b93df1a3..cebaa9350c7 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -312,7 +312,7 @@ public: events.Repeat(randtime(Seconds(7), Seconds(9))); break; case EVENT_ACID_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) DoCast(target, SPELL_ACID_CLOUD); events.Repeat(randtime(Seconds(16), Seconds(23))); 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 00d176bfe9d..002b7668914 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 @@ -453,7 +453,7 @@ class npc_watcher_gashra : public CreatureScript _events.Repeat(randtime(Seconds(12), Seconds(20))); break; case EVENT_WEB_WRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f)) DoCast(target, SPELL_WEB_WRAP); _events.Repeat(randtime(Seconds(13), Seconds(19))); break; @@ -531,7 +531,7 @@ class npc_watcher_narjil : public CreatureScript _events.Repeat(randtime(Seconds(23), Seconds(27))); break; case EVENT_WEB_WRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_WEB_WRAP); _events.Repeat(randtime(Seconds(13), Seconds(19))); break; @@ -609,7 +609,7 @@ class npc_watcher_silthik : public CreatureScript _events.Repeat(randtime(Seconds(13), Seconds(19))); break; case EVENT_WEB_WRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_WEB_WRAP); _events.Repeat(randtime(Seconds(13), Seconds(17))); break; @@ -733,7 +733,7 @@ class npc_anub_ar_skirmisher : public CreatureScript switch (eventId) { case EVENT_ANUBAR_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CHARGE); _events.Repeat(randtime(Seconds(20), Seconds(25))); break; @@ -805,7 +805,7 @@ class npc_anub_ar_shadowcaster : public CreatureScript switch (eventId) { case EVENT_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SHADOW_BOLT); _events.Repeat(randtime(Seconds(2), Seconds(4))); break; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp index b40a48764c9..af5abc41880 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp @@ -456,7 +456,7 @@ public: events.ScheduleEvent(EVENT_CLEAVE_ATTACK, 7s, 10s); break; case EVENT_LAVA_STRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { CastLavaStrikeOnTarget(target); if (urand(0, 5) == 0) diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp index 3450f33e901..4c4f6a2574c 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp @@ -217,7 +217,7 @@ struct dummy_dragonAI : public ScriptedAI { me->GetMotionMaster()->Clear(); DoZoneInCombat(); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0, true)) { AddThreat(target, 1.0f); me->Attack(target, true); @@ -384,7 +384,7 @@ struct dummy_dragonAI : public ScriptedAI switch (eventId) { case EVENT_SHADOW_FISSURE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SHADOW_FISSURE); events.ScheduleEvent(eventId, urand(15000, 20000)); break; 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 c483067f564..6e4635697e5 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 @@ -206,7 +206,7 @@ class boss_baltharus_the_warborn : public CreatureScript break; case EVENT_ENERVATING_BRAND: for (uint8 i = 0; i < RAID_MODE<uint8>(2, 4, 2, 4); i++) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND)) DoCast(target, SPELL_ENERVATING_BRAND); events.Repeat(Seconds(26)); break; @@ -303,7 +303,7 @@ class npc_baltharus_the_warborn_clone : public CreatureScript break; case EVENT_ENERVATING_BRAND: for (uint8 i = 0; i < RAID_MODE<uint8>(2, 4, 2, 4); i++) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true, false, -SPELL_ENERVATING_BRAND)) DoCast(target, SPELL_ENERVATING_BRAND); events.Repeat(Seconds(26)); break; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 5cbb464765d..50e5b9688af 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -352,7 +352,7 @@ class boss_halion : public CreatureScript break; case EVENT_METEOR_STRIKE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_TWILIGHT_REALM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_TWILIGHT_REALM)) { _meteorStrikePos = target->GetPosition(); me->CastSpell(_meteorStrikePos, SPELL_METEOR_STRIKE, CastSpellExtraArgs(TRIGGERED_FULL_MASK) @@ -364,7 +364,7 @@ class boss_halion : public CreatureScript } case EVENT_FIERY_COMBUSTION: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, -SPELL_TWILIGHT_REALM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, true, -SPELL_TWILIGHT_REALM)) me->CastSpell(target, SPELL_FIERY_COMBUSTION, TRIGGERED_IGNORE_SET_FACING); events.ScheduleEvent(EVENT_FIERY_COMBUSTION, 25s); break; @@ -537,7 +537,7 @@ class boss_twilight_halion : public CreatureScript events.ScheduleEvent(EVENT_BREATH, randtime(Seconds(10), Seconds(14))); break; case EVENT_SOUL_CONSUMPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, SPELL_TWILIGHT_REALM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, true, SPELL_TWILIGHT_REALM)) me->CastSpell(target, SPELL_SOUL_CONSUMPTION, TRIGGERED_IGNORE_SET_FACING); events.ScheduleEvent(EVENT_SOUL_CONSUMPTION, 20s); 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 628dfccaccb..7eee9ce6614 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -225,7 +225,7 @@ public: { me->InterruptNonMeleeSpells(true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250, true)) { if (target->IsAlive()) { @@ -351,7 +351,7 @@ public: if (uiHolyFireTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250, true)) { if (target->IsAlive()) DoCast(target, SPELL_HOLY_FIRE); @@ -364,7 +364,7 @@ public: if (uiHolySmiteTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250, true)) { if (target->IsAlive()) DoCast(target, SPELL_SMITE); @@ -457,7 +457,7 @@ public: if (uiOldWoundsTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->IsAlive()) DoCast(target, SPELL_OLD_WOUNDS); @@ -473,7 +473,7 @@ public: if (uiShadowPastTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { if (target->IsAlive()) DoCast(target, SPELL_SHADOWS_PAST); 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 38afbf9e3f6..05b1761b1f3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -195,7 +195,7 @@ public: { if (uiDeathRespiteTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (target->IsAlive()) DoCast(target, SPELL_DEATH_RESPITE); @@ -223,7 +223,7 @@ public: } if (uiDesecration <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (target->IsAlive()) DoCast(target, SPELL_DESECRATION); @@ -250,7 +250,7 @@ public: } else uiDeathBiteTimer -= uiDiff; if (uiMarkedDeathTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (target->IsAlive()) DoCast(target, SPELL_MARKED_DEATH); @@ -331,7 +331,7 @@ public: if (uiAttackTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) { if (target->IsAlive()) DoCast(target, (SPELL_LEAP)); 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 27522e26e0f..0f7f1072e34 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp @@ -555,7 +555,7 @@ public: if (uiPolymorphTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_POLYMORPH); uiPolymorphTimer = 8000; } else uiPolymorphTimer -= uiDiff; @@ -692,7 +692,7 @@ public: if (uiChainLightningTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHAIN_LIGHTNING); uiChainLightningTimer = 16000; @@ -849,7 +849,7 @@ public: if (uiShootTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXDISTANCE, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 30.0f)) { uiTargetGUID = target->GetGUID(); DoCast(target, SPELL_SHOOT); @@ -1008,7 +1008,7 @@ public: if (uiPosionBottleTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_POISON_BOTTLE); uiPosionBottleTimer = 19000; } else uiPosionBottleTimer -= uiDiff; 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 5d15e0b71f5..39d7a3dff14 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -257,7 +257,7 @@ class boss_anubarak_trial : public CreatureScript break; case NPC_SPIKE: summoned->SetDisplayFromModel(0); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { summoned->EngageWithTarget(target); Talk(EMOTE_SPIKE, target); @@ -557,7 +557,7 @@ class npc_nerubian_burrower : public CreatureScript { case ACTION_SHADOW_STRIKE: if (!me->HasAura(SPELL_AWAKENED)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_STRIKE); break; default: @@ -718,7 +718,7 @@ class npc_anubarak_spike : public CreatureScript void JustEngagedWith(Unit* who) override { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { StartChase(target); Talk(EMOTE_SPIKE, who); @@ -748,7 +748,7 @@ class npc_anubarak_spike : public CreatureScript DoCast(me, SPELL_SPIKE_SPEED1); DoCast(me, SPELL_SPIKE_TRAIL); _phase = PHASE_IMPALE_NORMAL; - if (Unit* target2 = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target2 = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { StartChase(target2); Talk(EMOTE_SPIKE, target2); 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 172f356bb7d..c99269e0d80 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -910,7 +910,7 @@ class npc_toc_shaman : public CreatureScript events.ScheduleEvent(EVENT_HEAL_BLOODLUST_HEROISM, 5*MINUTE*IN_MILLISECONDS); return; case EVENT_HEX: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_HEX); events.ScheduleEvent(EVENT_HEX, 15s, 30s); return; @@ -1024,7 +1024,7 @@ class npc_toc_paladin : public CreatureScript events.RescheduleEvent(EVENT_HEAL_HAND_OF_PROTECTION, 10*IN_MILLISECONDS); return; case EVENT_HAMMER_OF_JUSTICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0f, true)) DoCast(target, SPELL_HAMMER_OF_JUSTICE); events.ScheduleEvent(EVENT_HAMMER_OF_JUSTICE, 40s); return; @@ -1094,7 +1094,7 @@ class npc_toc_priest : public CreatureScript events.ScheduleEvent(EVENT_FLASH_HEAL, 3s, 5s); return; case EVENT_HEAL_DISPEL: - if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* target = urand(0, 1) ? SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f)) DoCast(target, SPELL_DISPEL); events.ScheduleEvent(EVENT_HEAL_DISPEL, 10s, 20s); return; @@ -1174,12 +1174,12 @@ class npc_toc_shadow_priest : public CreatureScript events.ScheduleEvent(EVENT_SILENCE, 10s, 25s); return; case EVENT_VAMPIRIC_TOUCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_VAMPIRIC_TOUCH); events.ScheduleEvent(EVENT_VAMPIRIC_TOUCH, 10s, 35s); return; case EVENT_SW_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_SW_PAIN); events.ScheduleEvent(EVENT_SW_PAIN, 10s, 35s); return; @@ -1201,7 +1201,7 @@ class npc_toc_shadow_priest : public CreatureScript events.RescheduleEvent(EVENT_DISPERSION, 5*IN_MILLISECONDS); return; case EVENT_DPS_DISPEL: - if (Unit* target = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f)) + if (Unit* target = urand(0, 1) ? SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true) : DoSelectLowestHpFriendly(40.0f)) DoCast(target, SPELL_DISPEL); events.ScheduleEvent(EVENT_DPS_DISPEL, 10s, 20s); return; @@ -1273,22 +1273,22 @@ class npc_toc_warlock : public CreatureScript events.ScheduleEvent(EVENT_HELLFIRE, 10s, 30s); return; case EVENT_CORRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_CORRUPTION); events.ScheduleEvent(EVENT_CORRUPTION, 15s, 25s); return; case EVENT_CURSE_OF_AGONY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_CURSE_OF_AGONY); events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 20s, 35s); return; case EVENT_CURSE_OF_EXHAUSTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_CURSE_OF_EXHAUSTION); events.ScheduleEvent(EVENT_CURSE_OF_EXHAUSTION, 20s, 35s); return; case EVENT_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) DoCast(target, SPELL_FEAR); events.ScheduleEvent(EVENT_FEAR, 5s, 20s); return; @@ -1297,7 +1297,7 @@ class npc_toc_warlock : public CreatureScript events.ScheduleEvent(EVENT_SEARING_PAIN, 10s, 25s); return; case EVENT_UNSTABLE_AFFLICTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_UNSTABLE_AFFLICTION); events.ScheduleEvent(EVENT_UNSTABLE_AFFLICTION, 10s, 25s); return; @@ -1391,7 +1391,7 @@ class npc_toc_mage : public CreatureScript events.RescheduleEvent(EVENT_ICE_BLOCK, 5*IN_MILLISECONDS); return; case EVENT_POLYMORPH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_POLYMORPH); events.ScheduleEvent(EVENT_POLYMORPH, 10s, 30s); return; @@ -1493,7 +1493,7 @@ class npc_toc_hunter : public CreatureScript events.ScheduleEvent(EVENT_WING_CLIP, 15s, 25s); return; case EVENT_WYVERN_STING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_WYVERN_STING); events.ScheduleEvent(EVENT_WYVERN_STING, 10s, 30s); return; @@ -1551,12 +1551,12 @@ class npc_toc_boomkin : public CreatureScript switch (eventId) { case EVENT_CYCLONE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_CYCLONE); events.ScheduleEvent(EVENT_CYCLONE, 10s, 20s); return; case EVENT_ENTANGLING_ROOTS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_ENTANGLING_ROOTS); events.ScheduleEvent(EVENT_ENTANGLING_ROOTS, 10s, 20s); return; @@ -1849,7 +1849,7 @@ class npc_toc_rogue : public CreatureScript events.ScheduleEvent(EVENT_FAN_OF_KNIVES, 10s, 20s); return; case EVENT_BLIND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_BLIND); events.ScheduleEvent(EVENT_BLIND, 10s, 30s); return; @@ -2108,7 +2108,7 @@ class npc_toc_retro_paladin : public CreatureScript events.ScheduleEvent(EVENT_JUDGEMENT_OF_COMMAND, 10s, 15s); return; case EVENT_REPENTANCE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) DoCast(target, SPELL_REPENTANCE); events.ScheduleEvent(EVENT_REPENTANCE, 1min); return; 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 8424a3a927c..0ae2d22f75d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -208,12 +208,12 @@ struct boss_jaraxxus : public BossAI events.Repeat(11s, 13s); break; case EVENT_FEL_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_FEL_LIGHTNING); events.Repeat(10s, 30s); break; case EVENT_INCINERATE_FLESH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { Talk(EMOTE_INCINERATE, target); Talk(SAY_INCINERATE); @@ -230,7 +230,7 @@ struct boss_jaraxxus : public BossAI break; } case EVENT_LEGION_FLAME: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { Talk(EMOTE_LEGION_FLAME, target); DoCast(target, SPELL_LEGION_FLAME); @@ -350,7 +350,7 @@ struct npc_fel_infernal : public ScriptedAI _scheduler.Schedule(Seconds(2), [this](TaskContext context) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_FEL_STREAK_VISUAL); context.Repeat(Seconds(15)); }); @@ -441,7 +441,7 @@ struct npc_mistress_of_pain : public ScriptedAI _events.Repeat(3s, 10s); return; case EVENT_SPINNING_SPIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SPINNING_SPIKE); _events.Repeat(20s); return; 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 213eb44f9ec..af583068cb0 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -490,7 +490,7 @@ struct npc_snobold_vassal : public ScriptedAI me->AttackStop(); SetCombatMovement(true); _gormokDead = true; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { AttackStart(target); me->GetMotionMaster()->MoveChase(target); @@ -515,7 +515,7 @@ struct npc_snobold_vassal : public ScriptedAI switch (eventId) { case EVENT_FIRE_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_FIRE_BOMB); _events.Repeat(20s, 30s); break; @@ -770,7 +770,7 @@ struct boss_jormungarAI : public boss_northrend_beastsAI DoCastAOE(SPELL_HATE_TO_ZERO, true); me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)); me->SetReactState(REACT_AGGRESSIVE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); // if the worm was mobile before submerging, make him stationary now @@ -834,7 +834,7 @@ struct boss_jormungarAI : public boss_northrend_beastsAI me->SummonCreature(NPC_ACIDMAW, ToCCommonLoc[9]); break; case EVENT_SPRAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, spraySpell); events.Repeat(21s); break; @@ -1020,7 +1020,7 @@ struct boss_icehowl : public boss_northrend_beastsAI me->GetMotionMaster()->MoveJump(ToCCommonLoc[1], 20.0f, 20.0f, POINT_MIDDLE); break; case EVENT_SELECT_CHARGE_TARGET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_FURIOUS_CHARGE_SUMMON, true); me->SetTarget(target->GetGUID()); @@ -1048,7 +1048,7 @@ struct boss_icehowl : public boss_northrend_beastsAI events.Repeat(20s); break; case EVENT_ARCTIC_BREATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_ARCTIC_BREATH); events.Repeat(24s); break; @@ -1079,7 +1079,7 @@ class spell_gormok_jump_to_hand : public AuraScript return; if (Creature* gormok = GetTarget()->ToCreature()) - if (Unit* target = gormok->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, SnobolledTargetSelector())) + if (Unit* target = gormok->AI()->SelectTarget(SelectTargetMethod::Random, 0, SnobolledTargetSelector())) { gormok->AI()->Talk(EMOTE_SNOBOLLED); caster->GetAI()->DoAction(ACTION_ACTIVE_SNOBOLD); 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 9943a77b159..a4e1bf0051e 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -312,7 +312,7 @@ struct boss_twin_baseAI : public BossAI events.Repeat(20s); break; case EVENT_TOUCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200.0f, true, true, OtherEssenceSpellId)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 200.0f, true, true, OtherEssenceSpellId)) { CastSpellExtraArgs args; args.AddSpellMod(SPELLVALUE_MAX_TARGETS, 1); // @todo spellmgr correction instead? diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 2d9b32cf96a..044e4b9f140 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -156,7 +156,7 @@ public: events.ScheduleEvent(EVENT_SUMMON_MINIONS, 15s); break; case EVENT_ATTACK: - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random)) DoCast(victim, RAND(SPELL_ARCANE_BLAST, SPELL_BLIZZARD, SPELL_FROSTBOLT, SPELL_WRATH_OF_MISERY)); events.ScheduleEvent(EVENT_ATTACK, 3s); break; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 89c626758d2..b8fe72bc336 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -129,7 +129,7 @@ class boss_tharon_ja : public CreatureScript switch (eventId) { case EVENT_CURSE_OF_LIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CURSE_OF_LIFE); events.ScheduleEvent(EVENT_CURSE_OF_LIFE, 10s, 15s); return; @@ -138,17 +138,17 @@ class boss_tharon_ja : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_VOLLEY, 8s, 10s); return; case EVENT_RAIN_OF_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_RAIN_OF_FIRE); events.ScheduleEvent(EVENT_RAIN_OF_FIRE, 14s, 18s); return; case EVENT_LIGHTNING_BREATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_LIGHTNING_BREATH); events.ScheduleEvent(EVENT_LIGHTNING_BREATH, 6s, 7s); return; case EVENT_EYE_BEAM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_EYE_BEAM); events.ScheduleEvent(EVENT_EYE_BEAM, 4s, 6s); return; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 6ccc27ab5f7..1573e0a70e3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -184,7 +184,7 @@ class boss_bronjahm : public CreatureScript } break; case EVENT_CORRUPT_SOUL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { Talk(SAY_CORRUPT_SOUL); DoCast(target, SPELL_CORRUPT_SOUL); 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 224ba8c25cf..96376fe0f1b 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 @@ -260,12 +260,12 @@ class boss_devourer_of_souls : public CreatureScript events.ScheduleEvent(EVENT_MIRRORED_SOUL, 15s, 30s); break; case EVENT_WELL_OF_SOULS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WELL_OF_SOULS); events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20s); break; case EVENT_UNLEASHED_SOULS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_UNLEASHED_SOULS); me->SetDisplayId(DISPLAY_SORROW); Talk(SAY_FACE_UNLEASH_SOUL); @@ -282,7 +282,7 @@ class boss_devourer_of_souls : public CreatureScript Talk(SAY_FACE_WAILING_SOUL); Talk(EMOTE_WAILING_SOUL); DoCast(me, SPELL_WAILING_SOULS_STARTING); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->SetFacingToObject(target); DoCast(me, SPELL_WAILING_SOULS_BEAM); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp index c33677ed377..fad436fcae1 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp @@ -126,7 +126,7 @@ class boss_falric : public CreatureScript events.ScheduleEvent(EVENT_QUIVERING_STRIKE, 10s); break; case EVENT_IMPENDING_DESPAIR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) { Talk(SAY_IMPENDING_DESPAIR); DoCast(target, SPELL_IMPENDING_DESPAIR); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index a2880509ce8..67097c872dd 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -104,7 +104,7 @@ class boss_marwyn : public CreatureScript events.ScheduleEvent(EVENT_OBLITERATE, 8s, 13s); break; case EVENT_WELL_OF_CORRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_WELL_OF_CORRUPTION); events.ScheduleEvent(EVENT_WELL_OF_CORRUPTION, 13s); break; @@ -114,7 +114,7 @@ class boss_marwyn : public CreatureScript events.ScheduleEvent(EVENT_CORRUPTED_FLESH, 20s); break; case EVENT_SHARED_SUFFERING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SHARED_SUFFERING); events.ScheduleEvent(EVENT_SHARED_SUFFERING, 14s, 15s); break; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index 7df468c46c1..b4c7fd662ff 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -1530,17 +1530,17 @@ class npc_ghostly_priest : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_SHADOW_WORD_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_SHADOW_WORD_PAIN); _events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, 6s, 15s); break; case EVENT_CIRCLE_OF_DESTRUCTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 10.0f, true)) DoCast(target, SPELL_CIRCLE_OF_DESTRUCTION); _events.ScheduleEvent(EVENT_CIRCLE_OF_DESTRUCTION, 12s); break; case EVENT_COWER_IN_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) DoCast(target, SPELL_COWER_IN_FEAR); _events.ScheduleEvent(EVENT_COWER_IN_FEAR, 10s); break; @@ -1608,22 +1608,22 @@ class npc_phantom_mage : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FIREBALL); _events.ScheduleEvent(EVENT_FIREBALL, 15s); break; case EVENT_FLAMESTRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FLAMESTRIKE); _events.ScheduleEvent(EVENT_FLAMESTRIKE, 15s); break; case EVENT_FROSTBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FROSTBOLT); _events.ScheduleEvent(EVENT_FROSTBOLT, 15s); break; case EVENT_CHAINS_OF_ICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_CHAINS_OF_ICE); _events.ScheduleEvent(EVENT_CHAINS_OF_ICE, 15s); break; @@ -1708,7 +1708,7 @@ class npc_shadowy_mercenary : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_SHADOW_STEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SHADOW_STEP); _events.ScheduleEvent(EVENT_SHADOW_STEP, 8s); break; @@ -1717,7 +1717,7 @@ class npc_shadowy_mercenary : public CreatureScript _events.ScheduleEvent(EVENT_DEADLY_POISON, 10s); break; case EVENT_ENVENOMED_DAGGER_THROW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_ENVENOMED_DAGGER_THROW); _events.ScheduleEvent(EVENT_ENVENOMED_DAGGER_THROW, 10s); break; @@ -1823,12 +1823,12 @@ class npc_tortured_rifleman : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_SHOOT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_SHOOT); _events.ScheduleEvent(EVENT_SHOOT, 2s); break; case EVENT_CURSED_ARROW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_CURSED_ARROW); _events.ScheduleEvent(EVENT_CURSED_ARROW, 10s); break; @@ -1837,7 +1837,7 @@ class npc_tortured_rifleman : public CreatureScript _events.ScheduleEvent(EVENT_FROST_TRAP, 30s); break; case EVENT_ICE_SHOT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_ICE_SHOT); _events.ScheduleEvent(EVENT_ICE_SHOT, 15s); break; @@ -1927,12 +1927,12 @@ class npc_frostsworn_general : public CreatureScript switch (event) { case EVENT_SHIELD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_SHIELD_THROWN); _events.ScheduleEvent(EVENT_SHIELD, 8s, 12s); break; case EVENT_SPIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_SPIKE); _events.ScheduleEvent(EVENT_SPIKE, 15s, 20s); break; @@ -1950,7 +1950,7 @@ class npc_frostsworn_general : public CreatureScript void SummonClones() { std::list<Unit*> playerList; - SelectTargetList(playerList, 5, SELECT_TARGET_MAXTHREAT, 0, 0.0f, true); + SelectTargetList(playerList, 5, SelectTargetMethod::MaxThreat, 0, 0.0f, true); for (Unit* target : playerList) { if (Creature* reflection = me->SummonCreature(NPC_REFLECTION, *target, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 3000)) @@ -2011,7 +2011,7 @@ class npc_spiritual_reflection : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_BALEFUL_STRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 8.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 8.0f, true)) DoCast(target, SPELL_BALEFUL_STRIKE); _events.ScheduleEvent(EVENT_BALEFUL_STRIKE, 3s, 8s); break; @@ -2156,7 +2156,7 @@ class HoRStartMovementEvent : public BasicEvent bool Execute(uint64 /*execTime*/, uint32 /*diff*/) override { _owner->SetReactState(REACT_AGGRESSIVE); - if (Unit* target = _owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = _owner->AI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) _owner->AI()->AttackStart(target); return true; } @@ -2303,17 +2303,17 @@ class npc_risen_witch_doctor : public CreatureScript switch (_events.ExecuteEvent()) { case EVENT_RISEN_WITCH_DOCTOR_CURSE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_CURSE_OF_DOOM); _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_CURSE, 10s, 15s); break; case EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, 20.0f, true)) DoCast(target, SPELL_SHADOW_BOLT); _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT, 2s, 3s); break; case EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY: - if (SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCastAOE(SPELL_SHADOW_BOLT_VOLLEY); _events.ScheduleEvent(EVENT_RISEN_WITCH_DOCTOR_SHADOW_BOLT_VOLLEY, 15s, 22s); break; 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 0a143b0c48d..f2ef9299f67 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -204,7 +204,7 @@ class boss_garfrost : public CreatureScript switch (eventId) { case EVENT_THROW_SARONITE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { Talk(SAY_THROW_SARONITE, target); DoCast(target, SPELL_THROW_SARONITE); @@ -216,7 +216,7 @@ class boss_garfrost : public CreatureScript events.ScheduleEvent(EVENT_CHILLING_WAVE, 4s, 0, PHASE_TWO); break; case EVENT_DEEP_FREEZE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { Talk(SAY_CAST_DEEP_FREEZE, target); DoCast(target, SPELL_DEEP_FREEZE); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index b6d4a03aae7..4173646734e 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -233,7 +233,7 @@ struct boss_ick : public BossAI case EVENT_TOXIC_WASTE: if (Creature* krick = GetKrick()) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) krick->CastSpell(target, SPELL_TOXIC_WASTE); } events.ScheduleEvent(EVENT_TOXIC_WASTE, 7s, 10s); @@ -241,7 +241,7 @@ struct boss_ick : public BossAI case EVENT_SHADOW_BOLT: if (Creature* krick = GetKrick()) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.f, true)) krick->CastSpell(target, SPELL_SHADOW_BOLT); } events.ScheduleEvent(EVENT_SHADOW_BOLT, 15s); 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 3bf56aa8f16..1d14f696945 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -252,7 +252,7 @@ class boss_tyrannus : public CreatureScript events.ScheduleEvent(EVENT_MARK_OF_RIMEFANG, 25s, 27s); break; case EVENT_OVERLORD_BRAND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_OVERLORD_BRAND); events.ScheduleEvent(EVENT_OVERLORD_BRAND, 11s, 12s); break; @@ -268,7 +268,7 @@ class boss_tyrannus : public CreatureScript break; case EVENT_MARK_OF_RIMEFANG: Talk(SAY_MARK_RIMEFANG_1); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { Talk(SAY_MARK_RIMEFANG_2, target); DoCast(target, SPELL_MARK_OF_RIMEFANG); @@ -366,7 +366,7 @@ class boss_rimefang : public CreatureScript _events.ScheduleEvent(EVENT_MOVE_NEXT, 2s, 0, PHASE_COMBAT); break; case EVENT_ICY_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ICY_BLAST); _events.ScheduleEvent(EVENT_ICY_BLAST, 15s, 0, PHASE_COMBAT); break; 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 f32e40b1f3c..6ffcf79907f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -91,12 +91,12 @@ class npc_ymirjar_flamebearer : public CreatureScript 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.RescheduleEvent(EVENT_FIREBALL, 5000); break; case EVENT_TACTICAL_BLINK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_TACTICAL_BLINK); DoCast(me, SPELL_HELLFIRE); _events.RescheduleEvent(EVENT_TACTICAL_BLINK, 12000); @@ -212,7 +212,7 @@ class npc_geist_ambusher : public CreatureScript if (_leapingFaceMaulCooldown < diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 5.0f, true)) DoCast(target, SPELL_LEAPING_FACE_MAUL); _leapingFaceMaulCooldown = urand(9000, 14000); } diff --git a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp index 0dbec20cf86..9868bdea0d4 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -284,7 +284,7 @@ class boss_drakkari_elemental : public CreatureScript { case EVENT_SURGE: DoCast(SPELL_SURGE_VISUAL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_SURGE); events.ScheduleEvent(EVENT_SURGE, 5s, 15s); break; diff --git a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp index 0f9db4d4969..3e7ff3f64bf 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_eck.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_eck.cpp @@ -96,7 +96,7 @@ class boss_eck : public CreatureScript events.ScheduleEvent(EVENT_SPIT, 6s, 14s); break; case EVENT_SPRING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 35.0f, true)) DoCast(target, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2)); events.ScheduleEvent(EVENT_SPRING, 5s, 10s); break; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index d9333de0ba0..135ff7cc4ba 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -105,7 +105,7 @@ class boss_gal_darah : public CreatureScript { summon->CastSpell(summon, SPELL_STAMPEDE_SPIRIT, true); summon->CastSpell(summon, SPELL_STAMPEDE_SPIRIT_2, true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->CastSpell(target, SPELL_STAMPEDE_SPIRIT_CHARGE); } } @@ -185,7 +185,7 @@ class boss_gal_darah : public CreatureScript switch (eventId) { case EVENT_IMPALING_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_IMPALING_CHARGE); if (++_phaseCounter >= 2) events.ScheduleEvent(EVENT_TRANSFORM, 5s); 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 631d6f120c7..78aff3be319 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -721,9 +721,9 @@ class boss_prince_taldaram_icc : public CreatureScript void JustSummoned(Creature* summon) override { summons.Summon(summon); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true); // first try at distance + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, -10.0f, true); // first try at distance if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); // too bad for you raiders, its going to boom + target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); // too bad for you raiders, its going to boom if (summon->GetEntry() == NPC_BALL_OF_INFERNO_FLAME && target) Talk(EMOTE_TALDARAM_FLAME, target); @@ -853,7 +853,7 @@ class boss_prince_valanar_icc : public CreatureScript Talk(SAY_VALANAR_BERSERK); break; case EVENT_KINETIC_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { DoCast(target, SPELL_KINETIC_BOMB_TARGET); Talk(SAY_VALANAR_SPECIAL); @@ -869,7 +869,7 @@ class boss_prince_valanar_icc : public CreatureScript } else { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_SHOCK_VORTEX); events.Repeat(Seconds(18), Seconds(23)); } diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 303602c006f..5c7e5e73473 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -383,7 +383,7 @@ class boss_deathbringer_saurfang : public CreatureScript 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)) { if (target->GetTransport()) { @@ -583,7 +583,7 @@ class boss_deathbringer_saurfang : public CreatureScript } case ACTION_MARK_OF_THE_FALLEN_CHAMPION: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, -SPELL_MARK_OF_THE_FALLEN_CHAMPION)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, true, -SPELL_MARK_OF_THE_FALLEN_CHAMPION)) { ++_fallenChampionCastCount; DoCast(target, SPELL_MARK_OF_THE_FALLEN_CHAMPION); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index 4666aeba426..4a88377ed86 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -214,8 +214,8 @@ class boss_festergut : public CreatureScript { std::list<Unit*> ranged, melee; uint32 minTargets = RAID_MODE<uint32>(3, 8, 3, 8); - SelectTargetList(ranged, 25, SELECT_TARGET_RANDOM, 0, -5.0f, true); - SelectTargetList(melee, 25, SELECT_TARGET_RANDOM, 0, 5.0f, true); + SelectTargetList(ranged, 25, SelectTargetMethod::Random, 0, -5.0f, true); + SelectTargetList(melee, 25, SelectTargetMethod::Random, 0, 5.0f, true); while (ranged.size() < minTargets) { if (melee.empty()) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index c25728b6bdf..7c256c98af0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -303,7 +303,7 @@ class boss_lady_deathwhisper : public CreatureScript }) .Schedule(Seconds(17), [this](TaskContext death_and_decay) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_DEATH_AND_DECAY); death_and_decay.Repeat(Seconds(22), Seconds(30)); }); @@ -312,7 +312,7 @@ class boss_lady_deathwhisper : public CreatureScript { Talk(SAY_DOMINATE_MIND); std::list<Unit*> targets; - SelectTargetList(targets, _dominateMindCount, SELECT_TARGET_RANDOM, 0, 0.0f, true, false, -SPELL_DOMINATE_MIND); + SelectTargetList(targets, _dominateMindCount, SelectTargetMethod::Random, 0, 0.0f, true, false, -SPELL_DOMINATE_MIND); for (Unit* target : targets) DoCast(target, SPELL_DOMINATE_MIND); dominate_mind.Repeat(Seconds(40), Seconds(45)); @@ -326,7 +326,7 @@ class boss_lady_deathwhisper : public CreatureScript }) .Schedule(Seconds(2), GROUP_ONE, [this](TaskContext shadow_bolt) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_SHADOW_BOLT); shadow_bolt.Repeat(Milliseconds(2450), Milliseconds(3600)); }) @@ -472,7 +472,7 @@ class boss_lady_deathwhisper : public CreatureScript case NPC_DARNAVAN_10: case NPC_DARNAVAN_25: _darnavanGUID = summon->GetGUID(); - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random)); return; case NPC_VENGEFUL_SHADE: if (_nextVengefulShadeTargetGUID.empty()) @@ -483,7 +483,7 @@ class boss_lady_deathwhisper : public CreatureScript case NPC_CULT_ADHERENT: case NPC_CULT_FANATIC: _cultistQueue.push_back(summon->GetGUID()); - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random)); break; default: break; @@ -729,7 +729,7 @@ class npc_cult_adherent : public CreatureScript }) .Schedule(Seconds(15), [this](TaskContext curse_of_torpor) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_CURSE_OF_TORPOR); curse_of_torpor.Repeat(Seconds(18)); }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 44e852a129c..e3944c0bbd4 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -234,9 +234,9 @@ class boss_lord_marrowgar : public CreatureScript case EVENT_BONE_STORM_MOVE: { events.ScheduleEvent(EVENT_BONE_STORM_MOVE, _boneStormDuration/3); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me)); + Unit* unit = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me)); if (!unit) - unit = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); + unit = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); if (unit) me->GetMotionMaster()->MovePoint(POINT_TARGET_BONESTORM_PLAYER, *unit); break; @@ -525,9 +525,9 @@ class spell_marrowgar_coldflame : public SpellScriptLoader { targets.clear(); // select any unit but not the tank - Unit* target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, -GetCaster()->GetCombatReach(), true, false, -SPELL_IMPALED); + Unit* target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, -GetCaster()->GetCombatReach(), true, false, -SPELL_IMPALED); if (!target) - target = GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true); // or the tank if its solo + target = GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true); // or the tank if its solo if (!target) return; @@ -639,7 +639,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader SpellCastResult CheckCast() { - return GetCaster()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, BoneSpikeTargetSelector(GetCaster()->GetAI())) ? SPELL_CAST_OK : SPELL_FAILED_NO_VALID_TARGETS; + return GetCaster()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, BoneSpikeTargetSelector(GetCaster()->GetAI())) ? SPELL_CAST_OK : SPELL_FAILED_NO_VALID_TARGETS; } void HandleSpikes(SpellEffIndex effIndex) @@ -651,7 +651,7 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader uint8 boneSpikeCount = uint8(GetCaster()->GetMap()->Is25ManRaid() ? 3 : 1); std::list<Unit*> targets; - marrowgarAI->SelectTargetList(targets, boneSpikeCount, SELECT_TARGET_RANDOM, 1, BoneSpikeTargetSelector(marrowgarAI)); + marrowgarAI->SelectTargetList(targets, boneSpikeCount, SelectTargetMethod::Random, 1, BoneSpikeTargetSelector(marrowgarAI)); if (targets.empty()) return; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 9992a599a7b..dc068965a5b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -602,7 +602,7 @@ class boss_professor_putricide : public CreatureScript case EVENT_SLIME_PUDDLE: { std::list<Unit*> targets; - SelectTargetList(targets, 2, SELECT_TARGET_RANDOM, 0, 0.0f, true); + SelectTargetList(targets, 2, SelectTargetMethod::Random, 0, 0.0f, true); if (!targets.empty()) for (std::list<Unit*>::iterator itr = targets.begin(); itr != targets.end(); ++itr) DoCast(*itr, SPELL_SLIME_PUDDLE_TRIGGER); @@ -631,7 +631,7 @@ class boss_professor_putricide : public CreatureScript if (Is25ManRaid()) { std::list<Unit*> targets; - SelectTargetList(targets, 2, SELECT_TARGET_RANDOM, 0, -7.0f, true); + SelectTargetList(targets, 2, SelectTargetMethod::Random, 0, -7.0f, true); if (!targets.empty()) { Talk(EMOTE_MALLEABLE_GOO); @@ -641,7 +641,7 @@ class boss_professor_putricide : public CreatureScript } else { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -7.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, -7.0f, true)) { Talk(EMOTE_MALLEABLE_GOO); DoCast(target, SPELL_MALLEABLE_GOO); @@ -655,7 +655,7 @@ class boss_professor_putricide : public CreatureScript events.ScheduleEvent(EVENT_CHOKING_GAS_BOMB, 35s, 40s); break; case EVENT_UNBOUND_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(me))) { DoCast(target, SPELL_UNBOUND_PLAGUE); DoCast(target, SPELL_UNBOUND_PLAGUE_SEARCHER); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index 7dec66feb4b..45e996511ef 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -202,7 +202,7 @@ class boss_rotface : public CreatureScript switch (eventId) { case EVENT_SLIME_SPRAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) { DoSummon(NPC_OOZE_SPRAY_STALKER, *target, 8000, TEMPSUMMON_TIMED_DESPAWN); Talk(EMOTE_SLIME_SPRAY); @@ -396,7 +396,7 @@ class npc_precious_icc : public CreatureScript 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 ff48f2635cc..fa6c9067f4d 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -933,7 +933,7 @@ class npc_rimefang : public CreatureScript 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); DoCast(target, SPELL_ICY_BLAST); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp index 766dbc50304..3dc7df4841b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp @@ -488,7 +488,7 @@ struct boss_sister_svalna : public BossAI Talk(SAY_SVALNA_AGGRO); break; case EVENT_IMPALING_SPEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, -SPELL_IMPALING_SPEAR)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, true, -SPELL_IMPALING_SPEAR)) { DoCast(me, SPELL_AETHER_SHIELD); DoCast(target, SPELL_IMPALING_SPEAR); @@ -967,7 +967,7 @@ struct npc_captain_arnath : public npc_argent_captainAI Events.ScheduleEvent(EVENT_ARNATH_SMITE, 4s, 7s); break; case EVENT_ARNATH_DOMINATE_MIND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_DOMINATE_MIND); Events.ScheduleEvent(EVENT_ARNATH_DOMINATE_MIND, 28s, 37s); break; @@ -1037,7 +1037,7 @@ struct npc_captain_brandon : public npc_argent_captainAI Events.ScheduleEvent(EVENT_BRANDON_JUDGEMENT_OF_COMMAND, 8s, 13s); 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, 45s, 60s); break; @@ -1096,7 +1096,7 @@ struct npc_captain_grondel : public npc_argent_captainAI Events.ScheduleEvent(EVENT_GRONDEL_SUNDER_ARMOR, 5s, 17s); 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, 10s, 15s); break; @@ -1141,17 +1141,17 @@ struct npc_captain_rupert : public npc_argent_captainAI 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, 15s, 20s); 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, 25s, 30s); 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, 10s, 15s); break; @@ -1300,7 +1300,7 @@ struct npc_frostwing_ymirjar_vrykul : public ScriptedAI _events.Repeat(10s, 20s); break; case EVENT_YMIRJAR_TWISTED_WINDS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) DoCast(target, SPELL_TWISTED_WINDS); _events.Repeat(10s, 20s); break; @@ -1321,12 +1321,12 @@ struct npc_frostwing_ymirjar_vrykul : public ScriptedAI _events.Repeat(20s, 30s); break; case EVENT_YMIRJAR_ICE_TRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.0f, true)) DoCast(target, SPELL_ICE_TRAP); _events.Repeat(15s, 20s); break; case EVENT_YMIRJAR_VOLLEY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 40.0f, true)) DoCast(target, SPELL_VOLLEY); _events.Repeat(10s, 20s); break; @@ -1343,7 +1343,7 @@ struct npc_frostwing_ymirjar_vrykul : public ScriptedAI _events.Repeat(10s, 20s); break; case EVENT_YMIRJAR_BANISH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 20.0f, true)) DoCast(target, SPELL_BANISH); _events.Repeat(10s, 20s); break; 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 d7a8e89c0f2..a848a4e2ca1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -432,7 +432,7 @@ class LichKingStartMovementEvent : public BasicEvent { _owner->SetReactState(REACT_AGGRESSIVE); if (Creature* _summoner = ObjectAccessor::GetCreature(*_owner, _summonerGuid)) - if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(_summoner))) + if (Unit* target = _summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(_summoner))) _owner->AI()->AttackStart(target); return true; } @@ -727,7 +727,7 @@ class boss_the_lich_king : public CreatureScript break; case NPC_ICE_SPHERE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { summon->SetReactState(REACT_PASSIVE); summon->CastSpell(summon, SPELL_ICE_SPHERE, false); @@ -938,7 +938,7 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_INFEST, urand(21000, 24000), 0, events.IsInPhase(PHASE_ONE) ? PHASE_ONE : PHASE_TWO); break; case EVENT_NECROTIC_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, NecroticPlagueTargetCheck(me, NECROTIC_PLAGUE_LK, NECROTIC_PLAGUE_PLR))) { Talk(EMOTE_NECROTIC_PLAGUE_WARNING, target); DoCast(target, SPELL_NECROTIC_PLAGUE); @@ -946,7 +946,7 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_NECROTIC_PLAGUE, urand(30000, 33000), 0, PHASE_ONE); break; case EVENT_SHADOW_TRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SpellTargetSelector(me, SPELL_SHADOW_TRAP))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, SpellTargetSelector(me, SPELL_SHADOW_TRAP))) DoCast(target, SPELL_SHADOW_TRAP); events.ScheduleEvent(EVENT_SHADOW_TRAP, 15500, 0, PHASE_ONE); break; @@ -955,7 +955,7 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_SOUL_REAPER, urand(33000, 35000), 0, PHASE_TWO_THREE); break; case EVENT_DEFILE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_HARVEST_SOUL_VALKYR)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_HARVEST_SOUL_VALKYR)) { Talk(EMOTE_DEFILE_WARNING); DoCast(target, SPELL_DEFILE); @@ -964,12 +964,12 @@ class boss_the_lich_king : public CreatureScript break; case EVENT_HARVEST_SOUL: Talk(SAY_LK_HARVEST_SOUL); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SpellTargetSelector(me, SPELL_HARVEST_SOUL))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, SpellTargetSelector(me, SPELL_HARVEST_SOUL))) DoCast(target, SPELL_HARVEST_SOUL); events.ScheduleEvent(EVENT_HARVEST_SOUL, 75s, 0, PHASE_THREE); 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)) me->CastSpell(target, SPELL_PAIN_AND_SUFFERING, TRIGGERED_NONE); events.ScheduleEvent(EVENT_PAIN_AND_SUFFERING, urand(1500, 4000), 0, PHASE_TRANSITION); break; @@ -978,12 +978,12 @@ class boss_the_lich_king : public CreatureScript events.ScheduleEvent(EVENT_SUMMON_ICE_SPHERE, urand(7500, 8500), 0, PHASE_TRANSITION); break; case EVENT_SUMMON_RAGING_SPIRIT: - 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_RAGING_SPIRIT, TRIGGERED_NONE); events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, urand(22000, 23000), 0, PHASE_TRANSITION); break; case EVENT_SUMMON_RAGING_SPIRIT_2: - 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_RAGING_SPIRIT, TRIGGERED_NONE); events.ScheduleEvent(EVENT_SUMMON_RAGING_SPIRIT, 18s, 0, PHASE_TRANSITION); break; @@ -1597,7 +1597,7 @@ class npc_valkyr_shadowguard : public CreatureScript me->GetMotionMaster()->MovePoint(POINT_DROP_PLAYER, _dropPoint); break; case EVENT_LIFE_SIPHON: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_LIFE_SIPHON); _events.ScheduleEvent(EVENT_LIFE_SIPHON, 2500ms); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index 4efcceff275..a5fe846aae8 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -757,12 +757,12 @@ class npc_risen_archmage : public CreatureScript _events.ScheduleEvent(EVENT_FROSTBOLT_VOLLEY, 8s, 15s); break; case EVENT_MANA_VOID: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, ValithriaManaVoidSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, ValithriaManaVoidSelector(me))) DoCast(target, SPELL_MANA_VOID); _events.ScheduleEvent(EVENT_MANA_VOID, 20s, 25s); break; case EVENT_COLUMN_OF_FROST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, -10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, -10.0f, true)) DoCast(target, SPELL_COLUMN_OF_FROST); _events.ScheduleEvent(EVENT_COLUMN_OF_FROST, 15s, 25s); break; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 7f8fb391876..368031c4dec 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -477,7 +477,7 @@ class npc_rotting_frost_giant : public CreatureScript switch (eventId) { case EVENT_DEATH_PLAGUE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, DeathPlagueTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, DeathPlagueTargetSelector(me))) { Talk(EMOTE_DEATH_PLAGUE_WARNING, target); DoCast(target, SPELL_DEATH_PLAGUE_AURA); @@ -916,7 +916,7 @@ struct npc_darkfallen_noble : public DarkFallenAI AttackSpellId = SPELL_SHADOW_BOLT; Scheduler.Schedule(500ms, [this](TaskContext /*context*/) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, false, -SPELL_CHAINS_OF_SHADOW)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, false, -SPELL_CHAINS_OF_SHADOW)) DoCast(target, SPELL_CHAINS_OF_SHADOW); }) .Schedule(11s, [this](TaskContext summonVampiric) @@ -976,7 +976,7 @@ struct npc_darkfallen_archmage : public DarkFallenAI AttackSpellId = SPELL_FIREBALL; Scheduler.Schedule(1s, [this](TaskContext amplifyMagic) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_AMPLIFY_MAGIC); amplifyMagic.Repeat(15s, 24s); }) @@ -987,7 +987,7 @@ struct npc_darkfallen_archmage : public DarkFallenAI }) .Schedule(17s, [this](TaskContext polymorph) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, false, -SPELL_POLYMORPH)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, false, -SPELL_POLYMORPH)) DoCast(target, SPELL_POLYMORPH); polymorph.Repeat(25s, 35s); }); @@ -1027,7 +1027,7 @@ struct npc_darkfallen_tactician : public DarkFallenAI }) .Schedule(10s, [this](TaskContext shadowStep) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, false)) { DoCast(target, SPELL_SHADOWSTEP); DoCast(target, SPELL_BLOOD_SAP); diff --git a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp index 0f4532378c8..6a7156703ef 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/boss_ioc_horde_alliance.cpp @@ -97,7 +97,7 @@ public: _events.ScheduleEvent(EVENT_BRUTAL_STRIKE, 5s); break; case EVENT_DAGGER_THROW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_DAGGER_THROW); _events.ScheduleEvent(EVENT_DAGGER_THROW, 7s); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp index 2473d3253ee..fb89fbf224b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp @@ -187,7 +187,7 @@ public: { case EVENT_IMPALE: if (events.GetTimeUntilEvent(EVENT_LOCUST) < 5 * IN_MILLISECONDS) break; // don't chain impale tank -> locust swarm - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_IMPALE); else EnterEvadeMode(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp index 54e137c666c..7ff87390263 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp @@ -166,7 +166,7 @@ class boss_faerlina : public CreatureScript events.Repeat(randtime(Seconds(8), Seconds(15))); break; case EVENT_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_RAIN_OF_FIRE); events.Repeat(randtime(Seconds(6), Seconds(18))); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index e44371b464c..6a2d917b39c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -505,7 +505,7 @@ class boss_four_horsemen_thane : public CreatureScript events.Repeat(Seconds(12)); break; case EVENT_METEOR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, true)) { DoCast(target, SPELL_METEOR); _shouldSay = true; @@ -580,7 +580,7 @@ class boss_four_horsemen_lady : public CreatureScript events.Repeat(Seconds(15)); break; case EVENT_VOIDZONE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) { DoCast(target, SPELL_VOID_ZONE, true); Talk(SAY_SPECIAL); @@ -593,7 +593,7 @@ class boss_four_horsemen_lady : public CreatureScript if (me->HasUnitState(UNIT_STATE_CASTING)) return; - if (Unit* target = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 45.0f, true)) DoCast(target, SPELL_SHADOW_BOLT); else { @@ -650,7 +650,7 @@ class boss_four_horsemen_sir : public CreatureScript events.Repeat(Seconds(15)); break; case EVENT_HOLYWRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 45.0f, true)) { DoCast(target, SPELL_HOLY_WRATH, true); _shouldSay = true; @@ -663,7 +663,7 @@ class boss_four_horsemen_sir : public CreatureScript if (me->HasUnitState(UNIT_STATE_CASTING)) return; - if (Unit* target = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 45.0f, true)) DoCast(target, SPELL_HOLY_BOLT); else { diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 85e9fc14c98..4ae174f6aed 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -94,7 +94,7 @@ class boss_grobbulus : public CreatureScript events.Repeat(randtime(Seconds(15), Seconds(30))); return; case EVENT_INJECT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true, true, -SPELL_MUTATING_INJECTION)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true, true, -SPELL_MUTATING_INJECTION)) DoCast(target, SPELL_MUTATING_INJECTION); events.Repeat(Seconds(8) + Milliseconds(uint32(std::round(120 * me->GetHealthPct())))); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index a21ef5ff402..4af7a42f517 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -188,9 +188,9 @@ class KelThuzadCharmedPlayerAI : public SimpleCharmedPlayerAI { if (Creature* charmer = GetCharmer()) { - if (Unit* target = charmer->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, CharmedPlayerTargetSelectPred())) + if (Unit* target = charmer->AI()->SelectTarget(SelectTargetMethod::Random, 0, CharmedPlayerTargetSelectPred())) return target; - if (Unit* target = charmer->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_CHAINS)) + if (Unit* target = charmer->AI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_CHAINS)) return target; } return nullptr; @@ -289,7 +289,7 @@ public: { Talk(SAY_CHAINS); std::list<Unit*> targets; - SelectTargetList(targets, 3, SELECT_TARGET_RANDOM, 0, 0.0f, true, false); + SelectTargetList(targets, 3, SelectTargetMethod::Random, 0, 0.0f, true, false); for (Unit* target : targets) DoCast(target, SPELL_CHAINS); } @@ -451,7 +451,7 @@ public: break; case EVENT_SHADOW_FISSURE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_SHADOW_FISSURE); events.Repeat(randtime(Seconds(14), Seconds(17))); break; @@ -459,14 +459,14 @@ public: case EVENT_DETONATE_MANA: { ManaUserTargetSelector pred; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, pred)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, pred)) DoCast(target, SPELL_DETONATE_MANA); events.Repeat(randtime(Seconds(30), Seconds(40))); break; } case EVENT_FROST_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_FROST_BLAST); events.Repeat(randtime(Seconds(25), Seconds(45))); break; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp index 80754d9b1a2..e0fa047c4fc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp @@ -139,7 +139,7 @@ public: case EVENT_WRAP: { std::list<Unit*> targets; - SelectTargetList(targets, RAID_MODE(1, 2), SELECT_TARGET_RANDOM, 1, WebTargetSelector(me)); + SelectTargetList(targets, RAID_MODE(1, 2), SelectTargetMethod::Random, 1, WebTargetSelector(me)); if (!targets.empty()) { Talk(EMOTE_WEB_WRAP); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp index 75c8d5bad47..f4f72e9860f 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_razuvious.cpp @@ -154,7 +154,7 @@ public: events.Repeat(Seconds(16)); return; case EVENT_KNIFE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f)) DoCast(target, SPELL_JAGGED_KNIFE); events.Repeat(randtime(Seconds(10), Seconds(15))); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index ba7367b9488..ccbb2049274 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -263,7 +263,7 @@ class boss_sapphiron : public CreatureScript if (Unit* temp = ObjectAccessor::GetUnit(*me, summonGuid)) blizzards.push_back(temp); - if (Unit* newTarget = me->AI()->SelectTarget(SELECT_TARGET_RANDOM, 1, BlizzardTargetSelector(blizzards))) + if (Unit* newTarget = me->AI()->SelectTarget(SelectTargetMethod::Random, 1, BlizzardTargetSelector(blizzards))) return newTarget->GetGUID(); } @@ -348,7 +348,7 @@ class boss_sapphiron : public CreatureScript _iceboltTargets.clear(); std::list<Unit*> targets; - SelectTargetList(targets, RAID_MODE(2, 3), SELECT_TARGET_RANDOM, 0, 200.0f, true); + SelectTargetList(targets, RAID_MODE(2, 3), SelectTargetMethod::Random, 0, 200.0f, true); for (Unit* target : targets) _iceboltTargets.push_back(target->GetGUID()); return; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 53483222e0a..6fad136251b 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -442,7 +442,7 @@ struct boss_thaddius : public BossAI DoMeleeAttackIfReady(); } else if (ballLightningUnlocked) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_BALL_LIGHTNING); } } @@ -616,7 +616,7 @@ public: creatureCaster->AI()->Talk(EMOTE_TESLA_LINK_BREAKS); me->RemoveAura(SPELL_STALAGG_CHAIN_VISUAL); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) { creatureCaster->CastStop(SPELL_TESLA_SHOCK); creatureCaster->CastSpell(target, SPELL_TESLA_SHOCK,true); @@ -867,7 +867,7 @@ public: creatureCaster->AI()->Talk(EMOTE_TESLA_LINK_BREAKS); me->RemoveAura(SPELL_STALAGG_CHAIN_VISUAL); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { creatureCaster->CastStop(SPELL_TESLA_SHOCK); creatureCaster->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 3cba17226ce..cc6d0ae36f3 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -928,7 +928,7 @@ public: case EVENT_SURGE_OF_POWER_P_THREE: if (GetDifficulty() == DIFFICULTY_10_N) { - if (Unit* tempSurgeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, false, true, SPELL_RIDE_RED_DRAGON_BUDDY)) + if (Unit* tempSurgeTarget = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, false, true, SPELL_RIDE_RED_DRAGON_BUDDY)) { if (Vehicle* drakeVehicle = tempSurgeTarget->GetVehicleKit()) { @@ -954,7 +954,7 @@ public: events.ScheduleEvent(EVENT_SURGE_OF_POWER_P_THREE, 9s, 18s, 0, PHASE_THREE); break; case EVENT_STATIC_FIELD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, false, true, SPELL_RIDE_RED_DRAGON_BUDDY)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, false, true, SPELL_RIDE_RED_DRAGON_BUDDY)) DoCast(target, SPELL_STATIC_FIELD_MISSLE, true); events.ScheduleEvent(EVENT_STATIC_FIELD, 15s, 30s, 0, PHASE_THREE); @@ -1341,7 +1341,7 @@ class npc_nexus_lord : public CreatureScript switch (eventId) { case EVENT_ARCANE_SHOCK: - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 5.0f, true)) DoCast(victim, SPELL_ARCANE_SHOCK); _events.ScheduleEvent(EVENT_ARCANE_SHOCK, 7s, 15s); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp index e89194732c2..4de7b972cac 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp @@ -169,7 +169,7 @@ class boss_anomalus : public CreatureScript if (Creature* Rift = me->SummonCreature(NPC_CHAOTIC_RIFT, RiftLocation[urand(0, 5)], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) { //DoCast(Rift, SPELL_CHARGE_RIFT); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) Rift->AI()->AttackStart(target); uiChaoticRiftGUID = Rift->GetGUID(); Talk(SAY_RIFT); @@ -178,7 +178,7 @@ class boss_anomalus : public CreatureScript if (uiSparkTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SPARK); uiSparkTimer = 5000; } @@ -235,7 +235,7 @@ class npc_chaotic_rift : public CreatureScript if (uiChaoticEnergyBurstTimer <= diff) { Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ANOMALUS)); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) DoCast(target, SPELL_CHARGED_CHAOTIC_ENERGY_BURST); @@ -250,7 +250,7 @@ class npc_chaotic_rift : public CreatureScript if (uiSummonCrazedManaWraithTimer <= diff) { if (Creature* Wraith = me->SummonCreature(NPC_CRAZED_MANA_WRAITH, me->GetPositionX() + 1, me->GetPositionY() + 1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1000)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) Wraith->AI()->AttackStart(target); Creature* Anomalus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_ANOMALUS)); if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD)) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 817e2705675..d52ca6851a6 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -187,7 +187,7 @@ class boss_keristrasza : public CreatureScript Talk(SAY_CRYSTAL_NOVA); if (IsHeroic()) DoCast(me, SPELL_CRYSTALLIZE); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CRYSTAL_CHAINS); events.ScheduleEvent(EVENT_TAIL_SWEEP, DUNGEON_MODE(30000, 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 8c1a132bdc2..872b20003ce 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -206,7 +206,7 @@ public: break; } } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) Summoned->AI()->AttackStart(target); return Summoned->GetGUID(); } @@ -325,7 +325,7 @@ public: if (uiIceNovaTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_ICE_NOVA, false); uiCooldown = 1500; @@ -345,7 +345,7 @@ public: if (uiFireBombTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_FIREBOMB, false); uiCooldown = 2*IN_MILLISECONDS; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp index 9492c9dd357..2568181ad6d 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_nexus_commanders.cpp @@ -68,7 +68,7 @@ class boss_nexus_commanders : public CreatureScript switch (eventId) { case EVENT_CHARGE_COMMANDER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE_COMMANDER, 11s, 15s); break; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index 98399f0ab44..0c5d408a69f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -148,7 +148,7 @@ public: events.ScheduleEvent(EVENT_CRYSTAL_SPIKES, 12s); break; case EVENT_CRYSTALLINE_TANGLER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, OrmorokTanglerPredicate(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, OrmorokTanglerPredicate(me))) DoCast(target, SPELL_SUMMON_CRYSTALLINE_TANGLER); events.ScheduleEvent(EVENT_CRYSTALLINE_TANGLER, 15s); break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 7c85a112068..0d90c87c5db 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -272,7 +272,7 @@ class boss_urom : public CreatureScript events.ScheduleEvent(EVENT_FROST_BOMB, 5s, 8s); break; case EVENT_TIME_BOMB: - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random)) DoCast(unit, SPELL_TIME_BOMB); events.ScheduleEvent(EVENT_TIME_BOMB, 20s, 25s); break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 773132afba2..a1ea341b1b3 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -239,7 +239,7 @@ class npc_azure_ring_captain : public CreatureScript case ACTION_CALL_DRAGON_EVENT: if (Creature* varos = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_VAROS))) { - if (Unit* victim = varos->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* victim = varos->AI()->SelectTarget(SelectTargetMethod::Random, 0)) { me->SetReactState(REACT_PASSIVE); me->SetWalk(false); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index 94f25c86336..4212a377ce1 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -202,7 +202,7 @@ public: summoned->CastSpell(summoned, SPELL_SPARK_VISUAL_TRIGGER, true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { summoned->SetInCombatWith(target); summoned->GetMotionMaster()->Clear(); @@ -260,7 +260,7 @@ public: if (uiStaticOverloadTimer <= uiDiff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_STATIC_OVERLOAD); uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 34ad8d05894..c74ed9f03f5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -147,7 +147,7 @@ public: switch (eventId) { case EVENT_ARC_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARC_LIGHTNING); events.ScheduleEvent(EVENT_ARC_LIGHTNING, 15s, 16s); break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 8e69dbd9256..f8c5a28bdb5 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -197,7 +197,7 @@ public: { m_lGolemGUIDList.push_back(summoned->GetGUID()); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f); // Why healing when just summoned? @@ -331,7 +331,7 @@ public: // 4 - Wait for delay to expire if (m_uiDelay_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) { me->SetReactState(REACT_AGGRESSIVE); me->SetInCombatWith(target); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 73e0e788b89..bf8d497d676 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -91,12 +91,12 @@ class boss_krystallus : public CreatureScript switch (eventId) { case EVENT_BOULDER_TOSS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) DoCast(target, SPELL_BOULDER_TOSS); events.ScheduleEvent(EVENT_BOULDER_TOSS, 9s, 15s); break; case EVENT_GROUND_SPIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_GROUND_SPIKE); events.ScheduleEvent(EVENT_GROUND_SPIKE, 12s, 17s); break; 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 248ad44e434..b41437e0c85 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 @@ -106,7 +106,7 @@ class boss_maiden_of_grief : public CreatureScript switch (eventId) { case EVENT_PARTING_SORROW: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_PARTING_SORROW); events.ScheduleEvent(EVENT_PARTING_SORROW, 30s, 40s); break; @@ -121,7 +121,7 @@ class boss_maiden_of_grief : public CreatureScript events.ScheduleEvent(EVENT_SHOCK_OF_SORROW, 20s, 30s); break; case EVENT_PILLAR_OF_WOE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_PILLAR_OF_WOE); else DoCastVictim(SPELL_PILLAR_OF_WOE); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 85463eecb58..a8192d938ed 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -117,7 +117,7 @@ class boss_sjonnir : public CreatureScript void JustSummoned(Creature* summon) override { summon->GetMotionMaster()->MovePoint(0, CenterPoint); - /*if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + /*if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) summon->AI()->AttackStart(target);*/ summons.Summon(summon); } @@ -163,7 +163,7 @@ class boss_sjonnir : public CreatureScript switch (eventId) { case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_CHAIN_LIGHTING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 10s, 15s); break; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp index ae430cdbe0f..0d1cd3ca15c 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.cpp @@ -212,7 +212,7 @@ public: { if (uiKaddrakEncounterTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) if (!KaddrakGUIDList.empty()) for (GuidList::const_iterator itr = KaddrakGUIDList.begin(); itr != KaddrakGUIDList.end(); ++itr) { @@ -229,7 +229,7 @@ public: { if (uiMarnakEncounterTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (Creature* summon = me->SummonCreature(NPC_DARK_MATTER_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { @@ -245,7 +245,7 @@ public: { if (uiAbedneumEncounterTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { if (Creature* summon = me->SummonCreature(NPC_SEARING_GAZE_TARGET, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0.0f, TEMPSUMMON_TIMED_DESPAWN, 1000)) { 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 b2d101565ca..feb09246622 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 @@ -745,7 +745,7 @@ struct npc_living_constellation : public CreatureAI case ACTION_ACTIVATE_STAR: if (Creature* algalon = _instance->GetCreature(BOSS_ALGALON)) { - if (Unit* target = algalon->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, NonTankTargetSelector(algalon))) + if (Unit* target = algalon->AI()->SelectTarget(SelectTargetMethod::Random, 0, NonTankTargetSelector(algalon))) { me->SetReactState(REACT_AGGRESSIVE); me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); 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 0ccd94a81f2..495eaef18bd 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 @@ -255,7 +255,7 @@ class boss_steelbreaker : public CreatureScript events.ScheduleEvent(EVENT_FUSION_PUNCH, 13s, 22s); break; case EVENT_STATIC_DISRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_STATIC_DISRUPTION); events.ScheduleEvent(EVENT_STATIC_DISRUPTION, 20s, 40s); break; @@ -422,13 +422,13 @@ class boss_runemaster_molgeim : public CreatureScript break; case EVENT_RUNE_OF_DEATH: Talk(SAY_MOLGEIM_RUNE_DEATH); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_RUNE_OF_DEATH); events.ScheduleEvent(EVENT_RUNE_OF_DEATH, 30s, 40s); 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)) DoCast(target, SPELL_RUNE_OF_SUMMONING); events.ScheduleEvent(EVENT_RUNE_OF_SUMMONING, 30s, 45s); break; @@ -574,7 +574,7 @@ class boss_stormcaller_brundir : public CreatureScript events.CancelEvent(EVENT_BERSERK); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHAIN_LIGHTNING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 7s, 10s); break; @@ -600,7 +600,7 @@ class boss_stormcaller_brundir : public CreatureScript events.ScheduleEvent(EVENT_LIGHTNING_TENDRILS, 90s); break; case EVENT_FLIGHT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->GetMotionMaster()->MovePoint(0, *target); events.ScheduleEvent(EVENT_FLIGHT, 6s); break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index c480100327f..977b87dc0a5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -253,7 +253,7 @@ struct boss_auriaya : public BossAI DoCastSelf(SPELL_ACTIVATE_DEFENDER); break; case EVENT_SWARNING_GUARDIAN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 0.0f, true)) DoCast(target, SPELL_SUMMON_SWARMING_GUARDIAN); events.Repeat(Seconds(25), Seconds(45)); break; @@ -320,7 +320,7 @@ struct npc_sanctum_sentry : public ScriptedAI _events.Repeat(Seconds(10), Seconds(12)); break; case EVENT_SAVAGE_POUNCE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, CatsTargetSelector(me, 10.0f, 15.0f))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, CatsTargetSelector(me, 10.0f, 15.0f))) { DoCast(target, SPELL_SAVAGE_POUNCE); _events.Repeat(Seconds(10)); @@ -379,12 +379,12 @@ struct npc_feral_defender : public ScriptedAI case EVENT_START_COMBAT: _events.SetPhase(PHASE_COMBAT); me->SetReactState(REACT_AGGRESSIVE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) AttackStart(target); _events.ScheduleEvent(EVENT_RUSH, 1s); break; case EVENT_RUSH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, CatsTargetSelector(me, 10.0f, 11.0f))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, CatsTargetSelector(me, 10.0f, 11.0f))) { DoCast(target, SPELL_FERAL_RUSH, true); _events.Repeat(Seconds(5)); @@ -409,7 +409,7 @@ struct npc_feral_defender : public ScriptedAI me->SetReactState(REACT_AGGRESSIVE); me->SetDisableGravity(false); me->SetHover(false); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) AttackStart(target); _events.ScheduleEvent(EVENT_RUSH, 1s); break; @@ -562,7 +562,7 @@ class spell_auriaya_agro_creator : public SpellScript if (!caster || !caster->IsAIEnabled() || caster->HasReactState(REACT_PASSIVE)) return; - if (Unit* target = caster->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, CatsTargetSelector(caster, 5.0f, 10.0f))) + if (Unit* target = caster->AI()->SelectTarget(SelectTargetMethod::Random, 0, CatsTargetSelector(caster, 5.0f, 10.0f))) { caster->CastSpell(target, SPELL_POUNCE, true); caster->GetThreatManager().AddThreat(target, 50000000.0f, nullptr, true); @@ -593,11 +593,11 @@ class spell_auriaya_random_agro_periodic : public AuraScript return; bool farTarget = true; - Unit* target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, CatsTargetSelector(owner, 15.0f, 25.0f)); + Unit* target = owner->AI()->SelectTarget(SelectTargetMethod::Random, 0, CatsTargetSelector(owner, 15.0f, 25.0f)); if (!target) { farTarget = false; - target = owner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + target = owner->AI()->SelectTarget(SelectTargetMethod::Random, 0); } if (!target) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 4066be2f034..cf101b413f4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -465,7 +465,7 @@ class boss_flame_leviathan : public CreatureScript for (int32 i = 0; i < 4; ++i) me->SummonCreature(NPC_FREYA_BEACON, FreyaBeacons[i]); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_FREYA_S_WARD); events.CancelEvent(EVENT_FREYA_S_WARD); break; @@ -703,7 +703,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript if (NapalmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (CanAIAttack(target)) DoCast(target, SPELL_NAPALM, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index e71c0efacbd..07c9e61329d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -422,7 +422,7 @@ class boss_freya : public CreatureScript DoCast(me, SPELL_ENRAGE); break; case EVENT_SUNBEAM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_SUNBEAM); events.ScheduleEvent(EVENT_SUNBEAM, 10s, 15s); break; @@ -431,7 +431,7 @@ class boss_freya : public CreatureScript events.ScheduleEvent(EVENT_NATURE_BOMB, 10s, 12s); break; case EVENT_UNSTABLE_ENERGY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_FREYA_UNSTABLE_SUNBEAM, true); events.ScheduleEvent(EVENT_UNSTABLE_ENERGY, 15s, 20s); break; @@ -449,7 +449,7 @@ class boss_freya : public CreatureScript break; case EVENT_STRENGTHENED_IRON_ROOTS: Talk(EMOTE_IRON_ROOTS); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_ROOTS_FREYA)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_ROOTS_FREYA)) target->CastSpell(target, SPELL_ROOTS_FREYA, true); // This must be cast by Target self events.ScheduleEvent(EVENT_STRENGTHENED_IRON_ROOTS, 12s, 20s); break; @@ -661,7 +661,7 @@ class boss_freya : public CreatureScript } // Need to have it there, or summoned units would do nothing untill attacked - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 250.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 250.0f, true)) { summoned->AI()->AttackStart(target); AddThreat(target, 250.0f, summoned); @@ -965,7 +965,7 @@ class boss_elder_ironbranch : public CreatureScript events.ScheduleEvent(EVENT_IMPALE, 15s, 25s); break; case EVENT_IRON_ROOTS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_ROOTS_IRONBRANCH)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_ROOTS_IRONBRANCH)) target->CastSpell(target, SPELL_ROOTS_IRONBRANCH, true); events.ScheduleEvent(EVENT_IRON_ROOTS, 10s, 20s); break; @@ -1039,7 +1039,7 @@ class npc_detonating_lasher : public CreatureScript if (changeTargetTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { // Switching to other target - modify aggro of new target by 20% from current target's aggro AddThreat(target, GetThreat(me->GetVictim()) * 1.2f); @@ -1098,7 +1098,7 @@ class npc_ancient_water_spirit : public CreatureScript if (tidalWaveTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoCast(target, SPELL_TIDAL_WAVE); DoCast(target, SPELL_TIDAL_WAVE_EFFECT, true); @@ -1175,7 +1175,7 @@ class npc_storm_lasher : public CreatureScript if (stormboltTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_STORMBOLT); stormboltTimer = urand(8000, 12000); } @@ -1309,7 +1309,7 @@ class npc_ancient_conservator : public CreatureScript if (natureFuryTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_NATURE_FURY)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_NATURE_FURY)) DoCast(target, SPELL_NATURE_FURY); me->AddAura(SPELL_CONSERVATOR_GRIP, me); natureFuryTimer = 5000; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index d085f830a42..abf5b877fd4 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -165,7 +165,7 @@ class boss_general_vezax : public CreatureScript { Unit* target = CheckPlayersInRange(RAID_MODE<uint8>(4, 9), 15.0f, 50.0f); if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 150.0f, true); if (target) DoCast(target, SPELL_SHADOW_CRASH); events.ScheduleEvent(EVENT_SHADOW_CRASH, 8s, 12s); @@ -179,7 +179,7 @@ class boss_general_vezax : public CreatureScript { Unit* target = CheckPlayersInRange(RAID_MODE<uint8>(4, 9), 15.0f, 50.0f); if (!target) - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 150.0f, true); if (target) DoCast(target, SPELL_MARK_OF_THE_FACELESS); events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, 35s, 45s); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 8c98934e08d..3b99f5b9c0f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -448,7 +448,7 @@ class boss_hodir : public CreatureScript events.ScheduleEvent(EVENT_FREEZE, 30s, 45s); break; case EVENT_ICICLE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_ICICLE); events.ScheduleEvent(EVENT_ICICLE, RAID_MODE(5500, 3500)); break; @@ -456,7 +456,7 @@ class boss_hodir : public CreatureScript Talk(SAY_FLASH_FREEZE); Talk(EMOTE_FREEZE); for (uint8 n = 0; n < RAID_MODE(2, 3); ++n) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) target->CastSpell(target, SPELL_ICICLE_SNOWDRIFT, true); DoCast(SPELL_FLASH_FREEZE); events.ScheduleEvent(EVENT_FLASH_FREEZE_EFFECT, 500ms); @@ -772,7 +772,7 @@ class npc_hodir_shaman : public CreatureScript switch (eventId) { case EVENT_STORM_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_STORM_CLOUD, true); events.ScheduleEvent(EVENT_STORM_CLOUD, 15s, 20s); break; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index ea9ca86fd02..1c5fff7a292 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -225,7 +225,7 @@ class boss_ignis : public CreatureScript events.ScheduleEvent(EVENT_JET, 35s, 40s); break; case EVENT_SLAG_POT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) { Talk(SAY_SLAG_POT); _slagPotGUID = target->GetGUID(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index e862f380d50..9de592958ff 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -305,7 +305,7 @@ class boss_kologarn : public CreatureScript break; } case EVENT_FOCUSED_EYEBEAM: - if (Unit* eyebeamTargetUnit = SelectTarget(SELECT_TARGET_MAXDISTANCE, 0, 0, true)) + if (Unit* eyebeamTargetUnit = SelectTarget(SelectTargetMethod::MaxDistance, 0, 0, true)) { eyebeamTarget = eyebeamTargetUnit->GetGUID(); DoCast(me, SPELL_SUMMON_FOCUSED_EYEBEAM, true); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 4f79b562e3f..9b161801d50 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1063,7 +1063,7 @@ class boss_vx_001 : public CreatureScript switch (eventId) { case EVENT_RAPID_BURST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 120, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 120, true)) DoCast(target, SPELL_SUMMON_BURST_TARGET); events.RescheduleEvent(EVENT_RAPID_BURST, 3000, 0, PHASE_VX_001); break; @@ -1078,7 +1078,7 @@ class boss_vx_001 : public CreatureScript rocket->SetDisplayId(rocket->GetNativeDisplayId()); break; case EVENT_HAND_PULSE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 120, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 120, true)) DoCast(target, RAND(SPELL_HAND_PULSE_LEFT, SPELL_HAND_PULSE_RIGHT)); events.RescheduleEvent(EVENT_HAND_PULSE, urand(1500, 3000), 0, PHASE_VOL7RON); break; @@ -1311,7 +1311,7 @@ class npc_mimiron_assault_bot : public CreatureScript if (me->HasUnitState(UNIT_STATE_ROOT)) { - if (Unit* newTarget = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 30.0f, true)) + if (Unit* newTarget = SelectTarget(SelectTargetMethod::MinDistance, 0, 30.0f, true)) { me->GetThreatManager().ResetAllThreat(); AttackStart(newTarget); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 4de47589379..1b3604ee02e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -576,12 +576,12 @@ struct boss_razorscale : public BossAI Talk(EMOTE_BERSERK, me); break; case EVENT_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_FIREBALL); events.Repeat(Seconds(2), Seconds(3)); break; case EVENT_DEVOURING_FLAME: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_DEVOURING_FLAME); if (_permaGround) events.Repeat(Seconds(10), Seconds(12)); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 1c82686cb32..0c79b89d336 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -716,7 +716,7 @@ class boss_thorim : public CreatureScript events.Repeat(15000, 20000); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CHAIN_LIGHTNING); events.Repeat(7000, 15000); break; @@ -1286,7 +1286,7 @@ class npc_thorim_arena_phase : public CreatureScript case EVENT_ABILITY_CHARGE: { Unit* referer = me; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, [referer](Unit* unit){ return unit->GetTypeId() == TYPEID_PLAYER && unit->IsInRange(referer, 8.0f, 25.0f); })) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [referer](Unit* unit){ return unit->GetTypeId() == TYPEID_PLAYER && unit->IsInRange(referer, 8.0f, 25.0f); })) DoCast(target, SPELL_CHARGE); _events.ScheduleEvent(eventId, 12s); break; @@ -1443,7 +1443,7 @@ class npc_runic_colossus : public CreatureScript case EVENT_RUNIC_CHARGE: { Unit* referer = me; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, [referer](Unit* unit){ return unit->GetTypeId() == TYPEID_PLAYER && unit->IsInRange(referer, 8.0f, 40.0f); })) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, [referer](Unit* unit){ return unit->GetTypeId() == TYPEID_PLAYER && unit->IsInRange(referer, 8.0f, 40.0f); })) DoCast(target, SPELL_RUNIC_CHARGE); _events.Repeat(20000); break; @@ -1536,7 +1536,7 @@ class npc_ancient_rune_giant : public CreatureScript _events.Repeat(10000, 12000); break; case EVENT_RUNE_DETONATION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_RUNE_DETONATION); _events.Repeat(10000, 12000); break; @@ -1616,7 +1616,7 @@ class npc_sif : public CreatureScript switch (eventId) { case EVENT_BLINK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_BLINK); _events.ScheduleEvent(EVENT_FROST_NOVA, 0); _events.Repeat(20000, 25000); @@ -1625,7 +1625,7 @@ class npc_sif : public CreatureScript DoCastAOE(SPELL_FROSTNOVA); return; case EVENT_FROSTBOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_FROSTBOLT); _events.Repeat(2000); return; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index 752bb7f4262..238b6fbf2ac 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -428,7 +428,7 @@ class StartAttackEvent : public BasicEvent { _owner->SetReactState(REACT_AGGRESSIVE); if (Creature* _summoner = ObjectAccessor::GetCreature(*_owner, _summonerGuid)) - if (Unit* target = _summoner->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 300.0f)) + if (Unit* target = _summoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, 300.0f)) _owner->AI()->AttackStart(target); return true; } @@ -1281,7 +1281,7 @@ class npc_corruptor_tentacle : public CreatureScript switch (eventId) { case EVENT_CAST_RANDOM_SPELL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, RAND(SPELL_BLACK_PLAGUE, SPELL_CURSE_OF_DOOM, SPELL_APATHY, SPELL_DRAINING_POISON)); _events.ScheduleEvent(EVENT_CAST_RANDOM_SPELL, 3s); 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 c8f2324072a..ed74df411ab 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 @@ -251,7 +251,7 @@ class boss_ingvar_the_plunderer : public CreatureScript events.ScheduleEvent(EVENT_WOE_STRIKE, 10s, 14s, 0, PHASE_UNDEAD); break; case EVENT_SHADOW_AXE: - 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_AXE_SUMMON); events.ScheduleEvent(EVENT_SHADOW_AXE, 30*IN_MILLISECONDS, 0, PHASE_UNDEAD); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index ce2f5864ce5..beae52d9fb4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -205,7 +205,7 @@ class boss_keleseth : public CreatureScript events.ScheduleEvent(EVENT_SHADOWBOLT, 2s, 3s); break; case EVENT_FROST_TOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_FROST_TOMB)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_FROST_TOMB)) { Talk(SAY_FROST_TOMB); Talk(SAY_FROST_TOMB_EMOTE, target); @@ -297,7 +297,7 @@ class npc_vrykul_skeleton : public CreatureScript switch (eventId) { case EVENT_DECREPIFY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true, -SPELL_DECREPIFY)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true, -SPELL_DECREPIFY)) DoCast(target, SPELL_DECREPIFY); events.ScheduleEvent(EVENT_DECREPIFY, 1s, 5s); break; 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 42fd3b55e3b..058549ac4a5 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_skarvald_dalronn.cpp @@ -203,7 +203,7 @@ class boss_skarvald_the_constructor : public CreatureScript switch (eventId) { case EVENT_SKARVALD_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, SkarvaldChargePredicate(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, SkarvaldChargePredicate(me))) DoCast(target, SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE, 5s, 10s); break; @@ -266,12 +266,12 @@ class boss_dalronn_the_controller : public CreatureScript switch (eventId) { case EVENT_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_SHADOW_BOLT); events.ScheduleEvent(EVENT_SHADOW_BOLT, 2100ms); //give a 100ms pause to try cast other spells break; case EVENT_DEBILITATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) DoCast(target, SPELL_DEBILITATE); events.ScheduleEvent(EVENT_DEBILITATE, 5s, 10s); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 6ed046ba160..4503dcd317b 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -238,7 +238,7 @@ public: events.Repeat(Seconds(7)); break; case EVENT_IMPALE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_IMPALE); events.Repeat(Seconds(10), Seconds(15)); break; @@ -475,7 +475,7 @@ public: events.Repeat(Seconds(19)); break; case EVENT_GRIEVOUS_WOUND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_GRIEVOUS_WOUND); events.Repeat(Seconds(18)); break; @@ -533,7 +533,7 @@ public: events.Repeat(Seconds(16)); break; case EVENT_POISON_BREATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_POISON_BREATH); events.Repeat(Seconds(14)); break; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index aaa13484d75..d76697df741 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -279,7 +279,7 @@ public: }) .Schedule(Seconds(11), [this](TaskContext poisonedSpear) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_POISONED_SPEAR); poisonedSpear.Repeat(); }) @@ -610,7 +610,7 @@ public: _scheduler .Schedule(Seconds(13), [this](TaskContext net) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXDISTANCE, 0, 30, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxDistance, 0, 30, true)) DoCast(target, SPELL_NET); net.Repeat(); }) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 2157779fd25..2b1519c323d 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -229,7 +229,7 @@ class boss_svala : public CreatureScript events.ScheduleEvent(EVENT_CALL_FLAMES, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS), 0, NORMAL); SetCombatMovement(true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 300.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 300.0f, true)) me->GetMotionMaster()->MoveChase(target); } } @@ -352,12 +352,12 @@ class boss_svala : public CreatureScript events.ScheduleEvent(EVENT_SINISTER_STRIKE, 5s, 9s, 0, NORMAL); break; case EVENT_CALL_FLAMES: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CALL_FLAMES); events.ScheduleEvent(EVENT_CALL_FLAMES, urand(10 * IN_MILLISECONDS, 20 * IN_MILLISECONDS), 0, NORMAL); break; case EVENT_RITUAL_PREPARATION: - if (Unit* sacrificeTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true)) + if (Unit* sacrificeTarget = SelectTarget(SelectTargetMethod::Random, 0, 80.0f, true)) { instance->SetGuidData(DATA_SACRIFICED_PLAYER, sacrificeTarget->GetGUID()); Talk(SAY_SACRIFICE_PLAYER); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index c883d735d22..164547adb33 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -192,7 +192,7 @@ public: SpiritFountGUID = summon->GetGUID(); break; case NPC_AVENGING_SPIRIT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { AddThreat(target, 0.0f, summon); summon->AI()->AttackStart(target); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 7593753c28c..c29ba834e96 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -102,12 +102,12 @@ class boss_archavon : public CreatureScript switch (eventId) { case EVENT_ROCK_SHARDS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ROCK_SHARDS); events.ScheduleEvent(EVENT_ROCK_SHARDS, 15s); break; case EVENT_CHOKING_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -10.0f, true)) { DoCast(target, SPELL_CRUSHING_LEAP, true); //10y~80y, ignore range Talk(EMOTE_LEAP, target); @@ -188,7 +188,7 @@ class npc_archavon_warder : public CreatureScript switch (eventId) { case EVENT_ROCK_SHOWER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ROCK_SHOWER); events.ScheduleEvent(EVENT_ROCK_SHARDS, 6s); break; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp index 03b4d3fd3c1..31a3949f00a 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_emalon.cpp @@ -134,7 +134,7 @@ class boss_emalon : public CreatureScript switch (eventId) { case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHAIN_LIGHTNING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 25s); break; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index c108cdcc70e..9670a21799b 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -91,7 +91,7 @@ struct boss_toravon : public BossAI events.Repeat(38s); break; case EVENT_FREEZING_GROUND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_FREEZING_GROUND); events.Repeat(38s); break; @@ -198,7 +198,7 @@ class spell_toravon_random_aggro : public SpellScript caster->GetThreatManager().ResetAllThreat(); if (CreatureAI* ai = caster->AI()) - if (Unit* target = ai->SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = ai->SelectTarget(SelectTargetMethod::Random, 1)) caster->GetThreatManager().AddThreat(target, 1000000); } diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index db8b2aa5c9a..0a2a1050de3 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -91,7 +91,7 @@ class boss_cyanigosa : public CreatureScript scheduler.Schedule(Seconds(15), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_BLIZZARD); task.Repeat(); }); @@ -112,7 +112,7 @@ class boss_cyanigosa : public CreatureScript { scheduler.Schedule(Seconds(30), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) DoCast(target, SPELL_MANA_DESTRUCTION); task.Repeat(); }); diff --git a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp index d86fc54b7c5..b4a3596bff6 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_erekem.cpp @@ -200,7 +200,7 @@ class boss_erekem : public CreatureScript scheduler.Schedule(Seconds(2), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f)) DoCast(target, SPELL_LIGHTNING_BOLT); task.Repeat(Milliseconds(2500)); diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index ef419123100..f1cfe384ca7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -218,7 +218,7 @@ class boss_ichoron : public CreatureScript scheduler.Schedule(Seconds(6), Seconds(9), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f)) DoCast(target, SPELL_WATER_BLAST); task.Repeat(Seconds(6), Seconds(9)); }); diff --git a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp index 4cce44e32fa..aef05bd8e5a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_lavanthor.cpp @@ -56,7 +56,7 @@ class boss_lavanthor : public CreatureScript { scheduler.Schedule(Seconds(1), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_FIREBOLT); task.Repeat(Seconds(5), Seconds(13)); }); @@ -69,7 +69,7 @@ class boss_lavanthor : public CreatureScript scheduler.Schedule(Seconds(10), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f)) DoCast(target, SPELL_LAVA_BURN); task.Repeat(Seconds(15), Seconds(23)); }); diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 1f22d400708..625944355ad 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -71,7 +71,7 @@ class boss_moragg : public CreatureScript scheduler.Schedule(Seconds(15), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true)) DoCast(target, SPELL_OPTIC_LINK); task.Repeat(Seconds(25)); }); @@ -106,7 +106,7 @@ class spell_moragg_ray : public SpellScriptLoader if (!GetTarget()->GetAI()) return; - if (Unit* target = GetTarget()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = GetTarget()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) { uint32 triggerSpell = aurEff->GetSpellEffectInfo().TriggerSpell; GetTarget()->CastSpell(target, triggerSpell, aurEff); diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 4925c379d97..2043ff95b61 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -146,7 +146,7 @@ class boss_xevozz : public CreatureScript scheduler.Schedule(Seconds(10), Seconds(11), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true)) DoCast(target, SPELL_ARCANE_BUFFET); task.Repeat(Seconds(15), Seconds(20)); }); diff --git a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp index c8db2218821..bee57ec50a4 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp @@ -135,7 +135,7 @@ class boss_zuramat : public CreatureScript scheduler.Schedule(Seconds(9), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_VOID_SHIFT); task.Repeat(Seconds(15)); }); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index 9dc0526a8dd..a6b4c05471a 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1007,7 +1007,7 @@ class npc_azure_binder : public CreatureScript _scheduler.Schedule(Seconds(4), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_ARCANE_BARRAGE); task.Repeat(Seconds(6)); }); @@ -1022,7 +1022,7 @@ class npc_azure_binder : public CreatureScript _scheduler.Schedule(Seconds(4), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f)) DoCast(target, SPELL_FROSTBOLT); task.Repeat(Seconds(6)); }); @@ -1060,7 +1060,7 @@ class npc_azure_mage_slayer : public CreatureScript _scheduler.Schedule(Seconds(5), [this](TaskContext task) { // wrong spellid? - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_SPELL_LOCK); task.Repeat(Seconds(9)); }); @@ -1118,12 +1118,12 @@ class npc_azure_stalker : public CreatureScript { _scheduler.Schedule(Seconds(8), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f)) DoCast(target, SPELL_TACTICAL_BLINK); task.Schedule(Milliseconds(1300), [this](TaskContext /*task*/) { - if (Unit* target = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, 5.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 5.0f)) DoCast(target, SPELL_BACKSTAB); }); @@ -1153,14 +1153,14 @@ class npc_azure_spellbreaker : public CreatureScript { _scheduler.Schedule(Seconds(5), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_ARCANE_BLAST); task.Repeat(Seconds(6)); }); _scheduler.Schedule(Seconds(4), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_SLOW); task.Repeat(Seconds(5)); }); @@ -1169,7 +1169,7 @@ class npc_azure_spellbreaker : public CreatureScript { _scheduler.Schedule(Seconds(5), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f)) DoCast(target, SPELL_CHAINS_OF_ICE); task.Repeat(Seconds(7)); }); @@ -1233,7 +1233,7 @@ class npc_azure_sorceror : public CreatureScript { _scheduler.Schedule(Seconds(4), [this](TaskContext task) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f)) DoCast(target, SPELL_ARCANE_STREAM); task.Repeat(Seconds(5), Seconds(10)); }); 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 cdce3694680..c48f75a428e 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -272,7 +272,7 @@ public: if (StolenSoul_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->GetTypeId() == TYPEID_PLAYER) { @@ -295,7 +295,7 @@ public: if (Ribbon_of_Souls_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_RIBBON_OF_SOULS); Ribbon_of_Souls_timer = 5000 + (rand32() % 20 * 1000); 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 6978dd0ac5d..f16aebd35b0 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 @@ -151,7 +151,7 @@ public: if (FocusFire_Timer <= diff) { // Summon Focus Fire & Emote - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (target && target->GetTypeId() == TYPEID_PLAYER && target->IsAlive()) { FocusedTargetGUID = target->GetGUID(); diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp index 5faecfba8b3..3dce5f19d7e 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp @@ -122,7 +122,7 @@ class boss_nexusprince_shaffar : public CreatureScript { summoned->CastSpell(summoned, SPELL_ETHEREAL_BEACON_VISUAL, false); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); } diff --git a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp index c5f79567648..32001f644a2 100644 --- a/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp +++ b/src/server/scripts/Outland/Auchindoun/ManaTombs/boss_pandemonius.cpp @@ -80,7 +80,7 @@ public: switch (eventId) { 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_anzu.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp index a7f885e42cc..4f8b4e63c54 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp @@ -130,7 +130,7 @@ class boss_anzu : public CreatureScript events.ScheduleEvent(EVENT_PARALYZING_SCREECH, 25s); break; case EVENT_CYCLONE_OF_FEATHERS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CYCLONE_OF_FEATHERS); events.ScheduleEvent(EVENT_CYCLONE_OF_FEATHERS, 21s); break; @@ -143,7 +143,7 @@ class boss_anzu : public CreatureScript events.ScheduleEvent(EVENT_SPELL_BOMB, 12s); break; case EVENT_SPELL_BOMB: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->GetPowerType() == POWER_MANA) { diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp index f76d03915de..c3c871cfaae 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_darkweaver_syth.cpp @@ -123,7 +123,7 @@ public: void JustSummoned(Creature* summoned) override { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); summons.Summon(summoned); @@ -168,27 +168,27 @@ public: switch (eventId) { case EVENT_FLAME_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FLAME_SHOCK); events.ScheduleEvent(EVENT_FLAME_SHOCK, 10s, 15s); break; case EVENT_ARCANE_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARCANE_SHOCK); events.ScheduleEvent(EVENT_ARCANE_SHOCK, 10s, 15s); break; case EVENT_FROST_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FROST_SHOCK); events.ScheduleEvent(EVENT_FROST_SHOCK, 10s, 15s); break; case EVENT_SHADOW_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_SHOCK); events.ScheduleEvent(EVENT_SHADOW_SHOCK, 10s, 15s); break; case EVENT_CHAIN_LIGHTNING: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHAIN_LIGHTNING); events.ScheduleEvent(EVENT_CHAIN_LIGHTNING, 25000); break; @@ -241,7 +241,7 @@ public: if (flameshock_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FLAME_SHOCK); flameshock_timer = 5000; @@ -249,7 +249,7 @@ public: if (flamebuffet_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FLAME_BUFFET); flamebuffet_timer = 5000; @@ -300,7 +300,7 @@ public: if (arcaneshock_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARCANE_SHOCK); arcaneshock_timer = 5000; @@ -308,7 +308,7 @@ public: if (arcanebuffet_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARCANE_BUFFET); arcanebuffet_timer = 5000; @@ -359,7 +359,7 @@ public: if (frostshock_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FROST_SHOCK); frostshock_timer = 5000; @@ -367,7 +367,7 @@ public: if (frostbuffet_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FROST_BUFFET); frostbuffet_timer = 5000; @@ -418,7 +418,7 @@ public: if (shadowshock_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_SHOCK); shadowshock_timer = 5000; @@ -426,7 +426,7 @@ public: if (shadowbuffet_timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_BUFFET); shadowbuffet_timer = 5000; 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 3f17d54d8fc..33ca379db91 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 @@ -99,9 +99,9 @@ public: case EVENT_POLYMORPH: // Second top aggro in normal, random target in heroic. if (IsHeroic()) - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POLYMORPH); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_POLYMORPH); else - DoCast(SelectTarget(SELECT_TARGET_MAXTHREAT, 1), SPELL_POLYMORPH); + DoCast(SelectTarget(SelectTargetMethod::MaxThreat, 1), SPELL_POLYMORPH); events.ScheduleEvent(EVENT_POLYMORPH, urand(15000, 17500)); break; case EVENT_ARCANE_VOLLEY: 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 5fa767c848f..7c3832ea999 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 @@ -142,7 +142,7 @@ struct boss_blackheart_the_inciter : public BossAI break; } case EVENT_CHARGE_ATTACK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE, 15s, 25s); 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 d73e7ad57f0..33627f8f049 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp @@ -180,7 +180,7 @@ class boss_grandmaster_vorpil : public CreatureScript events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 15s, 30s); break; case EVENT_BANISH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, false)) DoCast(target, SPELL_BANISH); events.ScheduleEvent(EVENT_BANISH, 15s); break; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index a440b7335f2..16939674c36 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -105,7 +105,7 @@ class boss_murmur : public CreatureScript events.ScheduleEvent(EVENT_RESONANCE, 1500ms); break; case EVENT_MURMURS_TOUCH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 80.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 80.0f, true)) DoCast(target, SPELL_MURMURS_TOUCH); events.ScheduleEvent(EVENT_MURMURS_TOUCH, 25s, 35s); break; @@ -117,7 +117,7 @@ class boss_murmur : public CreatureScript } break; case EVENT_MAGNETIC_PULL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_MAGNETIC_PULL); events.ScheduleEvent(EVENT_MAGNETIC_PULL, 15s, 30s); @@ -130,7 +130,7 @@ class boss_murmur : public CreatureScript events.ScheduleEvent(EVENT_THUNDERING_STORM, 15000); break; case EVENT_SONIC_SHOCK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f, false)) DoCast(target, SPELL_SONIC_SHOCK); events.ScheduleEvent(EVENT_SONIC_SHOCK, 10s, 20s); break; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 3e80d3cd183..8d993f73f9b 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -159,7 +159,7 @@ struct npc_wrathbone_flayer : public ScriptedAI _events.ScheduleEvent(EVENT_CLEAVE, 1s, 2s); break; case EVENT_IGNORED: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_IGNORED); _events.ScheduleEvent(EVENT_IGNORED, 10s); break; diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index b1bc46a7f9c..5515ebd1f11 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -194,7 +194,7 @@ struct boss_gurtogg_bloodboil : public BossAI events.Repeat(Seconds(10)); break; case EVENT_FEL_ACID_BREATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, me->GetCombatReach())) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, me->GetCombatReach())) DoCast(target, SPELL_FEL_ACID_BREATH); events.Repeat(Seconds(25), Seconds(30)); break; @@ -209,7 +209,7 @@ struct boss_gurtogg_bloodboil : public BossAI ChangePhase(); break; case EVENT_START_PHASE_2: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { if (Unit* oldTarget = me->GetVictim()) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index acf3bf8bf42..d9fb44cbe34 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -837,7 +837,7 @@ struct boss_illidan_stormrage : public BossAI events.Repeat(Seconds(12)); break; case EVENT_PARASITIC_SHADOWFIEND: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_PARASITIC_SHADOWFIEND); events.Repeat(Seconds(30)); break; @@ -912,7 +912,7 @@ struct boss_illidan_stormrage : public BossAI } case EVENT_DARK_BARRAGE: { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150.0f, true)) DoCast(target, SPELL_DARK_BARRAGE); events.RescheduleEvent(EVENT_EYE_BLAST, Seconds(5), GROUP_PHASE_2); uint32 currentTime = events.GetNextEventTime(EVENT_FLY_TO_RANDOM_PILLAR); @@ -920,7 +920,7 @@ struct boss_illidan_stormrage : public BossAI break; } case EVENT_FIREBALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 150.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 150.0f, true)) DoCast(target, SPELL_FIREBALL); events.Repeat(Seconds(2), Seconds(4)); break; @@ -1510,7 +1510,7 @@ struct npc_flame_of_azzinoth : public ScriptedAI _events.ScheduleEvent(EVENT_FLAME_CHARGE, 5s); break; case EVENT_FLAME_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, ChargeTargetSelector())) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, ChargeTargetSelector())) { DoCast(target, SPELL_CHARGE); _events.Repeat(Seconds(5)); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index c0f167375f4..6c2ba15a92e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -347,7 +347,7 @@ struct boss_gathios_the_shatterer : public IllidariCouncilBossAI events.Repeat(Seconds(30)); break; case EVENT_HAMMER_OF_JUSTICE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, HammerTargetSelector(me))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, HammerTargetSelector(me))) DoCast(target, SPELL_HAMMER_OF_JUSTICE); events.Repeat(Seconds(20)); break; @@ -394,13 +394,13 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI switch (eventId) { case EVENT_FLAMESTRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FLAMESTRIKE); Talk(SAY_COUNCIL_SPECIAL); events.Repeat(Seconds(40)); break; case EVENT_BLIZZARD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_BLIZZARD); events.Repeat(Seconds(15), Seconds(40)); break; @@ -408,7 +408,7 @@ struct boss_high_nethermancer_zerevor : public IllidariCouncilBossAI _canUseArcaneExplosion = true; break; case EVENT_ARCANE_EXPLOSION: - if (_canUseArcaneExplosion && SelectTarget(SELECT_TARGET_RANDOM, 0, 10.0f)) + if (_canUseArcaneExplosion && SelectTarget(SelectTargetMethod::Random, 0, 10.0f)) { DoCastSelf(SPELL_ARCANE_EXPLOSION); _canUseArcaneExplosion = false; @@ -631,7 +631,7 @@ class spell_illidari_council_deadly_strike : public AuraScript { PreventDefaultAction(); - if (Unit* victim = GetTarget()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true, true)) + if (Unit* victim = GetTarget()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true, true)) GetTarget()->CastSpell(victim, SPELL_DEADLY_POISON, aurEff); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index b6f24ad1586..0fd7c967109 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -260,7 +260,7 @@ class spell_mother_shahraz_saber_lash : public AuraScript PreventDefaultAction(); uint32 triggerSpell = aurEff->GetSpellEffectInfo().TriggerSpell; - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0)) GetUnitOwner()->CastSpell(target, triggerSpell, true); } @@ -289,7 +289,7 @@ class spell_mother_shahraz_generic_periodic : public AuraScript PreventDefaultAction(); uint32 triggerSpell = aurEff->GetSpellEffectInfo().TriggerSpell; - if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = GetUnitOwner()->GetAI()->SelectTarget(SelectTargetMethod::Random, 0)) GetUnitOwner()->CastSpell(target, triggerSpell, true); } diff --git a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp index 5801e6c8eec..cce34c1081c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_supremus.cpp @@ -153,7 +153,7 @@ struct boss_supremus : public BossAI events.Repeat(Seconds(5)); break; case EVENT_SWITCH_TARGET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { ResetThreatList(); AddThreat(target, 1000000.0f); diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index f717e9d5fa5..f99353325bd 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -183,7 +183,7 @@ struct boss_teron_gorefiend : public BossAI DoCast(SPELL_BERSERK); break; case EVENT_INCINERATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_INCINERATE); Talk(SAY_INCINERATE); events.Repeat(Seconds(12), Seconds(20)); @@ -194,7 +194,7 @@ struct boss_teron_gorefiend : public BossAI events.Repeat(Seconds(30), Seconds(40)); break; case EVENT_SHADOW_DEATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, true, -SPELL_SPIRITUAL_VENGEANCE)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, true, -SPELL_SPIRITUAL_VENGEANCE)) DoCast(target, SPELL_SHADOW_OF_DEATH); events.Repeat(Seconds(30), Seconds(35)); break; @@ -236,7 +236,7 @@ struct npc_doom_blossom : public NullCreatureAI DoZoneInCombat(); _scheduler.Schedule(Seconds(12), [this](TaskContext shadowBolt) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOWBOLT); shadowBolt.Repeat(Seconds(2)); @@ -314,10 +314,10 @@ struct npc_shadowy_construct : public ScriptedAI { if (Creature* teron = _instance->GetCreature(DATA_TERON_GOREFIEND)) { - Unit* target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true, true, -SPELL_SPIRITUAL_VENGEANCE); + Unit* target = teron->AI()->SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true, true, -SPELL_SPIRITUAL_VENGEANCE); // He should target Vengeful Spirits only if has no other player available if (!target) - target = teron->AI()->SelectTarget(SELECT_TARGET_RANDOM, 0); + target = teron->AI()->SelectTarget(SelectTargetMethod::Random, 0); if (target) { diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 4bf3c1bd840..4cb171a95e5 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -151,7 +151,7 @@ struct boss_najentus : public BossAI DoCastSelf(SPELL_BERSERK, true); break; case EVENT_SPINE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 200.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 200.0f, true)) { DoCast(target, SPELL_IMPALING_SPINE, true); _spineTargetGUID = target->GetGUID(); 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 5406c35e176..b464b403bbf 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -245,7 +245,7 @@ public: if (CataclysmicBolt_Timer <= diff) { //select a random unit other than the main tank - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); //if there aren't other units, cast on the tank if (!target) @@ -430,7 +430,7 @@ public: pet_id = CREATURE_FATHOM_SPOREBAT; } //DoCast(me, spell_id, true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Creature* Pet = DoSpawnCreature(pet_id, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000)) { @@ -670,7 +670,7 @@ public: Cyclone->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE); Cyclone->SetFaction(me->GetFaction()); Cyclone->CastSpell(Cyclone, SPELL_CYCLONE_CYCLONE, true); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) Cyclone->AI()->AttackStart(target); } } 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 89d60753ddb..f153b227645 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 @@ -276,7 +276,7 @@ public: //VileSludge_Timer if (VileSludge_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_VILE_SLUDGE); VileSludge_Timer = 15000; @@ -359,7 +359,7 @@ public: //WaterTomb_Timer if (WaterTomb_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); if (target) DoCast(target, SPELL_WATER_TOMB); 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 ccd10905332..d3b943dc7a8 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp @@ -357,7 +357,7 @@ public: { // Static Charge // Used on random people (only 1 person at any given time) in Phases 1 and 3, it's a debuff doing 2775 to 3225 Nature damage to the target and everybody in about 5 yards around it, every 1 seconds for 30 seconds. It can be removed by Cloak of Shadows, Iceblock, Divine Shield, etc, but not by Cleanse or Dispel Magic. - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 200, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 200, true); if (target && !target->HasAura(SPELL_STATIC_CHARGE_TRIGGER)) DoCast(target, SPELL_STATIC_CHARGE_TRIGGER); // cast Static Charge every 2 seconds for 20 seconds @@ -409,7 +409,7 @@ public: if (SummonSporebatTimer <= diff) { if (Creature* sporebat = me->SummonCreature(TOXIC_SPOREBAT, SPOREBAT_X, SPOREBAT_Y, SPOREBAT_Z, SPOREBAT_O, TEMPSUMMON_CORPSE_DESPAWN, 0)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) sporebat->AI()->AttackStart(target); // summon sporebats faster and faster @@ -456,7 +456,7 @@ public: { // Forked Lightning // Used constantly in Phase 2, it shoots out completely randomly targeted bolts of lightning which hit everybody in a roughtly 60 degree cone in front of Vashj for 2313-2687 nature damage. - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target) target = me->GetVictim(); @@ -495,7 +495,7 @@ public: Creature* coilfangElite = me->SummonCreature(COILFANG_ELITE, CoilfangElitePos[pos][0], CoilfangElitePos[pos][1], CoilfangElitePos[pos][2], CoilfangElitePos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (coilfangElite) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) coilfangElite->AI()->AttackStart(target); else if (me->GetVictim()) coilfangElite->AI()->AttackStart(me->GetVictim()); @@ -509,7 +509,7 @@ public: uint32 pos = rand32() % 3; if (Creature* CoilfangStrider = me->SummonCreature(COILFANG_STRIDER, CoilfangStriderPos[pos][0], CoilfangStriderPos[pos][1], CoilfangStriderPos[pos][2], CoilfangStriderPos[pos][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000)) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) CoilfangStrider->AI()->AttackStart(target); else if (me->GetVictim()) CoilfangStrider->AI()->AttackStart(me->GetVictim()); @@ -690,7 +690,7 @@ public: // PoisonBoltTimer if (PoisonBoltTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && target->IsWithinDistInMap(me, 30)) DoCast(target, SPELL_POISON_BOLT); @@ -782,7 +782,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 a7d7b2cc303..abfc1df4306 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 @@ -436,7 +436,7 @@ public: { if (Whirlwind_Timer <= diff) { - Unit* newTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* newTarget = SelectTarget(SelectTargetMethod::Random, 0); if (newTarget) { ResetThreatList(); @@ -775,7 +775,7 @@ public: if (Mindblast_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_MINDBLAST); Mindblast_Timer = urand(10000, 15000); 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 1034a1f8039..009adea6113 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp @@ -309,7 +309,7 @@ public: if (GeyserTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (!target && me->GetVictim()) target = me->GetVictim(); if (target) @@ -323,7 +323,7 @@ public: { if (WaterboltTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target && me->GetVictim()) target = me->GetVictim(); if (target) @@ -436,7 +436,7 @@ public: if (ShootBowTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->CastSpell(target, SPELL_SHOOT, CastSpellExtraArgs(TRIGGERED_FULL_MASK).AddSpellBP0(1100)); ShootBowTimer = 4000 + rand32() % 5000; MultiShotTimer += 1500; // add global cooldown diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp index ea3780eb07e..507cc984041 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp @@ -198,7 +198,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* Murloc = me->SummonCreature(NPC_TIDEWALKER_LURKER, MurlocCords[i][0], MurlocCords[i][1], MurlocCords[i][2], MurlocCords[i][3], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000)) Murloc->AI()->AttackStart(target); } @@ -229,7 +229,7 @@ public: Unit* target; do { - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only + target = SelectTarget(SelectTargetMethod::Random, 1, 50, true); //target players only if (counter < Playercount) break; if (target) @@ -267,7 +267,7 @@ public: Unit* pGlobuleTarget; do { - pGlobuleTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + pGlobuleTarget = SelectTarget(SelectTargetMethod::Random, 0, 50, true); if (pGlobuleTarget) itr = globules.find(pGlobuleTarget->GetGUID()); if (counter > Playercount) 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 b89982cf689..3294c6aacdb 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_hydromancer_thespia.cpp @@ -82,26 +82,26 @@ class boss_hydromancer_thespia : public CreatureScript switch (eventId) { case EVENT_LIGHTNING_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_LIGHTNING_CLOUD); // cast twice in Heroic mode if (IsHeroic()) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_LIGHTNING_CLOUD); events.ScheduleEvent(EVENT_LIGHTNING_CLOUD, 15s, 25s); break; case EVENT_LUNG_BURST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_LUNG_BURST); events.ScheduleEvent(EVENT_LUNG_BURST, 7s, 12s); break; case EVENT_ENVELOPING_WINDS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) DoCast(target, SPELL_ENVELOPING_WINDS); // cast twice in Heroic mode if (IsHeroic()) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true)) DoCast(target, SPELL_ENVELOPING_WINDS); events.ScheduleEvent(EVENT_ENVELOPING_WINDS, 10s, 15s); 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 9b9528c4732..03a221eab28 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_mekgineer_steamrigger.cpp @@ -143,7 +143,7 @@ public: if (Saw_Blade_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_SAW_BLADE); else DoCastVictim(SPELL_SAW_BLADE); 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 4480183ee7b..a67aa4a0f69 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp @@ -190,7 +190,7 @@ public: //Impale_Timer if (Impale_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_IMPALE); Impale_Timer = 7500 + rand32() % 5000; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp index 5d4469079db..b0d9abd1415 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_quagmirran.cpp @@ -95,7 +95,7 @@ class boss_quagmirran : public CreatureScript events.ScheduleEvent(EVENT_CLEAVE, 18s, 34s); break; case EVENT_UPPERCUT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 10.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 10.0f, true)) DoCast(target, SPELL_UPPERCUT); events.ScheduleEvent(EVENT_UPPERCUT, 22s); break; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp index fdd5c88963f..50cb0b879b1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_hungarfen.cpp @@ -89,7 +89,7 @@ public: if (Mushroom_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->SummonCreature(17990, target->GetPositionX() + (rand32() % 8), target->GetPositionY() + (rand32() % 8), target->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 22000); else me->SummonCreature(17990, me->GetPositionX() + (rand32() % 8), me->GetPositionY() + (rand32() % 8), me->GetPositionZ(), float(rand32() % 5), TEMPSUMMON_TIMED_DESPAWN, 22000); @@ -99,7 +99,7 @@ public: if (AcidGeyser_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ACID_GEYSER); AcidGeyser_Timer = 10000 + rand32() % 7500; } else AcidGeyser_Timer -= diff; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index ac48bceb1d1..114580546b5 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -95,7 +95,7 @@ public: if (summon && summon->GetEntry() == ENTRY_SPORE_STRIDER) { Striders.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()) @@ -163,7 +163,7 @@ public: } if (Levitate_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { DoCast(target, SPELL_LEVITATE); LevitatedTarget = target->GetGUID(); @@ -176,7 +176,7 @@ public: // Chain Lightning if (ChainLightning_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CHAIN_LIGHTNING); ChainLightning_Timer = 7000; } else ChainLightning_Timer -= diff; @@ -184,7 +184,7 @@ public: // Static Charge if (StaticCharge_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30, true)) DoCast(target, SPELL_STATIC_CHARGE); StaticCharge_Timer = 10000; } else StaticCharge_Timer -= diff; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index 62340af1e3c..6b889df62b3 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -207,7 +207,7 @@ class boss_gruul : public CreatureScript // Hurtful Strike if (m_uiHurtfulStrike_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 1); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 1); if (target && me->IsWithinMeleeRange(me->GetVictim())) DoCast(target, SPELL_HURTFUL_STRIKE); @@ -231,7 +231,7 @@ class boss_gruul : public CreatureScript // Cave In if (m_uiCaveIn_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_CAVE_IN); if (m_uiCaveIn_StaticTimer >= 4000) 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 b217ef479eb..78c3e190c50 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_high_king_maulgar.cpp @@ -180,7 +180,7 @@ public: //Charging_Timer if (Charging_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { AttackStart(target); DoCast(target, SPELL_BERSERKER_C); @@ -290,7 +290,7 @@ public: //DeathCoil Timer /need correct timer if (DeathCoil_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_DEATH_COIL); DeathCoil_Timer = 20000; } else DeathCoil_Timer -= diff; @@ -363,7 +363,7 @@ public: //GreaterPolymorph_Timer if (GreaterPolymorph_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_GREATER_POLYMORPH); GreaterPolymorph_Timer = urand(15000, 20000); 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 8202a868587..5c7183d365f 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 @@ -344,7 +344,7 @@ class npc_shadowmoon_channeler : public CreatureScript if (MarkOfShadow_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_MARK_OF_SHADOW); MarkOfShadow_Timer = 15000 + rand32() % 5000; } 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 0dc28a64688..7b3ed67cde7 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp @@ -83,12 +83,12 @@ class boss_the_maker : public CreatureScript events.ScheduleEvent(EVENT_ACID_SPRAY, 15s, 23s); break; case EVENT_EXPLODING_BREAKER: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true)) DoCast(target, SPELL_EXPLODING_BREAKER); events.ScheduleEvent(EVENT_EXPLODING_BREAKER, 4s, 12s); break; case EVENT_DOMINATION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_DOMINATION); events.ScheduleEvent(EVENT_DOMINATION, 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 30224965ca1..266cd8dfbee 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 @@ -104,7 +104,7 @@ class boss_omor_the_unscarred : public CreatureScript { Talk(SAY_SUMMON); - if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* random = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(random); ++SummonedCount; @@ -160,7 +160,7 @@ class boss_omor_the_unscarred : public CreatureScript Unit* temp = nullptr; if (me->IsWithinMeleeRange(me->GetVictim())) temp = me->GetVictim(); - else temp = SelectTarget(SELECT_TARGET_RANDOM, 0); + else temp = SelectTarget(SelectTargetMethod::Random, 0); if (temp && temp->GetTypeId() == TYPEID_PLAYER) { @@ -190,7 +190,7 @@ class boss_omor_the_unscarred : public CreatureScript { Talk(SAY_CURSE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_TREACHEROUS_AURA); Aura_Timer = 8000 + rand32() % 8000; @@ -201,7 +201,7 @@ class boss_omor_the_unscarred : public CreatureScript if (Shadowbolt_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { target = me->GetVictim(); 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 f9829a0f5e9..cc02ab01ca7 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 @@ -124,7 +124,7 @@ class boss_nazan : public CreatureScript if (Fireball_Timer <= diff) { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(victim, SPELL_FIREBALL, true); Fireball_Timer = urand(4000, 7000); } @@ -142,7 +142,7 @@ class boss_nazan : public CreatureScript me->SetDisableGravity(false); me->SetWalk(true); me->GetMotionMaster()->Clear(); - if (Unit* victim = SelectTarget(SELECT_TARGET_MINDISTANCE, 0)) + if (Unit* victim = SelectTarget(SelectTargetMethod::MinDistance, 0)) AttackStart(victim); DoStartMovement(me->GetVictim()); Talk(EMOTE); 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 3303416c686..b02d9cd7fc9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -132,7 +132,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript break; case EVENT_SURGE: Talk(SAY_SURGE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SURGE); events.ScheduleEvent(EVENT_SURGE, urand (5000, 13000)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 2bec89430ca..55bf6536646 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -387,7 +387,7 @@ class npc_hellfire_channeler : public CreatureScript _events.Repeat(Seconds(15), Seconds(20)); break; case EVENT_FEAR: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_FEAR); _events.Repeat(Seconds(25), Seconds(40)); break; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp index e76f7ff71e5..35145e10b5a 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp @@ -260,7 +260,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript { if (ShadowFissure_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOW_FISSURE); ShadowFissure_Timer = urand(7500, 15000); } @@ -269,7 +269,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript if (DeathCoil_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_DEATH_COIL); DeathCoil_Timer = urand(15000, 20000); } 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 9d183710ffd..3882381424c 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -341,7 +341,7 @@ class boss_warbringer_omrogg : public CreatureScript if (ResetThreat_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoYellForThreat(); ResetThreatList(); 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 cf1976e1a5b..cd3a5494f85 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 @@ -136,7 +136,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript case NPC_HEARTHEN_GUARD: case NPC_SHARPSHOOTER_GUARD: case NPC_REAVER_GUARD: - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); adds.push_back(summon->GetGUID()); break; case NPC_SHATTERED_ASSASSIN: @@ -269,7 +269,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript { if (Charge_timer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), H_SPELL_CHARGE); Charge_timer = 0; } else diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 11e56ac9d91..9a31cd22955 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -181,7 +181,7 @@ class boss_alar : public CreatureScript void JustSummoned(Creature* summon) override { if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->AI()->AttackStart(target); } @@ -310,7 +310,7 @@ class boss_alar : public CreatureScript WaitTimer = 4000; return; case WE_DIVE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL); DoCast(target, SPELL_DIVE_BOMB, true); @@ -399,7 +399,7 @@ class boss_alar : public CreatureScript { if (Charge_Timer <= diff) { - Unit* target= SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); + Unit* target= SelectTarget(SelectTargetMethod::Random, 1, 100, true); if (target) DoCast(target, SPELL_CHARGE); Charge_Timer = 30000; @@ -431,7 +431,7 @@ class boss_alar : public CreatureScript if (FlamePatch_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000); if (Summoned) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 94b6665ef4c..bcc6207d694 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -180,7 +180,7 @@ class boss_high_astromancer_solarian : public CreatureScript Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); if (Summoned) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) Summoned->AI()->AttackStart(target); summons.Summon(Summoned); @@ -236,7 +236,7 @@ class boss_high_astromancer_solarian : public CreatureScript if (Wrath_Timer <= diff) { me->InterruptNonMeleeSpells(false); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) DoCast(target, SPELL_WRATH_OF_THE_ASTROMANCER, true); Wrath_Timer = 20000 + rand32() % 5000; } @@ -252,7 +252,7 @@ class boss_high_astromancer_solarian : public CreatureScript } else { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (!me->HasInArc(2.5f, target)) target = me->GetVictim(); @@ -269,7 +269,7 @@ class boss_high_astromancer_solarian : public CreatureScript { me->InterruptNonMeleeSpells(false); //Target the tank ? - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) { if (target->GetTypeId() == TYPEID_PLAYER) { diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index b5e3ff5239e..58710ecc508 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -625,7 +625,7 @@ class boss_kaelthas : public CreatureScript me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE); me->RemoveAurasDueToSpell(SPELL_FULLPOWER); - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0)) AttackStart(target); DoAction(ACTION_SCHEDULE_COMBAT_EVENTS); @@ -646,7 +646,7 @@ class boss_kaelthas : public CreatureScript // if not phoenix, then it's one of the 7 weapons if (summoned->GetEntry() != NPC_PHOENIX) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); summons.Summon(summoned); @@ -684,7 +684,7 @@ class boss_kaelthas : public CreatureScript { advisor->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); } ++_advisorCounter; @@ -714,7 +714,7 @@ class boss_kaelthas : public CreatureScript me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED)); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); DoAction(ACTION_SCHEDULE_COMBAT_EVENTS); @@ -729,7 +729,7 @@ class boss_kaelthas : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_DISRUPTION, 60000, EVENT_GROUP_COMBAT, PHASE_COMBAT); break; case EVENT_FLAMESTRIKE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FLAME_STRIKE); events.ScheduleEvent(EVENT_FLAMESTRIKE, 30000, EVENT_GROUP_COMBAT, PHASE_COMBAT); @@ -778,7 +778,7 @@ class boss_kaelthas : public CreatureScript case EVENT_NETHER_BEAM: if (_netherbeamsCast <= 8) { - if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(unit, SPELL_NETHER_BEAM); _netherbeamsCast++; @@ -931,7 +931,7 @@ class boss_thaladred_the_darkener : public CreatureScript //Gaze_Timer if (Gaze_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { ResetThreatList(); AddThreat(target, 5000000.0f); @@ -1125,7 +1125,7 @@ class boss_grand_astromancer_capernian : public CreatureScript //Conflagration_Timer if (Conflagration_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && me->IsWithinDistInMap(target, 30)) DoCast(target, SPELL_CONFLAGRATION); @@ -1232,7 +1232,7 @@ class boss_master_engineer_telonicus : public CreatureScript //RemoteToy_Timer if (RemoteToy_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_REMOTE_TOY); RemoteToy_Timer = 10000 + rand32() % 5000; diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index f023f4bd5dd..58a86d3bc0a 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -206,7 +206,7 @@ class npc_ragin_flames : public CreatureScript if (!onlyonce) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->GetMotionMaster()->MoveChase(target); onlyonce = true; } 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 545122c0193..af016f589b8 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 @@ -123,7 +123,7 @@ class boss_pathaleon_the_calculator : public CreatureScript case EVENT_SUMMON: for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Creature* Wraith = me->SummonCreature(NPC_NETHER_WRAITH, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000)) Wraith->AI()->AttackStart(target); @@ -207,7 +207,7 @@ class npc_nether_wraith : public CreatureScript if (ArcaneMissiles_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_ARCANE_MISSILES); else DoCastVictim(SPELL_ARCANE_MISSILES); diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp index 31609f33233..b0e44415180 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp @@ -345,7 +345,7 @@ class npc_warden_mellichar : public CreatureScript void JustSummoned(Creature* summon) override { DoZoneInCombat(summon); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) summon->AI()->AttackStart(target); } 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 4c543f5301a..31e268f6e89 100644 --- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp +++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp @@ -129,7 +129,7 @@ class boss_harbinger_skyriss : public CreatureScript else summon->SetHealth(summon->CountPctFromMaxHealth(66)); if (me->GetVictim()) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summon->AI()->AttackStart(target); summons.Summon(summon); @@ -209,7 +209,7 @@ class boss_harbinger_skyriss : public CreatureScript if (MindRend_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_MIND_REND); else DoCastVictim(SPELL_MIND_REND); @@ -226,7 +226,7 @@ class boss_harbinger_skyriss : public CreatureScript Talk(SAY_FEAR); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_FEAR); else DoCastVictim(SPELL_FEAR); @@ -243,7 +243,7 @@ class boss_harbinger_skyriss : public CreatureScript Talk(SAY_MIND); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_DOMINATION); else DoCastVictim(SPELL_DOMINATION); @@ -260,7 +260,7 @@ class boss_harbinger_skyriss : public CreatureScript if (me->IsNonMeleeSpellCast(false)) return; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, H_SPELL_MANA_BURN); ManaBurn_Timer = 16000 + rand32() % 16000; 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 2ccb1e04c88..59ee0d0c78e 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 @@ -90,7 +90,7 @@ class boss_zereketh_the_unbound : public CreatureScript switch (eventId) { case EVENT_VOID_ZONE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) DoCast(target, SPELL_VOID_ZONE); events.ScheduleEvent(EVENT_VOID_ZONE, urand (6000, 10000)); break; @@ -100,7 +100,7 @@ class boss_zereketh_the_unbound : public CreatureScript events.ScheduleEvent(EVENT_SHADOW_NOVA, urand (6000, 10000)); break; case EVENT_SEED_OF_CORRUPTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100, true)) DoCast(target, SPELL_SEED_OF_CORRUPTION); events.ScheduleEvent(EVENT_SEED_OF_CORRUPTION, 12s, 20s); break; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 7d18b01133a..ebf092c6971 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -171,7 +171,7 @@ class boss_laj : public CreatureScript void JustSummoned(Creature* summon) override { if (summon && me->GetVictim()) - summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); } void UpdateAI(uint32 diff) override 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 4ecbae7ae46..5735da1de06 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 @@ -117,7 +117,7 @@ class boss_thorngrin_the_tender : public CreatureScript switch (eventId) { 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); DoCast(target, SPELL_SACRIFICE, true); diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index f03400a3f5e..d19f27f9e8c 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -139,7 +139,7 @@ class boss_doomlord_kazzak : public CreatureScript _events.ScheduleEvent(EVENT_VOID_BOLT, 15s, 18s); break; case EVENT_MARK_OF_KAZZAK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) DoCast(target, SPELL_MARK_OF_KAZZAK); _events.ScheduleEvent(EVENT_MARK_OF_KAZZAK, 20s); break; @@ -149,7 +149,7 @@ class boss_doomlord_kazzak : public CreatureScript _events.ScheduleEvent(EVENT_ENRAGE, 30s); 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 09ec6d30d07..dfc2326f996 100644 --- a/src/server/scripts/Outland/boss_doomwalker.cpp +++ b/src/server/scripts/Outland/boss_doomwalker.cpp @@ -144,7 +144,7 @@ class boss_doomwalker : public CreatureScript _events.ScheduleEvent(EVENT_QUAKE, 30s, 55s); 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, 7s, 27s); break; diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 8d244c3b240..6beb0ed5c53 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -496,7 +496,7 @@ public: }) .Schedule(Seconds(3), Seconds(6), [this](TaskContext ChainsOfIce) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_CHAINS_OF_ICE, true); ChainsOfIce.Repeat(Seconds(20),Seconds(25)); }); diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index a71daccef04..e7add25b91c 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1232,7 +1232,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 05118162c85..5c8a167c553 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -154,7 +154,7 @@ struct emerald_dragonAI : public WorldBossAI return; } - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, 0, -50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, 0, -50.0f, true)) DoCast(target, SPELL_SUMMON_PLAYER); DoMeleeAttackIfReady(); @@ -195,7 +195,7 @@ class npc_dream_fog : public CreatureScript 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(); |