aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/EasternKingdoms/ScarletMonastery
diff options
context:
space:
mode:
authorSpp- <u84280@epreinf21.(none)>2011-06-30 14:24:56 +0200
committerSpp- <u84280@epreinf21.(none)>2011-06-30 14:24:56 +0200
commit6fd41ae50e5f988473f86ad8370b60a1e29eac5f (patch)
tree481e934be575ae4b0f44581e72e7ecc92d590ae1 /src/server/scripts/EasternKingdoms/ScarletMonastery
parentd12bb4a657e4df5230ce06f9b082f176d9db0b85 (diff)
Scripts: Reorder file names in Commands/CMakeList file and cosmetic changes in all scripts
Diffstat (limited to 'src/server/scripts/EasternKingdoms/ScarletMonastery')
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp56
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp8
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp2
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp4
-rw-r--r--src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp2
9 files changed, 42 insertions, 42 deletions
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
index 3aba9f3ffca..3ac8928f7b8 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp
@@ -49,7 +49,7 @@ public:
struct boss_arcanist_doanAI : public ScriptedAI
{
- boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {}
+ boss_arcanist_doanAI(Creature* c) : ScriptedAI(c) {}
uint32 Polymorph_Timer;
uint32 AoESilence_Timer;
@@ -101,7 +101,7 @@ public:
if (Polymorph_Timer <= diff)
{
- if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
+ if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 1))
DoCast(pTarget, SPELL_POLYMORPH);
Polymorph_Timer = 20000;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
index d0dcc4c9d83..04e525a3985 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp
@@ -41,7 +41,7 @@ public:
struct boss_azshir_the_sleeplessAI : public ScriptedAI
{
- boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {}
+ boss_azshir_the_sleeplessAI(Creature* c) : ScriptedAI(c) {}
uint32 SoulSiphon_Timer;
uint32 CallOftheGrave_Timer;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
index f5a8479faa3..852b21de423 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp
@@ -49,7 +49,7 @@ public:
struct boss_bloodmage_thalnosAI : public ScriptedAI
{
- boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {}
+ boss_bloodmage_thalnosAI(Creature* c) : ScriptedAI(c) {}
bool HpYell;
uint32 FlameShock_Timer;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index dd877a2d257..f897f6fc90c 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -140,7 +140,7 @@ public:
struct mob_wisp_invisAI : public ScriptedAI
{
- mob_wisp_invisAI(Creature *c) : ScriptedAI(c)
+ mob_wisp_invisAI(Creature* c) : ScriptedAI(c)
{
Creaturetype = delay = spell = spell2 = 0;
//that's hack but there are no info about range of this spells in dbc
@@ -189,7 +189,7 @@ public:
me->SetDisplayId(2027);
}
- void MoveInLineOfSight(Unit *who)
+ void MoveInLineOfSight(Unit* who)
{
if (!who || Creaturetype != 1 || !who->isTargetableForAttack())
return;
@@ -227,7 +227,7 @@ public:
struct mob_headAI : public ScriptedAI
{
- mob_headAI(Creature *c) : ScriptedAI(c) {}
+ mob_headAI(Creature* c) : ScriptedAI(c) {}
uint64 bodyGUID;
@@ -249,11 +249,11 @@ public:
}
void EnterCombat(Unit* /*who*/) {}
- void SaySound(int32 textEntry, Unit *pTarget = 0)
+ void SaySound(int32 textEntry, Unit* pTarget = 0)
{
DoScriptText(textEntry, me, pTarget);
//DoCast(me, SPELL_HEAD_SPEAKS, true);
- Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
+ Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
if (speaker)
speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false);
laugh += 3000;
@@ -290,7 +290,7 @@ public:
}
}
- void SpellHit(Unit *caster, const SpellEntry* spell)
+ void SpellHit(Unit* caster, const SpellEntry* spell)
{
if (!withbody)
return;
@@ -330,7 +330,7 @@ public:
laugh = urand(15000, 30000);
DoPlaySoundToSet(me, RandomLaugh[urand(0, 2)]);
//DoCast(me, SPELL_HEAD_SPEAKS, true); //this spell remove buff "head"
- Creature *speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
+ Creature* speaker = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 1000);
if (speaker)
speaker->CastSpell(speaker, SPELL_HEAD_SPEAKS, false);
me->MonsterTextEmote(EMOTE_LAUGHS, 0);
@@ -343,7 +343,7 @@ public:
if (wait <= diff)
{
die = false;
- if (Unit *body = Unit::GetUnit((*me), bodyGUID))
+ if (Unit* body = Unit::GetUnit((*me), bodyGUID))
body->Kill(body);
me->Kill(me);
} else wait -= diff;
@@ -366,7 +366,7 @@ public:
struct boss_headless_horsemanAI : public ScriptedAI
{
- boss_headless_horsemanAI(Creature *c) : ScriptedAI(c)
+ boss_headless_horsemanAI(Creature* c) : ScriptedAI(c)
{
pInstance = c->GetInstanceScript();
}
@@ -451,7 +451,7 @@ public:
break;
case 1:
{
- if (Creature *smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
+ if (Creature* smoke = me->SummonCreature(HELPER, Spawn[1].x, Spawn[1].y, Spawn[1].z, 0, TEMPSUMMON_TIMED_DESPAWN, 20000))
CAST_AI(mob_wisp_invis::mob_wisp_invisAI, smoke->AI())->SetType(3);
DoCast(me, SPELL_RHYME_BIG);
break;
@@ -470,7 +470,7 @@ public:
wp_reached = false;
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
SaySound(SAY_ENTRANCE);
- if (Unit *plr = Unit::GetUnit((*me), PlayerGUID))
+ if (Unit* plr = Unit::GetUnit((*me), PlayerGUID))
DoStartMovement(plr);
break;
}
@@ -485,24 +485,24 @@ public:
DoZoneInCombat();
}
void AttackStart(Unit* who) {ScriptedAI::AttackStart(who);}
- void MoveInLineOfSight(Unit *who)
+ void MoveInLineOfSight(Unit* who)
{
if (withhead && Phase != 0)
ScriptedAI::MoveInLineOfSight(who);
}
- void KilledUnit(Unit *plr)
+ void KilledUnit(Unit* plr)
{
if (plr->GetTypeId() == TYPEID_PLAYER)
{
if (withhead)
SaySound(SAY_PLAYER_DEATH);
//maybe possible when player dies from conflagration
- else if (Creature *Head = Unit::GetCreature((*me), headGUID))
+ else if (Creature* Head = Unit::GetCreature((*me), headGUID))
CAST_AI(mob_head::mob_headAI, Head->AI())->SaySound(SAY_PLAYER_DEATH);
}
}
- void SaySound(int32 textEntry, Unit *pTarget = 0)
+ void SaySound(int32 textEntry, Unit* pTarget = 0)
{
DoScriptText(textEntry, me, pTarget);
laugh += 4000;
@@ -545,15 +545,15 @@ public:
me->StopMoving();
//me->GetMotionMaster()->MoveIdle();
SaySound(SAY_DEATH);
- if (Creature *flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
+ if (Creature* flame = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
flame->CastSpell(flame, SPELL_BODY_FLAME, false);
- if (Creature *wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
+ if (Creature* wisp = DoSpawnCreature(WISP_INVIS, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN, 60000))
CAST_AI(mob_wisp_invis::mob_wisp_invisAI, wisp->AI())->SetType(4);
if (pInstance)
pInstance->SetData(DATA_HORSEMAN_EVENT, DONE);
}
- void SpellHit(Unit *caster, const SpellEntry* spell)
+ void SpellHit(Unit* caster, const SpellEntry* spell)
{
if (withhead)
return;
@@ -583,7 +583,7 @@ public:
}
}
- void DamageTaken(Unit *done_by, uint32 &damage)
+ void DamageTaken(Unit* done_by, uint32 &damage)
{
if (damage >= me->GetHealth() && withhead)
{
@@ -625,7 +625,7 @@ public:
if (say_timer <= diff)
{
say_timer = 3000;
- Player *plr = SelectRandomPlayer(100.0f, false);
+ Player* plr = SelectRandomPlayer(100.0f, false);
if (count < 3)
{
if (plr)
@@ -663,7 +663,7 @@ public:
break;
if (burn <= diff)
{
- if (Creature *flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000))
+ if (Creature* flame = me->SummonCreature(HELPER, Spawn[0].x, Spawn[0].y, Spawn[0].z, 0, TEMPSUMMON_TIMED_DESPAWN, 17000))
CAST_AI(mob_wisp_invis::mob_wisp_invisAI, flame->AI())->SetType(2);
burned = true;
} else burn -= diff;
@@ -671,7 +671,7 @@ public:
case 2:
if (conflagrate <= diff)
{
- if (Unit *plr = SelectRandomPlayer(30.0f))
+ if (Unit* plr = SelectRandomPlayer(30.0f))
DoCast(plr, SPELL_CONFLAGRATION, false);
conflagrate = urand(10000, 16000);
} else conflagrate -= diff;
@@ -755,7 +755,7 @@ public:
struct mob_pulsing_pumpkinAI : public ScriptedAI
{
- mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {}
+ mob_pulsing_pumpkinAI(Creature* c) : ScriptedAI(c) {}
bool sprouted;
uint64 debuffGUID;
@@ -766,7 +766,7 @@ public:
me->GetPosition(x, y, z); //this visual aura some under ground
me->GetMap()->CreatureRelocation(me, x, y, z + 0.35f, 0.0f);
Despawn();
- Creature *debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500);
+ Creature* debuff = DoSpawnCreature(HELPER, 0, 0, 0, 0, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 14500);
if (debuff)
{
debuff->SetDisplayId(me->GetDisplayId());
@@ -798,7 +798,7 @@ public:
void Despawn()
{
if (!debuffGUID) return;
- Unit *debuff = Unit::GetUnit((*me), debuffGUID);
+ Unit* debuff = Unit::GetUnit((*me), debuffGUID);
if (debuff)
debuff->SetVisible(false);
debuffGUID = 0;
@@ -806,7 +806,7 @@ public:
void JustDied(Unit* /*killer*/) { if (!sprouted) Despawn(); }
- void MoveInLineOfSight(Unit *who)
+ void MoveInLineOfSight(Unit* who)
{
if (!who || !who->isTargetableForAttack() || !me->IsHostileTo(who) || me->getVictim())
return;
@@ -847,7 +847,7 @@ public:
if (plr->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && plr->getLevel() > 64)
{ */
pPlayer->AreaExploredOrEventHappens(11405);
- if (Creature *horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0))
+ if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0))
{
CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = pPlayer->GetGUID();
CAST_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode();
@@ -864,7 +864,7 @@ void mob_head::mob_headAI::Disappear()
return;
if (bodyGUID)
{
- Creature *body = Unit::GetCreature((*me), bodyGUID);
+ Creature* body = Unit::GetCreature((*me), bodyGUID);
if (body && body->isAlive())
{
withbody = true;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 3ec4d9c91fa..6950f312f90 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -52,7 +52,7 @@ public:
struct boss_herodAI : public ScriptedAI
{
- boss_herodAI(Creature *c) : ScriptedAI(c) {}
+ boss_herodAI(Creature* c) : ScriptedAI(c) {}
bool Enrage;
@@ -130,7 +130,7 @@ public:
struct mob_scarlet_traineeAI : public npc_escortAI
{
- mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c)
+ mob_scarlet_traineeAI(Creature* c) : npc_escortAI(c)
{
Start_Timer = urand(1000, 6000);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index 664521dd7a2..ddbbd43b1d0 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -47,7 +47,7 @@ public:
struct boss_high_inquisitor_fairbanksAI : public ScriptedAI
{
- boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {}
+ boss_high_inquisitor_fairbanksAI(Creature* c) : ScriptedAI(c) {}
uint32 CurseOfBlood_Timer;
uint32 DispelMagic_Timer;
@@ -87,7 +87,7 @@ public:
//Fear_Timer
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 = 40000;
@@ -96,7 +96,7 @@ public:
//Sleep_Timer
if (Sleep_Timer <= diff)
{
- if (Unit *pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0))
+ if (Unit* pTarget = SelectTarget(SELECT_TARGET_TOPAGGRO, 0))
DoCast(pTarget, SPELL_SLEEP);
Sleep_Timer = 30000;
@@ -112,7 +112,7 @@ public:
//Dispel_Timer
if (Dispel_Timer <= diff)
{
- if (Unit *pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
+ if (Unit* pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0))
DoCast(pTarget, SPELL_DISPELMAGIC);
DispelMagic_Timer = 30000;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
index 4aa6b74681a..351b0681423 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_houndmaster_loksey.cpp
@@ -44,7 +44,7 @@ public:
struct boss_houndmaster_lokseyAI : public ScriptedAI
{
- boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {}
+ boss_houndmaster_lokseyAI(Creature* c) : ScriptedAI(c) {}
uint32 BloodLust_Timer;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index 6168b5d8939..d369cd8b247 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -49,7 +49,7 @@ public:
struct boss_interrogator_vishasAI : public ScriptedAI
{
- boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c)
+ boss_interrogator_vishasAI(Creature* c) : ScriptedAI(c)
{
pInstance = me->GetInstanceScript();
}
@@ -81,7 +81,7 @@ public:
return;
//Any other actions to do with vorrel? setStandState?
- if (Unit *vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL)))
+ if (Unit* vorrel = Unit::GetUnit(*me, pInstance->GetData64(DATA_VORREL)))
DoScriptText(SAY_TRIGGER_VORREL, vorrel);
}
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
index de190f9d260..5b025a7c579 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_scorn.cpp
@@ -42,7 +42,7 @@ public:
struct boss_scornAI : public ScriptedAI
{
- boss_scornAI(Creature *c) : ScriptedAI(c) {}
+ boss_scornAI(Creature* c) : ScriptedAI(c) {}
uint32 LichSlap_Timer;
uint32 FrostboltVolley_Timer;