nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 20:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/AI): convert SelectAggroTarget to enum class (#9893)

Browse Source
This commit is contained in:
Kargatum
2021-12-29 05:13:12 +07:00
committed by GitHub
parent e928d8b67e
commit c81891fc11
236 changed files with 622 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
View File

@@ -223,7 +223,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_FIREBALL, urand(3000, 4500));
break;
case EVENT_SPELL_FLAMESTRIKE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true))
{
me->CastSpell(target, SPELL_FLAMESTRIKE_SUMMON, true);
Talk(SAY_FLAMESTRIKE);

22
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
View File

@@ -223,7 +223,7 @@ public:
switch (urand(0, 2))
{
case 0:
target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true);
target = SelectTarget(SelectTargetMethod::Random, 0, 30, true);
break;
case 1:
target = me;
@@ -248,7 +248,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_IMMUNITY, 1000);
break;
case EVENT_SPELL_SW_PAIN:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
me->CastSpell(target, DUNGEON_MODE(SPELL_SHADOW_WORD_PAIN_N, SPELL_SHADOW_WORD_PAIN_H), false);
events.ScheduleEvent(EVENT_SPELL_SW_PAIN, 10000);
break;
@@ -463,7 +463,7 @@ public:
case EVENT_SPELL_VANISH:
me->CastSpell(me, SPELL_VANISH, false);
DoResetThreat();
if (Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* unit = SelectTarget(SelectTargetMethod::Random, 0))
me->AddThreat(unit, 1000.0f);
events.ScheduleEvent(EVENT_SPELL_VANISH, 30000);
@@ -556,7 +556,7 @@ public:
switch (actualEventId)
{
case EVENT_SPELL_IMMOLATE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
me->CastSpell(target, DUNGEON_MODE(SPELL_IMMOLATE_N, SPELL_IMMOLATE_H), false);
events.ScheduleEvent(EVENT_SPELL_IMMOLATE, 12000);
break;
@@ -565,17 +565,17 @@ public:
events.ScheduleEvent(EVENT_SPELL_SHADOW_BOLT, 5000);
break;
case EVENT_SPELL_SEED_OF_CORRUPTION:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
me->CastSpell(target, SPELL_SEED_OF_CORRUPTION, false);
events.ScheduleEvent(EVENT_SPELL_SEED_OF_CORRUPTION, 18000);
break;
case EVENT_SPELL_CURSE_OF_AGONY:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
me->CastSpell(target, DUNGEON_MODE(SPELL_CURSE_OF_AGONY_N, SPELL_CURSE_OF_AGONY_H), false);
events.ScheduleEvent(EVENT_SPELL_CURSE_OF_AGONY, 13000);
break;
case EVENT_SPELL_FEAR:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f))
me->CastSpell(target, SPELL_FEAR, false);
events.ScheduleEvent(EVENT_SPELL_FEAR, 15000);
break;
@@ -709,7 +709,7 @@ public:
switch (actualEventId)
{
case EVENT_SPELL_POLYMORPH:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
me->CastSpell(target, SPELL_POLYMORPH, false);
events.ScheduleEvent(EVENT_SPELL_POLYMORPH, 20000);
break;
@@ -722,7 +722,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_ICE_BLOCK, 1000);
break;
case EVENT_SPELL_BLIZZARD:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
me->CastSpell(target, DUNGEON_MODE(SPELL_BLIZZARD_N, SPELL_BLIZZARD_H), false);
events.ScheduleEvent(EVENT_SPELL_BLIZZARD, 20000);
break;
@@ -1015,7 +1015,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_WAR_STOMP, 120000);
break;
case EVENT_SPELL_PURGE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30.0f))
me->CastSpell(target, SPELL_PURGE, false);
events.ScheduleEvent(EVENT_SPELL_PURGE, 15000);
break;
@@ -1096,7 +1096,7 @@ public:
events.ScheduleEvent(EVENT_SPELL_ROCKET_LAUNCH, 20000);
break;
case EVENT_SPELL_IRON_BOMB:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 15.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0f))
me->CastSpell(target, DUNGEON_MODE(SPELL_FEL_IRON_BOMB_N, SPELL_FEL_IRON_BOMB_H), false);
events.ScheduleEvent(EVENT_SPELL_IRON_BOMB, 20000);
break;

4
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
View File

@@ -190,12 +190,12 @@ public:
switch (events.ExecuteEvent())
{
case EVENT_SPELL_DRAIN_LIFE:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
me->CastSpell(target, DUNGEON_MODE(SPELL_DRAIN_LIFE_N, SPELL_DRAIN_LIFE_H), false);
events.ScheduleEvent(EVENT_SPELL_DRAIN_LIFE, 10000, 1);
return;
case EVENT_SPELL_DRAIN_MANA:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false)))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, PowerUsersSelector(me, POWER_MANA, 40.0f, false)))
me->CastSpell(target, SPELL_DRAIN_MANA, false);
events.ScheduleEvent(EVENT_SPELL_DRAIN_MANA, 10000, 1);
return;

6
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
View File

@@ -116,7 +116,7 @@ public:
void JustSummoned(Creature* summon) override
{
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
{
summon->GetMotionMaster()->MoveFollow(target, 0.0f, 0.0f);
summon->CastSpell(target, SPELL_ENERGY_FEEDBACK_CHANNEL, false);
@@ -168,12 +168,12 @@ public:
events.ScheduleEvent(EVENT_HEALTH_CHECK, 0);
break;
case EVENT_SPELL_CHAIN_LIGHTNING:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
me->CastSpell(target, DUNGEON_MODE(SPELL_CHAIN_LIGHTNING_N, SPELL_CHAIN_LIGHTNING_H), false);
events.ScheduleEvent(EVENT_SPELL_CHAIN_LIGHTNING, 8000);
break;
case EVENT_SPELL_ARCANE_SHOCK:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 20.0f))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 20.0f))
me->CastSpell(target, DUNGEON_MODE(SPELL_ARCANE_SHOCK_N, SPELL_ARCANE_SHOCK_H), false);
events.ScheduleEvent(EVENT_SPELL_ARCANE_SHOCK, 8000);
break;