josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Backport TrinityCore2 r4137.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-06-19 11:13:50 +02:00
parent 294c8a734e
commit b28a7eb406
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/scripts/zone/magisters_terrace/boss_selin_fireheart.cpp
-3
View File
@@ -230,10 +230,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
DoScriptText(SAY_DEATH, m_creature); DoScriptText(SAY_DEATH, m_creature);
if(!pInstance) if(!pInstance)
{
error_log(ERROR_INST_DATA);
return; return;
}
pInstance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete! pInstance->SetData(DATA_SELIN_EVENT, DONE); // Encounter complete!
src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+9 -4
View File
@@ -50,12 +50,13 @@ EndScriptData */
struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
{ {
boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c) boss_pathaleon_the_calculatorAI(Creature *c) : ScriptedAI(c), summons(m_creature)
{ {
HeroicMode = m_creature->GetMap()->IsHeroic(); HeroicMode = m_creature->GetMap()->IsHeroic();
} }
uint32 Summon_Timer; uint32 Summon_Timer;
SummonList summons;
uint32 ManaTap_Timer; uint32 ManaTap_Timer;
uint32 ArcaneTorrent_Timer; uint32 ArcaneTorrent_Timer;
uint32 Domination_Timer; uint32 Domination_Timer;
@@ -76,7 +77,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
Enraged = false; Enraged = false;
Counter = 0; Counter = 0;
summons.DespawnAll();
} }
void Aggro(Unit *who) void Aggro(Unit *who)
{ {
@@ -95,8 +96,13 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
void JustDied(Unit* Killer) void JustDied(Unit* Killer)
{ {
DoScriptText(SAY_DEATH, m_creature); DoScriptText(SAY_DEATH, m_creature);
summons.DespawnAll();
} }
void JustSummoned(Creature *summon) { summons.Summon(summon); }
void SummonedCreatureDespawn(Creature *summon) { summons.Despawn(summon); }
void UpdateAI(const uint32 diff) void UpdateAI(const uint32 diff)
{ {
//Return since we have no target //Return since we have no target
@@ -107,8 +113,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
{ {
for(int i = 0; i < 3;i++) for(int i = 0; i < 3;i++)
{ {
Unit* target = NULL; Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
if (target && Wraith) if (target && Wraith)
Wraith->AI()->AttackStart(target); Wraith->AI()->AttackStart(target);