DB/Instance/The Eye: Overhaul part 2

(cherry picked from commit 6ad76dd7c09b7a519998d4505ea0925e0dc6b810)

4 files changed, 4 insertions, 115 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 741c71517cb..929220c33c6 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -169,6 +169,7 @@ class boss_high_astromancer_solarian : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 BossAI::JustEngagedWith(who);
+                me->CallForHelp(120.0f);
             }
 
             void SummonMinion(uint32 entry, float x, float y, float z)
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
index 256c760f382..e5285341207 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_void_reaver.cpp
@@ -82,6 +82,7 @@ class boss_void_reaver : public CreatureScript
             {
                 Talk(SAY_AGGRO);
                 BossAI::JustEngagedWith(who);
+                me->CallForHelp(120.0f);
 
                 events.ScheduleEvent(EVENT_POUNDING, 15s);
                 events.ScheduleEvent(EVENT_ARCANE_ORB, 3s);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
deleted file mode 100644
index b9eedc85432..00000000000
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* ScriptData
-SDName: The_Eye
-SD%Complete: 100
-SDComment:
-SDCategory: Tempest Keep, The Eye
-EndScriptData */
-
-/* ContentData
-npc_crystalcore_devastator
-EndContentData */
-
-#include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "the_eye.h"
-
-enum Spells
-{
-    SPELL_COUNTERCHARGE    = 35035,
-    SPELL_KNOCKAWAY        = 22893,
-};
-
-class npc_crystalcore_devastator : public CreatureScript
-{
-    public:
-
-        npc_crystalcore_devastator()
-            : CreatureScript("npc_crystalcore_devastator")
-        {
-        }
-        struct npc_crystalcore_devastatorAI : public ScriptedAI
-        {
-            npc_crystalcore_devastatorAI(Creature* creature) : ScriptedAI(creature)
-            {
-                Initialize();
-            }
-
-            void Initialize()
-            {
-                Countercharge_Timer = 9000;
-                Knockaway_Timer = 25000;
-            }
-
-            uint32 Knockaway_Timer;
-            uint32 Countercharge_Timer;
-
-            void Reset() override
-            {
-                Initialize();
-            }
-
-            void JustEngagedWith(Unit* /*who*/) override
-            {
-            }
-
-            void UpdateAI(uint32 diff) override
-            {
-                if (!UpdateVictim())
-                    return;
-
-                //Check if we have a current target
-                //Knockaway_Timer
-                if (Knockaway_Timer <= diff)
-                {
-                    if (Unit* victim = me->GetVictim())
-                    {
-                        DoCastVictim(SPELL_KNOCKAWAY, true);
-                        me->GetThreatManager().ResetThreat(victim);
-                    }
-
-                    Knockaway_Timer = 23000;
-                }
-                else
-                    Knockaway_Timer -= diff;
-
-                //Countercharge_Timer
-                if (Countercharge_Timer <= diff)
-                {
-                    DoCast(me, SPELL_COUNTERCHARGE);
-                    Countercharge_Timer = 45000;
-                }
-                else
-                    Countercharge_Timer -= diff;
-
-                DoMeleeAttackIfReady();
-            }
-        };
-
-        CreatureAI* GetAI(Creature* creature) const override
-        {
-            return GetTheEyeAI<npc_crystalcore_devastatorAI>(creature);
-        }
-};
-void AddSC_the_eye()
-{
-    new npc_crystalcore_devastator();
-}
diff --git a/src/server/scripts/Outland/outland_script_loader.cpp b/src/server/scripts/Outland/outland_script_loader.cpp
index ca6b0023580..68a1ed7591a 100644
--- a/src/server/scripts/Outland/outland_script_loader.cpp
+++ b/src/server/scripts/Outland/outland_script_loader.cpp
@@ -116,7 +116,7 @@ void AddSC_boss_kaelthas();
 void AddSC_boss_void_reaver();
 void AddSC_boss_high_astromancer_solarian();
 void AddSC_instance_the_eye();
-void AddSC_the_eye();
+// void AddSC_the_eye();
 void AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
 void AddSC_boss_gatewatcher_gyrokill();
 void AddSC_boss_nethermancer_sepethrea();
@@ -239,7 +239,7 @@ void AddOutlandScripts()
     AddSC_boss_void_reaver();
     AddSC_boss_high_astromancer_solarian();
     AddSC_instance_the_eye();
-    AddSC_the_eye();
+    // AddSC_the_eye();
     AddSC_boss_gatewatcher_iron_hand();     //TK The Mechanar
     AddSC_boss_gatewatcher_gyrokill();
     AddSC_boss_nethermancer_sepethrea();