Scripts/BT: Remove unconfirmed parts of Teron's intro (#26670)

(cherry picked from commit b15359a1e2be7824009164f3856036a40ed0d2b8)

3 files changed, 4 insertions, 39 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index 1150096f748..96b6af6eb32 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -54,9 +54,8 @@ enum BTDataTypes
     DATA_ESSENCE_OF_DESIRE          = 21,
     DATA_ESSENCE_OF_ANGER           = 22,
     DATA_ILLIDAN_MUSIC_CONTROLLER   = 23,
-    DATA_TERON_GOREFIEND_INTRO      = 24,
-    DATA_AKAMA_ILLIDAN_INTRO        = 25,
-    DATA_RELIQUARY_COMBAT_TRIGGER   = 26
+    DATA_AKAMA_ILLIDAN_INTRO        = 24,
+    DATA_RELIQUARY_COMBAT_TRIGGER   = 25
 };
 
 enum TriggerEmotes
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 75c2550d717..8d6017741ca 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -85,14 +85,7 @@ enum Events
     EVENT_INCINERATE,
     EVENT_SUMMON_DOOM_BLOSSOM,
     EVENT_SHADOW_DEATH,
-    EVENT_CRUSHING_SHADOWS,
-    EVENT_FINISH_INTRO
-};
-
-enum Phases
-{
-    PHASE_INTRO = 1,
-    PHASE_COMBAT
+    EVENT_CRUSHING_SHADOWS
 };
 
 enum Actions
@@ -112,21 +105,10 @@ struct boss_teron_gorefiend : public BossAI
 {
     boss_teron_gorefiend(Creature* creature) : BossAI(creature, DATA_TERON_GOREFIEND) { }
 
-    void Reset() override
-    {
-        _Reset();
-        if (instance->GetData(DATA_TERON_GOREFIEND_INTRO))
-        {
-            me->AddUnitFlag(UnitFlags(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE));
-            me->SetReactState(REACT_PASSIVE);
-        }
-    }
-
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
         Talk(SAY_AGGRO);
-        events.SetPhase(PHASE_COMBAT);
         events.ScheduleEvent(EVENT_ENRAGE, 10min);
         events.ScheduleEvent(EVENT_INCINERATE, 12s);
         events.ScheduleEvent(EVENT_SUMMON_DOOM_BLOSSOM, 8s);
@@ -144,12 +126,7 @@ struct boss_teron_gorefiend : public BossAI
     void DoAction(int32 action) override
     {
         if (action == ACTION_START_INTRO && me->IsAlive())
-        {
-            instance->SetData(DATA_TERON_GOREFIEND_INTRO, 0);
             Talk(SAY_INTRO);
-            events.SetPhase(PHASE_INTRO);
-            events.ScheduleEvent(EVENT_FINISH_INTRO, 20s);
-        }
     }
 
     void KilledUnit(Unit* victim) override
@@ -167,7 +144,7 @@ struct boss_teron_gorefiend : public BossAI
 
     void UpdateAI(uint32 diff) override
     {
-        if (!events.IsInPhase(PHASE_INTRO) && !UpdateVictim())
+        if (!UpdateVictim())
             return;
 
         events.Update(diff);
@@ -203,10 +180,6 @@ struct boss_teron_gorefiend : public BossAI
                     Talk(SAY_CRUSHING);
                     events.Repeat(Seconds(18), Seconds(30));
                     break;
-                case EVENT_FINISH_INTRO:
-                    me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE));
-                    me->SetReactState(REACT_AGGRESSIVE);
-                    break;
                 default:
                     break;
             }
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index c69478a51f9..c872b185e5c 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -103,7 +103,6 @@ class instance_black_temple : public InstanceMapScript
                 LoadObjectData(creatureData, gameObjectData);
                 LoadBossBoundaries(boundaries);
                 AkamaState = AKAMA_INTRO;
-                TeronGorefiendIntro = 1;
                 AkamaIllidanIntro = 1;
             }
 
@@ -144,8 +143,6 @@ class instance_black_temple : public InstanceMapScript
                 {
                     case DATA_AKAMA:
                         return AkamaState;
-                    case DATA_TERON_GOREFIEND_INTRO:
-                        return TeronGorefiendIntro;
                     case DATA_AKAMA_ILLIDAN_INTRO:
                         return AkamaIllidanIntro;
                     default:
@@ -164,9 +161,6 @@ class instance_black_temple : public InstanceMapScript
                         if (GameObject* illidanGate = GetGameObject(DATA_GO_ILLIDAN_GATE))
                             HandleGameObject(ObjectGuid::Empty, true, illidanGate);
                         break;
-                    case DATA_TERON_GOREFIEND_INTRO:
-                        TeronGorefiendIntro = data;
-                        break;
                     case DATA_AKAMA_ILLIDAN_INTRO:
                         AkamaIllidanIntro = data;
                         break;
@@ -228,7 +222,6 @@ class instance_black_temple : public InstanceMapScript
         protected:
             GuidVector AshtongueGUIDs;
             uint8 AkamaState;
-            uint8 TeronGorefiendIntro;
             uint8 AkamaIllidanIntro;
         };