*Convert tabs to spaces and delete white spaces in Sunwell Plateau's scripts.
--HG-- branch : trunk
This commit is contained in:
@@ -71,7 +71,7 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
|
|||||||
}
|
}
|
||||||
|
|
||||||
ScriptedInstance* pInstance;
|
ScriptedInstance* pInstance;
|
||||||
Unit* Madrigosa;
|
Unit* Madrigosa;
|
||||||
|
|
||||||
uint32 SlashTimer;
|
uint32 SlashTimer;
|
||||||
uint32 BurnTimer;
|
uint32 BurnTimer;
|
||||||
@@ -99,18 +99,18 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
|
|||||||
|
|
||||||
IsIntro = false;
|
IsIntro = false;
|
||||||
Enraged = false;
|
Enraged = false;
|
||||||
Intro = true; //for debug
|
Intro = true; //for debug
|
||||||
|
|
||||||
m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
|
m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
|
||||||
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||||
Madrigosa = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_MADRIGOSA));
|
Madrigosa = Unit::GetUnit(*m_creature, pInstance->GetData64(DATA_MADRIGOSA));
|
||||||
//Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
|
//Creature* boss = Unit::GetCreature((*m_creature),AzgalorGUID);
|
||||||
if(!Madrigosa) error_log("Madrigosa ist nicht zu finden");
|
if(!Madrigosa) error_log("Madrigosa ist nicht zu finden");
|
||||||
|
|
||||||
if(Intro && Madrigosa){
|
if(Intro && Madrigosa){
|
||||||
if(!Madrigosa->isAlive())
|
if(!Madrigosa->isAlive())
|
||||||
EndIntro();
|
EndIntro();
|
||||||
else error_log("Madrigosa is Tod");
|
else error_log("Madrigosa is Tod");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
EndIntro();
|
EndIntro();
|
||||||
@@ -141,12 +141,12 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
DoScriptText(YELL_DEATH, m_creature);
|
DoScriptText(YELL_DEATH, m_creature);
|
||||||
|
|
||||||
if(pInstance){
|
if(pInstance){
|
||||||
pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE);
|
pInstance->SetData(DATA_BRUTALLUS_EVENT, DONE);
|
||||||
float x,y,z;
|
float x,y,z;
|
||||||
m_creature->GetPosition(x,y,z);
|
m_creature->GetPosition(x,y,z);
|
||||||
m_creature->SummonCreature(FELMYST, x,y, z+30, m_creature->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0);
|
m_creature->SummonCreature(FELMYST, x,y, z+30, m_creature->GetOrientation(), TEMPSUMMON_MANUAL_DESPAWN, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void StartIntro()
|
void StartIntro()
|
||||||
@@ -154,16 +154,16 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
|
|||||||
if(!Intro)
|
if(!Intro)
|
||||||
return;
|
return;
|
||||||
if(Madrigosa){
|
if(Madrigosa){
|
||||||
Madrigosa->setDeathState(ALIVE);
|
Madrigosa->setDeathState(ALIVE);
|
||||||
Madrigosa->setActive(true);
|
Madrigosa->setActive(true);
|
||||||
IsIntro = true;
|
IsIntro = true;
|
||||||
}
|
}
|
||||||
error_log("Starte das Intro");
|
error_log("Starte das Intro");
|
||||||
}
|
}
|
||||||
|
|
||||||
void EndIntro()
|
void EndIntro()
|
||||||
{
|
{
|
||||||
error_log("Beende das Intro");
|
error_log("Beende das Intro");
|
||||||
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||||
Intro = false;
|
Intro = false;
|
||||||
IsIntro = false;
|
IsIntro = false;
|
||||||
@@ -245,10 +245,10 @@ struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MoveInLineOfSight(Unit *who){
|
void MoveInLineOfSight(Unit *who){
|
||||||
if(pInstance && Intro)
|
if(pInstance && Intro)
|
||||||
pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
|
pInstance->SetData(DATA_BRUTALLUS_EVENT, SPECIAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void UpdateAI(const uint32 diff)
|
void UpdateAI(const uint32 diff)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
|
|||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
//m_creature->AttackStop();
|
//m_creature->AttackStop();
|
||||||
error_log("prevent fly phase");
|
error_log("prevent fly phase");
|
||||||
m_creature->GetMotionMaster()->Clear(false);
|
m_creature->GetMotionMaster()->Clear(false);
|
||||||
m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
|
m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
|
||||||
m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT);
|
m_creature->SetUnitMovementFlags(MOVEMENTFLAG_LEVITATING + MOVEMENTFLAG_ONTRANSPORT);
|
||||||
@@ -299,15 +299,15 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
|
|||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
|
||||||
break;
|
break;
|
||||||
case 1:
|
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);
|
m_creature->GetMotionMaster()->MovePoint(0, m_creature->GetPositionX()+1, m_creature->GetPositionY(), m_creature->GetPositionZ()+10);
|
||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
|
||||||
break;
|
break;
|
||||||
case 2:{
|
case 2:{
|
||||||
error_log("Summon Vapor case 2");
|
error_log("Summon Vapor case 2");
|
||||||
Unit* target;
|
Unit* target;
|
||||||
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
||||||
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
||||||
if(target)
|
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);
|
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();
|
}else EnterEvadeMode();
|
||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
|
||||||
break;}
|
break;}
|
||||||
case 3: {
|
case 3: {
|
||||||
DespawnSummons(MOB_VAPOR_TRAIL);
|
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
|
//m_creature->CastSpell(m_creature, SPELL_VAPOR_SELECT); need core support
|
||||||
Unit* target;
|
Unit* target;
|
||||||
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
||||||
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
||||||
if(target)
|
if(target)
|
||||||
{
|
{
|
||||||
//target->CastSpell(target, SPELL_VAPOR_SUMMON, true); need core support
|
//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);
|
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();
|
}else EnterEvadeMode();
|
||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 10000;
|
||||||
break;}
|
break;}
|
||||||
case 4:
|
case 4:
|
||||||
DespawnSummons(MOB_VAPOR_TRAIL);
|
DespawnSummons(MOB_VAPOR_TRAIL);
|
||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 1;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 1;
|
||||||
break;
|
break;
|
||||||
case 5:{
|
case 5:{
|
||||||
Unit* target;
|
Unit* target;
|
||||||
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
target = SelectUnit(SELECT_TARGET_RANDOM, 0, 150, true);
|
||||||
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
if(!target) target = Unit::GetUnit((*m_creature), pInstance->GetData64(DATA_PLAYER_GUID));
|
||||||
if(target)
|
if(target)
|
||||||
{
|
{
|
||||||
BreathX = target->GetPositionX();
|
BreathX = target->GetPositionX();
|
||||||
BreathY = target->GetPositionY();
|
BreathY = target->GetPositionY();
|
||||||
@@ -359,7 +359,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
|
|||||||
m_creature->GetMotionMaster()->MovePoint(0, x, y, z+10);
|
m_creature->GetMotionMaster()->MovePoint(0, x, y, z+10);
|
||||||
}else EnterEvadeMode();
|
}else EnterEvadeMode();
|
||||||
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
|
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
|
||||||
break;}
|
break;}
|
||||||
case 6:
|
case 6:
|
||||||
m_creature->SetOrientation(m_creature->GetAngle(BreathX, BreathY));
|
m_creature->SetOrientation(m_creature->GetAngle(BreathX, BreathY));
|
||||||
m_creature->StopMoving();
|
m_creature->StopMoving();
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -38,6 +38,6 @@
|
|||||||
#define DATA_GATE_5 26
|
#define DATA_GATE_5 26
|
||||||
|
|
||||||
/*** Misc ***/
|
/*** Misc ***/
|
||||||
#define DATA_PLAYER_GUID 27
|
#define DATA_PLAYER_GUID 27
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ EndScriptData */
|
|||||||
#define ENCOUNTERS 6
|
#define ENCOUNTERS 6
|
||||||
|
|
||||||
enum GoState{
|
enum GoState{
|
||||||
CLOSE = 1,
|
CLOSE = 1,
|
||||||
OPEN = 0
|
OPEN = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Sunwell Plateau:
|
/* Sunwell Plateau:
|
||||||
@@ -108,8 +108,8 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
|
|||||||
if (!players.isEmpty())
|
if (!players.isEmpty())
|
||||||
{
|
{
|
||||||
for(Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
|
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))
|
if (plr && !plr->HasAura(45839,0))
|
||||||
return plr;
|
return plr;
|
||||||
}
|
}
|
||||||
@@ -199,10 +199,10 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
|
|||||||
case DATA_KILJAEDEN_CONTROLLER: return KilJaedenController; break;
|
case DATA_KILJAEDEN_CONTROLLER: return KilJaedenController; break;
|
||||||
case DATA_ANVEENA: return Anveena; break;
|
case DATA_ANVEENA: return Anveena; break;
|
||||||
case DATA_KALECGOS_KJ: return KalecgosKJ; break;
|
case DATA_KALECGOS_KJ: return KalecgosKJ; break;
|
||||||
case DATA_PLAYER_GUID:
|
case DATA_PLAYER_GUID:
|
||||||
Player* Target = GetPlayerInMap();
|
Player* Target = GetPlayerInMap();
|
||||||
return Target->GetGUID();
|
return Target->GetGUID();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
@@ -220,20 +220,20 @@ struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
|
|||||||
Encounters[2] = data; break;
|
Encounters[2] = data; break;
|
||||||
case DATA_EREDAR_TWINS_EVENT: Encounters[3] = data; break;
|
case DATA_EREDAR_TWINS_EVENT: Encounters[3] = data; break;
|
||||||
case DATA_MURU_EVENT:
|
case DATA_MURU_EVENT:
|
||||||
switch(data){
|
switch(data){
|
||||||
case DONE:
|
case DONE:
|
||||||
HandleGameObject(Gate[4], OPEN);
|
HandleGameObject(Gate[4], OPEN);
|
||||||
HandleGameObject(Gate[3], OPEN);
|
HandleGameObject(Gate[3], OPEN);
|
||||||
break;
|
break;
|
||||||
case IN_PROGRESS:
|
case IN_PROGRESS:
|
||||||
HandleGameObject(Gate[4], CLOSE);
|
HandleGameObject(Gate[4], CLOSE);
|
||||||
HandleGameObject(Gate[3], CLOSE);
|
HandleGameObject(Gate[3], CLOSE);
|
||||||
break;
|
break;
|
||||||
case NOT_STARTED:
|
case NOT_STARTED:
|
||||||
HandleGameObject(Gate[4], CLOSE);
|
HandleGameObject(Gate[4], CLOSE);
|
||||||
HandleGameObject(Gate[3], OPEN);
|
HandleGameObject(Gate[3], OPEN);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Encounters[4] = data; break;
|
Encounters[4] = data; break;
|
||||||
case DATA_KILJAEDEN_EVENT: Encounters[5] = data; break;
|
case DATA_KILJAEDEN_EVENT: Encounters[5] = data; break;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user