aboutsummaryrefslogtreecommitdiff
path: root/src/scripts/eastern_kingdoms
diff options
context:
space:
mode:
authorSpp <none@none>2010-04-07 18:09:10 +0200
committerSpp <none@none>2010-04-07 18:09:10 +0200
commitb27ce42704c33e292bda390265bb8fd01a433505 (patch)
tree29b2df222a2c1be3325e3d6fab75206100b578fd /src/scripts/eastern_kingdoms
parentf490ad5ac259712e323f0a52e608ff1383b2fc41 (diff)
Code Style: Remove trailing spaces
--HG-- branch : trunk
Diffstat (limited to 'src/scripts/eastern_kingdoms')
-rw-r--r--src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp28
-rw-r--r--src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp14
-rw-r--r--src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp4
-rw-r--r--src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp10
-rw-r--r--src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h2
-rw-r--r--src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp12
-rw-r--r--src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp2
-rw-r--r--src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp6
-rw-r--r--src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp28
-rw-r--r--src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp6
-rw-r--r--src/scripts/eastern_kingdoms/western_plaguelands.cpp4
11 files changed, 58 insertions, 58 deletions
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp b/src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
index 081fb6f28a4..bdaeb4aa949 100644
--- a/src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
+++ b/src/scripts/eastern_kingdoms/alterac_valley/alterac_valley.cpp
@@ -49,7 +49,7 @@ enum Creatures
struct mob_av_marshal_or_warmasterAI : public ScriptedAI
{
mob_av_marshal_or_warmasterAI(Creature *c) : ScriptedAI(c) {}
-
+
uint32 uiChargeTimer;
uint32 uiCleaveTimer;
uint32 uiDemoralizingShoutTimer;
@@ -57,7 +57,7 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
uint32 uiWhirlwind2Timer;
uint32 uiEnrageTimer;
uint32 uiResetTimer;
-
+
bool bHasAura;
void Reset()
@@ -72,12 +72,12 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
bHasAura = false;
}
-
+
void JustRespawned()
{
Reset();
}
-
+
void UpdateAI(const uint32 diff)
{
if (!bHasAura)
@@ -112,47 +112,47 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
bHasAura = true;
}
-
+
if (!UpdateVictim())
return;
-
+
if (uiChargeTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CHARGE);
uiChargeTimer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
} else uiChargeTimer -= diff;
-
+
if (uiCleaveTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_CLEAVE);
uiCleaveTimer = urand(10*IN_MILISECONDS,16*IN_MILISECONDS);
} else uiCleaveTimer -= diff;
-
+
if (uiDemoralizingShoutTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_DEMORALIZING_SHOUT);
uiDemoralizingShoutTimer = urand(10*IN_MILISECONDS,15*IN_MILISECONDS);
} else uiDemoralizingShoutTimer -= diff;
-
+
if (uiWhirlwind1Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WHIRLWIND1);
uiWhirlwind1Timer = urand(6*IN_MILISECONDS,20*IN_MILISECONDS);
} else uiWhirlwind1Timer -= diff;
-
+
if (uiWhirlwind2Timer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_WHIRLWIND2);
uiWhirlwind2Timer = urand(10*IN_MILISECONDS,25*IN_MILISECONDS);
} else uiWhirlwind2Timer -= diff;
-
+
if (uiEnrageTimer <= diff)
{
DoCast(m_creature->getVictim(), SPELL_ENRAGE);
uiEnrageTimer = urand(10*IN_MILISECONDS,30*IN_MILISECONDS);
}else uiEnrageTimer -= diff;
-
-
+
+
// check if creature is not outside of building
if(uiResetTimer <= diff)
{
@@ -160,7 +160,7 @@ struct mob_av_marshal_or_warmasterAI : public ScriptedAI
EnterEvadeMode();
uiResetTimer = 5*IN_MILISECONDS;
} else uiResetTimer -= diff;
-
+
DoMeleeAttackIfReady();
}
};
diff --git a/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp b/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
index 2226fec339c..6b0f5bb7e60 100644
--- a/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
+++ b/src/scripts/eastern_kingdoms/alterac_valley/boss_balinda.cpp
@@ -43,11 +43,11 @@ enum WaterElementalSpells
struct mob_water_elementalAI : public ScriptedAI
{
mob_water_elementalAI(Creature *c) : ScriptedAI(c) {}
-
+
uint32 uiWaterBoltTimer;
uint64 uiBalindaGUID;
uint32 uiResetTimer;
-
+
void Reset()
{
uiWaterBoltTimer = 3*IN_MILISECONDS;
@@ -58,13 +58,13 @@ struct mob_water_elementalAI : public ScriptedAI
{
if (!UpdateVictim())
return;
-
+
if(uiWaterBoltTimer < diff)
{
DoCast(m_creature->getVictim(), SPELL_WATERBOLT);
uiWaterBoltTimer = 5*IN_MILISECONDS;
} else uiWaterBoltTimer -= diff;
-
+
// check if creature is not outside of building
if(uiResetTimer < diff)
{
@@ -73,7 +73,7 @@ struct mob_water_elementalAI : public ScriptedAI
EnterEvadeMode();
uiResetTimer = 5*IN_MILISECONDS;
} else uiResetTimer -= diff;
-
+
DoMeleeAttackIfReady();
}
};
@@ -88,7 +88,7 @@ struct boss_balindaAI : public ScriptedAI
uint32 uiFrostboltTimer;
uint32 uiResetTimer;
uint32 uiWaterElementalTimer;
-
+
SummonList Summons;
void Reset()
@@ -117,7 +117,7 @@ struct boss_balindaAI : public ScriptedAI
{
((mob_water_elementalAI*)summoned->AI())->uiBalindaGUID = m_creature->GetGUID();
summoned->AI()->AttackStart(SelectTarget(SELECT_TARGET_RANDOM,0, 50, true));
- summoned->setFaction(m_creature->getFaction());
+ summoned->setFaction(m_creature->getFaction());
Summons.Summon(summoned);
}
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
index d376dea8b6e..87ec1023b58 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
@@ -47,7 +47,7 @@ enum eEnums
NPC_SEETHREL = 9038,
NPC_GLOOMREL = 9037,
NPC_DOOMREL = 9039,
- NPC_MAGMUS = 9938,
+ NPC_MAGMUS = 9938,
GO_ARENA1 = 161525,
GO_ARENA2 = 161522,
@@ -164,7 +164,7 @@ struct instance_blackrock_depths : public ScriptedInstance
case NPC_SEETHREL: TombBossGUIDs[4] = pCreature->GetGUID(); break;
case NPC_GLOOMREL: TombBossGUIDs[5] = pCreature->GetGUID(); break;
case NPC_ANGERREL: TombBossGUIDs[6] = pCreature->GetGUID(); break;
- case NPC_MAGMUS:
+ case NPC_MAGMUS:
MagmusGUID = pCreature->GetGUID();
if(!pCreature->isAlive())
HandleGameObject(GetData64(DATA_THRONE_DOOR), true); // if Magmus is dead open door to last boss
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
index c6f28b8574c..d09998cf85b 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.cpp
@@ -28,9 +28,9 @@ struct npc_rookey_whelpAI : public ScriptedAI
{
pInstance = c->GetInstanceData();
}
-
+
ScriptedInstance* pInstance;
-
+
void JustDied(Unit *who)
{
if (pInstance)
@@ -38,12 +38,12 @@ struct npc_rookey_whelpAI : public ScriptedAI
pInstance->SetData(WHELP_DEATH_COUNT, pInstance->GetData(WHELP_DEATH_COUNT)+1);
}
}
-
+
void UpdateAI(const uint32 diff)
{
if (!UpdateVictim())
return;
-
+
DoMeleeAttackIfReady();
}
};
@@ -72,7 +72,7 @@ void AddSC_blackrock_spire()
newscript->GetAI = &GetAI_rookey_whelp;
newscript->RegisterSelf();
newscript = new Script;
-
+
newscript->Name = "go_rookey_egg";
newscript->pGOHello = &GOHello_rookey_egg;
newscript->RegisterSelf();
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
index 61b21e321a9..56b6e0cbe23 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
@@ -21,6 +21,6 @@ enum Data
{
EVENT_LEEEROY,
WHELP_DEATH_COUNT
-};
+};
#endif
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
index 709ad00efeb..f2e2b39fe87 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
@@ -25,13 +25,13 @@ enum Achievements
struct instance_blackrock_spire : public ScriptedInstance
{
instance_blackrock_spire(Map* pMap) : ScriptedInstance(pMap) {}
-
+
uint32 uiLeeroyTimer;
uint32 uiWhelpCount;
uint32 uiLeroyData;
-
+
bool bLeeeeeeeeroy;
-
+
void Initialize()
{
uiLeeroyTimer = 15*IN_MILISECONDS;
@@ -39,7 +39,7 @@ struct instance_blackrock_spire : public ScriptedInstance
bLeeeeeeeeroy = true;
uiLeroyData = 0;
}
-
+
void SetData(uint32 type, uint32 data)
{
switch(type)
@@ -57,7 +57,7 @@ struct instance_blackrock_spire : public ScriptedInstance
}
uiWhelpCount = data;
break;
- }
+ }
}
uint32 GetData(uint32 type)
@@ -71,7 +71,7 @@ struct instance_blackrock_spire : public ScriptedInstance
}
void Update(uint32 diff)
- {
+ {
if (GetData(EVENT_LEEEROY) != FAIL && GetData(EVENT_LEEEROY) == IN_PROGRESS)
{
if (uiLeeroyTimer <= diff)
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
index 9b8066708c0..567a16fadae 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
@@ -270,7 +270,7 @@ struct boss_selin_fireheartAI : public ScriptedAI
if (DrainCrystalTimer <= diff)
{
SelectNearestCrystal();
- if (IsHeroic())
+ if (IsHeroic())
DrainCrystalTimer = 10000 + rand()%5000;
else
DrainCrystalTimer = 20000 + rand()%5000;
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
index f1ed1ded9b2..62bbe42ab82 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
@@ -85,11 +85,11 @@ struct npc_valkyr_battle_maidenAI : public PassiveAI
FlyBackTimer = 5000;
break;
case 3:
- me->SetVisibility(VISIBILITY_OFF);
- FlyBackTimer = 3000;
+ me->SetVisibility(VISIBILITY_OFF);
+ FlyBackTimer = 3000;
break;
case 4:
- me->DisappearAndDie();
+ me->DisappearAndDie();
break;
default:
//Nothing To DO
diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
index f4d0e3d29e7..bc1643de076 100644
--- a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
@@ -147,26 +147,26 @@ struct instance_stratholme : public ScriptedInstance
{
switch(pGo->GetEntry())
{
- case GO_SERVICE_ENTRANCE:
- serviceEntranceGUID = pGo->GetGUID();
+ case GO_SERVICE_ENTRANCE:
+ serviceEntranceGUID = pGo->GetGUID();
break;
case GO_GAUNTLET_GATE1:
//weird, but unless flag is set, client will not respond as expected. DB bug?
pGo->SetFlag(GAMEOBJECT_FLAGS,GO_FLAG_LOCKED);
gauntletGate1GUID = pGo->GetGUID();
break;
- case GO_ZIGGURAT1:
- ziggurat1GUID = pGo->GetGUID();
+ case GO_ZIGGURAT1:
+ ziggurat1GUID = pGo->GetGUID();
if (GetData(TYPE_BARONESS) == IN_PROGRESS)
HandleGameObject(0, true, pGo);
break;
- case GO_ZIGGURAT2:
- ziggurat2GUID = pGo->GetGUID();
+ case GO_ZIGGURAT2:
+ ziggurat2GUID = pGo->GetGUID();
if (GetData(TYPE_NERUB) == IN_PROGRESS)
HandleGameObject(0, true, pGo);
break;
- case GO_ZIGGURAT3:
- ziggurat3GUID = pGo->GetGUID();
+ case GO_ZIGGURAT3:
+ ziggurat3GUID = pGo->GetGUID();
if (GetData(TYPE_PALLID) == IN_PROGRESS)
HandleGameObject(0, true, pGo);
break;
@@ -180,18 +180,18 @@ struct instance_stratholme : public ScriptedInstance
if (GetData(TYPE_BARON) == DONE || GetData(TYPE_RAMSTEIN) == DONE)
HandleGameObject(0, true, pGo);
break;
- case GO_PORT_GAUNTLET:
- portGauntletGUID = pGo->GetGUID();
+ case GO_PORT_GAUNTLET:
+ portGauntletGUID = pGo->GetGUID();
if (GetData(TYPE_BARONESS) == IN_PROGRESS && GetData(TYPE_NERUB) == IN_PROGRESS && GetData(TYPE_PALLID) == IN_PROGRESS)
HandleGameObject(0, true, pGo);
break;
- case GO_PORT_SLAUGTHER:
- portSlaugtherGUID = pGo->GetGUID();
+ case GO_PORT_SLAUGTHER:
+ portSlaugtherGUID = pGo->GetGUID();
if (GetData(TYPE_BARONESS) == IN_PROGRESS && GetData(TYPE_NERUB) == IN_PROGRESS && GetData(TYPE_PALLID) == IN_PROGRESS)
HandleGameObject(0, true, pGo);
break;
- case GO_PORT_ELDERS:
- portElderGUID = pGo->GetGUID();
+ case GO_PORT_ELDERS:
+ portElderGUID = pGo->GetGUID();
break;
}
}
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
index 2359b75f5b7..8debcb9068f 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
@@ -99,9 +99,9 @@ struct boss_brutallusAI : public ScriptedAI
IntroFrostBoltTimer = 0;
IsIntro = false;
- Enraged = false;
+ Enraged = false;
- DoCast(m_creature, SPELL_DUAL_WIELD, true);
+ DoCast(m_creature, SPELL_DUAL_WIELD, true);
if (pInstance)
pInstance->SetData(DATA_BRUTALLUS_EVENT, NOT_STARTED);
@@ -151,7 +151,7 @@ struct boss_brutallusAI : public ScriptedAI
Madrigosa->setActive(true);
IsIntro = true;
Madrigosa->SetMaxHealth(m_creature->GetMaxHealth());
- Madrigosa->SetHealth(m_creature->GetMaxHealth());
+ Madrigosa->SetHealth(m_creature->GetMaxHealth());
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
m_creature->Attack(Madrigosa, true);
Madrigosa->Attack(m_creature, true);
diff --git a/src/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/scripts/eastern_kingdoms/western_plaguelands.cpp
index 90b21f98283..806c7cb9169 100644
--- a/src/scripts/eastern_kingdoms/western_plaguelands.cpp
+++ b/src/scripts/eastern_kingdoms/western_plaguelands.cpp
@@ -25,7 +25,7 @@ EndScriptData */
npcs_dithers_and_arbington
npc_myranda_the_hag
npc_the_scourge_cauldron
-npc_andorhal_tower
+npc_andorhal_tower
EndContentData */
#include "ScriptedPch.h"
@@ -206,7 +206,7 @@ CreatureAI* GetAI_npc_the_scourge_cauldron(Creature* pCreature)
}
/*######
-## npcs_andorhal_tower
+## npcs_andorhal_tower
######*/
enum eAndorhalTower