diff options
| author | Shauren <shauren.trinity@gmail.com> | 2011-10-12 18:11:00 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2011-10-12 18:11:00 +0200 |
| commit | f7d06a14f5012db15ec9a51e90e28afc2ea303c5 (patch) | |
| tree | 9943a55e2634f6f031816d0cff6dd4c9cf17aea9 /src/server/scripts | |
| parent | 481d16af1332201a75d5a2b2c64550f7c7aa8398 (diff) | |
Scripts/Icecrown Citadel
* Corrected Shadow Prison (Prince Keleseth casts it)
* Fixed spell_putricide_slime_puddle second effect hook
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp | 19 | ||||
| -rwxr-xr-x | src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 4b7b1e8d12f..4a5d609eb67 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -239,9 +239,6 @@ class boss_blood_council_controller : public CreatureScript _invocationOrder[1] = InvocationData(instance->GetData64(DATA_PRINCE_KELESETH_GUID), SPELL_INVOCATION_OF_BLOOD_KELESETH, EMOTE_KELESETH_INVOCATION, 71080); _invocationOrder[2] = InvocationData(instance->GetData64(DATA_PRINCE_TALDARAM_GUID), SPELL_INVOCATION_OF_BLOOD_TALDARAM, EMOTE_TALDARAM_INVOCATION, 71081); } - - if (IsHeroic()) - me->AddAura(SPELL_SHADOW_PRISON_DUMMY, me); } void SetData(uint32 /*type*/, uint32 data) @@ -391,8 +388,6 @@ class boss_prince_keleseth_icc : public CreatureScript me->SetHealth(_spawnHealth); instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(true)); me->SetReactState(REACT_DEFENSIVE); - if (IsHeroic()) - DoCast(me, SPELL_SHADOW_PRISON); } void EnterCombat(Unit* /*who*/) @@ -403,6 +398,12 @@ class boss_prince_keleseth_icc : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); events.ScheduleEvent(EVENT_SHADOW_RESONANCE, urand(10000, 15000)); events.ScheduleEvent(EVENT_SHADOW_LANCE, 2000); + + if (IsHeroic()) + { + me->AddAura(SPELL_SHADOW_PRISON, me); + DoCast(me, SPELL_SHADOW_PRISON_DUMMY); + } } void JustDied(Unit* /*killer*/) @@ -611,8 +612,6 @@ class boss_prince_taldaram_icc : public CreatureScript me->SetHealth(_spawnHealth); instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(true)); me->SetReactState(REACT_DEFENSIVE); - if (IsHeroic()) - DoCast(me, SPELL_SHADOW_PRISON); } void MoveInLineOfSight(Unit* /*who*/) @@ -627,6 +626,8 @@ class boss_prince_taldaram_icc : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); events.ScheduleEvent(EVENT_GLITTERING_SPARKS, urand(12000, 15000)); events.ScheduleEvent(EVENT_CONJURE_FLAME, 20000); + if (IsHeroic()) + me->AddAura(SPELL_SHADOW_PRISON, me); } void JustDied(Unit* /*killer*/) @@ -834,8 +835,6 @@ class boss_prince_valanar_icc : public CreatureScript me->SetHealth(me->GetMaxHealth()); instance->SetData(DATA_ORB_WHISPERER_ACHIEVEMENT, uint32(true)); me->SetReactState(REACT_DEFENSIVE); - if (IsHeroic()) - DoCast(me, SPELL_SHADOW_PRISON); } void MoveInLineOfSight(Unit* /*who*/) @@ -850,6 +849,8 @@ class boss_prince_valanar_icc : public CreatureScript events.ScheduleEvent(EVENT_BERSERK, 600000); events.ScheduleEvent(EVENT_KINETIC_BOMB, urand(18000, 24000)); events.ScheduleEvent(EVENT_SHOCK_VORTEX, urand(15000, 20000)); + if (IsHeroic()) + me->AddAura(SPELL_SHADOW_PRISON, me); } void JustDied(Unit* /*killer*/) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index 8e79bb185cf..a84471d132b 100755 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -847,7 +847,7 @@ class spell_putricide_slime_puddle : public SpellScriptLoader void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnUnitTargetSelect += SpellUnitTargetFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); + OnUnitTargetSelect += SpellUnitTargetFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); } }; |