Scripts: Reorder file names in Commands/CMakeList file and cosmetic changes in all scripts
This commit is contained in:
@@ -173,7 +173,7 @@ public:
|
||||
//Close the encounter door, open it in JustDied/Reset
|
||||
}
|
||||
|
||||
void MoveInLineOfSight(Unit *who)
|
||||
void MoveInLineOfSight(Unit* who)
|
||||
{
|
||||
if (!HasTaunted && me->IsWithinDistInMap(who, 40.0f))
|
||||
{
|
||||
@@ -302,7 +302,7 @@ public:
|
||||
if (PhoenixTimer <= diff)
|
||||
{
|
||||
|
||||
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
|
||||
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1);
|
||||
|
||||
uint8 random = urand(1, 2);
|
||||
float x = KaelLocations[random][0];
|
||||
@@ -323,7 +323,7 @@ public:
|
||||
|
||||
if (FlameStrikeTimer <= diff)
|
||||
{
|
||||
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
|
||||
{
|
||||
me->InterruptSpell(CURRENT_CHANNELED_SPELL);
|
||||
me->InterruptSpell(CURRENT_GENERIC_SPELL);
|
||||
@@ -395,7 +395,7 @@ public:
|
||||
|
||||
for (uint8 i = 0; i < 3; ++i)
|
||||
{
|
||||
Unit *pTarget = NULL;
|
||||
Unit* pTarget = NULL;
|
||||
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
|
||||
|
||||
Creature* Orb = DoSpawnCreature(CREATURE_ARCANE_SPHERE, 5, 5, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 30000);
|
||||
@@ -441,7 +441,7 @@ public:
|
||||
|
||||
struct mob_felkael_flamestrikeAI : public ScriptedAI
|
||||
{
|
||||
mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c)
|
||||
mob_felkael_flamestrikeAI(Creature* c) : ScriptedAI(c)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -603,7 +603,7 @@ public:
|
||||
|
||||
struct mob_felkael_phoenix_eggAI : public ScriptedAI
|
||||
{
|
||||
mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {}
|
||||
mob_felkael_phoenix_eggAI(Creature* c) : ScriptedAI(c) {}
|
||||
|
||||
uint32 HatchTimer;
|
||||
|
||||
@@ -640,7 +640,7 @@ public:
|
||||
|
||||
struct mob_arcane_sphereAI : public ScriptedAI
|
||||
{
|
||||
mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); }
|
||||
mob_arcane_sphereAI(Creature* c) : ScriptedAI(c) { Reset(); }
|
||||
|
||||
uint32 DespawnTimer;
|
||||
uint32 ChangeTargetTimer;
|
||||
@@ -671,7 +671,7 @@ public:
|
||||
|
||||
if (ChangeTargetTimer <= diff)
|
||||
{
|
||||
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true))
|
||||
{
|
||||
me->AddThreat(pTarget, 1.0f);
|
||||
me->TauntApply(pTarget);
|
||||
|
||||
@@ -256,7 +256,7 @@ public:
|
||||
if (HealTimer <= diff)
|
||||
{
|
||||
uint32 health = me->GetHealth();
|
||||
Unit *pTarget = me;
|
||||
Unit* pTarget = me;
|
||||
for (uint8 i = 0; i < MAX_ACTIVE_LACKEY; ++i)
|
||||
{
|
||||
if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[i]))
|
||||
@@ -272,7 +272,7 @@ public:
|
||||
|
||||
if (RenewTimer <= diff)
|
||||
{
|
||||
Unit *pTarget = me;
|
||||
Unit* pTarget = me;
|
||||
|
||||
if (urand(0, 1))
|
||||
if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
|
||||
@@ -285,7 +285,7 @@ public:
|
||||
|
||||
if (ShieldTimer <= diff)
|
||||
{
|
||||
Unit *pTarget = me;
|
||||
Unit* pTarget = me;
|
||||
|
||||
if (urand(0, 1))
|
||||
if (Unit* pAdd = Unit::GetUnit(*me, m_auiLackeyGUID[rand()%MAX_ACTIVE_LACKEY]))
|
||||
@@ -298,7 +298,7 @@ public:
|
||||
|
||||
if (DispelTimer <= diff)
|
||||
{
|
||||
Unit *pTarget = NULL;
|
||||
Unit* pTarget = NULL;
|
||||
|
||||
if (urand(0, 1))
|
||||
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true);
|
||||
@@ -494,7 +494,7 @@ public:
|
||||
struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Rogue
|
||||
boss_kagani_nightstrikeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_kagani_nightstrikeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Gouge_Timer;
|
||||
uint32 Kick_Timer;
|
||||
@@ -599,7 +599,7 @@ public:
|
||||
struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Warlock
|
||||
boss_ellris_duskhallowAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_ellris_duskhallowAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Immolate_Timer;
|
||||
uint32 Shadow_Bolt_Timer;
|
||||
@@ -691,7 +691,7 @@ public:
|
||||
struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Monk
|
||||
boss_eramas_brightblazeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_eramas_brightblazeAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Knockdown_Timer;
|
||||
uint32 Snap_Kick_Timer;
|
||||
@@ -753,7 +753,7 @@ public:
|
||||
struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Mage
|
||||
boss_yazzaiAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_yazzaiAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
bool HasIceBlocked;
|
||||
|
||||
@@ -791,7 +791,7 @@ public:
|
||||
|
||||
if (Polymorph_Timer <= diff)
|
||||
{
|
||||
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
{
|
||||
DoCast(pTarget, SPELL_POLYMORPH);
|
||||
Polymorph_Timer = 20000;
|
||||
@@ -836,7 +836,7 @@ public:
|
||||
std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList();
|
||||
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
|
||||
{
|
||||
if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
{
|
||||
//if in melee range
|
||||
if (pTarget->IsWithinDistInMap(me, 5))
|
||||
@@ -884,7 +884,7 @@ public:
|
||||
struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Warrior
|
||||
boss_warlord_salarisAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_warlord_salarisAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Intercept_Stun_Timer;
|
||||
uint32 Disarm_Timer;
|
||||
@@ -923,7 +923,7 @@ public:
|
||||
std::list<HostileReference*>& t_list = me->getThreatManager().getThreatList();
|
||||
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
|
||||
{
|
||||
if (Unit *pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
if (Unit* pTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid()))
|
||||
{
|
||||
//if in melee range
|
||||
if (pTarget->IsWithinDistInMap(me, ATTACK_DISTANCE))
|
||||
@@ -1005,7 +1005,7 @@ public:
|
||||
struct boss_garaxxasAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Hunter
|
||||
boss_garaxxasAI(Creature *c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; }
|
||||
boss_garaxxasAI(Creature* c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; }
|
||||
|
||||
uint64 m_uiPetGUID;
|
||||
|
||||
@@ -1125,7 +1125,7 @@ public:
|
||||
struct boss_apokoAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Shaman
|
||||
boss_apokoAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_apokoAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Totem_Timer;
|
||||
uint8 Totem_Amount;
|
||||
@@ -1224,7 +1224,7 @@ public:
|
||||
struct boss_zelfanAI : public boss_priestess_lackey_commonAI
|
||||
{
|
||||
//Engineer
|
||||
boss_zelfanAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
|
||||
boss_zelfanAI(Creature* c) : boss_priestess_lackey_commonAI(c) {}
|
||||
|
||||
uint32 Goblin_Dragon_Gun_Timer;
|
||||
uint32 Rocket_Launch_Timer;
|
||||
|
||||
@@ -333,7 +333,7 @@ public:
|
||||
|
||||
struct mob_fel_crystalAI : public ScriptedAI
|
||||
{
|
||||
mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {}
|
||||
mob_fel_crystalAI(Creature* c) : ScriptedAI(c) {}
|
||||
|
||||
void Reset() {}
|
||||
void EnterCombat(Unit* /*who*/) {}
|
||||
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
|
||||
struct boss_vexallusAI : public ScriptedAI
|
||||
{
|
||||
boss_vexallusAI(Creature *c) : ScriptedAI(c)
|
||||
boss_vexallusAI(Creature* c) : ScriptedAI(c)
|
||||
{
|
||||
pInstance = c->GetInstanceScript();
|
||||
}
|
||||
@@ -115,9 +115,9 @@ public:
|
||||
pInstance->SetData(DATA_VEXALLUS_EVENT, IN_PROGRESS);
|
||||
}
|
||||
|
||||
void JustSummoned(Creature *summoned)
|
||||
void JustSummoned(Creature* summoned)
|
||||
{
|
||||
if (Unit *temp = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* temp = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
summoned->GetMotionMaster()->MoveFollow(temp, 0, 0);
|
||||
|
||||
//spells are SUMMON_TYPE_GUARDIAN, so using setOwner should be ok
|
||||
@@ -163,7 +163,7 @@ public:
|
||||
|
||||
if (ChainLightningTimer <= diff)
|
||||
{
|
||||
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
DoCast(pTarget, SPELL_CHAIN_LIGHTNING);
|
||||
|
||||
ChainLightningTimer = 8000;
|
||||
@@ -171,7 +171,7 @@ public:
|
||||
|
||||
if (ArcaneShockTimer <= diff)
|
||||
{
|
||||
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
|
||||
if (pTarget)
|
||||
DoCast(pTarget, SPELL_ARCANE_SHOCK);
|
||||
|
||||
@@ -206,13 +206,13 @@ public:
|
||||
|
||||
struct mob_pure_energyAI : public ScriptedAI
|
||||
{
|
||||
mob_pure_energyAI(Creature *c) : ScriptedAI(c) {}
|
||||
mob_pure_energyAI(Creature* c) : ScriptedAI(c) {}
|
||||
|
||||
void Reset() {}
|
||||
|
||||
void JustDied(Unit* slayer)
|
||||
{
|
||||
if (Unit *temp = me->GetOwner())
|
||||
if (Unit* temp = me->GetOwner())
|
||||
{
|
||||
if (temp && temp->isAlive())
|
||||
slayer->CastSpell(slayer, SPELL_ENERGY_FEEDBACK, true, 0, 0, temp->GetGUID());
|
||||
|
||||
Reference in New Issue
Block a user