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
@@ -49,7 +49,7 @@ public:
struct boss_kriAI : public ScriptedAI
{
boss_kriAI(Creature *c) : ScriptedAI(c)
boss_kriAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -146,7 +146,7 @@ public:
struct boss_vemAI : public ScriptedAI
{
boss_vemAI(Creature *c) : ScriptedAI(c)
boss_vemAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -193,7 +193,7 @@ public:
//Charge_Timer
if (Charge_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
{
@@ -239,7 +239,7 @@ public:
struct boss_yaujAI : public ScriptedAI
{
boss_yaujAI(Creature *c) : ScriptedAI(c)
boss_yaujAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -273,7 +273,7 @@ public:
for (uint8 i = 0; i < 10; ++i)
{
Unit *pTarget = SelectTarget(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);
@@ -303,8 +303,8 @@ public:
{
if (pInstance)
{
Unit *pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI));
Unit *pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM));
Unit* pKri = Unit::GetUnit((*me), pInstance->GetData64(DATA_KRI));
Unit* pVem = Unit::GetUnit((*me), pInstance->GetData64(DATA_VEM));
switch (urand(0, 2))
{
@@ -176,7 +176,7 @@ public:
struct eye_of_cthunAI : public Scripted_NoMovementAI
{
eye_of_cthunAI(Creature *c) : Scripted_NoMovementAI(c)
eye_of_cthunAI(Creature* c) : Scripted_NoMovementAI(c)
{
pInst = c->GetInstanceScript();
if (!pInst)
@@ -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 = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Spawned->AI())
Spawned->AI()->AttackStart(pTarget);
}
@@ -328,7 +328,7 @@ public:
me->SetUInt64Value(UNIT_FIELD_TARGET, 0);
//Select random target for dark beam to start on
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
//Face our target
DarkGlareAngle = me->GetAngle(pTarget);
@@ -480,7 +480,7 @@ public:
struct cthunAI : public Scripted_NoMovementAI
{
cthunAI(Creature *c) : Scripted_NoMovementAI(c)
cthunAI(Creature* c) : Scripted_NoMovementAI(c)
{
SetCombatMovement(false);
@@ -558,7 +558,7 @@ public:
Creature* Spawned;
Spawned = DoSpawnCreature(MOB_EYE_TENTACLE, x, y, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 500);
if (Spawned && Spawned->AI())
if (Unit *pTarget = SelectRandomNotStomach())
if (Unit* pTarget = SelectRandomNotStomach())
Spawned->AI()->AttackStart(pTarget);
}
@@ -787,7 +787,7 @@ public:
//Stomach Enter Timer
if (StomachEnterTimer <= diff)
{
if (Unit *pTarget = SelectRandomNotStomach())
if (Unit* pTarget = SelectRandomNotStomach())
{
//Set target in stomach
Stomach_Map[pTarget->GetGUID()] = true;
@@ -820,7 +820,7 @@ public:
//GientClawTentacleTimer
if (GiantClawTentacleTimer <= diff)
{
if (Unit *pTarget = SelectRandomNotStomach())
if (Unit* pTarget = SelectRandomNotStomach())
{
//Spawn claw tentacle on the random target
if (Creature* spawned = me->SummonCreature(MOB_GIANT_CLAW_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500))
@@ -835,7 +835,7 @@ public:
//GiantEyeTentacleTimer
if (GiantEyeTentacleTimer <= diff)
{
if (Unit *pTarget = SelectRandomNotStomach())
if (Unit* pTarget = SelectRandomNotStomach())
{
//Spawn claw tentacle on the random target
if (Creature* spawned = me->SummonCreature(MOB_GIANT_EYE_TENTACLE, *pTarget, TEMPSUMMON_CORPSE_DESPAWN, 500))
@@ -939,7 +939,7 @@ public:
struct eye_tentacleAI : public Scripted_NoMovementAI
{
eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c)
eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
{
if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
{
@@ -988,7 +988,7 @@ public:
//MindflayTimer
if (MindflayTimer <= diff)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID))
DoCast(pTarget, SPELL_MIND_FLAY);
@@ -1012,7 +1012,7 @@ public:
struct claw_tentacleAI : public Scripted_NoMovementAI
{
claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c)
claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
{
SetCombatMovement(false);
@@ -1064,7 +1064,7 @@ public:
//Dissapear and reappear at new position
me->SetVisible(false);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
{
me->Kill(me);
@@ -1122,7 +1122,7 @@ public:
struct giant_claw_tentacleAI : public Scripted_NoMovementAI
{
giant_claw_tentacleAI(Creature *c) : Scripted_NoMovementAI(c)
giant_claw_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
{
SetCombatMovement(false);
@@ -1176,7 +1176,7 @@ public:
//Dissapear and reappear at new position
me->SetVisible(false);
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (!pTarget)
{
me->Kill(me);
@@ -1241,7 +1241,7 @@ public:
struct giant_eye_tentacleAI : public Scripted_NoMovementAI
{
giant_eye_tentacleAI(Creature *c) : Scripted_NoMovementAI(c)
giant_eye_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
{
SetCombatMovement(false);
@@ -1281,7 +1281,7 @@ public:
//BeamTimer
if (BeamTimer <= diff)
{
Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget && !pTarget->HasAura(SPELL_DIGESTIVE_ACID))
DoCast(pTarget, SPELL_GREEN_BEAM);
@@ -1305,7 +1305,7 @@ public:
struct flesh_tentacleAI : public Scripted_NoMovementAI
{
flesh_tentacleAI(Creature *c) : Scripted_NoMovementAI(c)
flesh_tentacleAI(Creature* c) : Scripted_NoMovementAI(c)
{
SetCombatMovement(false);
}
@@ -49,7 +49,7 @@ public:
struct boss_fankrissAI : public ScriptedAI
{
boss_fankrissAI(Creature *c) : ScriptedAI(c) {}
boss_fankrissAI(Creature* c) : ScriptedAI(c) {}
uint32 MortalWound_Timer;
uint32 SpawnHatchlings_Timer;
@@ -136,7 +136,7 @@ public:
{
if (SpawnHatchlings_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget && pTarget->GetTypeId() == TYPEID_PLAYER)
{
@@ -47,7 +47,7 @@ public:
struct boss_huhuranAI : public ScriptedAI
{
boss_huhuranAI(Creature *c) : ScriptedAI(c) {}
boss_huhuranAI(Creature* c) : ScriptedAI(c) {}
uint32 Frenzy_Timer;
uint32 Wyvern_Timer;
@@ -95,7 +95,7 @@ public:
// Wyvern Timer
if (Wyvern_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(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;
@@ -45,7 +45,7 @@ public:
struct boss_ouroAI : public ScriptedAI
{
boss_ouroAI(Creature *c) : ScriptedAI(c) {}
boss_ouroAI(Creature* c) : ScriptedAI(c) {}
uint32 Sweep_Timer;
uint32 SandBlast_Timer;
@@ -111,7 +111,7 @@ public:
//ChangeTarget_Timer
if (Submerged && ChangeTarget_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0);
if (pTarget)
@@ -49,7 +49,7 @@ public:
struct boss_sarturaAI : public ScriptedAI
{
boss_sarturaAI(Creature *c) : ScriptedAI(c) {}
boss_sarturaAI(Creature* c) : ScriptedAI(c) {}
uint32 WhirlWind_Timer;
uint32 WhirlWindRandom_Timer;
@@ -192,7 +192,7 @@ public:
struct mob_sartura_royal_guardAI : public ScriptedAI
{
mob_sartura_royal_guardAI(Creature *c) : ScriptedAI(c) {}
mob_sartura_royal_guardAI(Creature* c) : ScriptedAI(c) {}
uint32 WhirlWind_Timer;
uint32 WhirlWindRandom_Timer;
@@ -63,7 +63,7 @@ public:
struct boss_skeramAI : public ScriptedAI
{
boss_skeramAI(Creature *c) : ScriptedAI(c)
boss_skeramAI(Creature* c) : ScriptedAI(c)
{
IsImage = false;
}
@@ -236,7 +236,7 @@ public:
for (uint16 i = 0; i < 41; ++i)
{
if (Player *pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)))
if (Player* pTarget = CAST_PLR(SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)))
{
if (Group *pGrp = pTarget->GetGroup())
for (uint8 ico = 0; ico < TARGETICONCOUNT; ++ico)
@@ -264,9 +264,9 @@ public:
case 25: Images25 = true; break;
}
Unit *pTarget = SelectTarget(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);
Creature* Image1 = me->SummonCreature(15263, i1->x, i1->y, i1->z, i1->r, TEMPSUMMON_CORPSE_DESPAWN, 30000);
if (Image1)
{
Image1->SetMaxHealth(me->GetMaxHealth() / 5);
@@ -276,7 +276,7 @@ public:
CAST_AI(boss_skeram::boss_skeramAI, Image1->AI())->IsImage = true;
}
Creature *Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000);
Creature* Image2 = me->SummonCreature(15263, i2->x, i2->y, i2->z, i2->r, TEMPSUMMON_CORPSE_DESPAWN, 30000);
if (Image2)
{
Image2->SetMaxHealth(me->GetMaxHealth() / 5);
@@ -61,7 +61,7 @@ EndScriptData */
struct boss_twinemperorsAI : public ScriptedAI
{
boss_twinemperorsAI(Creature *c): ScriptedAI(c)
boss_twinemperorsAI(Creature* c): ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -79,7 +79,7 @@ struct boss_twinemperorsAI : public ScriptedAI
virtual bool IAmVeklor() = 0;
virtual void Reset() = 0;
virtual void CastSpellOnBug(Creature *pTarget) = 0;
virtual void CastSpellOnBug(Creature* pTarget) = 0;
void TwinReset()
{
@@ -95,7 +95,7 @@ struct boss_twinemperorsAI : public ScriptedAI
EnrageTimer = 15*60000;
}
Creature *GetOtherBoss()
Creature* GetOtherBoss()
{
if (pInstance)
return Unit::GetCreature(*me, pInstance->GetData64(IAmVeklor() ? DATA_VEKNILASH : DATA_VEKLOR));
@@ -105,7 +105,7 @@ struct boss_twinemperorsAI : public ScriptedAI
void DamageTaken(Unit* /*done_by*/, uint32 &damage)
{
Unit *pOtherBoss = GetOtherBoss();
Unit* pOtherBoss = GetOtherBoss();
if (pOtherBoss)
{
float dPercent = ((float)damage) / ((float)me->GetMaxHealth());
@@ -122,7 +122,7 @@ struct boss_twinemperorsAI : public ScriptedAI
void JustDied(Unit* /*Killer*/)
{
Creature *pOtherBoss = GetOtherBoss();
Creature* pOtherBoss = GetOtherBoss();
if (pOtherBoss)
{
pOtherBoss->SetHealth(0);
@@ -142,7 +142,7 @@ struct boss_twinemperorsAI : public ScriptedAI
void EnterCombat(Unit* who)
{
DoZoneInCombat();
Creature *pOtherBoss = GetOtherBoss();
Creature* pOtherBoss = GetOtherBoss();
if (pOtherBoss)
{
// TODO: we should activate the other boss location so he can start attackning even if nobody
@@ -157,12 +157,12 @@ struct boss_twinemperorsAI : public ScriptedAI
}
}
void SpellHit(Unit *caster, const SpellEntry *entry)
void SpellHit(Unit* caster, const SpellEntry *entry)
{
if (caster == me)
return;
Creature *pOtherBoss = GetOtherBoss();
Creature* pOtherBoss = GetOtherBoss();
if (entry->Id != SPELL_HEAL_BROTHER || !pOtherBoss)
return;
@@ -193,7 +193,7 @@ struct boss_twinemperorsAI : public ScriptedAI
if (Heal_Timer <= diff)
{
Unit *pOtherBoss = GetOtherBoss();
Unit* pOtherBoss = GetOtherBoss();
if (pOtherBoss && pOtherBoss->IsWithinDist(me, 60))
{
DoCast(pOtherBoss, SPELL_HEAL_BROTHER);
@@ -212,7 +212,7 @@ struct boss_twinemperorsAI : public ScriptedAI
if (IAmVeklor())
return; // mechanics handled by veknilash so they teleport exactly at the same time and to correct coordinates
Creature *pOtherBoss = GetOtherBoss();
Creature* pOtherBoss = GetOtherBoss();
if (pOtherBoss)
{
//me->MonsterYell("Teleporting ...", LANG_UNIVERSAL, 0);
@@ -260,7 +260,7 @@ struct boss_twinemperorsAI : public ScriptedAI
{
AfterTeleport = false;
me->ClearUnitState(UNIT_STAT_STUNNED);
if (Unit *nearu = me->SelectNearestTarget(100))
if (Unit* nearu = me->SelectNearestTarget(100))
{
//DoYell(nearu->GetName(), LANG_UNIVERSAL, 0);
AttackStart(nearu);
@@ -289,7 +289,7 @@ struct boss_twinemperorsAI : public ScriptedAI
}
}
void MoveInLineOfSight(Unit *who)
void MoveInLineOfSight(Unit* who)
{
if (!who || me->getVictim())
return;
@@ -308,7 +308,7 @@ struct boss_twinemperorsAI : public ScriptedAI
}
}
Creature *RespawnNearbyBugsAndGetOne()
Creature* RespawnNearbyBugsAndGetOne()
{
std::list<Creature*> lUnitList;
me->GetCreatureListWithEntryInGrid(lUnitList, 15316, 150.0f);
@@ -317,11 +317,11 @@ struct boss_twinemperorsAI : public ScriptedAI
if (lUnitList.empty())
return NULL;
Creature *nearb = NULL;
Creature* nearb = NULL;
for (std::list<Creature*>::const_iterator iter = lUnitList.begin(); iter != lUnitList.end(); ++iter)
{
Creature *c = *iter;
Creature* c = *iter;
if (c)
{
if (c->isDead())
@@ -344,7 +344,7 @@ struct boss_twinemperorsAI : public ScriptedAI
{
if (BugsTimer < diff || Abuse_Bug_Timer <= diff)
{
Creature *c = RespawnNearbyBugsAndGetOne();
Creature* c = RespawnNearbyBugsAndGetOne();
if (Abuse_Bug_Timer <= diff)
{
if (c)
@@ -396,7 +396,7 @@ public:
struct boss_veknilashAI : public boss_twinemperorsAI
{
bool IAmVeklor() {return false;}
boss_veknilashAI(Creature *c) : boss_twinemperorsAI(c) {}
boss_veknilashAI(Creature* c) : boss_twinemperorsAI(c) {}
uint32 UpperCut_Timer;
uint32 UnbalancingStrike_Timer;
@@ -418,7 +418,7 @@ public:
me->ApplySpellImmune(0, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_MAGIC, true);
}
void CastSpellOnBug(Creature *pTarget)
void CastSpellOnBug(Creature* pTarget)
{
pTarget->setFaction(14);
pTarget->AI()->AttackStart(me->getThreatManager().getHostilTarget());
@@ -482,7 +482,7 @@ public:
struct boss_veklorAI : public boss_twinemperorsAI
{
bool IAmVeklor() {return true;}
boss_veklorAI(Creature *c) : boss_twinemperorsAI(c) {}
boss_veklorAI(Creature* c) : boss_twinemperorsAI(c) {}
uint32 ShadowBolt_Timer;
uint32 Blizzard_Timer;
@@ -508,7 +508,7 @@ public:
me->SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, 0);
}
void CastSpellOnBug(Creature *pTarget)
void CastSpellOnBug(Creature* pTarget)
{
pTarget->setFaction(14);
pTarget->AddAura(SPELL_EXPLODEBUG, pTarget);
@@ -542,7 +542,7 @@ public:
//Blizzard_Timer
if (Blizzard_Timer <= diff)
{
Unit *pTarget = NULL;
Unit* pTarget = NULL;
pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0, 45, true);
if (pTarget)
DoCast(pTarget, SPELL_BLIZZARD);
@@ -551,7 +551,7 @@ public:
if (ArcaneBurst_Timer <= diff)
{
Unit *mvic;
Unit* mvic;
if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true)) != NULL)
{
DoCast(mvic, SPELL_ARCANEBURST);
@@ -86,7 +86,7 @@ public:
}
}
aqsentinelAI(Creature *c) : ScriptedAI(c)
aqsentinelAI(Creature* c) : ScriptedAI(c)
{
ClearBuddyList();
abselected = 0; // just initialization of variable
@@ -116,7 +116,7 @@ public:
}
}
void GiveBuddyMyList(Creature *c)
void GiveBuddyMyList(Creature* c)
{
aqsentinelAI *cai = CAST_AI(aqsentinelAI, (c)->AI());
for (int i=0; i<3; ++i)
@@ -128,15 +128,15 @@ public:
void SendMyListToBuddies()
{
for (int i=0; i<3; ++i)
if (Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
GiveBuddyMyList(pNearby);
}
void CallBuddiesToAttack(Unit *who)
void CallBuddiesToAttack(Unit* who)
{
for (int i=0; i<3; ++i)
{
Creature *c = Unit::GetCreature(*me, NearbyGUID[i]);
Creature* c = Unit::GetCreature(*me, NearbyGUID[i]);
if (c)
{
if (!c->isInCombat())
@@ -177,7 +177,7 @@ public:
return 0; // should never happen
}
void GetOtherSentinels(Unit *who)
void GetOtherSentinels(Unit* who)
{
bool *chosenAbilities = new bool[9];
memset(chosenAbilities, 0, 9*sizeof(bool));
@@ -191,7 +191,7 @@ public:
if (!NearbyGUID[bli])
break;
Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[bli]);
Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[bli]);
if (!pNearby)
break;
@@ -217,7 +217,7 @@ public:
{
if (!NearbyGUID[i])
continue;
if (Creature *pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
if (Creature* pNearby = Unit::GetCreature(*me, NearbyGUID[i]))
{
if (pNearby->isDead())
pNearby->Respawn();
@@ -246,7 +246,7 @@ public:
{
for (int ni=0; ni<3; ++ni)
{
Creature *sent = Unit::GetCreature(*me, NearbyGUID[ni]);
Creature* sent = Unit::GetCreature(*me, NearbyGUID[ni]);
if (!sent)
continue;
if (sent->isDead())