Scripts: Reorder file names in Commands/CMakeList file and cosmetic changes in all scripts

This commit is contained in:
Spp-
2011-06-30 14:24:56 +02:00
parent d12bb4a657
commit 6fd41ae50e
372 changed files with 1974 additions and 1968 deletions
@@ -130,7 +130,7 @@ class boss_arlokk : public CreatureScript
void DoSummonPhanters()
{
if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID))
if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID))
DoScriptText(SAY_FEAST_PANTHER, me, pMarkedTarget);
me->SummonCreature(NPC_ZULIAN_PROWLER, -11532.7998f, -1649.6734f, 41.4800f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
@@ -139,7 +139,7 @@ class boss_arlokk : public CreatureScript
void JustSummoned(Creature* pSummoned)
{
if (Unit *pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID))
if (Unit* pMarkedTarget = Unit::GetUnit(*me, MarkedTargetGUID))
pSummoned->AI()->AttackStart(pMarkedTarget);
++m_uiSummonCount;
@@ -162,7 +162,7 @@ class boss_arlokk : public CreatureScript
if (m_uiMark_Timer <= uiDiff)
{
Unit *pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pMarkedTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pMarkedTarget)
{
@@ -40,7 +40,7 @@ class boss_gahzranka : public CreatureScript
struct boss_gahzrankaAI : public ScriptedAI
{
boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {}
boss_gahzrankaAI(Creature* c) : ScriptedAI(c) {}
uint32 Frostbreath_Timer;
uint32 MassiveGeyser_Timer;
uint32 Slam_Timer;
@@ -40,7 +40,7 @@ class boss_grilek : public CreatureScript
struct boss_grilekAI : public ScriptedAI
{
boss_grilekAI(Creature *c) : ScriptedAI(c) {}
boss_grilekAI(Creature* c) : ScriptedAI(c) {}
uint32 Avartar_Timer;
uint32 GroundTremor_Timer;
@@ -66,7 +66,7 @@ class boss_grilek : public CreatureScript
{
DoCast(me, SPELL_AVARTAR);
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
@@ -55,7 +55,7 @@ class boss_hakkar : public CreatureScript
struct boss_hakkarAI : public ScriptedAI
{
boss_hakkarAI(Creature *c) : ScriptedAI(c)
boss_hakkarAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -132,7 +132,7 @@ class boss_hakkar : public CreatureScript
//CauseInsanity_Timer
/*if (CauseInsanity_Timer <= diff)
{
if (Unit *pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_CAUSEINSANITY);
CauseInsanity_Timer = 35000 + rand()%8000;
@@ -141,7 +141,7 @@ class boss_hakkar : public CreatureScript
//WillOfHakkar_Timer
if (WillOfHakkar_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_WILLOFHAKKAR);
WillOfHakkar_Timer = 25000 + rand()%10000;
@@ -40,7 +40,7 @@ class boss_hazzarah : public CreatureScript
struct boss_hazzarahAI : public ScriptedAI
{
boss_hazzarahAI(Creature *c) : ScriptedAI(c) {}
boss_hazzarahAI(Creature* c) : ScriptedAI(c) {}
uint32 ManaBurn_Timer;
uint32 Sleep_Timer;
@@ -81,14 +81,14 @@ class boss_hazzarah : public CreatureScript
{
//We will summon 3 illusions that will spawn on a random gamer and attack this gamer
//We will just use one model for the beginning
Unit *pTarget = NULL;
Unit* pTarget = NULL;
for (uint8 i = 0; i < 3; ++i)
{
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
return;
Creature *Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
Creature* Illusion = me->SummonCreature(15163, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
if (Illusion)
Illusion->AI()->AttackStart(pTarget);
}
@@ -54,7 +54,7 @@ class boss_jeklik : public CreatureScript
struct boss_jeklikAI : public ScriptedAI
{
boss_jeklikAI(Creature *c) : ScriptedAI(c)
boss_jeklikAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -113,7 +113,7 @@ class boss_jeklik : public CreatureScript
{
if (Charge_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(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 = SelectTarget(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 = SelectTarget(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 = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
return;
@@ -236,7 +236,7 @@ class mob_batrider : public CreatureScript
struct mob_batriderAI : public ScriptedAI
{
mob_batriderAI(Creature *c) : ScriptedAI(c)
mob_batriderAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -264,7 +264,7 @@ class mob_batrider : public CreatureScript
//Bomb_Timer
if (Bomb_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_BOMB);
Bomb_Timer = 5000;
@@ -52,7 +52,7 @@ class boss_jindo : public CreatureScript
struct boss_jindoAI : public ScriptedAI
{
boss_jindoAI(Creature *c) : ScriptedAI(c) {}
boss_jindoAI(Creature* c) : ScriptedAI(c) {}
uint32 BrainWashTotem_Timer;
uint32 HealingWard_Timer;
@@ -108,11 +108,11 @@ 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 = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_DELUSIONSOFJINDO);
Creature *Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
Creature* Shade = me->SummonCreature(14986, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Shade)
Shade->AI()->AttackStart(pTarget);
}
@@ -123,7 +123,7 @@ class boss_jindo : public CreatureScript
//Teleporting a random gamer and spawning 9 skeletons that will attack this gamer
if (Teleport_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
@@ -132,7 +132,7 @@ class boss_jindo : public CreatureScript
if (DoGetThreat(me->getVictim()))
DoModifyThreatPercent(pTarget, -100);
Creature *Skeletons;
Creature* Skeletons;
Skeletons = me->SummonCreature(14826, pTarget->GetPositionX()+2, pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Skeletons)
Skeletons->AI()->AttackStart(pTarget);
@@ -187,7 +187,7 @@ class mob_healing_ward : public CreatureScript
struct mob_healing_wardAI : public ScriptedAI
{
mob_healing_wardAI(Creature *c) : ScriptedAI(c)
mob_healing_wardAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -212,7 +212,7 @@ class mob_healing_ward : public CreatureScript
{
if (pInstance)
{
Unit *pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO));
Unit* pJindo = Unit::GetUnit((*me), pInstance->GetData64(DATA_JINDO));
if (pJindo)
DoCast(pJindo, SPELL_HEAL);
}
@@ -241,7 +241,7 @@ class mob_shade_of_jindo : public CreatureScript
struct mob_shade_of_jindoAI : public ScriptedAI
{
mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) {}
mob_shade_of_jindoAI(Creature* c) : ScriptedAI(c) {}
uint32 ShadowShock_Timer;
@@ -55,7 +55,7 @@ class boss_mandokir : public CreatureScript
struct boss_mandokirAI : public ScriptedAI
{
boss_mandokirAI(Creature *c) : ScriptedAI(c)
boss_mandokirAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -294,7 +294,7 @@ class mob_ohgan : public CreatureScript
struct mob_ohganAI : public ScriptedAI
{
mob_ohganAI(Creature *c) : ScriptedAI(c)
mob_ohganAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -51,7 +51,7 @@ class boss_marli : public CreatureScript
struct boss_marliAI : public ScriptedAI
{
boss_marliAI(Creature *c) : ScriptedAI(c)
boss_marliAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -118,11 +118,11 @@ class boss_marli : public CreatureScript
{
DoScriptText(SAY_SPIDER_SPAWN, me);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
return;
Creature *Spider = NULL;
Creature* Spider = NULL;
Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Spider)
@@ -142,11 +142,11 @@ class boss_marli : public CreatureScript
if (SpawnSpider_Timer <= diff)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
return;
Creature *Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
Creature* Spider = me->SummonCreature(15041, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 15000);
if (Spider)
Spider->AI()->AttackStart(pTarget);
SpawnSpider_Timer = 12000 + rand()%5000;
@@ -173,7 +173,7 @@ class boss_marli : public CreatureScript
{
if (Charge_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
int i = 0;
while (i < 3) // max 3 tries to get a random target with power_mana
{
@@ -230,7 +230,7 @@ class mob_spawn_of_marli : public CreatureScript
struct mob_spawn_of_marliAI : public ScriptedAI
{
mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {}
mob_spawn_of_marliAI(Creature* c) : ScriptedAI(c) {}
uint32 LevelUp_Timer;
@@ -42,7 +42,7 @@ class boss_renataki : public CreatureScript
struct boss_renatakiAI : public ScriptedAI
{
boss_renatakiAI(Creature *c) : ScriptedAI(c) {}
boss_renatakiAI(Creature* c) : ScriptedAI(c) {}
uint32 Invisible_Timer;
uint32 Ambush_Timer;
@@ -92,7 +92,7 @@ class boss_renataki : public CreatureScript
{
if (Ambush_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
@@ -126,7 +126,7 @@ class boss_renataki : public CreatureScript
{
if (Aggro_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
if (DoGetThreat(me->getVictim()))
@@ -66,7 +66,7 @@ class boss_thekal : public CreatureScript
struct boss_thekalAI : public ScriptedAI
{
boss_thekalAI(Creature *c) : ScriptedAI(c)
boss_thekalAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -134,7 +134,7 @@ class boss_thekal : public CreatureScript
if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->setFaction(14);
@@ -148,7 +148,7 @@ class boss_thekal : public CreatureScript
if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL)
{
//Resurrect Zath
Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
if (pZath)
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
@@ -219,7 +219,7 @@ class boss_thekal : public CreatureScript
{
if (Charge_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_CHARGE);
DoResetThreat();
@@ -277,7 +277,7 @@ class mob_zealot_lorkhan : public CreatureScript
struct mob_zealot_lorkhanAI : public ScriptedAI
{
mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c)
mob_zealot_lorkhanAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -337,8 +337,8 @@ class mob_zealot_lorkhan : public CreatureScript
{
if (m_pInstance)
{
Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL));
Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL));
Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH));
if (!pThekal || !pZath)
return;
@@ -374,7 +374,7 @@ class mob_zealot_lorkhan : public CreatureScript
if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -386,7 +386,7 @@ class mob_zealot_lorkhan : public CreatureScript
if (m_pInstance->GetData(TYPE_ZATH) == SPECIAL)
{
//Resurrect Zath
if (Unit *pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)))
if (Unit* pZath = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_ZATH)))
{
pZath->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pZath->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -437,7 +437,7 @@ class mob_zealot_zath : public CreatureScript
struct mob_zealot_zathAI : public ScriptedAI
{
mob_zealot_zathAI(Creature *c) : ScriptedAI(c)
mob_zealot_zathAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -527,7 +527,7 @@ class mob_zealot_zath : public CreatureScript
if (m_pInstance->GetData(TYPE_LORKHAN) == SPECIAL)
{
//Resurrect LorKhan
if (Unit *pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
if (Unit* pLorKhan = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_LORKHAN)))
{
pLorKhan->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pLorKhan->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -539,7 +539,7 @@ class mob_zealot_zath : public CreatureScript
if (m_pInstance->GetData(TYPE_THEKAL) == SPECIAL)
{
//Resurrect Thekal
if (Unit *pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
if (Unit* pThekal = Unit::GetUnit((*me), m_pInstance->GetData64(DATA_THEKAL)))
{
pThekal->SetUInt32Value(UNIT_FIELD_BYTES_1, 0);
pThekal->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -50,7 +50,7 @@ class boss_venoxis : public CreatureScript
struct boss_venoxisAI : public ScriptedAI
{
boss_venoxisAI(Creature *c) : ScriptedAI(c)
boss_venoxisAI(Creature* c) : ScriptedAI(c)
{
m_pInstance = c->GetInstanceScript();
}
@@ -125,7 +125,7 @@ class boss_venoxis : public CreatureScript
TargetInRange = 0;
for (uint8 i = 0; i < 10; ++i)
{
if (Unit *pTarget = SelectTarget(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 = SelectTarget(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 = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_VENOMSPIT);
VenomSpit_Timer = 15000 + rand()%5000;
@@ -40,7 +40,7 @@ class boss_wushoolay : public CreatureScript
struct boss_wushoolayAI : public ScriptedAI
{
boss_wushoolayAI(Creature *c) : ScriptedAI(c) {}
boss_wushoolayAI(Creature* c) : ScriptedAI(c) {}
uint32 LightningCloud_Timer;
uint32 LightningWave_Timer;
@@ -70,7 +70,7 @@ class boss_wushoolay : public CreatureScript
//LightningWave_Timer
if (LightningWave_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget) DoCast(pTarget, SPELL_LIGHTNINGWAVE);