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/TempestKeep/Eye/boss_alar.cpp
+3 -3
View File
@@ -154,7 +154,7 @@ class boss_alar : public CreatureScript
void JustSummoned(Creature *summon)
{
if (summon->GetEntry() == CREATURE_EMBER_OF_ALAR)
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
summon->AI()->AttackStart(pTarget);
}
@@ -283,7 +283,7 @@ class boss_alar : public CreatureScript
WaitTimer = 4000;
return;
case WE_DIVE:
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
me->RemoveAurasDueToSpell(SPELL_DIVE_BOMB_VISUAL);
DoCast(pTarget, SPELL_DIVE_BOMB, true);
@@ -403,7 +403,7 @@ class boss_alar : public CreatureScript
if (FlamePatch_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000);
if (Summoned)
src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+3 -3
View File
@@ -171,7 +171,7 @@ class boss_high_astromancer_solarian : public CreatureScript
Creature* Summoned = me->SummonCreature(entry, x, y, z, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
if (Summoned)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
Summoned->AI()->AttackStart(pTarget);
Summons.Summon(Summoned);
@@ -243,7 +243,7 @@ class boss_high_astromancer_solarian : public CreatureScript
}
else
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!me->HasInArc(2.5f, pTarget))
pTarget = me->getVictim();
if (pTarget)
@@ -258,7 +258,7 @@ class boss_high_astromancer_solarian : public CreatureScript
{
me->InterruptNonMeleeSpells(false);
//Target the tank ?
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 1))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
{
if (pTarget->GetTypeId() == TYPEID_PLAYER)
{
src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+13 -13
View File
@@ -377,7 +377,7 @@ class boss_kaelthas : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
AttackStart(pTarget);
}
@@ -440,7 +440,7 @@ class boss_kaelthas : public CreatureScript
// if not phoenix, then it's one of the 7 weapons
if (pSummoned->GetEntry() != NPC_PHOENIX)
{
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
pSummoned->AI()->AttackStart(pTarget);
summons.Summon(pSummoned);
@@ -504,7 +504,7 @@ class boss_kaelthas : public CreatureScript
Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Advisor->setFaction(me->getFaction());
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Advisor->AI()->AttackStart(pTarget);
}
@@ -538,7 +538,7 @@ class boss_kaelthas : public CreatureScript
Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Advisor->setFaction(me->getFaction());
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Advisor->AI()->AttackStart(pTarget);
}
@@ -572,7 +572,7 @@ class boss_kaelthas : public CreatureScript
Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Advisor->setFaction(me->getFaction());
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Advisor->AI()->AttackStart(pTarget);
}
@@ -606,7 +606,7 @@ class boss_kaelthas : public CreatureScript
Advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Advisor->setFaction(me->getFaction());
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
Advisor->AI()->AttackStart(pTarget);
}
@@ -684,7 +684,7 @@ class boss_kaelthas : public CreatureScript
if (PhaseSubphase == 0)
{
//Respawn advisors
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Creature *Advisor;
for (uint8 i = 0; i < MAX_ADVISORS; ++i)
@@ -715,7 +715,7 @@ class boss_kaelthas : public CreatureScript
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
AttackStart(pTarget);
Phase_Timer = 30000;
@@ -772,7 +772,7 @@ class boss_kaelthas : public CreatureScript
if (FlameStrike_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_FLAME_STRIKE);
FlameStrike_Timer = 30000;
@@ -984,7 +984,7 @@ class boss_kaelthas : public CreatureScript
//NetherBeam_Timer
if (NetherBeam_Timer <= diff)
{
if (Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pUnit = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pUnit, SPELL_NETHER_BEAM);
NetherBeam_Timer = 4000;
@@ -1065,7 +1065,7 @@ class boss_thaladred_the_darkener : public CreatureScript
//Gaze_Timer
if (Gaze_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoResetThreat();
me->AddThreat(pTarget, 5000000.0f);
@@ -1268,7 +1268,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
if (Conflagration_Timer <= diff)
{
Unit *pTarget = NULL;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget && me->IsWithinDistInMap(pTarget, 30))
DoCast(pTarget, SPELL_CONFLAGRATION);
@@ -1381,7 +1381,7 @@ class boss_master_engineer_telonicus : public CreatureScript
//RemoteToy_Timer
if (RemoteToy_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_REMOTE_TOY);
RemoteToy_Timer = 10000+rand()%5000;
src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+2 -2
View File
@@ -73,10 +73,10 @@ class mob_crystalcore_devastator : 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/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+1 -1
View File
@@ -234,7 +234,7 @@ class mob_ragin_flames : public CreatureScript
if (!onlyonce)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0))
me->GetMotionMaster()->MoveChase(pTarget);
onlyonce = true;
}
src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
+3 -3
View File
@@ -129,7 +129,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
{
for (uint8 i = 0; i < 3; ++i)
{
Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,0);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,0);
Creature* Wraith = me->SummonCreature(21062,me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
if (pTarget && Wraith)
Wraith->AI()->AttackStart(pTarget);
@@ -158,7 +158,7 @@ class boss_pathaleon_the_calculator : public CreatureScript
if (Domination_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
{
DoScriptText(RAND(SAY_DOMINATION_1,SAY_DOMINATION_2), me);
DoCast(pTarget, SPELL_DOMINATION);
@@ -233,7 +233,7 @@ class mob_nether_wraith : public CreatureScript
if (ArcaneMissiles_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_ARCANE_MISSILES);
else
DoCast(me->getVictim(), SPELL_ARCANE_MISSILES);
src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+5 -5
View File
@@ -129,7 +129,7 @@ class boss_harbinger_skyriss : public CreatureScript
else
summon->SetHealth(summon->CountPctFromMaxHealth(66));
if (me->getVictim())
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
summon->AI()->AttackStart(pTarget);
}
@@ -209,7 +209,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (MindRend_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_MIND_REND);
else
DoCast(me->getVictim(), SPELL_MIND_REND);
@@ -226,7 +226,7 @@ class boss_harbinger_skyriss : public CreatureScript
DoScriptText(RAND(SAY_FEAR_1,SAY_FEAR_2), me);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_FEAR);
else
DoCast(me->getVictim(), SPELL_FEAR);
@@ -243,7 +243,7 @@ class boss_harbinger_skyriss : public CreatureScript
DoScriptText(RAND(SAY_MIND_1,SAY_MIND_2), me);
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, SPELL_DOMINATION);
else
DoCast(me->getVictim(), SPELL_DOMINATION);
@@ -260,7 +260,7 @@ class boss_harbinger_skyriss : public CreatureScript
if (me->IsNonMeleeSpellCasted(false))
return;
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM,1))
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM,1))
DoCast(pTarget, H_SPELL_MANA_BURN);
ManaBurn_Timer = 16000+rand()%16000;
src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ class boss_laj : public CreatureScript
void JustSummoned(Creature *summon)
{
if (summon && me->getVictim())
summon->AI()->AttackStart(SelectUnit(SELECT_TARGET_RANDOM, 0));
summon->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM, 0));
}
void UpdateAI(const uint32 diff)