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