*Minor clean and some typos in WLK only scripts.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-05-01 19:17:00 +02:00
parent 182a04f5ea
commit 923a4bd389
69 changed files with 785 additions and 780 deletions
@@ -74,6 +74,6 @@ void AddSC_boss_amanitar()
newscript = new Script; newscript = new Script;
newscript->Name="boss_amanitar"; newscript->Name="boss_amanitar";
newscript->GetAI = GetAI_boss_amanitar; newscript->GetAI = &GetAI_boss_amanitar;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -106,6 +106,6 @@ void AddSC_boss_volazj()
newscript = new Script; newscript = new Script;
newscript->Name="boss_volazj"; newscript->Name="boss_volazj";
newscript->GetAI = GetAI_boss_volazj; newscript->GetAI = &GetAI_boss_volazj;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -104,6 +104,6 @@ void AddSC_boss_jedoga()
newscript = new Script; newscript = new Script;
newscript->Name="boss_jedoga"; newscript->Name="boss_jedoga";
newscript->GetAI = GetAI_boss_jedoga; newscript->GetAI = &GetAI_boss_jedoga;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -104,6 +104,6 @@ void AddSC_boss_taldaram()
newscript = new Script; newscript = new Script;
newscript->Name="boss_taldaram"; newscript->Name="boss_taldaram";
newscript->GetAI = GetAI_boss_taldaram; newscript->GetAI = &GetAI_boss_taldaram;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -107,6 +107,6 @@ void AddSC_boss_anub_arak()
newscript = new Script; newscript = new Script;
newscript->Name="boss_anub_arak"; newscript->Name="boss_anub_arak";
newscript->GetAI = GetAI_boss_anub_arak; newscript->GetAI = &GetAI_boss_anub_arak;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -109,6 +109,6 @@ void AddSC_boss_hadronox()
newscript = new Script; newscript = new Script;
newscript->Name="boss_hadronox"; newscript->Name="boss_hadronox";
newscript->GetAI = GetAI_boss_hadronox; newscript->GetAI = &GetAI_boss_hadronox;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -110,7 +110,7 @@ void AddSC_boss_krik_thir()
newscript = new Script; newscript = new Script;
newscript->Name="boss_krik_thir"; newscript->Name="boss_krik_thir";
newscript->GetAI = GetAI_boss_krik_thir; newscript->GetAI = &GetAI_boss_krik_thir;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -81,6 +81,6 @@ void AddSC_boss_epoch()
newscript = new Script; newscript = new Script;
newscript->Name="boss_epoch"; newscript->Name="boss_epoch";
newscript->GetAI = GetAI_boss_epoch; newscript->GetAI = &GetAI_boss_epoch;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -42,21 +42,21 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI
{ {
boss_mal_ganisAI(Creature *c) : ScriptedAI(c) {} boss_mal_ganisAI(Creature *c) : ScriptedAI(c) {}
bool yelled, bool yelled,
yelled2, yelled2,
yelled3; yelled3;
void Reset() void Reset()
{ {
yelled = false; yelled = false;
yelled2 = false; yelled2 = false;
yelled3 = false; yelled3 = false;
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_AGGRO, m_creature); DoScriptText(SAY_AGGRO, m_creature);
} }
void AttackStart(Unit* who) {} void AttackStart(Unit* who) {}
void MoveInLineOfSight(Unit* who) {} void MoveInLineOfSight(Unit* who) {}
@@ -66,28 +66,28 @@ struct TRINITY_DLL_DECL boss_mal_ganisAI : public ScriptedAI
if(!UpdateVictim()) if(!UpdateVictim())
return; return;
if(!yelled) if(!yelled)
{ {
if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 30) if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 30)
{ {
DoScriptText(SAY_30HEALTH, m_creature); DoScriptText(SAY_30HEALTH, m_creature);
yelled = true; yelled = true;
} }
} }
if(!yelled2) if(!yelled2)
{ {
if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15) if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 15)
{ {
DoScriptText(SAY_15HEALTH, m_creature); DoScriptText(SAY_15HEALTH, m_creature);
yelled2 = true; yelled2 = true;
} }
} }
if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 1) if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 1)
{ {
//Handle Escape Event //Handle Escape Event
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
@@ -118,6 +118,6 @@ void AddSC_boss_mal_ganis()
newscript = new Script; newscript = new Script;
newscript->Name="boss_mal_ganis"; newscript->Name="boss_mal_ganis";
newscript->GetAI = GetAI_boss_mal_ganis; newscript->GetAI = &GetAI_boss_mal_ganis;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -133,6 +133,6 @@ void AddSC_boss_meathook()
newscript = new Script; newscript = new Script;
newscript->Name="boss_meathook"; newscript->Name="boss_meathook";
newscript->GetAI = GetAI_boss_meathook; newscript->GetAI = &GetAI_boss_meathook;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,7 +77,8 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
//Shadow bolt timer //Shadow bolt timer
if (Shadow_bolt_Timer < diff) if (Shadow_bolt_Timer < diff)
{ {
DoCast(random_target,SPELL_SHADOW_BOLT_N); if(random_target)
DoCast(random_target,SPELL_SHADOW_BOLT_N);
Shadow_bolt_Timer = 8000 + rand()%4000; Shadow_bolt_Timer = 8000 + rand()%4000;
}else Shadow_bolt_Timer -= diff; }else Shadow_bolt_Timer -= diff;
@@ -96,7 +97,8 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
DoScriptText(SAY_STEAL_FLESH_3, m_creature); DoScriptText(SAY_STEAL_FLESH_3, m_creature);
break; break;
} }
DoCast(random_target,SPELL_STEAL_FLESH); if(random_target)
DoCast(random_target,SPELL_STEAL_FLESH);
Steal_flesh_Timer = 10000; Steal_flesh_Timer = 10000;
}else Steal_flesh_Timer -= diff; }else Steal_flesh_Timer -= diff;
@@ -112,7 +114,8 @@ struct TRINITY_DLL_DECL boss_salrammAI : public ScriptedAI
DoScriptText(SAY_SUMMON_GHOULS_2, m_creature); DoScriptText(SAY_SUMMON_GHOULS_2, m_creature);
break; break;
} }
DoCast(random_target,SPELL_SUMMON_GHOULS); if(random_target)
DoCast(random_target,SPELL_SUMMON_GHOULS);
Summon_ghouls_Timer = 10000; Summon_ghouls_Timer = 10000;
}else Summon_ghouls_Timer -= diff; }else Summon_ghouls_Timer -= diff;
@@ -147,6 +150,6 @@ void AddSC_boss_salramm()
newscript = new Script; newscript = new Script;
newscript->Name="boss_salramm"; newscript->Name="boss_salramm";
newscript->GetAI = GetAI_boss_salramm; newscript->GetAI = &GetAI_boss_salramm;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_culling_of_stratholme()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_culling_of_stratholme"; newscript->Name = "instance_culling_of_stratholme";
newscript->GetInstanceData = GetInstanceData_instance_culling_of_stratholme; newscript->GetInstanceData = &GetInstanceData_instance_culling_of_stratholme;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -51,6 +51,6 @@ void AddSC_boss_dred()
newscript = new Script; newscript = new Script;
newscript->Name="boss_dred"; newscript->Name="boss_dred";
newscript->GetAI = GetAI_boss_dred; newscript->GetAI = &GetAI_boss_dred;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -70,6 +70,6 @@ void AddSC_boss_novos()
newscript = new Script; newscript = new Script;
newscript->Name="boss_novos"; newscript->Name="boss_novos";
newscript->GetAI = GetAI_boss_novos; newscript->GetAI = &GetAI_boss_novos;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -53,9 +53,9 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
void Reset() {} void Reset() {}
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_AGGRO, m_creature); DoScriptText(SAY_AGGRO, m_creature);
} }
void AttackStart(Unit* who) {} void AttackStart(Unit* who) {}
void MoveInLineOfSight(Unit* who) {} void MoveInLineOfSight(Unit* who) {}
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -67,9 +67,9 @@ struct TRINITY_DLL_DECL boss_tharon_jaAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_DEATH,m_creature); DoScriptText(SAY_DEATH,m_creature);
} }
}; };
CreatureAI* GetAI_boss_tharon_ja(Creature *_Creature) CreatureAI* GetAI_boss_tharon_ja(Creature *_Creature)
@@ -83,6 +83,6 @@ void AddSC_boss_tharon_ja()
newscript = new Script; newscript = new Script;
newscript->Name="boss_tharon_ja"; newscript->Name="boss_tharon_ja";
newscript->GetAI = GetAI_boss_tharon_ja; newscript->GetAI = &GetAI_boss_tharon_ja;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -70,6 +70,6 @@ void AddSC_boss_trollgore()
newscript = new Script; newscript = new Script;
newscript->Name="boss_trollgore"; newscript->Name="boss_trollgore";
newscript->GetAI = GetAI_boss_trollgore; newscript->GetAI = &GetAI_boss_trollgore;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_drak_tharon()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_drak_tharon"; newscript->Name = "instance_drak_tharon";
newscript->GetInstanceData = GetInstanceData_instance_drak_tharon; newscript->GetInstanceData = &GetInstanceData_instance_drak_tharon;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -367,12 +367,12 @@ void AddSC_the_scarlet_enclave()
newscript = new Script; newscript = new Script;
newscript->Name="npc_unworthy_initiate"; newscript->Name="npc_unworthy_initiate";
newscript->GetAI = GetAI_npc_unworthy_initiate; newscript->GetAI = &GetAI_npc_unworthy_initiate;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="npc_unworthy_initiate_anchor"; newscript->Name="npc_unworthy_initiate_anchor";
newscript->GetAI = GetAI_npc_unworthy_initiate_anchor; newscript->GetAI = &GetAI_npc_unworthy_initiate_anchor;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
@@ -50,6 +50,6 @@ void AddSC_boss_drakkari_colossus()
newscript = new Script; newscript = new Script;
newscript->Name="boss_drakkari_colossus"; newscript->Name="boss_drakkari_colossus";
newscript->GetAI = GetAI_boss_drakkari_colossus; newscript->GetAI = &GetAI_boss_drakkari_colossus;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -60,6 +60,6 @@ void AddSC_boss_eck()
newscript = new Script; newscript = new Script;
newscript->Name="boss_eck"; newscript->Name="boss_eck";
newscript->GetAI = GetAI_boss_eck; newscript->GetAI = &GetAI_boss_eck;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -80,6 +80,6 @@ void AddSC_boss_gal_darah()
newscript = new Script; newscript = new Script;
newscript->Name="boss_gal_darah"; newscript->Name="boss_gal_darah";
newscript->GetAI = GetAI_boss_gal_darah; newscript->GetAI = &GetAI_boss_gal_darah;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -83,6 +83,6 @@ void AddSC_boss_moorabi()
newscript = new Script; newscript = new Script;
newscript->Name="boss_moorabi"; newscript->Name="boss_moorabi";
newscript->GetAI = GetAI_boss_moorabi; newscript->GetAI = &GetAI_boss_moorabi;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -90,6 +90,6 @@ void AddSC_boss_slad_ran()
newscript = new Script; newscript = new Script;
newscript->Name="boss_slad_ran"; newscript->Name="boss_slad_ran";
newscript->GetAI = GetAI_boss_slad_ran; newscript->GetAI = &GetAI_boss_slad_ran;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_gundrak()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_gundrak"; newscript->Name = "instance_gundrak";
newscript->GetInstanceData = GetInstanceData_instance_gundrak; newscript->GetInstanceData = &GetInstanceData_instance_gundrak;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -151,7 +151,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public ScriptedAI
{ {
SummonWasters_Timer=3000; // 3s summon waster SummonWasters_Timer=3000; // 3s summon waster
SummonAbominations_Timer=25000; //25s summon abomination SummonAbominations_Timer=25000; //25s summon abomination
SummonAWeavers_Timer=20000; //20s summon Weavers SummonAWeavers_Timer=20000; //20s summon Weavers
FrostBolt_Timer = 2000; //2s CD FrostBolt_Timer = 2000; //2s CD
FrostBoltNova_Timer = 15000; //Cast every 15 seconds FrostBoltNova_Timer = 15000; //Cast every 15 seconds
@@ -323,7 +323,7 @@ struct TRINITY_DLL_DECL boss_kelthuzadAI : public ScriptedAI
if(ManaDetonation_Timer < diff) if(ManaDetonation_Timer < diff)
{ {
Unit* target; Unit* target;
//select a manaplayer during 10 raid ,how to make sure we can succed in finding a manaplayer or it's safty if there is no manaplayer in raid //select a manaplayer during 10 raid ,how to make sure we can succed in finding a manaplayer or it's safty if there is no manaplayer in raid
for(uint8 i = 0; i <NORMAL_RAID; i++) for(uint8 i = 0; i <NORMAL_RAID; i++)
{ {
if (target = SelectUnit(SELECT_TARGET_RANDOM,0)) if (target = SelectUnit(SELECT_TARGET_RANDOM,0))
@@ -165,6 +165,6 @@ void AddSC_boss_malygos()
newscript = new Script; newscript = new Script;
newscript->Name="boss_malygos"; newscript->Name="boss_malygos";
newscript->GetAI = GetAI_boss_malygos; newscript->GetAI = &GetAI_boss_malygos;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_eye_of_eternity()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_eye_of_eternity"; newscript->Name = "instance_eye_of_eternity";
newscript->GetInstanceData = GetInstanceData_instance_eye_of_eternity; newscript->GetInstanceData = &GetInstanceData_instance_eye_of_eternity;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -134,16 +134,16 @@ void AddSC_boss_anomalus()
newscript = new Script; newscript = new Script;
newscript->Name="boss_anomalus"; newscript->Name="boss_anomalus";
newscript->GetAI = GetAI_boss_anomalus; newscript->GetAI = &GetAI_boss_anomalus;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_crazed_mana_wraith"; newscript->Name="mob_crazed_mana_wraith";
newscript->GetAI = GetAI_mob_crazed_mana_wraith; newscript->GetAI = &GetAI_mob_crazed_mana_wraith;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="npc_chaotic_rift"; newscript->Name="npc_chaotic_rift";
newscript->GetAI = GetAI_npc_chaotic_rift; newscript->GetAI = &GetAI_npc_chaotic_rift;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -84,6 +84,6 @@ void AddSC_boss_keristrasza()
newscript = new Script; newscript = new Script;
newscript->Name="boss_keristrasza"; newscript->Name="boss_keristrasza";
newscript->GetAI = GetAI_boss_keristrasza; newscript->GetAI = &GetAI_boss_keristrasza;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -57,15 +57,15 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
{ {
boss_magus_telestraAI(Creature *c) : ScriptedAI(c) {} boss_magus_telestraAI(Creature *c) : ScriptedAI(c) {}
bool splited; bool splited;
uint64 Magus_frost, uint64 Magus_frost,
Magus_fire, Magus_fire,
Magus_arcane; Magus_arcane;
void Reset() void Reset()
{ {
splited = false; splited = false;
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_AGGRO, m_creature); DoScriptText(SAY_AGGRO, m_creature);
@@ -78,22 +78,22 @@ struct TRINITY_DLL_DECL boss_magus_telestraAI : public ScriptedAI
if(!UpdateVictim()) if(!UpdateVictim())
return; return;
if(!splited) if(!splited)
{ {
if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 50) if ((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) <= 50)
{ {
DoScriptText(SAY_SPLIT_1, m_creature); DoScriptText(SAY_SPLIT_1, m_creature);
//HandleSplit //HandleSplit
splited = true; splited = true;
} }
} }
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_DEATH, m_creature); DoScriptText(SAY_DEATH, m_creature);
} }
void KilledUnit(Unit *victim) void KilledUnit(Unit *victim)
{ {
if(victim == m_creature) if(victim == m_creature)
@@ -113,6 +113,6 @@ void AddSC_boss_magus_telestra()
newscript = new Script; newscript = new Script;
newscript->Name="boss_magus_telestra"; newscript->Name="boss_magus_telestra";
newscript->GetAI = GetAI_boss_magus_telestra; newscript->GetAI = &GetAI_boss_magus_telestra;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -85,6 +85,6 @@ void AddSC_boss_ormorok()
newscript = new Script; newscript = new Script;
newscript->Name="boss_ormorok"; newscript->Name="boss_ormorok";
newscript->GetAI = GetAI_boss_ormorok; newscript->GetAI = &GetAI_boss_ormorok;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -52,6 +52,6 @@ void AddSC_boss_commander_kolurg()
newscript = new Script; newscript = new Script;
newscript->Name="boss_commander_kolurg"; newscript->Name="boss_commander_kolurg";
newscript->GetAI = GetAI_boss_commander_kolurg; newscript->GetAI = &GetAI_boss_commander_kolurg;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -28,9 +28,9 @@ struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI
void Reset() {} void Reset() {}
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_AGGRO, m_creature); DoScriptText(SAY_AGGRO, m_creature);
} }
void AttackStart(Unit* who) {} void AttackStart(Unit* who) {}
void MoveInLineOfSight(Unit* who) {} void MoveInLineOfSight(Unit* who) {}
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -42,9 +42,9 @@ struct TRINITY_DLL_DECL boss_commander_stoutbeardAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_DEATH, m_creature); DoScriptText(SAY_DEATH, m_creature);
} }
}; };
CreatureAI* GetAI_boss_commander_stoutbeard(Creature *_Creature) CreatureAI* GetAI_boss_commander_stoutbeard(Creature *_Creature)
@@ -58,6 +58,6 @@ void AddSC_boss_commander_stoutbeard()
newscript = new Script; newscript = new Script;
newscript->Name="boss_commander_stoutbeard"; newscript->Name="boss_commander_stoutbeard";
newscript->GetAI = GetAI_boss_commander_stoutbeard; newscript->GetAI = &GetAI_boss_commander_stoutbeard;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -5,40 +5,40 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
{ {
instance_nexus(Map *Map) : ScriptedInstance(Map) {Initialize();}; instance_nexus(Map *Map) : ScriptedInstance(Map) {Initialize();};
uint64 Anomalus, uint64 Anomalus,
Ormorok, Ormorok,
Magus_telestra, Magus_telestra,
Magus_frost, Magus_frost,
Magus_fire, Magus_fire,
Magus_arcane, Magus_arcane,
keristrasza, keristrasza,
Commander_kolurg, Commander_kolurg,
Commander_stoutbeard; Commander_stoutbeard;
bool IsBossDied[9]; bool IsBossDied[9];
void Initialize() void Initialize()
{ {
Anomalus = 0; Anomalus = 0;
Ormorok = 0; Ormorok = 0;
Magus_telestra =0; Magus_telestra =0;
Magus_frost =0; Magus_frost =0;
Magus_fire =0; Magus_fire =0;
Magus_arcane =0; Magus_arcane =0;
keristrasza =0; keristrasza =0;
Commander_kolurg = 0; Commander_kolurg = 0;
Commander_stoutbeard = 0; Commander_stoutbeard = 0;
IsBossDied[0] = false; IsBossDied[0] = false;
IsBossDied[1] = false; IsBossDied[1] = false;
IsBossDied[2] = false; IsBossDied[2] = false;
IsBossDied[3] = false; IsBossDied[3] = false;
IsBossDied[4] = false; IsBossDied[4] = false;
IsBossDied[5] = false; IsBossDied[5] = false;
IsBossDied[6] = false; IsBossDied[6] = false;
IsBossDied[7] = false; IsBossDied[7] = false;
IsBossDied[8] = false; IsBossDied[8] = false;
} }
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
//not active //not active
return false; return false;
@@ -153,6 +153,6 @@ void AddSC_instance_nexus()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_nexus"; newscript->Name = "instance_nexus";
newscript->GetInstanceData = GetInstanceData_instance_nexus; newscript->GetInstanceData = &GetInstanceData_instance_nexus;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,6 +77,6 @@ void AddSC_boss_drakos()
newscript = new Script; newscript = new Script;
newscript->Name="boss_drakos"; newscript->Name="boss_drakos";
newscript->GetAI = GetAI_boss_drakos; newscript->GetAI = &GetAI_boss_drakos;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -99,6 +99,6 @@ void AddSC_boss_eregos()
newscript = new Script; newscript = new Script;
newscript->Name="boss_eregos"; newscript->Name="boss_eregos";
newscript->GetAI = GetAI_boss_eregos; newscript->GetAI = &GetAI_boss_eregos;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -82,6 +82,6 @@ void AddSC_boss_urom()
newscript = new Script; newscript = new Script;
newscript->Name="boss_urom"; newscript->Name="boss_urom";
newscript->GetAI = GetAI_boss_urom; newscript->GetAI = &GetAI_boss_urom;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -80,6 +80,6 @@ void AddSC_boss_varos()
newscript = new Script; newscript = new Script;
newscript->Name="boss_varos"; newscript->Name="boss_varos";
newscript->GetAI = GetAI_boss_varos; newscript->GetAI = &GetAI_boss_varos;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_oculus()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_oculus"; newscript->Name = "instance_oculus";
newscript->GetInstanceData = GetInstanceData_instance_oculus; newscript->GetInstanceData = &GetInstanceData_instance_oculus;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -85,9 +85,9 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI
berserk = false; berserk = false;
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_SARTHARION_DEATH,m_creature); DoScriptText(SAY_SARTHARION_DEATH,m_creature);
} }
void AttackStart(Unit* who) {} void AttackStart(Unit* who) {}
void MoveInLineOfSight(Unit* who) {} void MoveInLineOfSight(Unit* who) {}
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
@@ -107,9 +107,9 @@ struct TRINITY_DLL_DECL boss_sartharionAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_SARTHARION_DEATH,m_creature); DoScriptText(SAY_SARTHARION_DEATH,m_creature);
} }
}; };
/*###### /*######
@@ -132,9 +132,9 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public ScriptedAI
void Reset() {} void Reset() {}
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_VESPERON_AGGRO,m_creature); DoScriptText(SAY_VESPERON_AGGRO,m_creature);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
//Return since we have no target //Return since we have no target
@@ -144,9 +144,9 @@ struct TRINITY_DLL_DECL mob_vesperonAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_VESPERON_DEATH,m_creature); DoScriptText(SAY_VESPERON_DEATH,m_creature);
} }
}; };
/*###### /*######
@@ -169,9 +169,9 @@ struct TRINITY_DLL_DECL mob_shadronAI : public ScriptedAI
void Reset(){} void Reset(){}
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_SHADRON_AGGRO,m_creature); DoScriptText(SAY_SHADRON_AGGRO,m_creature);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
//Return since we have no target //Return since we have no target
@@ -181,9 +181,9 @@ struct TRINITY_DLL_DECL mob_shadronAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_SHADRON_DEATH,m_creature); DoScriptText(SAY_SHADRON_DEATH,m_creature);
} }
}; };
/*###### /*######
## Mob Tenebron ## Mob Tenebron
@@ -205,9 +205,9 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public ScriptedAI
void Reset() {} void Reset() {}
void EnterCombat(Unit* who) void EnterCombat(Unit* who)
{ {
DoScriptText(SAY_TENEBRON_AGGRO,m_creature); DoScriptText(SAY_TENEBRON_AGGRO,m_creature);
} }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
//Return since we have no target //Return since we have no target
@@ -217,9 +217,9 @@ struct TRINITY_DLL_DECL mob_tenebronAI : public ScriptedAI
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* killer) void JustDied(Unit* killer)
{ {
DoScriptText(SAY_TENEBRON_DEATH,m_creature); DoScriptText(SAY_TENEBRON_DEATH,m_creature);
} }
}; };
/*###### /*######
@@ -275,26 +275,26 @@ void AddSC_boss_sartharion()
newscript = new Script; newscript = new Script;
newscript->Name="boss_sartharion"; newscript->Name="boss_sartharion";
newscript->GetAI = GetAI_boss_sartharion; newscript->GetAI = &GetAI_boss_sartharion;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_vesperon"; newscript->Name="mob_vesperon";
newscript->GetAI = GetAI_mob_vesperon; newscript->GetAI = &GetAI_mob_vesperon;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_shadron"; newscript->Name="mob_shadron";
newscript->GetAI = GetAI_mob_shadron; newscript->GetAI = &GetAI_mob_shadron;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_tenebron"; newscript->Name="mob_tenebron";
newscript->GetAI = GetAI_mob_tenebron; newscript->GetAI = &GetAI_mob_tenebron;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_whelp"; newscript->Name="mob_whelp";
newscript->GetAI = GetAI_mob_whelp; newscript->GetAI = &GetAI_mob_whelp;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_obsidian_sanctum()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_obsidian_sanctum"; newscript->Name = "instance_obsidian_sanctum";
newscript->GetInstanceData = GetInstanceData_instance_obsidian_sanctum; newscript->GetInstanceData = &GetInstanceData_instance_obsidian_sanctum;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -89,6 +89,6 @@ void AddSC_boss_bjarngrim()
newscript = new Script; newscript = new Script;
newscript->Name="boss_bjarngrim"; newscript->Name="boss_bjarngrim";
newscript->GetAI = GetAI_boss_bjarngrim; newscript->GetAI = &GetAI_boss_bjarngrim;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -104,11 +104,11 @@ void AddSC_boss_ionar()
newscript = new Script; newscript = new Script;
newscript->Name="boss_ionar"; newscript->Name="boss_ionar";
newscript->GetAI = GetAI_boss_ionar; newscript->GetAI = &GetAI_boss_ionar;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="spark_of_ionar"; newscript->Name="spark_of_ionar";
newscript->GetAI = GetAI_npc_spark_of_ionar; newscript->GetAI = &GetAI_npc_spark_of_ionar;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -81,6 +81,6 @@ void AddSC_boss_loken()
newscript = new Script; newscript = new Script;
newscript->Name="boss_loken"; newscript->Name="boss_loken";
newscript->GetAI = GetAI_boss_loken; newscript->GetAI = &GetAI_boss_loken;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -118,11 +118,11 @@ void AddSC_boss_volkhan()
newscript = new Script; newscript = new Script;
newscript->Name="boss_volkhan"; newscript->Name="boss_volkhan";
newscript->GetAI = GetAI_boss_volkhan; newscript->GetAI = &GetAI_boss_volkhan;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_molten_golem"; newscript->Name="mob_molten_golem";
newscript->GetAI = GetAI_mob_molten_golem; newscript->GetAI = &GetAI_mob_molten_golem;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_halls_of_lightning()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_halls_of_lightning"; newscript->Name = "instance_halls_of_lightning";
newscript->GetInstanceData = GetInstanceData_instance_halls_of_lightning; newscript->GetInstanceData = &GetInstanceData_instance_halls_of_lightning;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -68,6 +68,6 @@ void AddSC_boss_krystallus()
newscript = new Script; newscript = new Script;
newscript->Name="boss_krystallus"; newscript->Name="boss_krystallus";
newscript->GetAI = GetAI_boss_krystallus; newscript->GetAI = &GetAI_boss_krystallus;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -76,6 +76,6 @@ void AddSC_boss_maiden_of_grief()
newscript = new Script; newscript = new Script;
newscript->Name="boss_maiden_of_grief"; newscript->Name="boss_maiden_of_grief";
newscript->GetAI = GetAI_boss_maiden_of_grief; newscript->GetAI = &GetAI_boss_maiden_of_grief;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -78,6 +78,6 @@ void AddSC_boss_sjonnir()
newscript = new Script; newscript = new Script;
newscript->Name="boss_sjonnir"; newscript->Name="boss_sjonnir";
newscript->GetAI = GetAI_boss_sjonnir; newscript->GetAI = &GetAI_boss_sjonnir;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_halls_of_stone()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_halls_of_stone"; newscript->Name = "instance_halls_of_stone";
newscript->GetInstanceData = GetInstanceData_instance_halls_of_stone; newscript->GetInstanceData = &GetInstanceData_instance_halls_of_stone;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -128,7 +128,8 @@ struct TRINITY_DLL_DECL boss_skarvald_the_constructorAI : public ScriptedAI
m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
//DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true); //DoCast(m_creature,SPELL_SUMMON_SKARVALD_GHOST,true);
Creature* temp = m_creature->SummonCreature(MOB_SKARVALD_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); Creature* temp = m_creature->SummonCreature(MOB_SKARVALD_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
temp->AI()->AttackStart(Killer); if(temp)
temp->AI()->AttackStart(Killer);
} }
} }
} }
@@ -279,7 +280,8 @@ struct TRINITY_DLL_DECL boss_dalronn_the_controllerAI : public ScriptedAI
m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE); m_creature->RemoveFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_LOOTABLE);
//DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true); //DoCast(m_creature,SPELL_SUMMON_DALRONN_GHOST,true);
Creature* temp = m_creature->SummonCreature(MOB_DALRONN_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000); Creature* temp = m_creature->SummonCreature(MOB_DALRONN_GHOST,m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),0,TEMPSUMMON_CORPSE_DESPAWN,5000);
temp->AI()->AttackStart(Killer); if(temp)
temp->AI()->AttackStart(Killer);
} }
} }
} }
@@ -73,6 +73,6 @@ void AddSC_boss_palehoof()
newscript = new Script; newscript = new Script;
newscript->Name="boss_palehoof"; newscript->Name="boss_palehoof";
newscript->GetAI = GetAI_boss_palehoof; newscript->GetAI = &GetAI_boss_palehoof;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -84,6 +84,6 @@ void AddSC_boss_skadi()
newscript = new Script; newscript = new Script;
newscript->Name="boss_skadi"; newscript->Name="boss_skadi";
newscript->GetAI = GetAI_boss_skadi; newscript->GetAI = &GetAI_boss_skadi;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -78,6 +78,6 @@ void AddSC_boss_svala()
newscript = new Script; newscript = new Script;
newscript->Name="boss_svala"; newscript->Name="boss_svala";
newscript->GetAI = GetAI_boss_svala; newscript->GetAI = &GetAI_boss_svala;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -80,6 +80,6 @@ void AddSC_boss_ymiron()
newscript = new Script; newscript = new Script;
newscript->Name="boss_ymiron"; newscript->Name="boss_ymiron";
newscript->GetAI = GetAI_boss_ymiron; newscript->GetAI = &GetAI_boss_ymiron;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_pinnacle()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_pinnacle"; newscript->Name = "instance_pinnacle";
newscript->GetInstanceData = GetInstanceData_instance_pinnacle; newscript->GetInstanceData = &GetInstanceData_instance_pinnacle;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -83,11 +83,11 @@ void AddSC_boss_archavon()
newscript = new Script; newscript = new Script;
newscript->Name="boss_archavon"; newscript->Name="boss_archavon";
newscript->GetAI = GetAI_boss_archavon; newscript->GetAI = &GetAI_boss_archavon;
newscript->RegisterSelf(); newscript->RegisterSelf();
newscript = new Script; newscript = new Script;
newscript->Name="mob_archavon_warder"; newscript->Name="mob_archavon_warder";
newscript->GetAI = GetAI_mob_warder; newscript->GetAI = &GetAI_mob_warder;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_archavon()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_archavon"; newscript->Name = "instance_archavon";
newscript->GetInstanceData = GetInstanceData_instance_archavon; newscript->GetInstanceData = &GetInstanceData_instance_archavon;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,6 +77,6 @@ void AddSC_boss_cyanigosa()
newscript = new Script; newscript = new Script;
newscript->Name="boss_cyanigosa"; newscript->Name="boss_cyanigosa";
newscript->GetAI = GetAI_boss_cyanigosa; newscript->GetAI = &GetAI_boss_cyanigosa;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,6 +77,6 @@ void AddSC_boss_erekem()
newscript = new Script; newscript = new Script;
newscript->Name="boss_erekem"; newscript->Name="boss_erekem";
newscript->GetAI = GetAI_boss_erekem; newscript->GetAI = &GetAI_boss_erekem;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -76,6 +76,6 @@ void AddSC_boss_ichoron()
newscript = new Script; newscript = new Script;
newscript->Name="boss_ichoron"; newscript->Name="boss_ichoron";
newscript->GetAI = GetAI_boss_ichoron; newscript->GetAI = &GetAI_boss_ichoron;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -47,6 +47,6 @@ void AddSC_boss_lavanthor()
newscript = new Script; newscript = new Script;
newscript->Name="boss_lavanthor"; newscript->Name="boss_lavanthor";
newscript->GetAI = GetAI_boss_lavanthor; newscript->GetAI = &GetAI_boss_lavanthor;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -45,6 +45,6 @@ void AddSC_boss_moragg()
newscript = new Script; newscript = new Script;
newscript->Name="boss_moragg"; newscript->Name="boss_moragg";
newscript->GetAI = GetAI_boss_moragg; newscript->GetAI = &GetAI_boss_moragg;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,6 +77,6 @@ void AddSC_boss_xevozz()
newscript = new Script; newscript = new Script;
newscript->Name="boss_xevozz"; newscript->Name="boss_xevozz";
newscript->GetAI = GetAI_boss_xevozz; newscript->GetAI = &GetAI_boss_xevozz;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -77,6 +77,6 @@ void AddSC_boss_zuramat()
newscript = new Script; newscript = new Script;
newscript->Name="boss_zuramat"; newscript->Name="boss_zuramat";
newscript->GetAI = GetAI_boss_zuramat; newscript->GetAI = &GetAI_boss_zuramat;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }
@@ -16,6 +16,6 @@ void AddSC_instance_violet_hold()
Script *newscript; Script *newscript;
newscript = new Script; newscript = new Script;
newscript->Name = "instance_violet_hold"; newscript->Name = "instance_violet_hold";
newscript->GetInstanceData = GetInstanceData_instance_violet_hold; newscript->GetInstanceData = &GetInstanceData_instance_violet_hold;
newscript->RegisterSelf(); newscript->RegisterSelf();
} }