aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts
diff options
context:
space:
mode:
authormaximius <none@none>2009-08-15 19:08:39 -0700
committermaximius <none@none>2009-08-15 19:08:39 -0700
commite5813517947e5af7ecc5fbef7516a8252f458f52 (patch)
treeec7e28483fe321457bc2be109ddebf3124958ba6 /src/bindings/scripts
parentc88304af95f9e289036a9c4e4e5433cc95044677 (diff)
*Replace every tab with 4 spaces, checked by hand
--HG-- branch : trunk
Diffstat (limited to 'src/bindings/scripts')
-rw-r--r--src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp26
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp36
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h8
-rw-r--r--src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp16
4 files changed, 43 insertions, 43 deletions
diff --git a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
index 34a4e25d73c..fc90ff5b4f0 100644
--- a/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
+++ b/src/bindings/scripts/scripts/zone/karazhan/boss_netherspite.cpp
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
{
boss_netherspiteAI(Creature* c) : ScriptedAI(c)
{
- pInstance = ((ScriptedInstance*)c->GetInstanceData());
+ pInstance = ((ScriptedInstance*)c->GetInstanceData());
for(int i=0; i<3; ++i)
{
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
}
}
- ScriptedInstance* pInstance;
+ ScriptedInstance* pInstance;
bool PortalPhase;
bool Berserk;
@@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
void Reset()
{
- Berserk = false;
+ Berserk = false;
NetherInfusionTimer = 540000;
VoidZoneTimer = 15000;
NetherbreathTimer = 3000;
@@ -249,23 +249,23 @@ struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
m_creature->RemoveAurasDueToSpell(NetherBuff[i]);
}
- void HandleDoors(bool open) // Massive Door switcher
+ void HandleDoors(bool open) // Massive Door switcher
{
- if(GameObject *Door = GameObject::GetGameObject((*m_creature),pInstance->GetData64(DATA_GO_MASSIVE_DOOR)))
- Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
+ if(GameObject *Door = GameObject::GetGameObject((*m_creature),pInstance->GetData64(DATA_GO_MASSIVE_DOOR)))
+ Door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
void Aggro(Unit *who)
- {
- HandleDoors(false);
+ {
+ HandleDoors(false);
SwitchToPortalPhase();
- }
+ }
- void JustDied(Unit* killer)
- {
- HandleDoors(true);
+ void JustDied(Unit* killer)
+ {
+ HandleDoors(true);
DestroyPortals();
- }
+ }
void UpdateAI(const uint32 diff)
{
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
index ba999ca766c..94290a05007 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
@@ -2,30 +2,30 @@
#include "def_vault_of_archavon.h"
//Emalon spells
-#define SPELL_CHAIN_LIGHTNING HEROIC(64213, 64215)
-#define SPELL_LIGHTNING_NOVA HEROIC(64216, 65279)
-#define SPELL_OVERCHARGE 64218 //Casted every 45 sec on a random Tempest Minion
-#define SPELL_BERSERK 26662
+#define SPELL_CHAIN_LIGHTNING HEROIC(64213, 64215)
+#define SPELL_LIGHTNING_NOVA HEROIC(64216, 65279)
+#define SPELL_OVERCHARGE 64218 //Casted every 45 sec on a random Tempest Minion
+#define SPELL_BERSERK 26662
//Tempest Minion spells
-#define SPELL_SHOCK 64363
-#define SPELL_OVERCHARGED 64217
-#define SPELL_OVERCHARGED_BLAST 64219 //Casted when Overcharged reaches 10 stacks. Mob dies after that
+#define SPELL_SHOCK 64363
+#define SPELL_OVERCHARGED 64217
+#define SPELL_OVERCHARGED_BLAST 64219 //Casted when Overcharged reaches 10 stacks. Mob dies after that
//Emotes
-#define EMOTE_OVERCHARGE -1590000
-#define EMOTE_MINION_RESPAWN -1590001
-#define EMOTE_BERSERK -1590002
+#define EMOTE_OVERCHARGE -1590000
+#define EMOTE_MINION_RESPAWN -1590001
+#define EMOTE_BERSERK -1590002
//Events
-#define EVENT_CHAIN_LIGHTNING 1
-#define EVENT_LIGHTNING_NOVA 2
-#define EVENT_OVERCHARGE 3
-#define EVENT_BERSERK 4
-#define EVENT_SHOCK 5
+#define EVENT_CHAIN_LIGHTNING 1
+#define EVENT_LIGHTNING_NOVA 2
+#define EVENT_OVERCHARGE 3
+#define EVENT_BERSERK 4
+#define EVENT_SHOCK 5
//Creatures
-#define MOB_TEMPEST_MINION 33998
+#define MOB_TEMPEST_MINION 33998
float TempestMinions[4][5] =
{
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
SummonList summons;
void Reset()
- {
+ {
events.Reset();
summons.DespawnAll();
MinionList.clear();
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
Minion->AI()->AttackStart(target);
}
- if (pInstance)
+ if (pInstance)
pInstance->SetData(DATA_EMALON_EVENT, NOT_STARTED);
}
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h b/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
index 0ebadb214d8..95c44035184 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/def_vault_of_archavon.h
@@ -1,8 +1,8 @@
#ifndef DEF_ARCHAVON_H
#define DEF_ARCHAVON_H
-#define DATA_ARCHAVON_EVENT 1
-#define DATA_EMALON_EVENT 2
-#define DATA_EMALON 3
-#define DATA_ARCHAVON 4
+#define DATA_ARCHAVON_EVENT 1
+#define DATA_EMALON_EVENT 2
+#define DATA_EMALON 3
+#define DATA_ARCHAVON 4
#endif
diff --git a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
index 4b5c8f371af..45d0a4be7ae 100644
--- a/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
+++ b/src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
@@ -18,12 +18,12 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
uint64 Emalon;
void Initialize()
- {
+ {
Archavon = 0;
Emalon = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
- Encounters[i] = NOT_STARTED;
+ Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
@@ -47,8 +47,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(type)
{
- case DATA_ARCHAVON_EVENT: return Encounters[0];
- case DATA_EMALON_EVENT: return Encounters[1];
+ case DATA_ARCHAVON_EVENT: return Encounters[0];
+ case DATA_EMALON_EVENT: return Encounters[1];
}
return 0;
}
@@ -57,8 +57,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(identifier)
{
- case DATA_ARCHAVON: return Archavon;
- case DATA_EMALON: return Emalon;
+ case DATA_ARCHAVON: return Archavon;
+ case DATA_EMALON: return Emalon;
}
return 0;
}
@@ -67,8 +67,8 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
{
switch(type)
{
- case DATA_ARCHAVON_EVENT: Encounters[0] = data; break;
- case DATA_EMALON_EVENT: Encounters[1] = data; break;
+ case DATA_ARCHAVON_EVENT: Encounters[0] = data; break;
+ case DATA_EMALON_EVENT: Encounters[1] = data; break;
}
if(data == DONE)