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/MagistersTerrace | |
| 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/MagistersTerrace')
4 files changed, 18 insertions, 18 deletions
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; |
