*Convert tabs to spaces and delete white spaces in Sunwell Plateau's scripts.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-04-28 17:40:01 +02:00
parent abf65881af
commit 1b690cf84d
8 changed files with 1122 additions and 1122 deletions

View File

@@ -30,7 +30,7 @@ enum Quotes
YELL_INTRO_CHARGE = -1580019,
YELL_INTRO_KILL_MADRIGOSA = -1580020,
YELL_INTRO_TAUNT = -1580021,
YELL_MADR_ICE_BARRIER = -1580031,
YELL_MADR_INTRO = -1580032,
YELL_MADR_ICE_BLOCK = -1580033,
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
}
ScriptedInstance* pInstance;
Unit* Madrigosa;
Unit* Madrigosa;
uint32 SlashTimer;
uint32 BurnTimer;
@@ -99,18 +99,18 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
IsIntro = false;
Enraged = false;
Intro = true; //for debug
Intro = true; //for debug
m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Madrigosa = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_MADRIGOSA));
//Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
if(!Madrigosa) error_log("Madrigosa ist nicht zu finden");
Madrigosa = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_MADRIGOSA));
//Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
if(!Madrigosa) error_log("Madrigosa ist nicht zu finden");
if(Intro && Madrigosa){
if(!Madrigosa->isAlive())
EndIntro();
else error_log("Madrigosa is Tod");
else error_log("Madrigosa is Tod");
}
else
EndIntro();
@@ -141,12 +141,12 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
{
DoScriptText(YELL_DEATH, m_creature);
if(pInstance){
if(pInstance){
pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE);
float x,y,z;
m_creature->GetPosition(x,y,z);
m_creature->SummonCreature(FELMYST, x,y, z+30, m_creature->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0);
}
float x,y,z;
m_creature->GetPosition(x,y,z);
m_creature->SummonCreature(FELMYST, x,y, z+30, m_creature->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0);
}
}
void StartIntro()
@@ -154,16 +154,16 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
if(!Intro)
return;
if(Madrigosa){
Madrigosa->setDeathState(ALIVE);
Madrigosa->setDeathState(ALIVE);
Madrigosa->setActive(true);
IsIntro = true;
}
error_log("Starte das Intro");
error_log("Starte das Intro");
}
void EndIntro()
{
error_log("Beende das Intro");
error_log("Beende das Intro");
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
Intro = false;
IsIntro = false;
@@ -184,7 +184,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
case 1:
m_creature->SetInFront(Madrigosa);
Madrigosa->SetInFront(m_creature);
DoScriptText(YELL_MADR_INTRO, Madrigosa, m_creature);
DoScriptText(YELL_MADR_INTRO, Madrigosa, m_creature);
IntroPhaseTimer = 9000;
++IntroPhase;
break;
@@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
case 7:
m_creature->DealDamage(Madrigosa, Madrigosa->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, true);
DoScriptText(YELL_MADR_DEATH, Madrigosa);
m_creature->SetHealth(m_creature->GetMaxHealth());
m_creature->SetHealth(m_creature->GetMaxHealth());
m_creature->AttackStop();
m_creature->SetSpeed(MOVE_RUN, 1.0f, true);
IntroPhaseTimer = 3000;
@@ -245,10 +245,10 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
}
}
void MoveInLineOfSight(Unit *who){
if(pInstance && Intro)
pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
}
void MoveInLineOfSight(Unit *who){
if(pInstance && Intro)
pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
}
void UpdateAI(const uint32 diff)
{
@@ -273,7 +273,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
if(!UpdateVictim() || IsIntro)
return;
if(SlashTimer < diff)
{
DoCast(m_creature->getVictim(), SPELL_METEOR_SLASH);
@@ -314,7 +314,7 @@ CreatureAI* GetAI_boss_brutallus(Creature *_Creature)
{
return new boss_brutallusAI (_Creature);
}
void AddSC_boss_brutallus()
{
Script *newscript;

View File

@@ -69,7 +69,7 @@ enum Spells
SPELL_SHADOW_FURY = 45270,
SPELL_IMAGE_VISUAL = 45263,
//Misc spells
//Misc spells
SPELL_ENRAGE = 46587,
SPELL_EMPOWER = 45366,
SPELL_DARK_FLAME = 45345,
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
ShadownovaTimer = 30000;
ConfoundingblowTimer = 25000;
ShadowimageTimer = 20000;
ConflagrationTimer = 30000;
ConflagrationTimer = 30000;
EnrageTimer = 360000;
SisterDeath = false;
@@ -216,7 +216,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
{
target->RemoveAurasDueToSpell(SPELL_DARK_TOUCHED);
target->CastSpell(target, SPELL_DARK_FLAME, true);
}else target->CastSpell(target, SPELL_FLAME_TOUCHED, true);
}else target->CastSpell(target, SPELL_FLAME_TOUCHED, true);
}
break;
case SPELL_DARK_TOUCHED:
@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
{
target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
target->CastSpell(target, SPELL_DARK_FLAME, true);
}else target->CastSpell(target, SPELL_DARK_TOUCHED, true);
}else target->CastSpell(target, SPELL_DARK_TOUCHED, true);
}
break;
}
@@ -244,7 +244,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
{
DoScriptText(YELL_SISTER_ALYTHESS_DEAD, m_creature);
DoCast(m_creature,SPELL_EMPOWER);
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
SisterDeath = true;
}
}
@@ -279,7 +279,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
if(!SisterDeath)
{
DoScriptText(EMOTE_SHADOW_NOVA, m_creature, target);
DoScriptText(EMOTE_SHADOW_NOVA, m_creature, target);
DoScriptText(YELL_SHADOW_NOVA, m_creature);
}
ShadownovaTimer = 30000+(rand()%5000);
@@ -396,7 +396,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
ConflagrationTimer = 45000;
BlazeTimer = 100;
PyrogenicsTimer = 15000;
ShadownovaTimer = 40000;
ShadownovaTimer = 40000;
EnrageTimer = 360000;
FlamesearTimer = 15000;
IntroYellTimer = 10000;
@@ -522,7 +522,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
{
target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
target->CastSpell(target, SPELL_DARK_FLAME, true);
}else target->CastSpell(target, SPELL_DARK_TOUCHED, true);
}else target->CastSpell(target, SPELL_DARK_TOUCHED, true);
}
break;
}
@@ -534,7 +534,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
switch (step)
{
case 0: return 0;
case 1:
case 1:
if(Sacrolash)
DoScriptText(YELL_INTRO_SAC_1, Sacrolash);
return 1000;
@@ -549,7 +549,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
DoScriptText(YELL_INTRO_SAC_5, Sacrolash);
return 2000;
case 6: DoScriptText(YELL_INTRO_ALY_6, m_creature); return 1000;
case 7:
case 7:
if(Sacrolash)
DoScriptText(YELL_INTRO_SAC_7, Sacrolash);
return 3000;
@@ -576,9 +576,9 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
Temp = Unit::GetUnit((*m_creature),pInstance->GetData64(DATA_SACROLASH));
if (Temp && Temp->isDead())
{
DoScriptText(YELL_SISTER_SACROLASH_DEAD, m_creature);
DoScriptText(YELL_SISTER_SACROLASH_DEAD, m_creature);
DoCast(m_creature, SPELL_EMPOWER);
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
m_creature->InterruptSpell(CURRENT_GENERIC_SPELL);
SisterDeath = true;
}
}
@@ -614,7 +614,7 @@ struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
if(!SisterDeath)
{
DoScriptText(EMOTE_CONFLAGRATION, m_creature, target);
DoScriptText(EMOTE_CONFLAGRATION, m_creature, target);
DoScriptText(YELL_CANFLAGRATION, m_creature);
}
@@ -695,7 +695,7 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
{
target->RemoveAurasDueToSpell(SPELL_FLAME_TOUCHED);
target->CastSpell(target, SPELL_DARK_FLAME, true);
}else target->CastSpell(target,SPELL_DARK_TOUCHED,true);
}else target->CastSpell(target,SPELL_DARK_TOUCHED,true);
}
break;
}
@@ -726,8 +726,8 @@ struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
if(!m_creature->IsNonMeleeSpellCasted(false))
{
//If we are within range melee the target
if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
DoCast(m_creature->getVictim(), SPELL_DARK_STRIKE);
if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))
DoCast(m_creature->getVictim(), SPELL_DARK_STRIKE);
}
DarkstrikeTimer = 3000;
}

View File

@@ -32,7 +32,7 @@ enum Quotes
YELL_TAKEOFF = -1580040,
YELL_BERSERK = -1580041,
YELL_DEATH = -1580042,
YELL_KALECGOS = -1580043 //after felmyst's death spawned and say this
YELL_KALECGOS = -1580043 //after felmyst's death spawned and say this
};
enum Spells
@@ -41,7 +41,7 @@ enum Spells
AURA_SUNWELL_RADIANCE = 45769,
AURA_NOXIOUS_FUMES = 47002,
//Land phase
//Land phase
SPELL_CLEAVE = 19983,
SPELL_CORROSION = 45866,
SPELL_GAS_NOVA = 45855,
@@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
{
case 0:
//m_creature->AttackStop();
error_log("prevent fly phase");
error_log("prevent fly phase");
m_creature->GetMotionMaster()->Clear(false);
m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT);
@@ -299,15 +299,15 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
break;
case 1:
error_log("Move to Fly point");
error_log("Move to Fly point");
m_creature->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX()+1, m_creature->GetPositionY(), m_creature->GetPositionZ()+10);
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
break;
case 2:{
error_log("Summon Vapor case 2");
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
case 2:{
error_log("Summon Vapor case 2");
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
if(target)
{
Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
@@ -320,15 +320,15 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
}
}else EnterEvadeMode();
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
break;}
case 3: {
break;}
case 3: {
DespawnSummons(MOB_VAPOR_TRAIL);
error_log("Summon Vapor case3");
error_log("Summon Vapor case3");
//m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
if(target)
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
if(target)
{
//target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
Creature* Vapor = m_creature->SummonCreature(MOB_VAPOR, target->GetPositionX()-5+rand()%10, target->GetPositionY()-5+rand()%10, target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 9000);
@@ -341,16 +341,16 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
}
}else EnterEvadeMode();
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
break;}
break;}
case 4:
DespawnSummons(MOB_VAPOR_TRAIL);
Timer[EVENT_FLIGHT_SEQUENCE] = 1;
break;
case 5:{
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
if(target)
case 5:{
Unit* target;
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
if(target)
{
BreathX = target->GetPositionX();
BreathY = target->GetPositionY();
@@ -359,7 +359,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
m_creature->GetMotionMaster()->MovePoint(0, x, y, z+10);
}else EnterEvadeMode();
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
break;}
break;}
case 6:
m_creature->SetOrientation(m_creature->GetAngle(BreathX, BreathY));
m_creature->StopMoving();

View File

@@ -33,7 +33,7 @@ enum Quotes
SAY_EVIL_SLAY1 = -1580003,
SAY_EVIL_SLAY2 = -1580004,
SAY_EVIL_ENRAGE = -1580005,
//Kalecgos humanoid form
SAY_GOOD_AGGRO = -1580006,
SAY_GOOD_NEAR_DEATH = -1580007,

View File

@@ -38,6 +38,6 @@
#define DATA_GATE_5 26
/*** Misc ***/
#define DATA_PLAYER_GUID 27
#define DATA_PLAYER_GUID 27
#endif

View File

@@ -4,7 +4,7 @@
/* ScriptData
SDName: Instance_Sunwell_Plateau
SD%Complete: 20
SD%Complete: 20
SDComment: VERIFY SCRIPT, rename Gates
SDCategory: Sunwell_Plateau
EndScriptData */
@@ -15,8 +15,8 @@ EndScriptData */
#define ENCOUNTERS 6
enum GoState{
CLOSE = 1,
OPEN = 0
CLOSE = 1,
OPEN = 0
};
/* Sunwell Plateau:
@@ -108,8 +108,8 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
if (!players.isEmpty())
{
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
{
Player* plr = itr->getSource();
{
Player* plr = itr->getSource();
if (plr && !plr->HasAura(45839,0))
return plr;
}
@@ -198,11 +198,11 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
case DATA_KILJAEDEN: return KilJaeden; break;
case DATA_KILJAEDEN_CONTROLLER: return KilJaedenController; break;
case DATA_ANVEENA: return Anveena; break;
case DATA_KALECGOS_KJ: return KalecgosKJ; break;
case DATA_PLAYER_GUID:
Player* Target = GetPlayerInMap();
return Target->GetGUID();
break;
case DATA_KALECGOS_KJ: return KalecgosKJ; break;
case DATA_PLAYER_GUID:
Player* Target = GetPlayerInMap();
return Target->GetGUID();
break;
}
return 0;
@@ -214,26 +214,26 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
{
case DATA_KALECGOS_EVENT: Encounters[0] = data; break;
case DATA_BRUTALLUS_EVENT: Encounters[1] = data; break;
case DATA_FELMYST_EVENT:
if(data == DONE)
HandleGameObject(FireBarrier, 1);
case DATA_FELMYST_EVENT:
if(data == DONE)
HandleGameObject(FireBarrier, 1);
Encounters[2] = data; break;
case DATA_EREDAR_TWINS_EVENT: Encounters[3] = data; break;
case DATA_MURU_EVENT:
switch(data){
case DONE:
HandleGameObject(Gate[4], OPEN);
HandleGameObject(Gate[3], OPEN);
break;
case IN_PROGRESS:
HandleGameObject(Gate[4], CLOSE);
HandleGameObject(Gate[3], CLOSE);
break;
case NOT_STARTED:
HandleGameObject(Gate[4], CLOSE);
HandleGameObject(Gate[3], OPEN);
break;
}
case DATA_MURU_EVENT:
switch(data){
case DONE:
HandleGameObject(Gate[4], OPEN);
HandleGameObject(Gate[3], OPEN);
break;
case IN_PROGRESS:
HandleGameObject(Gate[4], CLOSE);
HandleGameObject(Gate[3], CLOSE);
break;
case NOT_STARTED:
HandleGameObject(Gate[4], CLOSE);
HandleGameObject(Gate[3], OPEN);
break;
}
Encounters[4] = data; break;
case DATA_KILJAEDEN_EVENT: Encounters[5] = data; break;
}