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/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+1 -1
View File
@@ -352,7 +352,7 @@ class mob_shadowmoon_channeler : public CreatureScript
if (MarkOfShadow_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_MARK_OF_SHADOW);
MarkOfShadow_Timer = 15000+rand()%5000;
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript
if (ExplodingBreaker_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_EXPLODING_BREAKER);
ExplodingBreaker_Timer = 4000+rand()%8000;
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+4 -4
View File
@@ -107,7 +107,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
DoScriptText(SAY_SUMMON, me);
if (Unit* random = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* random = SelectTarget(SELECT_TARGET_RANDOM,0))
summoned->AI()->AttackStart(random);
++SummonedCount;
@@ -162,7 +162,7 @@ class boss_omor_the_unscarred : public CreatureScript
Unit* temp = NULL;
if (me->IsWithinMeleeRange(me->getVictim()))
temp = me->getVictim();
else temp = SelectUnit(SELECT_TARGET_RANDOM,0);
else temp = SelectTarget(SELECT_TARGET_RANDOM,0);
if (temp && temp->GetTypeId() == TYPEID_PLAYER)
{
@@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
DoScriptText(SAY_CURSE, me);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoCast(pTarget, SPELL_TREACHEROUS_AURA);
Aura_Timer = 8000+rand()%8000;
@@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript
if (Shadowbolt_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
if (pTarget)
pTarget = me->getVictim();
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+2 -2
View File
@@ -130,7 +130,7 @@ class boss_nazan : public CreatureScript
if (Fireball_Timer <= diff)
{
if (Unit* pVictim = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit* pVictim = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pVictim, DUNGEON_MODE(SPELL_FIREBALL, SPELL_FIREBALL_H), true);
Fireball_Timer = urand(4000,7000);
}
@@ -148,7 +148,7 @@ class boss_nazan : public CreatureScript
me->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
me->AddUnitMovementFlag(MOVEMENTFLAG_WALKING);
me->GetMotionMaster()->Clear();
if (Unit* pVictim = SelectUnit(SELECT_TARGET_NEAREST,0))
if (Unit* pVictim = SelectTarget(SELECT_TARGET_NEAREST,0))
me->AI()->AttackStart(pVictim);
DoStartMovement(me->getVictim());
DoScriptText(EMOTE, me);
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
{
DoScriptText(SAY_SURGE, me);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_SURGE);
Surge_Timer = 5000+rand()%8000;
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+4 -4
View File
@@ -426,7 +426,7 @@ class boss_magtheridon : public CreatureScript
if (Blaze_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
float x, y, z;
pTarget->GetPosition(x, y, z);
@@ -460,7 +460,7 @@ class boss_magtheridon : public CreatureScript
{
if (Debris_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
float x, y, z;
pTarget->GetPosition(x, y, z);
@@ -577,7 +577,7 @@ class mob_hellfire_channeler : public CreatureScript
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 = 25000 + rand()%15000;
}
@@ -586,7 +586,7 @@ class mob_hellfire_channeler : public CreatureScript
if (Infernal_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_BURNING_ABYSSAL, true);
Infernal_Timer = 30000 + rand()%10000;
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+2 -2
View File
@@ -277,7 +277,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
{
if (ShadowFissure_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_SHADOW_FISSURE);
ShadowFissure_Timer = urand(7500,15000);
}
@@ -286,7 +286,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
if (DeathCoil_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
DoCast(pTarget, SPELL_DEATH_COIL);
DeathCoil_Timer = urand(15000,20000);
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+1 -1
View File
@@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ResetThreat_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
{
DoYellForThreat();
DoResetThreat();
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+2 -2
View File
@@ -120,7 +120,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
case MOB_HEARTHEN_GUARD:
case MOB_SHARPSHOOTER_GUARD:
case MOB_REAVER_GUARD:
summoned->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM,0));
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0));
adds.push_back(summoned->GetGUID());
break;
case MOB_SHATTERED_ASSASSIN:
@@ -267,7 +267,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
{
if (Charge_timer <= diff)
{
DoCast(SelectUnit(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE);
DoCast(SelectTarget(SELECT_TARGET_RANDOM, 0), H_SPELL_CHARGE);
Charge_timer = 0;
}
else