josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts: Removed duplicate target selection function (SelectUnit), there is only SelectTarget now

Browse Source
This commit is contained in:
Shauren
2011-03-09 21:32:04 +01:00
parent 6e1e6957e2
commit c2c40a4750
169 changed files with 420 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/UnitAI.cpp
+1 -29
View File
@@ -87,35 +87,7 @@ Unit* UnitAI::SelectTarget(SelectAggroTarget targetType, uint32 position, float
void UnitAI::SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAggroTarget targetType, float dist, bool playerOnly, int32 aura)
{
const std::list<HostileReference*> &threatlist = me->getThreatManager().getThreatList();
if (threatlist.empty())
return;
DefaultTargetSelector targetSelector(me, dist,playerOnly, aura);
for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
if (targetSelector((*itr)->getTarget()))
targetList.push_back((*itr)->getTarget());
if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST)
targetList.sort(Trinity::ObjectDistanceOrderPred(me));
if (targetType == SELECT_TARGET_FARTHEST || targetType == SELECT_TARGET_BOTTOMAGGRO)
targetList.reverse();
if (targetList.size() < num)
return;
if (targetType == SELECT_TARGET_RANDOM)
{
while (num < targetList.size()) {
std::list<Unit*>::iterator itr = targetList.begin();
advance(itr, urand(0, targetList.size()-1));
targetList.erase(itr);
}
}
else
targetList.resize(num);
SelectTargetList(targetList, DefaultTargetSelector(me, dist, playerOnly, aura), num, targetType);
}
float UnitAI::DoGetSpellMaxRange(uint32 spellId, bool positive)
src/server/game/AI/CoreAI/UnitAI.h
+26 -66
View File
@@ -126,20 +126,16 @@ class UnitAI
Unit* SelectTarget(SelectAggroTarget targetType, uint32 position = 0, float dist = 0.0f, bool playerOnly = false, int32 aura = 0);
// Select the targets satifying the predicate.
// predicate shall extend std::unary_function<Unit *, bool>
template<class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE predicate)
template <class PREDICATE> Unit* SelectTarget(SelectAggroTarget targetType, uint32 position, PREDICATE predicate)
{
const std::list<HostileReference *> &threatlist = me->getThreatManager().getThreatList();
std::list<Unit*> targetList;
if (position >= threatlist.size())
return NULL;
std::list<Unit*> targetList;
for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
HostileReference* ref = (*itr);
if (predicate(ref->getTarget()))
targetList.push_back(ref->getTarget());
}
if (predicate((*itr)->getTarget()))
targetList.push_back((*itr)->getTarget());
if (position >= targetList.size())
return NULL;
@@ -147,33 +143,30 @@ class UnitAI
if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST)
targetList.sort(Trinity::ObjectDistanceOrderPred(me));
switch(targetType)
switch (targetType)
{
case SELECT_TARGET_NEAREST:
case SELECT_TARGET_TOPAGGRO:
{
std::list<Unit*>::iterator itr = targetList.begin();
advance(itr, position);
std::advance(itr, position);
return *itr;
}
break;
case SELECT_TARGET_FARTHEST:
case SELECT_TARGET_BOTTOMAGGRO:
{
std::list<Unit*>::reverse_iterator ritr = targetList.rbegin();
advance(ritr, position);
std::advance(ritr, position);
return *ritr;
}
break;
case SELECT_TARGET_RANDOM:
{
std::list<Unit*>::iterator itr = targetList.begin();
advance(itr, urand(position, targetList.size()-1));
std::advance(itr, urand(position, targetList.size()-1));
return *itr;
}
break;
default:
break;
}
return NULL;
@@ -182,62 +175,29 @@ class UnitAI
void SelectTargetList(std::list<Unit*> &targetList, uint32 num, SelectAggroTarget targetType, float dist = 0.0f, bool playerOnly = false, int32 aura = 0);
// Select the targets satifying the predicate.
// predicate shall extend std::unary_function<Unit *, bool>
template<class PREDICATE> void SelectTargetList(std::list<Unit*> &targetList, PREDICATE predicate, uint32 maxTargets, SelectAggroTarget targetType)
template <class PREDICATE> void SelectTargetList(std::list<Unit*> &targetList, PREDICATE predicate, uint32 maxTargets, SelectAggroTarget targetType)
{
std::list<HostileReference *> const &threatlist = me->getThreatManager().getThreatList();
std::list<HostileReference*>::const_iterator itr;
std::list<HostileReference*> const& threatlist = me->getThreatManager().getThreatList();
if (threatlist.empty())
return;
for (itr = threatlist.begin(); itr != threatlist.end(); ++itr)
{
HostileReference* ref = (*itr);
if (predicate(ref->getTarget()))
targetList.push_back(ref->getTarget());
}
for (std::list<HostileReference*>::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
if (predicate((*itr)->getTarget()))
targetList.push_back((*itr)->getTarget());
if (targetList.size() < maxTargets)
return;
if (targetType == SELECT_TARGET_NEAREST || targetType == SELECT_TARGET_FARTHEST)
targetList.sort(Trinity::ObjectDistanceOrderPred(me));
switch(targetType)
{
case SELECT_TARGET_NEAREST:
case SELECT_TARGET_TOPAGGRO:
{
// Already sorted
if (!maxTargets || maxTargets >= targetList.size()) // Do not filter
return;
if (targetType == SELECT_TARGET_FARTHEST || targetType == SELECT_TARGET_BOTTOMAGGRO)
targetList.reverse();
std::list<Unit*>::iterator itr = targetList.begin();
advance(itr, maxTargets);
for (; itr != targetList.end();)
targetList.erase(itr++); // Filter out any element more than maxTargets
}
break;
case SELECT_TARGET_FARTHEST:
case SELECT_TARGET_BOTTOMAGGRO:
{
if (maxTargets >= targetList.size()) // Do not filter
return;
// Sort (reverse)
targetList.reverse();
std::list<Unit*>::iterator itr = targetList.begin();
for (uint32 i = 0; i < maxTargets; ++i)
targetList.pop_back(); // Filter out any element more than maxTarget
}
break;
case SELECT_TARGET_RANDOM:
{
while (maxTargets < targetList.size())
{
std::list<Unit*>::iterator itr = targetList.begin();
advance(itr, urand(0, targetList.size()-1));
targetList.erase(itr);
}
}
break;
}
if (targetType == SELECT_TARGET_RANDOM)
Trinity::RandomResizeList(targetList, maxTargets);
else
targetList.resize(maxTargets);
}
// Called at any Damage to any victim (before damage apply)
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
-32
View File
@@ -192,38 +192,6 @@ Creature* ScriptedAI::DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ,
return me->SummonCreature(uiId, me->GetPositionX()+fX, me->GetPositionY()+fY, me->GetPositionZ()+fZ, fAngle, (TempSummonType)uiType, uiDespawntime);
}
Unit* ScriptedAI::SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition)
{
//ThreatList m_threatlist;
std::list<HostileReference*>& threatlist = me->getThreatManager().getThreatList();
std::list<HostileReference*>::iterator itr = threatlist.begin();
std::list<HostileReference*>::reverse_iterator ritr = threatlist.rbegin();
if (uiPosition >= threatlist.size() || !threatlist.size())
return NULL;
switch (pTarget)
{
case SELECT_TARGET_RANDOM:
advance (itr , uiPosition + (rand() % (threatlist.size() - uiPosition)));
return Unit::GetUnit((*me),(*itr)->getUnitGuid());
break;
case SELECT_TARGET_TOPAGGRO:
advance (itr , uiPosition);
return Unit::GetUnit((*me),(*itr)->getUnitGuid());
break;
case SELECT_TARGET_BOTTOMAGGRO:
advance (ritr , uiPosition);
return Unit::GetUnit((*me),(*ritr)->getUnitGuid());
break;
default:
return UnitAI::SelectTarget(pTarget, uiPosition);
}
}
SpellEntry const* ScriptedAI::SelectSpell(Unit* pTarget, uint32 uiSchool, uint32 uiMechanic, SelectTargetType selectTargets, uint32 uiPowerCostMin, uint32 uiPowerCostMax, float fRangeMin, float fRangeMax, SelectEffect selectEffects)
{
//No target so we can't cast
src/server/game/AI/ScriptedAI/ScriptedCreature.h
-3
View File
@@ -152,9 +152,6 @@ struct ScriptedAI : public CreatureAI
//Spawns a creature relative to me
Creature* DoSpawnCreature(uint32 uiId, float fX, float fY, float fZ, float fAngle, uint32 uiType, uint32 uiDespawntime);
//Selects a unit from the creature's current aggro list
Unit* SelectUnit(SelectAggroTarget pTarget, uint32 uiPosition);
bool HealthBelowPct(uint32 pct) const { return me->HealthBelowPct(pct); }
bool HealthAbovePct(uint32 pct) const { return me->HealthAbovePct(pct); }
src/server/game/AI/ScriptedAI/ScriptedSimpleAI.cpp
+9 -9
View File
@@ -134,13 +134,13 @@ void SimpleAI::KilledUnit(Unit *victim)
pTarget = me->getVictim();
break;
case CAST_HOSTILE_SECOND_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1);
break;
case CAST_HOSTILE_LAST_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0);
break;
case CAST_HOSTILE_RANDOM:
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
break;
case CAST_KILLEDUNIT_VICTIM:
pTarget = victim;
@@ -182,13 +182,13 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage)
pTarget = me->getVictim();
break;
case CAST_HOSTILE_SECOND_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1);
break;
case CAST_HOSTILE_LAST_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0);
break;
case CAST_HOSTILE_RANDOM:
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
break;
case CAST_JUSTDIED_KILLER:
pTarget = killer;
@@ -233,13 +233,13 @@ void SimpleAI::UpdateAI(const uint32 diff)
pTarget = me->getVictim();
break;
case CAST_HOSTILE_SECOND_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,1);
pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,1);
break;
case CAST_HOSTILE_LAST_AGGRO:
pTarget = SelectUnit(SELECT_TARGET_BOTTOMAGGRO,0);
pTarget = SelectTarget(SELECT_TARGET_BOTTOMAGGRO,0);
break;
case CAST_HOSTILE_RANDOM:
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
break;
}
src/server/scripts/EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ public:
if (HandOfThaurissan_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_HANDOFTHAURISSAN);
//3 Hands of Thaurissan will be casted
src/server/scripts/EasternKingdoms/BlackrockSpire/boss_gyth.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ public:
Unit* Summoned = me->SummonCreature(creatureId, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 240000);
if (Summoned)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Summoned->AddThreat(pTarget, 1.0f);
}
src/server/scripts/EasternKingdoms/Karazhan/boss_curator.cpp
+2 -2
View File
@@ -133,7 +133,7 @@ public:
//Summon Astral Flare
Creature* AstralFlare = DoSpawnCreature(17096, float(rand()%37), float(rand()%37), 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (AstralFlare && pTarget)
{
@@ -184,7 +184,7 @@ public:
else
HatefulBoltTimer = 15000;
if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1))
DoCast(pTarget, SPELL_HATEFUL_BOLT);
} else HatefulBoltTimer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp
+1 -1
View File
@@ -395,7 +395,7 @@ public:
if (FireballBarrageTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_FARTHEST, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_FARTHEST, 0))
DoCast(pTarget, SPELL_FIREBALL_BARRAGE);
FireballBarrageTimer = 20000;
} else FireballBarrageTimer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/boss_terestian_illhoof.cpp
+1 -1
View File
@@ -388,7 +388,7 @@ public:
if (ShadowboltTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
DoCast(SelectTarget(SELECT_TARGET_TOPAGGRO, 0), SPELL_SHADOW_BOLT);
ShadowboltTimer = 10000;
} else ShadowboltTimer -= diff;
src/server/scripts/EasternKingdoms/Karazhan/bosses_opera.cpp
+2 -2
View File
@@ -194,7 +194,7 @@ public:
if (WaterBoltTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_WATERBOLT);
WaterBoltTimer = TitoDied ? 1500 : 5000;
} else WaterBoltTimer -= diff;
@@ -1432,7 +1432,7 @@ void boss_julianne::boss_julianneAI::UpdateAI(const uint32 diff)
if (PowerfulAttractionTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_POWERFUL_ATTRACTION);
PowerfulAttractionTimer = urand(5000,30000);
} else PowerfulAttractionTimer -= diff;
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+2 -2
View File
@@ -302,7 +302,7 @@ public:
if (PhoenixTimer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
uint8 random = urand(1,2);
float x = KaelLocations[random][0];
@@ -396,7 +396,7 @@ public:
for (uint8 i = 0; i < 3; ++i)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
if (Orb && pTarget)
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+8 -8
View File
@@ -528,7 +528,7 @@ public:
{
DoCast(me, SPELL_VANISH);
Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0);
DoResetThreat();
@@ -646,7 +646,7 @@ public:
if (Seed_of_Corruption_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_SEED_OF_CORRUPTION);
Seed_of_Corruption_Timer = 10000;
@@ -654,7 +654,7 @@ public:
if (Curse_of_Agony_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_CURSE_OF_AGONY);
Curse_of_Agony_Timer = 13000;
@@ -662,7 +662,7 @@ public:
if (Fear_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_FEAR);
Fear_Timer = 10000;
@@ -793,7 +793,7 @@ public:
if (Polymorph_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_POLYMORPH);
Polymorph_Timer = 20000;
@@ -808,7 +808,7 @@ public:
if (Blizzard_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_BLIZZARD);
Blizzard_Timer = 8000;
@@ -939,7 +939,7 @@ public:
//if nobody is in melee range than try to use Intercept
if (!InMeleeRange)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_INTERCEPT_STUN);
}
@@ -1170,7 +1170,7 @@ public:
if (Purge_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_PURGE);
Purge_Timer = 15000;
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+2 -2
View File
@@ -253,7 +253,7 @@ public:
{
if (DrainLifeTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_DRAIN_LIFE);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_DRAIN_LIFE);
DrainLifeTimer = 10000;
} else DrainLifeTimer -= diff;
@@ -262,7 +262,7 @@ public:
{
if (DrainManaTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_DRAIN_MANA);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_DRAIN_MANA);
DrainManaTimer = 10000;
} else DrainManaTimer -= diff;
}
src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
+3 -3
View File
@@ -117,7 +117,7 @@ public:
void JustSummoned(Creature *summoned)
{
if (Unit *temp = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0))
summoned->GetMotionMaster()->MoveFollow(temp,0,0);
//spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok
@@ -163,7 +163,7 @@ public:
if (ChainLightningTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
ChainLightningTimer = 8000;
@@ -171,7 +171,7 @@ public:
if (ArcaneShockTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (pTarget)
DoCast(pTarget, SPELL_ARCANE_SHOCK);
src/server/scripts/EasternKingdoms/MoltenCore/boss_garr.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ class mob_firesworn : public CreatureScript
if (immolateTimer <= diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_IMMOLATE);
immolateTimer = urand(5000, 10000);
}
src/server/scripts/EasternKingdoms/MoltenCore/boss_gehennas.cpp
+2 -2
View File
@@ -80,12 +80,12 @@ class boss_gehennas : public CreatureScript
events.ScheduleEvent(EVENT_GEHENNAS_CURSE, urand(22000, 30000));
break;
case EVENT_RAIN_OF_FIRE:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_RAIN_OF_FIRE);
events.ScheduleEvent(EVENT_RAIN_OF_FIRE, urand(4000, 12000));
break;
case EVENT_SHADOW_BOLT:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(target, SPELL_SHADOW_BOLT);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 7000);
break;
src/server/scripts/EasternKingdoms/MoltenCore/boss_golemagg.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ class boss_golemagg : public CreatureScript
switch (eventId)
{
case EVENT_PYROBLAST:
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_PYROBLAST);
events.ScheduleEvent(EVENT_PYROBLAST, 7000);
break;
src/server/scripts/EasternKingdoms/MoltenCore/boss_majordomo_executus.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ class boss_majordomo : public CreatureScript
events.ScheduleEvent(EVENT_BLAST_WAVE, 10000);
break;
case EVENT_TELEPORT:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(target, SPELL_TELEPORT);
events.ScheduleEvent(EVENT_TELEPORT, 20000);
break;
src/server/scripts/EasternKingdoms/MoltenCore/boss_ragnaros.cpp
+3 -3
View File
@@ -172,7 +172,7 @@ class boss_ragnaros : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
me->HandleEmoteCommand(EMOTE_ONESHOT_EMERGE);
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
AttackStart(target);
instance->SetData(DATA_RAGNAROS_ADDS, 0);
@@ -259,7 +259,7 @@ class boss_ragnaros : public CreatureScript
// summon 8 elementals
for (uint8 i = 0; i < 8; ++i)
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000))
pSummoned->AI()->AttackStart(pTarget);
@@ -274,7 +274,7 @@ class boss_ragnaros : public CreatureScript
DoScriptText(SAY_REINFORCEMENTS2, me);
for (uint8 i = 0; i < 8; ++i)
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Creature* pSummoned = me->SummonCreature(12143, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0.0f,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,900000))
pSummoned->AI()->AttackStart(pTarget);
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+1 -1
View File
@@ -1535,7 +1535,7 @@ public:
{
if (Creature* pTemp = Unit::GetCreature(*me, ui_GUID))
if (pTemp->isAlive())
if (Unit* pTarger = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarger = SelectTarget(SELECT_TARGET_RANDOM,0))
if (pTarger->isAlive())
{
// pTemp->DeleteThreatList();
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ public:
if (Polymorph_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_POLYMORPH);
Polymorph_Timer = 20000;
src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+3 -3
View File
@@ -87,7 +87,7 @@ public:
//Fear_Timer
if (Fear_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_FEAR);
Fear_Timer = 40000;
@@ -96,7 +96,7 @@ public:
//Sleep_Timer
if (Sleep_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,0))
DoCast(pTarget, SPELL_SLEEP);
Sleep_Timer = 30000;
@@ -112,7 +112,7 @@ public:
//Dispel_Timer
if (Dispel_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_DISPELMAGIC);
DispelMagic_Timer = 30000;
src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp
+1 -1
View File
@@ -125,7 +125,7 @@ public:
if (Teleport_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
if (DoGetThreat(pTarget))
src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ public:
if (ShadowShock_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget) DoCast(pTarget, SPELL_SHADOWSHOCK);
ShadowShock_Timer = 12000;
src/server/scripts/EasternKingdoms/Scholomance/boss_instructor_malicia.cpp
+1 -1
View File
@@ -97,7 +97,7 @@ public:
if (Corruption_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget) DoCast(pTarget, SPELL_CORRUPTION);
Corruption_Timer = 24000;
src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ public:
Unit *pTarget = NULL;
for (uint8 i = 0; i < 10; ++i)
{
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
SummonIllusions(pTarget);
}
src/server/scripts/EasternKingdoms/Scholomance/boss_lord_alexei_barov.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
if (Immolate_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget) DoCast(pTarget, SPELL_IMMOLATE);
Immolate_Timer = 12000;
src/server/scripts/EasternKingdoms/Stratholme/boss_baron_rivendare.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ public:
void JustSummoned(Creature* summoned)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
summoned->AI()->AttackStart(pTarget);
}
@@ -140,7 +140,7 @@ public:
//ShadowBolt
if (ShadowBolt_Timer <= diff)
{
if (SelectUnit(SELECT_TARGET_RANDOM, 0))
if (SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(me->getVictim(), SPELL_SHADOWBOLT);
ShadowBolt_Timer = 10000;
src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
+2 -2
View File
@@ -186,7 +186,7 @@ public:
//PsychicScream
if (m_uiPsychicScream_Timer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_PSYCHICSCREAM);
m_uiPsychicScream_Timer = 20000;
@@ -195,7 +195,7 @@ public:
//DeepSleep
if (m_uiDeepSleep_Timer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_SLEEP);
m_uiDeepSleep_Timer = 15000;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+6 -6
View File
@@ -253,7 +253,7 @@ public:
{
me->InterruptSpell(CURRENT_GENERIC_SPELL);
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_CONFLAGRATION);
ConflagrationTimer = 30000+(rand()%5000);
@@ -267,7 +267,7 @@ public:
if (!me->IsNonMeleeSpellCasted(false))
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_SHADOW_NOVA);
@@ -287,7 +287,7 @@ public:
if (!me->IsNonMeleeSpellCasted(false))
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_CONFOUNDING_BLOW);
ConfoundingblowTimer = 20000 + (rand()%5000);
@@ -300,7 +300,7 @@ public:
Creature* temp = NULL;
for (uint8 i = 0; i<3; ++i)
{
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000);
if (temp && pTarget)
{
@@ -603,7 +603,7 @@ public:
if (!me->IsNonMeleeSpellCasted(false))
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_SHADOW_NOVA);
ShadownovaTimer= 30000+(rand()%5000);
@@ -618,7 +618,7 @@ public:
{
me->InterruptSpell(CURRENT_GENERIC_SPELL);
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_CONFLAGRATION);
ConflagrationTimer = 30000+(rand()%5000);
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+1 -1
View File
@@ -783,7 +783,7 @@ public:
if (AgonyCurseTimer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget) pTarget = me->getVictim();
DoCast(pTarget, SPELL_AGONY_CURSE);
AgonyCurseTimer = 20000;
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+1 -1
View File
@@ -1049,7 +1049,7 @@ public:
if (uiSpawnFiendTimer <= diff)
{
if (Creature* pFiend = DoSpawnCreature(CREATURE_VOLATILE_FELFIRE_FIEND, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 20000))
pFiend->AddThreat(SelectUnit(SELECT_TARGET_RANDOM,0), 100000.0f);
pFiend->AddThreat(SelectTarget(SELECT_TARGET_RANDOM,0), 100000.0f);
uiSpawnFiendTimer = urand(4000,8000);
} else uiSpawnFiendTimer -= diff;
}
src/server/scripts/EasternKingdoms/Uldaman/boss_ironaya.cpp
+2 -2
View File
@@ -72,10 +72,10 @@ class boss_ironaya : public CreatureScript
DoCast(me->getVictim(), SPELL_KNOCKAWAY, true);
// current aggro target is knocked away pick new target
Unit* pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0);
if (!pTarget || pTarget == me->getVictim())
pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 1);
pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 1);
if (pTarget)
me->TauntApply(pTarget);
src/server/scripts/EasternKingdoms/Uldaman/uldaman.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ class mob_jadespine_basilisk : public CreatureScript
//Stop attacking target thast asleep and pick new target
uiCslumberTimer = 28000;
Unit* pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0);
if (!pTarget || pTarget == me->getVictim())
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+4 -4
View File
@@ -285,7 +285,7 @@ class boss_akilzon : public CreatureScript
if (StaticDisruption_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!pTarget) pTarget = me->getVictim();
TargetGUID = pTarget->GetGUID();
DoCast(pTarget, SPELL_STATIC_DISRUPTION, false);
@@ -298,7 +298,7 @@ class boss_akilzon : public CreatureScript
if (GustOfWind_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!pTarget) pTarget = me->getVictim();
DoCast(pTarget, SPELL_GUST_OF_WIND);
GustOfWind_Timer = (20+rand()%10)*1000; //20 to 30 seconds(bosskillers)
@@ -362,7 +362,7 @@ class boss_akilzon : public CreatureScript
Unit* bird = Unit::GetUnit(*me,BirdGUIDs[i]);
if (!bird) //they despawned on die
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
x = pTarget->GetPositionX() + irand(-10,10);
y = pTarget->GetPositionY() + irand(-10,10);
@@ -443,7 +443,7 @@ class mob_akilzon_eagle : public CreatureScript
if (arrived)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
float x, y, z;
if (EagleSwoop_Timer)
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+1 -1
View File
@@ -262,7 +262,7 @@ class boss_halazzi : public CreatureScript
if (ShockTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
if (pTarget->IsNonMeleeSpellCasted(false))
DoCast(pTarget, SPELL_EARTHSHOCK);
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+1 -1
View File
@@ -602,7 +602,7 @@ class boss_alyson_antille : public CreatureScript
if (urand(0,1))
pTarget = DoSelectLowestHpFriendly(50, 0);
else
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
DoCast(pTarget, SPELL_DISPEL_MAGIC, false);
}
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+1 -1
View File
@@ -426,7 +426,7 @@ class boss_janalai : public CreatureScript
if (FireBreathTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
me->AttackStop();
me->GetMotionMaster()->Clear();
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+9 -9
View File
@@ -375,7 +375,7 @@ class boss_zuljin : public CreatureScript
Vortex->CastSpell(Vortex, SPELL_CYCLONE_VISUAL, true);
Vortex->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
Vortex->SetSpeed(MOVE_RUN, 1.0f);
Vortex->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
Vortex->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
DoZoneInCombat(Vortex);
}
}
@@ -463,7 +463,7 @@ class boss_zuljin : public CreatureScript
{
if (!TankGUID)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
TankGUID = me->getVictim()->GetGUID();
me->SetSpeed(MOVE_RUN, 5.0f);
@@ -479,7 +479,7 @@ class boss_zuljin : public CreatureScript
{
Unit *pTarget = me->getVictim();
if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = Unit::GetUnit(*me, TankGUID);
if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
if (!pTarget || !pTarget->isTargetableForAttack()) pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
AttackStart(pTarget);
@@ -512,7 +512,7 @@ class boss_zuljin : public CreatureScript
{
if (!TankGUID)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
TankGUID = me->getVictim()->GetGUID();
me->SetSpeed(MOVE_RUN, 5.0f);
@@ -526,7 +526,7 @@ class boss_zuljin : public CreatureScript
Unit *pTarget = me->getVictim();
if (!pTarget || !pTarget->isTargetableForAttack())
{
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
AttackStart(pTarget);
}
if (pTarget)
@@ -543,7 +543,7 @@ class boss_zuljin : public CreatureScript
TankGUID = 0;
}
else
AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
}
}
else
@@ -564,14 +564,14 @@ class boss_zuljin : public CreatureScript
if (Pillar_Of_Fire_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SUMMON_PILLAR);
Pillar_Of_Fire_Timer = 10000;
} else Pillar_Of_Fire_Timer -= diff;
if (Flame_Breath_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
me->SetInFront(pTarget);
DoCast(me, SPELL_FLAME_BREATH);
Flame_Breath_Timer = 10000;
@@ -621,7 +621,7 @@ class mob_zuljin_vortex : public CreatureScript
{
//if the vortex reach the target, it change his target to another player
if (me->IsWithinMeleeRange(me->getVictim()))
AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
}
};
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+2 -2
View File
@@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript
if (m_uiMark_Timer <= uiDiff)
{
Unit *pMarkedTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pMarkedTarget)
{
@@ -242,7 +242,7 @@ class boss_arlokk : public CreatureScript
me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, (cinfo->maxdmg +((cinfo->maxdmg/100) * 35)));
me->UpdateDamagePhysical(BASE_ATTACK);
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
AttackStart(pTarget);
m_bIsPhaseTwo = true;
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
+1 -1
View File
@@ -68,7 +68,7 @@ class boss_grilek : public CreatureScript
DoCast(me, SPELL_AVARTAR);
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (DoGetThreat(me->getVictim()))
DoModifyThreatPercent(me->getVictim(),-50);
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript
//WillOfHakkar_Timer
if (WillOfHakkar_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_WILLOFHAKKAR);
WillOfHakkar_Timer = 25000 + rand()%10000;
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ class boss_hazzarah : public CreatureScript
Unit *pTarget = NULL;
for (uint8 i = 0; i < 3; ++i)
{
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (!pTarget)
return;
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
+5 -5
View File
@@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript
{
if (Charge_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoCast(pTarget, SPELL_CHARGE);
AttackStart(pTarget);
@@ -136,7 +136,7 @@ class boss_jeklik : public CreatureScript
if (SpawnBats_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature* Bat = NULL;
Bat = me->SummonCreature(11368,-12291.6220f,-1380.2640f,144.8304f,5.483f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
@@ -165,7 +165,7 @@ class boss_jeklik : public CreatureScript
{
if (PhaseTwo && ShadowWordPain_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoCast(pTarget, SPELL_SHADOW_WORD_PAIN);
ShadowWordPain_Timer = 12000 + rand()%6000;
@@ -194,7 +194,7 @@ class boss_jeklik : public CreatureScript
if (SpawnFlyingBats_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
return;
@@ -264,7 +264,7 @@ class mob_batrider : public CreatureScript
//Bomb_Timer
if (Bomb_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_BOMB);
Bomb_Timer = 5000;
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ class boss_jindo : public CreatureScript
//Casting the delusion curse with a shade. So shade will attack the same target with the curse.
if (Delusions_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoCast(pTarget, SPELL_DELUSIONSOFJINDO);
@@ -124,7 +124,7 @@ class boss_jindo : public CreatureScript
if (Teleport_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
DoTeleportPlayer(pTarget, -11583.7783f,-1249.4278f,77.5471f,4.745f);
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+1 -1
View File
@@ -186,7 +186,7 @@ class boss_mandokir : public CreatureScript
if ((Watch_Timer < 8000) && !someWatched) //8 sec(cast time + expire time) before the check for the watch effect mandokir will cast watch debuff on a random target
{
if (Unit* p = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* p = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoScriptText(SAY_WATCH, me, p);
DoCast(p, SPELL_WATCH);
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
+2 -2
View File
@@ -118,7 +118,7 @@ class boss_marli : public CreatureScript
{
DoScriptText(SAY_SPIDER_SPAWN, me);
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (!pTarget)
return;
@@ -142,7 +142,7 @@ class boss_marli : public CreatureScript
if (SpawnSpider_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (!pTarget)
return;
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
+2 -2
View File
@@ -93,7 +93,7 @@ class boss_renataki : public CreatureScript
if (Ambush_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
{
DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
@@ -127,7 +127,7 @@ class boss_renataki : public CreatureScript
if (Aggro_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (DoGetThreat(me->getVictim()))
DoModifyThreatPercent(me->getVictim(),-50);
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
+1 -1
View File
@@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript
{
if (Charge_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoCast(pTarget, SPELL_CHARGE);
DoResetThreat();
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
+3 -3
View File
@@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript
TargetInRange = 0;
for (uint8 i = 0; i < 10; ++i)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_TOPAGGRO,i))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO,i))
if (me->IsWithinMeleeRange(pTarget))
++TargetInRange;
}
@@ -144,7 +144,7 @@ class boss_venoxis : public CreatureScript
if (HolyFire_Timer < diff && TargetInRange < 3)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_HOLY_FIRE);
HolyFire_Timer = 8000;
@@ -174,7 +174,7 @@ class boss_venoxis : public CreatureScript
if (PhaseTwo && VenomSpit_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_VENOMSPIT);
VenomSpit_Timer = 15000 + rand()%5000;
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ class boss_wushoolay : public CreatureScript
if (LightningWave_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE);
LightningWave_Timer = 12000 + rand()%4000;
src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp
+1 -1
View File
@@ -161,7 +161,7 @@ public:
{
if (uiFrostBoltVolleyTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
if (pTarget)
DoCast(pTarget, SPELL_FROST_BOLT_VOLLEY);
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp
+4 -4
View File
@@ -583,7 +583,7 @@ public:
if (GripOfTheLegionTimer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_GRIP_OF_THE_LEGION);
GripOfTheLegionTimer = urand(5000,25000);
} else GripOfTheLegionTimer -= diff;
@@ -594,7 +594,7 @@ public:
else
DoScriptText(SAY_AIR_BURST2, me);
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 1), SPELL_AIR_BURST);//not on tank
AirBurstTimer = urand(25000,40000);
} else AirBurstTimer -= diff;
@@ -611,7 +611,7 @@ public:
else
DoScriptText(SAY_DOOMFIRE2, me);
Unit *temp = SelectUnit(SELECT_TARGET_RANDOM, 1);
Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!temp)
temp = me->getVictim();
@@ -626,7 +626,7 @@ public:
{
if (CanUseFingerOfDeath())
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), SPELL_FINGER_OF_DEATH);
MeleeRangeCheckTimer = 1000;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp
+1 -1
View File
@@ -895,7 +895,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
switch(Spells[i].TargetType)
{
case TARGETTYPE_SELF: pTarget = me; break;
case TARGETTYPE_RANDOM: pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); break;
case TARGETTYPE_RANDOM: pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0); break;
case TARGETTYPE_VICTIM: pTarget = me->getVictim(); break;
}
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+1 -1
View File
@@ -1380,7 +1380,7 @@ public:
forcemove = false;
if (forcemove)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
me->Attack(pTarget,false);
}
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp
+3 -3
View File
@@ -117,7 +117,7 @@ public:
//Shadow bolt timer
if (uiShadowBoltTimer <= diff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SHADOW_BOLT);
uiShadowBoltTimer = urand(8000,12000);
} else uiShadowBoltTimer -= diff;
@@ -126,7 +126,7 @@ public:
if (uiStealFleshTimer <= diff)
{
DoScriptText(RAND(SAY_STEAL_FLESH_1,SAY_STEAL_FLESH_2,SAY_STEAL_FLESH_3), me);
if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(random_pTarget, SPELL_STEAL_FLESH);
uiStealFleshTimer = 10000;
} else uiStealFleshTimer -= diff;
@@ -135,7 +135,7 @@ public:
if (uiSummonGhoulsTimer <= diff)
{
DoScriptText(RAND(SAY_SUMMON_GHOULS_1,SAY_SUMMON_GHOULS_2), me);
if (Unit* random_pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(random_pTarget, SPELL_SUMMON_GHOULS);
uiSummonGhoulsTimer = 10000;
} else uiSummonGhoulsTimer -= diff;
src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+1 -1
View File
@@ -1190,7 +1190,7 @@ public:
if (uiExorcismTimer < diff)
{
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(target, SPELL_EXORCISM_N);
uiExorcismTimer = 7300;
} else uiExorcismTimer -= diff;
src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ public:
//Arcane Discharge
if (ArcaneDischarge_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
DoCast(pTarget, SPELL_ARCANE_DISCHARGE);
ArcaneDischarge_Timer = 20000+rand()%10000;
} else ArcaneDischarge_Timer -= diff;
src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ public:
if (WingBuffet_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_WING_BUFFET);
WingBuffet_Timer = 25000+rand()%10000;
} else WingBuffet_Timer -= diff;
src/server/scripts/Kalimdor/Maraudon/boss_celebras_the_cursed.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ public:
if (Wrath_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
DoCast(pTarget, SPELL_WRATH);
Wrath_Timer = 8000;
src/server/scripts/Kalimdor/Maraudon/boss_princess_theradras.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ public:
if (Boulder_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
DoCast(pTarget, SPELL_BOULDER);
Boulder_Timer = 10000;
src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp
+2 -2
View File
@@ -200,7 +200,7 @@ public:
void JustSummoned(Creature *pSummoned)
{
pSummoned->SetInCombatWithZone();
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
pSummoned->AI()->AttackStart(pTarget);
switch (pSummoned->GetEntry())
@@ -457,7 +457,7 @@ public:
{
if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != POINT_MOTION_TYPE)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_FIREBALL);
m_uiFireballTimer = 8000;
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp
+2 -2
View File
@@ -194,7 +194,7 @@ public:
if (Charge_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
{
DoCast(pTarget, SPELL_CHARGE);
@@ -273,7 +273,7 @@ public:
for (uint8 i = 0; i < 10; ++i)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature* Summoned = me->SummonCreature(15621,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000);
if (Summoned && pTarget)
Summoned->AI()->AttackStart(pTarget);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+8 -8
View File
@@ -241,7 +241,7 @@ public:
void SpawnEyeTentacle(float x, float y)
{
if (Creature* Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500))
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
if (Spawned->AI())
Spawned->AI()->AttackStart(pTarget);
}
@@ -284,7 +284,7 @@ public:
if (BeamTimer <= diff)
{
//SPELL_GREEN_BEAM
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
me->InterruptNonMeleeSpells(false);
DoCast(pTarget, SPELL_GREEN_BEAM);
@@ -300,7 +300,7 @@ public:
//ClawTentacleTimer
if (ClawTentacleTimer <= diff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
Creature* Spawned = NULL;
@@ -328,7 +328,7 @@ public:
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
//Select random target for dark beam to start on
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
//Face our target
DarkGlareAngle = me->GetAngle(pTarget);
@@ -988,7 +988,7 @@ public:
//MindflayTimer
if (MindflayTimer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID))
DoCast(pTarget, SPELL_MIND_FLAY);
@@ -1064,7 +1064,7 @@ public:
//Dissapear and reappear at new position
me->SetVisible(false);
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (!pTarget)
{
me->Kill(me);
@@ -1176,7 +1176,7 @@ public:
//Dissapear and reappear at new position
me->SetVisible(false);
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
{
me->Kill(me);
@@ -1281,7 +1281,7 @@ public:
//BeamTimer
if (BeamTimer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID))
DoCast(pTarget, SPELL_GREEN_BEAM);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
+7 -7
View File
@@ -115,16 +115,16 @@ public:
switch (urand(0,2))
{
case 0:
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
break;
case 1:
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
break;
case 2:
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectUnit(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
SummonSpawn(SelectTarget(SELECT_TARGET_RANDOM,0));
break;
}
SpawnSpawns_Timer = 30000 + rand()%30000;
@@ -137,7 +137,7 @@ public:
if (SpawnHatchlings_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
DoCast(pTarget, SPELL_ROOT);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ public:
// Wyvern Timer
if (Wyvern_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_WYVERNSTING);
Wyvern_Timer = 15000 + rand()%17000;
} else Wyvern_Timer -= diff;
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ public:
if (Submerged && ChangeTarget_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
DoTeleportTo(pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ());
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp
+4 -4
View File
@@ -106,7 +106,7 @@ public:
{
//Attack random Gamers
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (pTarget)
me->AddThreat(pTarget, 1.0f);
me->TauntApply(pTarget);
@@ -135,7 +135,7 @@ public:
{
//Attack random Gamers
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (pTarget)
me->AddThreat(pTarget, 1.0f);
me->TauntApply(pTarget);
@@ -243,7 +243,7 @@ public:
{
//Attack random Gamers
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (pTarget)
me->AddThreat(pTarget, 1.0f);
me->TauntApply(pTarget);
@@ -264,7 +264,7 @@ public:
{
//Attack random Gamers
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (pTarget)
me->AddThreat(pTarget, 1.0f);
me->TauntApply(pTarget);
src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp
+1 -1
View File
@@ -264,7 +264,7 @@ public:
case 25: Images25 = true; break;
}
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature *Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000);
if (Image1)
src/server/scripts/Kalimdor/boss_azuregos.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ public:
//ManaStorm_Timer
if (ManaStorm_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_MANASTORM);
ManaStorm_Timer = 7500 + rand()%5000;
} else ManaStorm_Timer -= diff;
src/server/scripts/Kalimdor/thunder_bluff.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ public:
if (BerserkerCharge_Timer <= diff)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
if (pTarget)
DoCast(pTarget, SPELL_BERSERKER_CHARGE);
BerserkerCharge_Timer = 25000;
src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp
+1 -1
View File
@@ -173,7 +173,7 @@ public:
if (uiGrabTimer <= diff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself.
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) // Draws all players (and attacking Mobs) to itself.
DoCast(pTarget, SPELL_WEB_GRAB);
uiGrabTimer = urand(15*IN_MILLISECONDS,30*IN_MILLISECONDS);
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_amanitar.cpp
+1 -1
View File
@@ -104,7 +104,7 @@ public:
{
for (uint8 i = 0; i < 30; ++i)
{
Unit* victim = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit* victim = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (victim)
{
src/server/scripts/Northrend/AzjolNerub/ahnkahet/boss_herald_volazj.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ public:
if (uiShiverTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SHIVER);
uiShiverTimer = 15*IN_MILLISECONDS;
} else uiShiverTimer -= diff;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp
+2 -2
View File
@@ -347,7 +347,7 @@ public:
if (uiOldWoundsTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
if (pTarget && pTarget->isAlive())
DoCast(pTarget, SPELL_OLD_WOUNDS);
@@ -363,7 +363,7 @@ public:
if (uiShadowPastTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
{
if (pTarget && pTarget->isAlive())
DoCast(pTarget,SPELL_SHADOWS_PAST);
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_grand_champions.cpp
+3 -3
View File
@@ -541,7 +541,7 @@ public:
if (uiPolymorphTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_POLYMORPH);
uiPolymorphTimer = 8000;
} else uiPolymorphTimer -= uiDiff;
@@ -673,7 +673,7 @@ public:
if (uiChainLightningTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget,SPELL_CHAIN_LIGHTNING);
uiChainLightningTimer = 16000;
@@ -980,7 +980,7 @@ public:
if (uiPosionBottleTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget,SPELL_POISON_BOTTLE);
uiPosionBottleTimer = 19000;
} else uiPosionBottleTimer -= uiDiff;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+1 -1
View File
@@ -513,7 +513,7 @@ public:
switch (actionId)
{
case ACTION_SHADOW_STRIKE:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SHADOW_STRIKE);
break;
}
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp
+18 -18
View File
@@ -606,7 +606,7 @@ public:
if (m_uiHexTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_HEX);
m_uiHexTimer = urand(10*IN_MILLISECONDS, 40*IN_MILLISECONDS);
} else m_uiHexTimer -= uiDiff;
@@ -708,7 +708,7 @@ public:
if (m_uiHolyShockTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_HOLY_SHOCK);
m_uiHolyShockTimer = urand(6*IN_MILLISECONDS, 15*IN_MILLISECONDS);
} else m_uiHolyShockTimer -= uiDiff;
@@ -722,7 +722,7 @@ public:
if (m_uiHammerOfJusticeTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_HAMMER_OF_JUSTICE);
m_uiHammerOfJusticeTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS);
} else m_uiHammerOfJusticeTimer -= uiDiff;
@@ -810,7 +810,7 @@ public:
DoCast(me, SPELL_FLASH_HEAL);
break;
case 4:
if (Unit *pTarget = urand(0, 1) ? SelectUnit(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f))
if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f))
DoCast(pTarget, SPELL_DISPEL);
break;
case 5:
@@ -905,7 +905,7 @@ public:
if (m_uiMindBlastTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_MIND_BLAST);
m_uiMindBlastTimer = urand(3*IN_MILLISECONDS, 8*IN_MILLISECONDS);
} else m_uiMindBlastTimer -= uiDiff;
@@ -915,19 +915,19 @@ public:
switch (urand(0, 4))
{
case 0: case 1:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_MIND_FLAY);
break;
case 2:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_VAMPIRIC_TOUCH);
break;
case 3:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SW_PAIN);
break;
case 4:
if (Unit *pTarget = urand(0, 1) ? SelectUnit(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f))
if (Unit *pTarget = urand(0, 1) ? SelectTarget(SELECT_TARGET_RANDOM, 0) : DoSelectLowestHpFriendly(40.0f))
DoCast(pTarget, SPELL_DISPEL);
break;
}
@@ -995,7 +995,7 @@ public:
if (m_uiFearTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_FEAR);
m_uiFearTimer = urand(4*IN_MILLISECONDS, 15*IN_MILLISECONDS);
} else m_uiFearTimer -= uiDiff;
@@ -1009,7 +1009,7 @@ public:
if (m_uiUnstableAfflictionTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_UNSTABLE_AFFLICTION);
m_uiUnstableAfflictionTimer = urand(2*IN_MILLISECONDS, 10*IN_MILLISECONDS);
} else m_uiUnstableAfflictionTimer -= uiDiff;
@@ -1036,7 +1036,7 @@ public:
DoCastVictim(SPELL_CURSE_OF_AGONY);
break;
case 5:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CURSE_OF_EXHAUSTION);
break;
}
@@ -1122,7 +1122,7 @@ public:
if (m_uiPolymorphTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_POLYMORPH);
m_uiPolymorphTimer = urand(15*IN_MILLISECONDS, 40*IN_MILLISECONDS);
} else m_uiPolymorphTimer -= uiDiff;
@@ -1324,14 +1324,14 @@ public:
if (m_uiCycloneTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CYCLONE);
m_uiCycloneTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS);
} else m_uiCycloneTimer -= uiDiff;
if (m_uiEntanglingRootsTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ENTANGLING_ROOTS);
m_uiEntanglingRootsTimer = urand(5*IN_MILLISECONDS, 40*IN_MILLISECONDS);
} else m_uiEntanglingRootsTimer -= uiDiff;
@@ -1546,7 +1546,7 @@ public:
if (m_uiChainsOfIceTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CHAINS_OF_ICE);
m_uiChainsOfIceTimer = urand(5*IN_MILLISECONDS, 15*IN_MILLISECONDS);
} else m_uiChainsOfIceTimer -= uiDiff;
@@ -1667,7 +1667,7 @@ public:
if (m_uiBlindTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
if (me->IsInRange(pTarget, 0.0f, 15.0f, false))
DoCast(pTarget, SPELL_BLIND);
m_uiBlindTimer = urand(7*IN_MILLISECONDS, 8*IN_MILLISECONDS);
@@ -1878,7 +1878,7 @@ public:
if (m_uiRepeteanceTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_REPENTANCE);
m_uiRepeteanceTimer = 60*IN_MILLISECONDS;
} else m_uiRepeteanceTimer -= uiDiff;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp
+2 -2
View File
@@ -236,7 +236,7 @@ public:
if (getDifficulty() == RAID_DIFFICULTY_25MAN_HEROIC && m_uiTouchOfJaraxxusTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_TOUCH_OF_JARAXXUS);
m_uiTouchOfJaraxxusTimer = urand(10*IN_MILLISECONDS, 15*IN_MILLISECONDS);
} else m_uiTouchOfJaraxxusTimer -= uiDiff;
@@ -398,7 +398,7 @@ public:
if (m_uiFelStreakTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_FEL_STREAK);
m_uiFelStreakTimer = 30*IN_MILLISECONDS;
} else m_uiFelStreakTimer -= uiDiff;
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+4 -4
View File
@@ -319,7 +319,7 @@ public:
m_bTargetDied = true;
me->GetMotionMaster()->MoveJump(gormok->GetPositionX(), gormok->GetPositionY(), gormok->GetPositionZ(), 15.0f, 15.0f);
}
else if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
else if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
m_uiTargetGUID = target->GetGUID();
me->GetMotionMaster()->MoveJump(target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 15.0f, 15.0f);
@@ -330,7 +330,7 @@ public:
if (m_uiFireBombTimer < uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_FIRE_BOMB);
m_uiFireBombTimer = 20000;
}
@@ -502,7 +502,7 @@ struct boss_jormungarAI : public ScriptedAI
case 4: // Stationary
if (sprayTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, spraySpell);
sprayTimer = urand(15*IN_MILLISECONDS, 30*IN_MILLISECONDS);
} else sprayTimer -= uiDiff;
@@ -805,7 +805,7 @@ public:
if (m_uiArticBreathTimer <= uiDiff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ARCTIC_BREATH);
m_uiArticBreathTimer = urand(25*IN_MILLISECONDS, 40*IN_MILLISECONDS);
} else m_uiArticBreathTimer -= uiDiff;
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp
+3 -3
View File
@@ -269,12 +269,12 @@ class boss_devourer_of_souls : public CreatureScript
events.ScheduleEvent(EVENT_MIRRORED_SOUL, urand(15000, 30000));
break;
case EVENT_WELL_OF_SOULS:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_WELL_OF_SOULS);
events.ScheduleEvent(EVENT_WELL_OF_SOULS, 20000);
break;
case EVENT_UNLEASHED_SOULS:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_UNLEASHED_SOULS);
me->SetDisplayId(DISPLAY_SORROW);
DoScriptText(RAND(SAY_FACE_ANGER_UNLEASH_SOUL, SAY_FACE_SORROW_UNLEASH_SOUL, SAY_FACE_DESIRE_UNLEASH_SOUL), me);
@@ -291,7 +291,7 @@ class boss_devourer_of_souls : public CreatureScript
DoScriptText(RAND(SAY_FACE_ANGER_WAILING_SOUL,SAY_FACE_DESIRE_WAILING_SOUL), me);
DoScriptText(EMOTE_WAILING_SOUL, me);
DoCast(me, SPELL_WAILING_SOULS_STARTING);
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
me->SetOrientation(me->GetAngle(target));
DoCast(me, SPELL_WAILING_SOULS_BEAM);
src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp
+7 -7
View File
@@ -509,7 +509,7 @@ public:
events.RescheduleEvent(EVENT_VEIL_OF_SHADOWS, 10000);
return;
case EVENT_WAIL_OF_SOULS:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_WAIL_OF_SOULS);
events.RescheduleEvent(EVENT_WAIL_OF_SOULS, 5000);
return;
@@ -624,7 +624,7 @@ public:
events.RescheduleEvent(EVENT_FROST_NOVA, 9600);
return;
case EVENT_SHADOW_LANCE:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_SHADOW_LANCE);
events.RescheduleEvent(EVENT_SHADOW_LANCE, 8000);
return;
@@ -750,17 +750,17 @@ public:
events.RescheduleEvent(EVENT_RAISE_DEAD, 25000);
return;
case EVENT_SHADOW_BOLT:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_SHADOW_BOLT);
events.RescheduleEvent(EVENT_SHADOW_BOLT, 5000);
return;
case EVENT_SOUL_SICKNESS:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_SOUL_SICKNESS);
events.RescheduleEvent(EVENT_SOUL_SICKNESS, 10000);
return;
case EVENT_SOUL_SIPHON:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_SOUL_SIPHON);
events.RescheduleEvent(EVENT_SOUL_SIPHON, 8000);
return;
@@ -823,12 +823,12 @@ public:
events.RescheduleEvent(EVENT_RAISE_DEAD, 25000);
return;
case EVENT_SHADOW_BOLT:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_SHADOW_BOLT);
events.RescheduleEvent(EVENT_SHADOW_BOLT, 4000);
return;
case EVENT_DRAIN_LIFE:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_DRAIN_LIFE);
events.RescheduleEvent(EVENT_DRAIN_LIFE, 9000);
return;
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp
+2 -2
View File
@@ -194,7 +194,7 @@ class boss_garfrost : public CreatureScript
switch (eventId)
{
case EVENT_THROW_SARONITE:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_THROW_SARONITE);
events.ScheduleEvent(EVENT_THROW_SARONITE, urand(12500, 20000));
break;
@@ -203,7 +203,7 @@ class boss_garfrost : public CreatureScript
events.ScheduleEvent(EVENT_CHILLING_WAVE, 40000, 0, PHASE_TWO);
break;
case EVENT_DEEP_FREEZE:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_DEEP_FREEZE);
events.ScheduleEvent(EVENT_DEEP_FREEZE, 35000, 0, PHASE_THREE);
break;
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp
+2 -2
View File
@@ -226,13 +226,13 @@ class boss_ick : public CreatureScript
{
case EVENT_TOXIC_WASTE:
if (Creature* krick = GetKrick())
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
krick->CastSpell(target, SPELL_TOXIC_WASTE, false);
events.ScheduleEvent(EVENT_TOXIC_WASTE, urand(7000, 10000));
break;
case EVENT_SHADOW_BOLT:
if (Creature* krick = GetKrick())
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
krick->CastSpell(target, SPELL_SHADOW_BOLT, false);
events.ScheduleEvent(EVENT_SHADOW_BOLT, 15000);
return;
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp
+1 -1
View File
@@ -345,7 +345,7 @@ class boss_rimefang : public CreatureScript
_events.ScheduleEvent(EVENT_MOVE_NEXT, 2000, 0, PHASE_COMBAT);
break;
case EVENT_ICY_BLAST:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_ICY_BLAST);
_events.ScheduleEvent(EVENT_ICY_BLAST, 15000, 0, PHASE_COMBAT);
break;
src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp
+2 -2
View File
@@ -79,12 +79,12 @@ class mob_ymirjar_flamebearer : public CreatureScript
switch (eventId)
{
case EVENT_FIREBALL:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_FIREBALL);
_events.RescheduleEvent(EVENT_FIREBALL, 5000);
break;
case EVENT_TACTICAL_BLINK:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(target, SPELL_TACTICAL_BLINK);
DoCast(me, SPELL_HELLFIRE);
_events.RescheduleEvent(EVENT_TACTICAL_BLINK, 12000);
src/server/scripts/Northrend/Gundrak/boss_eck.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ public:
if (uiSpringTimer <= diff)
{
Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM,1);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM,1);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
DoCast(pTarget, RAND(SPELL_ECK_SPRING_1, SPELL_ECK_SPRING_2));
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
+2 -2
View File
@@ -492,7 +492,7 @@ class boss_lady_deathwhisper : public CreatureScript
events.ScheduleEvent(EVENT_P2_TOUCH_OF_INSIGNIFICANCE, urand(9000, 13000), 0, PHASE_TWO);
break;
case EVENT_P2_SUMMON_SHADE:
if (Unit* shadeTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* shadeTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
{
nextVengefulShadeTarget = shadeTarget->GetGUID();
DoCast(shadeTarget, SPELL_SUMMON_SHADE);
@@ -773,7 +773,7 @@ class npc_cult_adherent : public CreatureScript
events.ScheduleEvent(EVENT_ADHERENT_DEATHCHILL, urand(9000, 13000));
break;
case EVENT_ADHERENT_CURSE_OF_TORPOR:
if (Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(target, SPELL_CURSE_OF_TORPOR);
events.ScheduleEvent(EVENT_ADHERENT_CURSE_OF_TORPOR, urand(9000, 13000));
break;
src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp
+2 -2
View File
@@ -199,9 +199,9 @@ class boss_lord_marrowgar : public CreatureScript
case EVENT_BONE_STORM_MOVE:
{
events.ScheduleEvent(EVENT_BONE_STORM_MOVE, boneStormDuration/3);
Unit* unit = SelectUnit(SELECT_TARGET_RANDOM, 1);
Unit* unit = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (!unit)
unit = SelectUnit(SELECT_TARGET_RANDOM, 0);
unit = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (unit)
me->GetMotionMaster()->MovePoint(POINT_TARGET_BONESTORM_PLAYER, unit->GetPositionX(), unit->GetPositionY(), unit->GetPositionZ());
break;
src/server/scripts/Northrend/Naxxramas/boss_anubrekhan.cpp
+1 -1
View File
@@ -156,7 +156,7 @@ public:
//Cast Impale on a random target
//Do NOT cast it when we are afflicted by locust swarm
if (!me->HasAura(RAID_MODE(SPELL_LOCUST_SWARM_10,SPELL_LOCUST_SWARM_25)))
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, RAID_MODE(SPELL_IMPALE_10,SPELL_IMPALE_25));
events.ScheduleEvent(EVENT_IMPALE, urand(10000,20000));
break;
src/server/scripts/Northrend/Naxxramas/boss_faerlina.cpp
+1 -1
View File
@@ -142,7 +142,7 @@ public:
events.ScheduleEvent(EVENT_POISON, urand(8000,15000));
break;
case EVENT_FIRE:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, RAID_MODE(SPELL_RAIN_OF_FIRE, H_SPELL_RAIN_OF_FIRE));
events.ScheduleEvent(EVENT_FIRE, urand(6000,18000));
break;
src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
+1 -1
View File
@@ -91,7 +91,7 @@ public:
events.ScheduleEvent(EVENT_SPRAY, 15000+rand()%15000);
return;
case EVENT_INJECT:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
if (!pTarget->HasAura(SPELL_MUTATING_INJECTION))
DoCast(pTarget, SPELL_MUTATING_INJECTION);
events.ScheduleEvent(EVENT_INJECT, 8000 + uint32(120 * me->GetHealthPct()));
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+1 -1
View File
@@ -614,7 +614,7 @@ public:
break;
}
case EVENT_FISSURE:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_SHADOW_FISURE);
events.RepeatEvent(urand(10000,45000));
break;
src/server/scripts/Northrend/Nexus/Nexus/boss_anomalus.cpp
+4 -4
View File
@@ -153,7 +153,7 @@ public:
if (Rift)
{
//DoCast(Rift, SPELL_CHARGE_RIFT);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
Rift->AI()->AttackStart(pTarget);
uiChaoticRiftGUID = Rift->GetGUID();
DoScriptText(SAY_RIFT , me);
@@ -163,7 +163,7 @@ public:
if (uiSparkTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SPARK);
uiSparkTimer = 5*IN_MILLISECONDS;
} else uiSparkTimer -= diff;
@@ -228,7 +228,7 @@ public:
if (uiChaoticEnergyBurstTimer <= diff)
{
Unit* pAnomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
if (pAnomalus && pAnomalus->HasAura(SPELL_RIFT_SHIELD))
DoCast(pTarget, SPELL_CHARGED_CHAOTIC_ENERGY_BURST);
@@ -242,7 +242,7 @@ public:
{
Creature* Wraith = me->SummonCreature(MOB_CRAZED_MANA_WRAITH, me->GetPositionX()+1, me->GetPositionY()+1, me->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS);
if (Wraith)
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
Wraith->AI()->AttackStart(pTarget);
Unit* Anomalus = Unit::GetUnit(*me, pInstance ? pInstance->GetData64(DATA_ANOMALUS) : 0);
if (Anomalus && Anomalus->HasAura(SPELL_RIFT_SHIELD))
src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp
+3 -3
View File
@@ -167,7 +167,7 @@ public:
break;
}
}
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
Summoned->AI()->AttackStart(pTarget);
return Summoned->GetGUID();
}
@@ -290,7 +290,7 @@ public:
if (uiIceNovaTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_ICE_NOVA, false);
uiCooldown = 1500;
@@ -310,7 +310,7 @@ public:
if (uiFireBombTimer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_FIREBOMB, false);
uiCooldown = 2*IN_MILLISECONDS;
src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp
+1 -1
View File
@@ -206,7 +206,7 @@ public:
break;
}
if (!pTarget)
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
Crystalline_Tangler->AI()->AttackStart(pTarget);
src/server/scripts/Northrend/ObsidianSanctum/boss_sartharion.cpp
+4 -4
View File
@@ -658,7 +658,7 @@ public:
// Lavas Strike
if (m_uiLavaStrikeTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
CastLavaStrikeOnTarget(pTarget);
@@ -1052,7 +1052,7 @@ public:
// shadow fissure
if (m_uiShadowFissureTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE));
m_uiShadowFissureTimer = urand(15000,20000);
@@ -1149,7 +1149,7 @@ public:
// shadow fissure
if (m_uiShadowFissureTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H));
m_uiShadowFissureTimer = urand(15000,20000);
@@ -1249,7 +1249,7 @@ public:
// shadow fissure
if (m_uiShadowFissureTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, RAID_MODE(SPELL_SHADOW_FISSURE, SPELL_SHADOW_FISSURE_H));
m_uiShadowFissureTimer = urand(15000,20000);
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp
+2 -2
View File
@@ -199,7 +199,7 @@ public:
pSummoned->CastSpell(pSummoned, DUNGEON_MODE(SPELL_SPARK_VISUAL_TRIGGER,H_SPELL_SPARK_VISUAL_TRIGGER), true);
Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
pSummoned->SetInCombatWith(pTarget);
@@ -257,7 +257,7 @@ public:
if (uiStaticOverloadTimer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_STATIC_OVERLOAD);
uiStaticOverloadTimer = urand(5*IN_MILLISECONDS, 6*IN_MILLISECONDS);
src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ public:
if (m_uiArcLightning_Timer <= uiDiff)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_ARC_LIGHTNING);
m_uiArcLightning_Timer = 15000 + rand()%1000;

Some files were not shown because too many files have changed in this diff Show More