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/Outland/TempestKeep | |
| 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/Outland/TempestKeep')
10 files changed, 30 insertions, 30 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index c0ae6c28057..0c0653c803e 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 80e77e5bdc7..592a1b6f1da 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 5817e0b2bff..e8c71e22dbf 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->RemoveFlag(UNIT_FIELD_FLAGS, 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->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) advisor->AI()->AttackStart(target); } ++_advisorCounter; @@ -714,7 +714,7 @@ class boss_kaelthas : public CreatureScript me->RemoveFlag(UNIT_FIELD_FLAGS, 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 c11b29fbfc5..64632707946 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 6b9d2533fed..9939c320ad3 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 ee6c4d971c4..78005f85a1b 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); |
