diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp index 7895bcdb116..62d2bc1d3dd 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_lightning/boss_ionar.cpp @@ -62,15 +62,12 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI boss_ionarAI(Creature *pCreature) : ScriptedAI(pCreature) { m_pInstance = pCreature->GetInstanceData(); - m_bIsHeroic = pCreature->GetMap()->IsHeroic(); } ScriptedInstance* m_pInstance; std::list<uint64> m_lSparkGUIDList; - bool m_bIsHeroic; - bool m_bIsSplitPhase; uint32 m_uiSplit_Timer; uint32 m_uiSparkAtHomeCount; @@ -108,7 +105,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI AttackStart(pAttacker); } - void Aggro(Unit* who) + void EnterCombat(Unit* who) { DoScriptText(SAY_AGGRO, m_creature); @@ -198,7 +195,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI { if (pSummoned->GetEntry() == NPC_SPARK_OF_IONAR) { - pSummoned->CastSpell(pSummoned, m_bIsHeroic ? SPELL_SPARK_VISUAL_TRIGGER_H : SPELL_SPARK_VISUAL_TRIGGER_N, true); + pSummoned->CastSpell(pSummoned, HEROIC(SPELL_SPARK_VISUAL_TRIGGER_N,SPELL_SPARK_VISUAL_TRIGGER_H), true); Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0); @@ -262,7 +259,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI if (m_uiStaticOverload_Timer < uiDiff) { if (Unit* pTarget = SelectUnit(SELECT_TARGET_RANDOM, 0)) - DoCast(pTarget, m_bIsHeroic ? SPELL_STATIC_OVERLOAD_H : SPELL_STATIC_OVERLOAD_N); + DoCast(pTarget, HEROIC(SPELL_STATIC_OVERLOAD_N,SPELL_STATIC_OVERLOAD_H)); m_uiStaticOverload_Timer = 5000 + rand()%1000; } @@ -271,7 +268,7 @@ struct TRINITY_DLL_DECL boss_ionarAI : public ScriptedAI if (m_uiBallLightning_Timer < uiDiff) { - DoCast(m_creature->getVictim(), m_bIsHeroic ? SPELL_BALL_LIGHTNING_H : SPELL_BALL_LIGHTNING_N); + DoCast(m_creature->getVictim(), HEROIC(SPELL_BALL_LIGHTNING_N,SPELL_BALL_LIGHTNING_H)); m_uiBallLightning_Timer = 10000 + rand()%1000; } else |