diff options
Diffstat (limited to 'src/server/scripts/Kalimdor')
35 files changed, 72 insertions, 72 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index d55ccf9c6fd..5525c0494a6 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -183,7 +183,7 @@ public: { if (frostBoltVolleyTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FROST_BOLT_VOLLEY); frostBoltVolleyTimer = urand(5000, 8000); } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index d95f5fba9c7..d77bd64c6e0 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -94,7 +94,7 @@ public: events.ScheduleEvent(EVENT_MIND_BLAST, 7s, 9s); break; case EVENT_SLEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) { Talk(SAY_SLEEP); DoCast(target, SPELL_SLEEP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index d1df892822c..dab7b38f08b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -145,7 +145,7 @@ public: if (SwarmTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) DoCast(target, SPELL_CARRION_SWARM); SwarmTimer = urand(45000, 60000); @@ -156,7 +156,7 @@ public: { for (uint8 i = 0; i < 3; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) target->CastSpell(target, SPELL_SLEEP, true); } SleepTimer = 60000; @@ -169,7 +169,7 @@ public: } else AuraTimer -= diff; if (InfernoTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_INFERNO); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_INFERNO); InfernoTimer = 45000; Talk(SAY_INFERNO); } else InfernoTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 89e46b7b128..b81930728ae 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -350,22 +350,22 @@ public: } break; case EVENT_FINGER_OF_DEATH: - if (!SelectTarget(SELECT_TARGET_RANDOM, 0, 5.0f)) // Checks if there are no targets in melee range + if (!SelectTarget(SelectTargetMethod::Random, 0, 5.0f)) // Checks if there are no targets in melee range { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH); + DoCast(SelectTarget(SelectTargetMethod::Random, 0), SPELL_FINGER_OF_DEATH); events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 1s); } else events.ScheduleEvent(EVENT_FINGER_OF_DEATH, 5s); break; case EVENT_GRIP_OF_THE_LEGION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_GRIP_OF_THE_LEGION); events.ScheduleEvent(EVENT_GRIP_OF_THE_LEGION, 5s, 25s); break; case EVENT_AIR_BURST: Talk(SAY_AIR_BURST); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1)) DoCast(target, SPELL_AIR_BURST); //not on tank events.ScheduleEvent(EVENT_AIR_BURST, 25s, 40s); break; @@ -375,7 +375,7 @@ public: break; case EVENT_DOOMFIRE: Talk(SAY_DOOMFIRE); - if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 1)) + if (Unit* temp = SelectTarget(SelectTargetMethod::Random, 1)) SummonDoomfire(temp); else SummonDoomfire(me->GetVictim()); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp index 249617c24c2..cd7bc6c7868 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_azgalor.cpp @@ -148,13 +148,13 @@ public: if (RainTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true), SPELL_RAIN_OF_FIRE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 30, true), SPELL_RAIN_OF_FIRE); RainTimer = 20000 + rand32() % 15000; } else RainTimer -= diff; if (DoomTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true), SPELL_DOOM);//never on tank + DoCast(SelectTarget(SelectTargetMethod::Random, 1, 100, true), SPELL_DOOM);//never on tank DoomTimer = 45000 + rand32() % 5000; } else DoomTimer -= diff; @@ -264,7 +264,7 @@ public: if (CrippleTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true), SPELL_CRIPPLE); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_CRIPPLE); CrippleTimer = 25000 + rand32() % 5000; } else CrippleTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp index 7965934e3d8..47b1d5d3c84 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_rage_winterchill.cpp @@ -155,7 +155,7 @@ public: } else NovaTimer -= diff; if (IceboltTimer <= diff) { - DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0, 40, true), SPELL_ICEBOLT); + DoCast(SelectTarget(SelectTargetMethod::Random, 0, 40, true), SPELL_ICEBOLT); IceboltTimer = 11000 + rand32() % 20000; } else IceboltTimer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index 5ca9038eb17..e90cc8e0490 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -866,7 +866,7 @@ void hyjalAI::UpdateAI(uint32 diff) break; case TARGETTYPE_RANDOM: - target = SelectTarget(SELECT_TARGET_RANDOM, 0); + target = SelectTarget(SelectTargetMethod::Random, 0); break; case TARGETTYPE_VICTIM: diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp index f226cd3c577..3d6031d9c9f 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp @@ -755,7 +755,7 @@ public: void JustSummoned(Creature* summon) override { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 30, true); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 30, true); if (target) summon->Attack(target, false); summons.Summon(summon); @@ -1353,7 +1353,7 @@ public: if (forcemove) { forcemove = false; - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) me->Attack(target, false); } if (MoveTimer <= diff) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp index fcf9c1b54a0..9d41dc7d38b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_chrono_lord_epoch.cpp @@ -81,7 +81,7 @@ class boss_epoch : public CreatureScript switch (eventId) { case EVENT_CURSE_OF_EXERTION: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f, true)) DoCast(target, SPELL_CURSE_OF_EXERTION); events.ScheduleEvent(EVENT_CURSE_OF_EXERTION, 9300); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp index f2dbe13b2c0..ed8fd08153b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite_corruptor.cpp @@ -103,7 +103,7 @@ class boss_infinite_corruptor : public CreatureScript switch (eventId) { case EVENT_CORRUPTING_BLIGHT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_CORRUPTING_BLIGHT); events.ScheduleEvent(EVENT_CORRUPTING_BLIGHT, 15s); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 5ec8c5de7ec..b9679ee2ef7 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -150,7 +150,7 @@ class boss_mal_ganis : public CreatureScript events.Repeat(Seconds(6)); break; case EVENT_MIND_BLAST: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true, -int32(sSpellMgr->GetSpellIdForDifficulty(SPELL_SLEEP, me)))) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, -int32(sSpellMgr->GetSpellIdForDifficulty(SPELL_SLEEP, me)))) DoCast(target, SPELL_MIND_BLAST); else DoCastVictim(SPELL_MIND_BLAST); @@ -161,7 +161,7 @@ class boss_mal_ganis : public CreatureScript events.Repeat(Seconds(30)); break; case EVENT_SLEEP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f)) DoCast(target, SPELL_SLEEP); else DoCastVictim(SPELL_SLEEP); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 9bec3ac49d7..a9348669ba8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -72,9 +72,9 @@ class boss_meathook : public CreatureScript switch (eventId) { case EVENT_CHAIN: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, -20.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, -20.0f, true)) DoCast(target, SPELL_CONSTRICTING_CHAINS); - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) DoCast(target, SPELL_CONSTRICTING_CHAINS); else DoCastVictim(SPELL_CONSTRICTING_CHAINS); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index c7b7bcde2f4..5ce9cd94b1a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -97,13 +97,13 @@ class boss_salramm : public CreatureScript events.ScheduleEvent(EVENT_EXPLODE_GHOUL2, Seconds(25), Seconds(29)); break; case EVENT_SHADOW_BOLT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 40.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 40.0f, true)) DoCast(target, SPELL_SHADOW_BOLT); events.Repeat(Seconds(3)); break; case EVENT_STEAL_FLESH: Talk(SAY_STEAL_FLESH); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 50.0f, true)) DoCast(target, SPELL_STEAL_FLESH); events.Repeat(Seconds(15), Seconds(20)); break; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index d8e551652d4..03b1e019b39 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -898,7 +898,7 @@ public: { if (me->HasUnitState(UNIT_STATE_CASTING)) _exorcismCooldown = 0; - else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + else if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_EXORCISM); _exorcismCooldown = urandms(7, 14); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index 105888eea31..93c035c5e89 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -128,7 +128,7 @@ public: if (WingBuffet_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WING_BUFFET); WingBuffet_Timer = 25000 + rand32() % 10000; } else WingBuffet_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp index f99076b445a..e68c8ce6e79 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/boss_chrono_lord_deja.cpp @@ -125,7 +125,7 @@ public: events.ScheduleEvent(EVENT_TIME_LAPSE, 15s, 25s); break; case EVENT_ARCANE_DISCHARGE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_ARCANE_DISCHARGE); events.ScheduleEvent(EVENT_ARCANE_DISCHARGE, 20s, 30s); break; diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp index fddef2e003f..f48988ff13d 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -81,7 +81,7 @@ public: //Wrath if (WrathTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WRATH); WrathTimer = 8000; } diff --git a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp index 54d4f174cb6..cbd00e4f215 100644 --- a/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp +++ b/src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp @@ -92,7 +92,7 @@ public: //BoulderTimer if (BoulderTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_BOULDER); BoulderTimer = 10000; } diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 9e843abb17b..d659a05a82d 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -174,7 +174,7 @@ public: void JustSummoned(Creature* summoned) override { DoZoneInCombat(summoned); - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) summoned->AI()->AttackStart(target); switch (summoned->GetEntry()) @@ -237,7 +237,7 @@ public: // tank selection based on phase one. If tank is not there i take nearest one if (Unit* tank = ObjectAccessor::GetUnit(*me, tankGUID)) me->GetMotionMaster()->MoveChase(tank); - else if (Unit* newtarget = SelectTarget(SELECT_TARGET_MINDISTANCE, 0)) + else if (Unit* newtarget = SelectTarget(SelectTargetMethod::MinDistance, 0)) me->GetMotionMaster()->MoveChase(newtarget); events.ScheduleEvent(EVENT_BELLOWING_ROAR, 5s); events.ScheduleEvent(EVENT_FLAME_BREATH, 10s, 20s); @@ -451,7 +451,7 @@ public: case EVENT_FIREBALL: // Phase PHASE_BREATH if (!IsMoving) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_FIREBALL); events.ScheduleEvent(EVENT_FIREBALL, 8s); } diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp index 239feee5a7e..70ada5662e7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_tuten_kash.cpp @@ -78,7 +78,7 @@ public: switch (eventId) { case EVENT_WEB_SPRAY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, false)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, false)) { if (!target->HasAura(SPELL_WEB_SPRAY)) DoCast(target, SPELL_WEB_SPRAY); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp index 9d875df5cff..e6c8fd6edd0 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ayamiss.cpp @@ -109,7 +109,7 @@ class boss_ayamiss : public CreatureScript who->GetMotionMaster()->MovePoint(POINT_PARALYZE, AltarPos); break; case NPC_HORNET: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) who->AI()->AttackStart(target); break; } @@ -199,7 +199,7 @@ class boss_ayamiss : public CreatureScript events.ScheduleEvent(EVENT_POISON_STINGER, 2s, 3s); break; case EVENT_PARALYZE: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0, true)) { DoCast(target, SPELL_PARALYZE); instance->SetGuidData(DATA_PARALYZED, target->GetGUID()); @@ -211,7 +211,7 @@ class boss_ayamiss : public CreatureScript case EVENT_SWARMER_ATTACK: for (GuidList::iterator i = _swarmers.begin(); i != _swarmers.end(); ++i) if (Creature* swarmer = ObjectAccessor::GetCreature(*me, *i)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random)) swarmer->AI()->AttackStart(target); _swarmers.clear(); diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index ce7975cf808..842bec78257 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -120,7 +120,7 @@ class boss_buru : public CreatureScript events.ScheduleEvent(EVENT_GATHERING_SPEED, 9s); events.ScheduleEvent(EVENT_FULL_SPEED, 1min); - if (Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* victim = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { ResetThreatList(); AttackStart(victim); @@ -218,7 +218,7 @@ class npc_buru_egg : public CreatureScript { if (who->GetEntry() == NPC_HATCHLING) if (Creature* buru = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_BURU))) - if (Unit* target = buru->AI()->SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* target = buru->AI()->SelectTarget(SelectTargetMethod::Random)) who->AI()->AttackStart(target); } diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp index 270d4eb781e..397fc3b5093 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp @@ -107,7 +107,7 @@ class boss_kurinnaxx : public CreatureScript events.ScheduleEvent(EVENT_MORTAL_WOUND, 8s); break; case EVENT_SANDTRAP: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100, true)) target->CastSpell(target, SPELL_SANDTRAP, true); else if (Unit* victim = me->GetVictim()) victim->CastSpell(victim, SPELL_SANDTRAP, true); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp index 588d45a361a..bbd400785f5 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp @@ -192,7 +192,7 @@ public: //Charge_Timer if (Charge_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { DoCast(target, SPELL_CHARGE); //me->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, true, 1); @@ -269,7 +269,7 @@ public: for (uint8 i = 0; i < 10; ++i) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { if (Creature* Summoned = me->SummonCreature(15621, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 90000)) Summoned->AI()->AttackStart(target); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 105d57d5c49..8e339ee65bc 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -230,7 +230,7 @@ public: void SpawnEyeTentacle(float x, float y) { if (Creature* Spawned = DoSpawnCreature(NPC_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500)) - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) if (Spawned->AI()) Spawned->AI()->AttackStart(target); } @@ -269,7 +269,7 @@ public: if (BeamTimer <= diff) { //SPELL_GREEN_BEAM - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { me->InterruptNonMeleeSpells(false); DoCast(target, SPELL_GREEN_BEAM); @@ -285,7 +285,7 @@ public: //ClawTentacleTimer if (ClawTentacleTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { Creature* Spawned = nullptr; @@ -313,7 +313,7 @@ public: me->SetTarget(ObjectGuid::Empty); //Select random target for dark beam to start on - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { //Face our target DarkGlareAngle = me->GetAbsoluteAngle(target); @@ -945,7 +945,7 @@ public: //MindflayTimer if (MindflayTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(target, SPELL_MIND_FLAY); @@ -1025,7 +1025,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target) { me->KillSelf(); @@ -1142,7 +1142,7 @@ public: //Dissapear and reappear at new position me->SetVisible(false); - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (!target) { me->KillSelf(); @@ -1249,7 +1249,7 @@ public: //BeamTimer if (BeamTimer <= diff) { - Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0); + Unit* target = SelectTarget(SelectTargetMethod::Random, 0); if (target && !target->HasAura(SPELL_DIGESTIVE_ACID)) DoCast(target, SPELL_GREEN_BEAM); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp index 20b9aebe304..1bae3854a33 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp @@ -122,16 +122,16 @@ public: switch (urand(0, 2)) { case 0: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; case 1: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; case 2: - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); - SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); + SummonSpawn(SelectTarget(SelectTargetMethod::Random, 0)); break; } SpawnSpawns_Timer = urand(30000, 60000); @@ -143,7 +143,7 @@ public: { if (SpawnHatchlings_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 0.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 0.0f, true)) { DoCast(target, SPELL_ROOT); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 5503c4f80f2..101f5279a9b 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -104,7 +104,7 @@ public: // Wyvern Timer if (Wyvern_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_WYVERNSTING); Wyvern_Timer = urand(15000, 32000); } else Wyvern_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp index 289dcc70a2e..6e070f194af 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp @@ -123,7 +123,7 @@ public: //ChangeTarget_Timer if (Submerged && ChangeTarget_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoTeleportTo(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ()); ChangeTarget_Timer = urand(10000, 20000); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 0362f85f572..d11116f2441 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -121,7 +121,7 @@ public: if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { AddThreat(target, 1.0f); AttackStart(target); @@ -148,7 +148,7 @@ public: if (AggroReset_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { AddThreat(target, 1.0f); AttackStart(target); @@ -262,7 +262,7 @@ public: if (WhirlWindRandom_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { AddThreat(target, 1.0f); AttackStart(target); @@ -282,7 +282,7 @@ public: if (AggroReset_Timer <= diff) { //Attack random Gamers - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true)) { AddThreat(target, 1.0f); AttackStart(target); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 95cd0d4aaf9..232cc98bc9e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -106,7 +106,7 @@ class boss_skeram : public CreatureScript if (_flag & (1 << 7)) _flag = 0; - if (Unit* Target = SelectTarget(SELECT_TARGET_RANDOM)) + if (Unit* Target = SelectTarget(SelectTargetMethod::Random)) creature->AI()->AttackStart(Target); float ImageHealthPct; @@ -164,7 +164,7 @@ class boss_skeram : public CreatureScript events.ScheduleEvent(EVENT_ARCANE_EXPLOSION, 8s, 18s); break; case EVENT_FULLFILMENT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 45.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1, 45.0f, true)) DoCast(target, SPELL_TRUE_FULFILLMENT); events.ScheduleEvent(EVENT_FULLFILMENT, 20s, 30s); break; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp index 1b7601837fe..ac3ff3617d7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_twinemperors.cpp @@ -455,7 +455,7 @@ public: if (UpperCut_Timer <= diff) { - Unit* randomMelee = SelectTarget(SELECT_TARGET_RANDOM, 0, NOMINAL_MELEE_RANGE, true); + Unit* randomMelee = SelectTarget(SelectTargetMethod::Random, 0, NOMINAL_MELEE_RANGE, true); if (randomMelee) DoCast(randomMelee, SPELL_UPPERCUT); UpperCut_Timer = 15000 + rand32() % 15000; @@ -554,14 +554,14 @@ public: //Blizzard_Timer if (Blizzard_Timer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 45, true)) DoCast(target, SPELL_BLIZZARD); Blizzard_Timer = 15000 + rand32() % 15000; } else Blizzard_Timer -= diff; if (ArcaneBurst_Timer <= diff) { - if (Unit* mvic = SelectTarget(SELECT_TARGET_MINDISTANCE, 0, NOMINAL_MELEE_RANGE, true)) + if (Unit* mvic = SelectTarget(SelectTargetMethod::MinDistance, 0, NOMINAL_MELEE_RANGE, true)) { DoCast(mvic, SPELL_ARCANEBURST); ArcaneBurst_Timer = 5000; diff --git a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp index 1e9164cebc2..7da92e05f4d 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/boss_zum_rah.cpp @@ -112,7 +112,7 @@ public: DoCast(me,SPELL_HEALING_WAVE); break; case EVENT_SHADOWBOLT_VOLLEY: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_SHADOWBOLT_VOLLEY); events.ScheduleEvent(EVENT_SHADOWBOLT_VOLLEY, 9s); break; diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index b0c41a5c37c..7cc28b27847 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -103,7 +103,7 @@ class boss_azuregos : public CreatureScript switch (eventId) { case EVENT_MANA_STORM: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 60.0f, true)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 60.0f, true)) DoCast(target, SPELL_MANA_STORM); events.ScheduleEvent(EVENT_MANA_STORM, urand(7500, 12500)); break; diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 82496ea1df7..60cef76737a 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -467,7 +467,7 @@ public: events.ScheduleEvent(EVENT_CAST_CLEAVE, 8s, 10s); break; case EVENT_CAST_STARFALL: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_OMEN_STARFALL); events.ScheduleEvent(EVENT_CAST_STARFALL, 14s, 16s); break; diff --git a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 7202ae4d384..70f4909b359 100644 --- a/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp @@ -91,7 +91,7 @@ public: if (BerserkerChargeTimer <= diff) { - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) + if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) DoCast(target, SPELL_BERSERKER_CHARGE); BerserkerChargeTimer = 25000; } else BerserkerChargeTimer -= diff; |