From 28b6014d127baabee4443c9ca3917b12070df5cc Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sat, 4 Feb 2023 23:56:49 +0100 Subject: [PATCH] =?UTF-8?q?fix(Scripts/HellfireRamparts):=20Removed=20inva?= =?UTF-8?q?lid=20spells=20from=20Omor=20the=20U=E2=80=A6=20(#14538)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boss_omor_the_unscarred.cpp | 24 +------------------ 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp index d442decef..22ee02767 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_omor_the_unscarred.cpp @@ -35,8 +35,6 @@ enum Spells SPELL_SUMMON_FIENDISH_HOUND = 30707, SPELL_TREACHEROUS_AURA = 30695, SPELL_DEMONIC_SHIELD = 31901, - SPELL_ORBITAL_STRIKE = 30637, - SPELL_SHADOW_WHIP = 30638 }; enum Misc @@ -45,9 +43,7 @@ enum Misc EVENT_SUMMON2 = 2, EVENT_TREACHEROUS_AURA = 3, EVENT_DEMONIC_SHIELD = 4, - EVENT_KILL_TALK = 5, - EVENT_ORBITAL_STRIKE = 6, - EVENT_SHADOW_WHIP = 7 + EVENT_KILL_TALK = 5 }; class boss_omor_the_unscarred : public CreatureScript @@ -77,7 +73,6 @@ public: events.ScheduleEvent(EVENT_SUMMON2, 25000); events.ScheduleEvent(EVENT_TREACHEROUS_AURA, 6000); events.ScheduleEvent(EVENT_DEMONIC_SHIELD, 1000); - events.ScheduleEvent(EVENT_ORBITAL_STRIKE, 20000); } void KilledUnit(Unit*) override @@ -137,23 +132,6 @@ public: else events.ScheduleEvent(EVENT_DEMONIC_SHIELD, 1000); break; - case EVENT_ORBITAL_STRIKE: - if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 15.0f, true)) - { - _targetGUID = target->GetGUID(); - me->CastSpell(target, SPELL_ORBITAL_STRIKE, false); - events.DelayEvents(5000); - events.ScheduleEvent(EVENT_SHADOW_WHIP, 4000); - me->GetMotionMaster()->Clear(); - } - events.ScheduleEvent(EVENT_ORBITAL_STRIKE, 20000); - break; - case EVENT_SHADOW_WHIP: - me->GetMotionMaster()->MoveChase(me->GetVictim()); - if (Unit* target = ObjectAccessor::GetUnit(*me, _targetGUID)) - me->CastSpell(target, SPELL_SHADOW_WHIP, false); - _targetGUID.Clear(); - break; } if (!me->GetVictim() || !me->isAttackReady())