diff options
Diffstat (limited to 'src/server/scripts/Northrend')
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp | 15 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 4cf7e3fdb57..902ff11fd62 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -81,8 +81,6 @@ struct boss_keristrasza : public BossAI Initialize(); _intenseColdList.clear(); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); - RemovePrison(CheckContainmentSpheres()); _Reset(); } @@ -133,15 +131,13 @@ struct boss_keristrasza : public BossAI { if (remove) { - me->SetImmuneToPC(false); - me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetImmuneToAll(false); if (me->HasAura(SPELL_FROZEN_PRISON)) me->RemoveAurasDueToSpell(SPELL_FROZEN_PRISON); } else { - me->SetImmuneToPC(true); - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + me->SetImmuneToAll(true); DoCast(me, SPELL_FROZEN_PRISON, false); } } diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp index ccec34c0cad..ce5eac22c8b 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_ionar.cpp @@ -37,7 +37,8 @@ enum Spells SPELL_SPARK_DESPAWN = 52776, // Spark of Ionar - SPELL_SPARK_VISUAL_TRIGGER = 52667 + SPELL_SPARK_VISUAL_TRIGGER = 52667, + SPELL_RANDOM_LIGHTNING_VISUAL = 52663 }; enum Yells @@ -168,6 +169,7 @@ struct boss_ionar : public ScriptedAI { if (pSpark->IsAlive()) { + pSpark->SetReactState(REACT_PASSIVE); pSpark->SetSpeedRate(MOVE_RUN, 2.0f); pSpark->GetMotionMaster()->Clear(); pSpark->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); @@ -190,8 +192,6 @@ struct boss_ionar : public ScriptedAI { lSparkList.Summon(summoned); - summoned->CastSpell(summoned, SPELL_SPARK_VISUAL_TRIGGER, true); - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0)) { summoned->SetInCombatWith(target); @@ -307,7 +307,8 @@ struct npc_spark_of_ionar : public ScriptedAI void Reset() override { Initialize(); - me->SetReactState(REACT_PASSIVE); + DoCastSelf(SPELL_SPARK_VISUAL_TRIGGER); + DoCastSelf(SPELL_RANDOM_LIGHTNING_VISUAL); } void MovementInform(uint32 uiType, uint32 uiPointId) override @@ -319,11 +320,6 @@ struct npc_spark_of_ionar : public ScriptedAI me->DespawnOrUnsummon(); } - void DamageTaken(Unit* /*pDoneBy*/, uint32 &uiDamage) override - { - uiDamage = 0; - } - void UpdateAI(uint32 uiDiff) override { // Despawn if the encounter is not running @@ -343,6 +339,7 @@ struct npc_spark_of_ionar : public ScriptedAI { Position pos = ionar->GetPosition(); + me->SetReactState(REACT_PASSIVE); me->SetSpeedRate(MOVE_RUN, 2.0f); me->GetMotionMaster()->Clear(); me->GetMotionMaster()->MovePoint(DATA_POINT_CALLBACK, pos); |