From d5e49ff0d2bd3370cc62ba2483d37a3fc5ac52ce Mon Sep 17 00:00:00 2001
From: offl <offl@users.noreply.github.com>
Date: Sun, 8 Nov 2020 00:25:13 +0200
Subject: DB/Instance/The Arcatraz: Update auras, scripts & stats

(cherry picked from commit a2da08deb19b64725bb6d4c3c387bb58da0e1dcf)
---
 .../Outland/TempestKeep/arcatraz/arcatraz.cpp      | 40 ----------------------
 .../arcatraz/boss_wrath_scryer_soccothrates.cpp    |  2 --
 2 files changed, 42 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 7b4620d6a7d..a9381dcb1e9 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -25,7 +25,6 @@ EndScriptData */
 /* ContentData
 npc_millhouse_manastorm
 npc_warden_mellichar
-npc_zerekethvoidzone
 EndContentData */
 
 #include "ScriptMgr.h"
@@ -519,47 +518,8 @@ class npc_warden_mellichar : public CreatureScript
         }
 };
 
-/*#####
-# npc_zerekethvoidzone (this script probably not needed in future -> `creature_template_addon`.`auras`='36120 0')
-#####*/
-
-enum ZerekethSpell
-{
-    SPELL_VOID_ZONE_DAMAGE = 36120,
-};
-
-class npc_zerekethvoidzone : public CreatureScript
-{
-    public:
-
-        npc_zerekethvoidzone() : CreatureScript("npc_zerekethvoidzone")
-        {
-        }
-        struct npc_zerekethvoidzoneAI : public ScriptedAI
-        {
-            npc_zerekethvoidzoneAI(Creature* creature) : ScriptedAI(creature) { }
-
-            void Reset() override
-            {
-                me->SetNpcFlags(UNIT_NPC_FLAG_NONE);
-                me->SetFaction(FACTION_MONSTER_2);
-                me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
-
-                DoCast(me, SPELL_VOID_ZONE_DAMAGE);
-            }
-
-            void JustEngagedWith(Unit* /*who*/) override { }
-        };
-
-        CreatureAI* GetAI(Creature* creature) const override
-        {
-            return GetArcatrazAI<npc_zerekethvoidzoneAI>(creature);
-        }
-};
-
 void AddSC_arcatraz()
 {
     new npc_millhouse_manastorm();
     new npc_warden_mellichar();
-    new npc_zerekethvoidzone();
 }
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
index 1a7b422b62a..a735d80f9eb 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_wrath_scryer_soccothrates.cpp
@@ -52,7 +52,6 @@ enum Say
 
 enum Spells
 {
-    SPELL_FEL_IMMOLATION            = 36051,
     SPELL_FELFIRE_SHOCK             = 35759,
     SPELL_KNOCK_AWAY                = 36512,
     SPELL_FELFIRE_LINE_UP           = 35770,
@@ -98,7 +97,6 @@ class boss_wrath_scryer_soccothrates : public CreatureScript
                 preFight = false;
                 dalliahTaunt = false;
                 dalliahDeath = false;
-                DoCast(me, SPELL_FEL_IMMOLATION);
             }
 
             void JustDied(Unit* /*killer*/) override
-- 
cgit v1.2.3