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

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

View File

@@ -134,12 +134,12 @@ public:
break;
case EVENT_SPELL_BLIZZARD:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45.0f, true))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45.0f, true))
me->CastSpell(target, SPELL_BLIZZARD, false);
events.RepeatEvent(15000);
break;
case EVENT_SPELL_MANA_DESTRUCTION:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 50.0f, true))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 50.0f, true))
me->CastSpell(target, SPELL_MANA_DESTRUCTION, false);
events.RepeatEvent(20000);
break;

View File

@@ -154,7 +154,7 @@ public:
events.RepeatEvent(urand(8000, 13000));
break;
case EVENT_SPELL_LIGHTNING_BOLT:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true))
me->CastSpell(target, SPELL_LIGHTNING_BOLT, false);
events.RepeatEvent(urand(15000, 25000));
break;

View File

@@ -99,7 +99,7 @@ public:
events.RepeatEvent(urand(8000, 10000));
break;
case EVENT_SPELL_OPTIC_LINK:
if (Unit* target = SelectTarget(SELECT_TARGET_FARTHEST, 0, 40.0f, true))
if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, 40.0f, true))
{
me->CastSpell(target, SPELL_OPTIC_LINK, false);
events.RepeatEvent(urand(18000, 21000));

View File

@@ -113,7 +113,7 @@ public:
events.RepeatEvent(20000);
break;
case EVENT_SPELL_VOID_SHIFT:
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true))
if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true))
{
me->CastSpell(target, SPELL_VOID_SHIFT, false);
me->Whisper("Gaze... into the void.", LANG_UNIVERSAL, target->ToPlayer());

View File

@@ -525,7 +525,7 @@ public:
if (uiImpaleTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 5.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_IMPALE);
uiImpaleTimer = 4000;
@@ -600,7 +600,7 @@ public:
if (uiArcainBarrageTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_ARCANE_BARRAGE);
uiArcainBarrageTimer = 6000;
@@ -619,7 +619,7 @@ public:
if (uiFrostboltTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_FROSTBOLT);
uiFrostboltTimer = 6000;
@@ -676,7 +676,7 @@ public:
{
if (uiSpellLockTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_SPELL_LOCK);
uiSpellLockTimer = 9000;
@@ -774,7 +774,7 @@ public:
{
if (uiTacticalBlinkTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_TACTICAL_BLINK);
uiTacticalBlinkTimer = 10000;
@@ -786,7 +786,7 @@ public:
{
if (uiBackstabTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_NEAREST, 0, 5.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::MaxDistance, 0, 5.0f, true);
if (pTarget && !pTarget->HasInArc(M_PI, me))
DoCast(pTarget, SPELL_BACKSTAB);
TacticalBlinkCasted = false;
@@ -838,7 +838,7 @@ public:
{
if (uiArcaneBlastTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_ARCANE_BLAST);
uiArcaneBlastTimer = 6000;
@@ -847,7 +847,7 @@ public:
if (uiSlowTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_SLOW);
uiSlowTimer = 5000;
@@ -859,7 +859,7 @@ public:
{
if (uiChainsOfIceTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 30.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_CHAINS_OF_ICE);
uiChainsOfIceTimer = 7000;
@@ -962,7 +962,7 @@ public:
if (uiArcaneStreamTimer <= diff)
{
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 35.0f, true);
Unit* pTarget = SelectTarget(SelectTargetMethod::Random, 0, 35.0f, true);
if (pTarget)
DoCast(pTarget, SPELL_ARCANE_STREAM);
uiArcaneStreamTimer = urand(0, 5000) + 5000;