diff options
| author | Peter Keresztes Schmidt <carbenium@outlook.com> | 2020-06-16 23:08:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 23:08:56 +0200 |
| commit | 418c3b1fd50664aad035bd975a65281e82ba2dea (patch) | |
| tree | 71878e2775bdbe99b8973745e9bb707d02b03869 /src/server/scripts/EasternKingdoms | |
| parent | 60e813df6b7dfe599266cf36ddd52ba204917267 (diff) | |
game/AI: Convert SelectAggroTarget to enum class (#24818)
* game/AI: Convert SelectAggroTarget to enum class
* game/AI: Rename SelectAggroTarget to SelectTargetMethod
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
74 files changed, 177 insertions, 177 deletions
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/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 42eaf0e9801..8132a4038f4 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 4b8a78933de..6a1393e7cf3 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 4550c6ec198..c81ee6f2597 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp @@ -175,7 +175,7 @@ struct boss_the_beast : public BossAI events.Repeat(Seconds(10)); break; case EVENT_IMMOLATE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.f, true)) DoCast(target, SPELL_IMMOLATE); events.Repeat(Seconds(8)); break; @@ -184,7 +184,7 @@ struct boss_the_beast : public BossAI events.Repeat(Seconds(20)); break; case EVENT_BERSERKER_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 38.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 38.f, true)) DoCast(target, SPELL_BERSERKER_CHARGE); events.Repeat(Seconds(15), Seconds(23)); break; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp index a1a53ce17ef..1af0e80f5f7 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp @@ -316,7 +316,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; } @@ -324,12 +324,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; @@ -513,7 +513,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 c276bb7b743..0279185fe72 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 f4a3e57c6c6..d19b5a9795a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -97,12 +97,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 b1d6b0adeda..b62ca197dcf 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp @@ -100,7 +100,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 a54ed40a464..feaa4c4d14a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp @@ -96,7 +96,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 d2163914443..14d26825b95 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp @@ -141,7 +141,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 01d89e4bde7..14c539058c3 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->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); 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 596cf9b6f73..fef44a03193 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 1a588e5cb0b..5de4b37aec9 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; @@ -423,7 +423,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 @@ -431,7 +431,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; @@ -575,7 +575,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 9368239ba6a..448dcd05bbe 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 77f7edc16c0..43b67dbf033 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 324a82f0a06..ea731485b1a 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp @@ -297,7 +297,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; @@ -339,7 +339,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 b5b546d5e0b..5b0f8dd0c38 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 dedeb2aebb9..2238dcb13bf 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -255,7 +255,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: @@ -304,7 +304,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; @@ -316,7 +316,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 b1925a4b235..b9697673840 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp @@ -313,7 +313,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)) @@ -332,7 +332,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; @@ -527,7 +527,7 @@ public: { DoCast(me, SPELL_VANISH); - Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* unit = SelectTarget(SelectTargetMethod::Random, 0); ResetThreatList(); @@ -651,7 +651,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; @@ -659,7 +659,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; @@ -667,7 +667,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; @@ -812,7 +812,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; @@ -827,7 +827,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; @@ -955,7 +955,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); } @@ -1189,7 +1189,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 ea181382b56..7499e3cd13f 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 1985e03ea6a..ed4586c4527 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 5368477841c..cb47ef95aec 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp @@ -1486,7 +1486,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 6e93fcdaef0..9b11fbbac44 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -688,7 +688,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 42e48427603..8506eb0adcc 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 dae8dea2f9e..eef824e3d03 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 4536e944085..5c3f91aec71 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 0a0744080d1..dfb0f40a4bc 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -280,7 +280,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 8c3bf09a448..64eeb39b59a 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 6a3d40ef67c..0d3633acae4 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 b7f7b41c4a8..6acdb18950a 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 83d84a99eaf..16d2a972dad 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -527,7 +527,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 20d11acebab..fb56e4d2483 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp @@ -674,7 +674,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); @@ -758,7 +758,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; } @@ -851,7 +851,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) @@ -1056,7 +1056,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; } @@ -1400,7 +1400,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 9633e9458e2..64529c8fd0a 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->RemoveFlag(UNIT_FIELD_FLAGS, 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/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 18efaf22e28..367e2ad8d1a 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -233,7 +233,7 @@ class boss_akilzon : public CreatureScript { case EVENT_STATIC_DISRUPTION: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (!target) target = me->GetVictim(); if (target) @@ -248,7 +248,7 @@ class boss_akilzon : public CreatureScript } case EVENT_GUST_OF_WIND: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1); if (!target) target = me->GetVictim(); if (target) @@ -262,7 +262,7 @@ class boss_akilzon : public CreatureScript break; case EVENT_ELECTRICAL_STORM: { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50, true); if (!target) { EnterEvadeMode(); @@ -331,7 +331,7 @@ class boss_akilzon : public CreatureScript Unit* bird = ObjectAccessor::GetUnit(*me, BirdGUIDs[i]); if (!bird) //they despawned on die { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { x = target->GetPositionX() + irand(-10, 10); y = target->GetPositionY() + irand(-10, 10); @@ -436,7 +436,7 @@ class npc_akilzon_eagle : public CreatureScript if (arrived) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { float x, y, z; if (EagleSwoop_Timer) diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp index f0d930cefd1..27aa3569675 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp @@ -258,7 +258,7 @@ class boss_halazzi : public CreatureScript if (ShockTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (target->IsNonMeleeSpellCast(false)) DoCast(target, SPELL_EARTHSHOCK); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 0e828f5b5bf..42a114ba193 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -419,7 +419,7 @@ class boss_hexlord_malacrass : public CreatureScript if (SiphonSoul_Timer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 70, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 70, true); Unit* trigger = DoSpawnCreature(NPC_TEMP_TRIGGER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 30000); if (!target || !trigger) { @@ -481,7 +481,7 @@ class boss_hexlord_malacrass : public CreatureScript break; case ABILITY_TARGET_ENEMY: default: - target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true); + target = SelectTarget(SelectTargetMethod::Random, 0, 100, true); break; case ABILITY_TARGET_HEAL: target = DoSelectLowestHpFriendly(50.f, 0); @@ -639,7 +639,7 @@ class boss_alyson_antille : public CreatureScript if (urand(0, 1)) target = DoSelectLowestHpFriendly(50, 0); else - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); if (target) DoCast(target, SPELL_DISPEL_MAGIC, false); } @@ -657,7 +657,7 @@ class boss_alyson_antille : public CreatureScript DoCast(target, SPELL_DISPEL_MAGIC, false); } else - me->CastSpell(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DISPEL_MAGIC, false); + me->CastSpell(SelectUnit(SelectTargetMethod::Random, 0), SPELL_DISPEL_MAGIC, false); dispelmagic_timer = 12000; } @@ -882,7 +882,7 @@ class boss_slither : public CreatureScript if (venomspit_timer <= diff) { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(victim, SPELL_VENOM_SPIT, false); venomspit_timer = 2500; } @@ -988,7 +988,7 @@ class boss_koragg : public CreatureScript } if (coldstare_timer <= diff) { - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(victim, SPELL_COLD_STARE, false); coldstare_timer = 12000; } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp index ff42de1e54b..a60bc4e55e3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp @@ -412,7 +412,7 @@ class boss_janalai : public CreatureScript if (FireBreathTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->AttackStop(); me->GetMotionMaster()->Clear(); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp index b7072f7b650..5b6b7544f10 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp @@ -383,7 +383,7 @@ class boss_nalorakk : public CreatureScript if (Surge_Timer <= diff) { Talk(YELL_SURGE); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 45, true); if (target) DoCast(target, SPELL_SURGE); Surge_Timer = urand(15000, 20000); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp index 367b64cc3c5..fa8a1e9808c 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -327,7 +327,7 @@ class boss_zuljin : public CreatureScript Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true); Vortex->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); Vortex->SetSpeedRate(MOVE_RUN, 1.0f); - Vortex->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + Vortex->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); DoZoneInCombat(Vortex); } } @@ -392,7 +392,7 @@ class boss_zuljin : public CreatureScript if (Grievous_Throw_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_GRIEVOUS_THROW, false); Grievous_Throw_Timer = 10000; } @@ -426,7 +426,7 @@ class boss_zuljin : public CreatureScript { if (!TankGUID) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (me->GetVictim()) TankGUID = me->EnsureVictim()->GetGUID(); @@ -446,7 +446,7 @@ class boss_zuljin : public CreatureScript if (!target || !target->isTargetableForAttack()) target = ObjectAccessor::GetUnit(*me, TankGUID); if (!target || !target->isTargetableForAttack()) - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); if (target) { AttackStart(target); @@ -482,7 +482,7 @@ class boss_zuljin : public CreatureScript { if (!TankGUID) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { TankGUID = me->EnsureVictim()->GetGUID(); me->SetSpeedRate(MOVE_RUN, 5.0f); @@ -496,7 +496,7 @@ class boss_zuljin : public CreatureScript Unit* target = me->GetVictim(); if (!target || !target->isTargetableForAttack()) { - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); AttackStart(target); } if (target) @@ -513,7 +513,7 @@ class boss_zuljin : public CreatureScript TankGUID.Clear(); } else - AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); } } else @@ -537,7 +537,7 @@ class boss_zuljin : public CreatureScript if (Pillar_Of_Fire_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SUMMON_PILLAR); Pillar_Of_Fire_Timer = 10000; } @@ -546,7 +546,7 @@ class boss_zuljin : public CreatureScript if (Flame_Breath_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->SetFacingToObject(target); DoCast(me, SPELL_FLAME_BREATH); Flame_Breath_Timer = 10000; @@ -596,7 +596,7 @@ class npc_zuljin_vortex : public CreatureScript { //if the vortex reach the target, it change his target to another player if (me->IsWithinMeleeRange(me->GetVictim())) - AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0)); + AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp index 2261fa84bb3..abbab3303e3 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp @@ -218,7 +218,7 @@ class boss_arlokk : public CreatureScript break; case EVENT_MARK_OF_ARLOKK: { - Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, urand(1, 3), 0.0f, false, true, -SPELL_MARK_OF_ARLOKK); + Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, urand(1, 3), 0.0f, false, true, -SPELL_MARK_OF_ARLOKK); if (!target) target = me->GetVictim(); if (target) @@ -263,7 +263,7 @@ class boss_arlokk : public CreatureScript case EVENT_VISIBLE: me->SetReactState(REACT_AGGRESSIVE); me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE|UNIT_FLAG_NOT_SELECTABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) AttackStart(target); me->RemoveAura(SPELL_SUPER_INVIS); me->RemoveAura(SPELL_VANISH); @@ -410,7 +410,7 @@ class npc_zulian_prowler : public CreatureScript switch (eventId) { case EVENT_ATTACK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0.0f, 100, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0.0f, 100, false)) me->Attack(target, true); break; default: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp index fe7f35a45b9..4e56eb23ed2 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp @@ -79,7 +79,7 @@ class boss_grilek : public CreatureScript // grilek ModifyThreatByPercent(victim, -50); } - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) AttackStart(target); events.ScheduleEvent(EVENT_AVATAR, 25s, 35s); break; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp index 5293177f6cc..c571739574e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp @@ -126,7 +126,7 @@ class boss_hakkar : public CreatureScript events.ScheduleEvent(EVENT_CORRUPTED_BLOOD, 30s, 45s); break; case EVENT_CAUSE_INSANITY: - // DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CAUSE_INSANITY); + // DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_CAUSE_INSANITY); // events.ScheduleEvent(EVENT_CAUSE_INSANITY, 35s, 45s); break; case EVENT_WILL_OF_HAKKAR: @@ -134,9 +134,9 @@ class boss_hakkar : public CreatureScript // Mind Control is only triggered when there is more than one unit currently fighting Hakkar, including pets/guardians // But it is only actually cast on the player with the highest threat std::list<Unit*> unitList; - SelectTargetList(unitList, 2, SELECT_TARGET_MAXTHREAT, 0, 0.0f, false); + SelectTargetList(unitList, 2, SelectTargetMethod::MaxThreat, 0, 0.0f, false); if (unitList.size() > 1) - DoCast(SelectTarget(SELECT_TARGET_MAXTHREAT, 0, 100, true), SPELL_WILL_OF_HAKKAR); + DoCast(SelectTarget(SelectTargetMethod::MaxThreat, 0, 100, true), SPELL_WILL_OF_HAKKAR); events.ScheduleEvent(EVENT_WILL_OF_HAKKAR, 25s, 35s); break; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp index 8e07f1eac40..068e15dab55 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp @@ -87,7 +87,7 @@ class boss_hazzarah : public CreatureScript // We will just use one model for the beginning for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) if (TempSummon* illusion = me->SummonCreature(NPC_NIGHTMARE_ILLUSION, target->GetPosition(), TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000)) illusion->AI()->AttackStart(target); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp index 865c0ca93bd..6ab7743e872 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp @@ -142,7 +142,7 @@ class boss_jeklik : public CreatureScript switch (eventId) { case EVENT_CHARGE_JEKLIK: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) { DoCast(target, SPELL_CHARGE); AttackStart(target); @@ -158,14 +158,14 @@ class boss_jeklik : public CreatureScript events.ScheduleEvent(EVENT_SCREECH, urand(18000, 26000), 0, PHASE_ONE); break; case EVENT_SPAWN_BATS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) for (uint8 i = 0; i < 6; ++i) if (TempSummon* bat = me->SummonCreature(NPC_BLOODSEEKER_BAT, SpawnBat[i], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000)) bat->AI()->AttackStart(target); events.ScheduleEvent(EVENT_SPAWN_BATS, 1min, 0, PHASE_ONE); break; case EVENT_SHADOW_WORD_PAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) DoCast(target, SPELL_SHADOW_WORD_PAIN); events.ScheduleEvent(EVENT_SHADOW_WORD_PAIN, urand(12000, 18000), 0, PHASE_TWO); break; @@ -184,7 +184,7 @@ class boss_jeklik : public CreatureScript events.ScheduleEvent(EVENT_GREATER_HEAL, urand(25000, 35000), 0, PHASE_TWO); break; case EVENT_SPAWN_FLYING_BATS: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) if (TempSummon* flyingBat = me->SummonCreature(NPC_FRENZIED_BAT, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ() + 15.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000)) flyingBat->AI()->AttackStart(target); events.ScheduleEvent(EVENT_SPAWN_FLYING_BATS, urand(10000, 15000), 0, PHASE_TWO); @@ -240,7 +240,7 @@ class npc_batrider : public CreatureScript if (_bombTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) { DoCast(target, SPELL_BOMB); _bombTimer = 5000; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp index 6a643276187..29401b535c7 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp @@ -130,7 +130,7 @@ class boss_jindo : public CreatureScript break; case EVENT_DELUSIONS_OF_JINDO: // Casting the delusion curse with a shade so shade will attack the same target with the curse. - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoCast(target, SPELL_SHADE_OF_JINDO, true); DoCast(target, SPELL_DELUSIONS_OF_JINDO); @@ -139,7 +139,7 @@ class boss_jindo : public CreatureScript break; case EVENT_TELEPORT: // Teleports a random player and spawns 9 Sacrificed Trolls to attack player - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoTeleportPlayer(target, TeleportLoc.GetPositionX(), TeleportLoc.GetPositionY(), TeleportLoc.GetPositionZ(), TeleportLoc.GetOrientation()); if (GetThreat(me->GetVictim())) diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index acde201a8d3..40efd8ea939 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -258,7 +258,7 @@ class boss_mandokir : public CreatureScript events.ScheduleEvent(EVENT_WHIRLWIND, 22s, 26s); break; case EVENT_WATCH_PLAYER: - if (Unit* player = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* player = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { DoCast(player, SPELL_WATCH); Talk(SAY_WATCH, player); @@ -266,7 +266,7 @@ class boss_mandokir : public CreatureScript events.ScheduleEvent(EVENT_WATCH_PLAYER, 12s, 15s); break; case EVENT_CHARGE_PLAYER: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_CHARGE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 40, true), SPELL_CHARGE); events.ScheduleEvent(EVENT_CHARGE_PLAYER, 22s, 30s); break; default: diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp index 21cbc8f939a..455b61c0d3f 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp @@ -118,7 +118,7 @@ class boss_marli : public CreatureScript void JustSummoned(Creature* creature) override { - creature->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)); + creature->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)); summons.Summon(creature); } @@ -184,7 +184,7 @@ class boss_marli : public CreatureScript int i = 0; while (i++ < 3) // max 3 tries to get a random target with power_mana { - target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true); // not aggro leader + target = SelectTarget(SelectTargetMethod::Random, 1, 100, true); // not aggro leader if (target && target->GetPowerType() == POWER_MANA) break; } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp index fb89448d998..e6d3e8c0b0b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp @@ -80,7 +80,7 @@ class boss_renataki : public CreatureScript { if (_ambushTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); DoCast(target, SPELL_AMBUSH); @@ -113,7 +113,7 @@ class boss_renataki : public CreatureScript { if (_aggroTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) { if (GetThreat(me->GetVictim())) ModifyThreatByPercent(me->GetVictim(), -50); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp index 2ad920d44b9..1994c204fbe 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp @@ -321,7 +321,7 @@ class boss_thekal : public CreatureScript events.ScheduleEvent(EVENT_FORCEPUNCH, 16s, 21s, 0, PHASE_TWO); break; case EVENT_CHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.f, true)) { ResetThreatList(); AttackStart(target); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp index dd366b476b3..7ad9dae85d1 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp @@ -192,7 +192,7 @@ class boss_venoxis : public CreatureScript for (uint8 i = 0; i < 10; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_MAXTHREAT, i)) + if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat, i)) // check if target is within melee-distance if (me->IsWithinMeleeRange(target)) ++_inMeleeRange; @@ -205,12 +205,12 @@ class boss_venoxis : public CreatureScript events.ScheduleEvent(EVENT_HOLY_NOVA, 45s, 75s, 0, PHASE_ONE); break; case EVENT_HOLY_FIRE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_HOLY_FIRE); events.ScheduleEvent(EVENT_HOLY_FIRE, 45s, 60s, 0, PHASE_ONE); break; case EVENT_HOLY_WRATH: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_HOLY_WRATH); events.ScheduleEvent(EVENT_HOLY_WRATH, 45s, 60s, 0, PHASE_ONE); break; @@ -220,17 +220,17 @@ class boss_venoxis : public CreatureScript // case EVENT_VENOM_SPIT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_VENOM_SPIT); events.ScheduleEvent(EVENT_VENOM_SPIT, 5s, 15s, 0, PHASE_TWO); break; case EVENT_POISON_CLOUD: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_POISON_CLOUD); events.ScheduleEvent(EVENT_POISON_CLOUD, 15s, 20s, 0, PHASE_TWO); break; case EVENT_PARASITIC_SERPENT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) DoCast(target, SPELL_SUMMON_PARASITIC_SERPENT); events.ScheduleEvent(EVENT_PARASITIC_SERPENT, 15s, 0, PHASE_TWO); break; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp index 977716e1081..70e1bdabb1a 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp @@ -66,7 +66,7 @@ class boss_wushoolay : public CreatureScript events.ScheduleEvent(EVENT_LIGHTNINGCLOUD, 15s, 20s); break; case EVENT_LIGHTNINGWAVE: - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_LIGHTNINGWAVE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_LIGHTNINGWAVE); events.ScheduleEvent(EVENT_LIGHTNINGWAVE, 12s, 16s); break; default: diff --git a/src/server/scripts/EasternKingdoms/zone_duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 9d9c804a4dc..2256ddcdc29 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; |