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/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;