josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ class boss_broggok : public CreatureScript
}
}
void JustSummoned(Creature *summoned)
void JustSummoned(Creature* summoned)
{
summoned->setFaction(16);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_kelidan_the_breaker.cpp
+10 -10
View File
@@ -136,7 +136,7 @@ class boss_kelidan_the_breaker : public CreatureScript
}
for (uint8 i=0; i<5; ++i)
{
Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
Creature* channeler = Unit::GetCreature(*me, Channelers[i]);
if (who && channeler && !channeler->isInCombat())
channeler->AI()->AttackStart(who);
}
@@ -146,7 +146,7 @@ class boss_kelidan_the_breaker : public CreatureScript
{
for (uint8 i=0; i<5; ++i)
{
Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
Creature* channeler = Unit::GetCreature(*me, Channelers[i]);
if (channeler && channeler->isAlive())
return;
}
@@ -155,14 +155,14 @@ class boss_kelidan_the_breaker : public CreatureScript
me->AI()->AttackStart(killer);
}
uint64 GetChanneled(Creature *channeler1)
uint64 GetChanneled(Creature* channeler1)
{
SummonChannelers();
if (!channeler1) return 0;
uint8 i;
for (i=0; i<5; ++i)
{
Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
Creature* channeler = Unit::GetCreature(*me, Channelers[i]);
if (channeler && channeler->GetGUID() == channeler1->GetGUID())
break;
}
@@ -173,7 +173,7 @@ class boss_kelidan_the_breaker : public CreatureScript
{
for (uint8 i=0; i<5; ++i)
{
Creature *channeler = Unit::GetCreature(*me, Channelers[i]);
Creature* channeler = Unit::GetCreature(*me, Channelers[i]);
if (!channeler || channeler->isDead())
channeler = me->SummonCreature(ENTRY_CHANNELER, ShadowmoonChannelers[i][0], ShadowmoonChannelers[i][1], ShadowmoonChannelers[i][2], ShadowmoonChannelers[i][3], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000);
if (channeler)
@@ -317,7 +317,7 @@ class mob_shadowmoon_channeler : public CreatureScript
void EnterCombat(Unit* who)
{
if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerEngaged(who);
if (me->IsNonMeleeSpellCasted(false))
me->InterruptNonMeleeSpells(true);
@@ -326,7 +326,7 @@ class mob_shadowmoon_channeler : public CreatureScript
void JustDied(Unit* Killer)
{
if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->ChannelerDied(Killer);
}
@@ -337,10 +337,10 @@ class mob_shadowmoon_channeler : public CreatureScript
if (check_Timer <= diff)
{
if (!me->IsNonMeleeSpellCasted(false))
if (Creature *Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
if (Creature* Kelidan = me->FindNearestCreature(ENTRY_KELIDAN, 100))
{
uint64 channeler = CAST_AI(boss_kelidan_the_breaker::boss_kelidan_the_breakerAI, Kelidan->AI())->GetChanneled(me);
if (Unit *channeled = Unit::GetUnit(*me, channeler))
if (Unit* channeled = Unit::GetUnit(*me, channeler))
DoCast(channeled, SPELL_CHANNELING);
}
check_Timer = 5000;
@@ -352,7 +352,7 @@ class mob_shadowmoon_channeler : public CreatureScript
if (MarkOfShadow_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_MARK_OF_SHADOW);
MarkOfShadow_Timer = 15000+rand()%5000;
}
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_the_maker.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ class boss_the_maker : public CreatureScript
if (ExplodingBreaker_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_EXPLODING_BREAKER);
ExplodingBreaker_Timer = 4000+rand()%8000;
}
@@ -132,7 +132,7 @@ class boss_the_maker : public CreatureScript
/* // Disabled until Core Support for mind control
if (domination_timer_timer <= diff)
{
Unit *pTarget;
Unit* pTarget;
pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0);
DoCast(pTarget, SPELL_DOMINATION);
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp
+2 -2
View File
@@ -192,7 +192,7 @@ class boss_omor_the_unscarred : public CreatureScript
{
DoScriptText(SAY_CURSE, me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoCast(pTarget, SPELL_TREACHEROUS_AURA);
Aura_Timer = 8000+rand()%8000;
@@ -203,7 +203,7 @@ class boss_omor_the_unscarred : public CreatureScript
if (Shadowbolt_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
if (pTarget)
pTarget = me->getVictim();
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+8 -8
View File
@@ -106,7 +106,7 @@ class boss_nazan : public CreatureScript
void EnterCombat(Unit* /*who*/) {}
void JustSummoned(Creature *summoned)
void JustSummoned(Creature* summoned)
{
if (summoned && summoned->GetEntry() == ENTRY_LIQUID_FIRE)
{
@@ -117,7 +117,7 @@ class boss_nazan : public CreatureScript
}
}
void SpellHitTarget(Unit *pTarget, const SpellEntry* entry)
void SpellHitTarget(Unit* pTarget, const SpellEntry* entry)
{
if (pTarget && entry->Id == uint32(SPELL_FIREBALL))
me->SummonCreature(ENTRY_LIQUID_FIRE, pTarget->GetPositionX(), pTarget->GetPositionY(), pTarget->GetPositionZ(), pTarget->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN, 30000);
@@ -139,7 +139,7 @@ class boss_nazan : public CreatureScript
if (flight) // phase 1 - the flight
{
Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID);
if (Fly_Timer < diff || !(Vazruden && Vazruden->isAlive() && Vazruden->HealthAbovePct(20)))
{
flight = false;
@@ -319,7 +319,7 @@ class boss_vazruden_the_herald : public CreatureScript
{
if (summoned)
{
Creature *Nazan = Unit::GetCreature(*me, NazanGUID);
Creature* Nazan = Unit::GetCreature(*me, NazanGUID);
if (!Nazan)
Nazan = me->FindNearestCreature(ENTRY_NAZAN, 5000);
if (Nazan)
@@ -328,7 +328,7 @@ class boss_vazruden_the_herald : public CreatureScript
NazanGUID = 0;
}
Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID);
if (!Vazruden)
Vazruden = me->FindNearestCreature(ENTRY_VAZRUDEN, 5000);
if (Vazruden)
@@ -424,8 +424,8 @@ class boss_vazruden_the_herald : public CreatureScript
default: // adds do the job now
if (check <= diff)
{
Creature *Nazan = Unit::GetCreature(*me, NazanGUID);
Creature *Vazruden = Unit::GetCreature(*me, VazrudenGUID);
Creature* Nazan = Unit::GetCreature(*me, NazanGUID);
Creature* Vazruden = Unit::GetCreature(*me, VazrudenGUID);
if ((Nazan && Nazan->isAlive()) || (Vazruden && Vazruden->isAlive()))
{
if ((Nazan && Nazan->getVictim()) || (Vazruden && Vazruden->getVictim()))
@@ -482,7 +482,7 @@ class mob_hellfire_sentry : public CreatureScript
void JustDied(Unit* who)
{
if (Creature *herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150))
if (Creature* herald = me->FindNearestCreature(ENTRY_VAZRUDEN_HERALD, 150))
CAST_AI(boss_vazruden_the_herald::boss_vazruden_the_heraldAI, herald->AI())->SentryDownBy(who);
}
src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+1 -1
View File
@@ -131,7 +131,7 @@ class boss_watchkeeper_gargolmar : public CreatureScript
{
DoScriptText(SAY_SURGE, me);
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SURGE);
Surge_Timer = 5000+rand()%8000;
src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+14 -14
View File
@@ -151,12 +151,12 @@ class mob_abyssal : public CreatureScript
{
DoZoneInCombat();
}
void AttackStart(Unit *who)
void AttackStart(Unit* who)
{
if (!trigger)
ScriptedAI::AttackStart(who);
}
void MoveInLineOfSight(Unit *who)
void MoveInLineOfSight(Unit* who)
{
if (!trigger)
ScriptedAI::MoveInLineOfSight(who);
@@ -290,7 +290,7 @@ class boss_magtheridon : public CreatureScript
}
//function to interrupt channeling and debuff clicker with mind exh(used if second person clicks with same cube or after dispeling/ending shadow grasp DoT)
void DebuffClicker(Unit *clicker)
void DebuffClicker(Unit* clicker)
{
if (!clicker || !clicker->isAlive())
return;
@@ -307,7 +307,7 @@ class boss_magtheridon : public CreatureScript
// if not - apply mind exhaustion and delete from clicker's list
for (CubeMap::iterator i = Cube.begin(); i != Cube.end(); ++i)
{
Unit *clicker = Unit::GetUnit(*me, (*i).second);
Unit* clicker = Unit::GetUnit(*me, (*i).second);
if (!clicker || !clicker->HasAura(SPELL_SHADOW_GRASP))
{
DebuffClicker(clicker);
@@ -346,7 +346,7 @@ class boss_magtheridon : public CreatureScript
void MoveInLineOfSight(Unit* /*who*/) {}
void AttackStart(Unit *who)
void AttackStart(Unit* who)
{
if (!me->HasUnitState(UNIT_STAT_STUNNED))
ScriptedAI::AttackStart(who);
@@ -426,11 +426,11 @@ class boss_magtheridon : public CreatureScript
if (Blaze_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
float x, y, z;
pTarget->GetPosition(x, y, z);
Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (summon)
{
CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(2);
@@ -460,11 +460,11 @@ class boss_magtheridon : public CreatureScript
{
if (Debris_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
float x, y, z;
pTarget->GetPosition(x, y, z);
Creature *summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
Creature* summon = me->SummonCreature(MOB_ABYSSAL, x, y, z, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if (summon)
CAST_AI(mob_abyssal::mob_abyssalAI, summon->AI())->SetTrigger(1);
}
@@ -536,7 +536,7 @@ class mob_hellfire_channeler : public CreatureScript
DoCast(me, SPELL_SHADOW_GRASP_C, false);
}
void JustSummoned(Creature *summon)
void JustSummoned(Creature* summon)
{
summon->AI()->AttackStart(me->getVictim());
}
@@ -577,7 +577,7 @@ class mob_hellfire_channeler : public CreatureScript
if (Fear_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_FEAR);
Fear_Timer = 25000 + rand()%15000;
}
@@ -586,7 +586,7 @@ class mob_hellfire_channeler : public CreatureScript
if (Infernal_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_BURNING_ABYSSAL, true);
Infernal_Timer = 30000 + rand()%10000;
}
@@ -611,7 +611,7 @@ public:
{
}
bool OnGossipHello(Player *pPlayer, GameObject* pGO)
bool OnGossipHello(Player* pPlayer, GameObject* pGO)
{
InstanceScript* pInstance = pGO->GetInstanceScript();
@@ -620,7 +620,7 @@ public:
if (pInstance->GetData(DATA_MAGTHERIDON_EVENT) != IN_PROGRESS)
return true;
Creature *Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON));
Creature* Magtheridon =Unit::GetCreature(*pGO, pInstance->GetData64(DATA_MAGTHERIDON));
if (!Magtheridon || !Magtheridon->isAlive())
return true;
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+6 -6
View File
@@ -182,7 +182,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
}
}
void MoveInLineOfSight(Unit *who)
void MoveInLineOfSight(Unit* who)
{
if (!IntroOnce && me->IsWithinDistInMap(who, 50.0f))
{
@@ -208,7 +208,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
DoScriptText(RAND(SAY_AGGRO_1, SAY_AGGRO_2, SAY_AGGRO_3), me);
}
void JustSummoned(Creature *summoned)
void JustSummoned(Creature* summoned)
{
summoned->setFaction(16);
summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
@@ -277,7 +277,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
{
if (ShadowFissure_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_SHADOW_FISSURE);
ShadowFissure_Timer = urand(7500, 15000);
}
@@ -286,7 +286,7 @@ class boss_grand_warlock_nethekurse : public CreatureScript
if (DeathCoil_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_DEATH_COIL);
DeathCoil_Timer = urand(15000, 20000);
}
@@ -342,7 +342,7 @@ class mob_fel_orc_convert : public CreatureScript
{
if (pInstance->GetData64(DATA_NETHEKURSE))
{
Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE));
Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE));
if (pKurse && me->IsWithinDist(pKurse, 45.0f))
{
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonAggro();
@@ -363,7 +363,7 @@ class mob_fel_orc_convert : public CreatureScript
if (pInstance->GetData(TYPE_NETHEKURSE) != IN_PROGRESS)
return;
if (pInstance->GetData64(DATA_NETHEKURSE))
if (Creature *pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)))
if (Creature* pKurse = Unit::GetCreature(*me, pInstance->GetData64(DATA_NETHEKURSE)))
CAST_AI(boss_grand_warlock_nethekurse::boss_grand_warlock_nethekurseAI, pKurse->AI())->DoYellForPeonDeath();
}
}
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp
+10 -10
View File
@@ -221,15 +221,15 @@ class boss_warbringer_omrogg : public CreatureScript
void DoYellForThreat()
{
Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit *pRightHead = Unit::GetUnit(*me, RightHeadGUID);
Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID);
Unit* pRightHead = Unit::GetUnit(*me, RightHeadGUID);
if (!pLeftHead || !pRightHead)
return;
ithreat = rand()%4;
Unit *source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead);
Unit* source = (pLeftHead->GetEntry() == Threat[ithreat].creature ? pLeftHead : pRightHead);
DoScriptText(Threat[ithreat].id, source);
@@ -242,7 +242,7 @@ class boss_warbringer_omrogg : public CreatureScript
me->SummonCreature(NPC_LEFT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
me->SummonCreature(NPC_RIGHT_HEAD, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_DEAD_DESPAWN, 0);
if (Unit *pLeftHead = Unit::GetUnit(*me, LeftHeadGUID))
if (Unit* pLeftHead = Unit::GetUnit(*me, LeftHeadGUID))
{
iaggro = rand()%3;
@@ -256,7 +256,7 @@ class boss_warbringer_omrogg : public CreatureScript
pInstance->SetData(TYPE_OMROGG, IN_PROGRESS);
}
void JustSummoned(Creature *summoned)
void JustSummoned(Creature* summoned)
{
if (summoned->GetEntry() == NPC_LEFT_HEAD)
LeftHeadGUID = summoned->GetGUID();
@@ -279,7 +279,7 @@ class boss_warbringer_omrogg : public CreatureScript
ikilling = rand()%2;
Unit *source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead);
Unit* source = (pLeftHead->GetEntry() == Killing[ikilling].creature ? pLeftHead : pRightHead);
switch(ikilling)
{
@@ -331,7 +331,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ThreatYell2)
{
Unit *source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead);
Unit* source = (pLeftHead->GetEntry() == ThreatDelay2[ithreat].creature ? pLeftHead : pRightHead);
DoScriptText(ThreatDelay2[ithreat].id, source);
ThreatYell2 = false;
@@ -339,7 +339,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ThreatYell)
{
Unit *source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead);
Unit* source = (pLeftHead->GetEntry() == ThreatDelay1[ithreat].creature ? pLeftHead : pRightHead);
DoScriptText(ThreatDelay1[ithreat].id, source);
ThreatYell = false;
@@ -348,7 +348,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (KillingYell)
{
Unit *source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead);
Unit* source = (pLeftHead->GetEntry() == KillingDelay[ikilling].creature ? pLeftHead : pRightHead);
DoScriptText(KillingDelay[ikilling].id, source);
KillingYell = false;
@@ -383,7 +383,7 @@ class boss_warbringer_omrogg : public CreatureScript
if (ResetThreat_Timer <= diff)
{
if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
{
DoYellForThreat();
DoResetThreat();
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warchief_kargath_bladefist.cpp
+1 -1
View File
@@ -113,7 +113,7 @@ class boss_warchief_kargath_bladefist : public CreatureScript
DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me);
}
void JustSummoned(Creature *summoned)
void JustSummoned(Creature* summoned)
{
switch(summoned->GetEntry())
{