Scripts/Mechanar: Update Sepethrea

Author: offl

sql/updates/world/3.3.5/2026_08_150_00_world.sql

@@ -0,0 +1,14 @@
+-- Sepethrea
+DELETE FROM `creature_text` WHERE `CreatureID` = 19221;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(19221,0,0,"Don't value your life very much, do you?",14,0,100,0,0,11186,19959,0,"Sepethrea SAY_AGGRO"),
+(19221,1,0,"And don't come back!",14,0,100,0,0,11187,19961,0,"Sepethrea SAY_SLAY_1"),
+(19221,1,1,"Endala finel endal!",14,0,100,0,0,11188,19962,0,"Sepethrea SAY_SLAY_2"),
+(19221,2,0,"Think you can take the heat?",14,0,100,0,0,11189,19963,0,"Sepethrea SAY_DRAGONS_BREATH_1"),
+(19221,2,1,"Anar'endal dracon!",14,0,100,0,0,11190,19964,0,"Sepethrea SAY_DRAGONS_BREATH_2"),
+(19221,3,0,"I am not alone.",14,0,100,0,0,11191,19965,0,"Sepethrea SAY_SUMMON"),
+(19221,4,0,"Anu... bala belore...alon.",14,0,100,0,0,11192,19966,0,"Sepethrea SAY_DEATH");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_nethermancer_sepethrea_arcane_blast';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(35314, 'spell_nethermancer_sepethrea_arcane_blast');

src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp

@@ -15,36 +15,45 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "mechanar.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
-#include "TemporarySummon.h"
 
 enum SepethreaTexts
 {
     SAY_AGGRO                      = 0,
-    SAY_SUMMON                     = 1,     // Was never used or used under unknown conditions
+    SAY_SLAY                       = 1,
     SAY_DRAGONS_BREATH             = 2,
-    SAY_SLAY                       = 3,
+    SAY_SUMMON                     = 3,     // Was never used or used under unknown conditions
     SAY_DEATH                      = 4
 };
 
 enum SepethreaSpells
 {
+    // Sepethrea - Initial
     SPELL_FROST_ATTACK             = 45196, // This is definitely spell added in TBC but did it replaced both 35264 and 39086 or only normal version?
     SPELL_SUMMON_RAGING_FLAMES     = 35275,
-    SPELL_QUELL_RAGING_FLAMES      = 35277,
+
+    // Sepethrea - Combat
     SPELL_ARCANE_BLAST             = 35314,
     SPELL_DRAGONS_BREATH           = 35250,
 
+    // Sepethrea - Combat - Misc
+    SPELL_QUELL_RAGING_FLAMES      = 35277,
+
     // Raging Flames
-    SPELL_RAGING_FLAMES_DUMMY      = 35274, // NYI, no clue what it can do
     SPELL_RAGING_FLAMES_AREA_AURA  = 35281,
     SPELL_INVIS_STEALTH_DETECTION  = 18950,
     SPELL_INFERNO                  = 35268,
+
+    // Scripts
     SPELL_INFERNO_DAMAGE           = 35283
 };
 
@@ -68,30 +77,30 @@ struct boss_nethermancer_sepethrea : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_ARCANE_BLAST, 15s, 25s);
-        events.ScheduleEvent(EVENT_DRAGONS_BREATH, 20s, 30s);
+
         Talk(SAY_AGGRO);
+
         DoCastSelf(SPELL_SUMMON_RAGING_FLAMES);
+
+        events.ScheduleEvent(EVENT_ARCANE_BLAST, 15s, 25s);
+        events.ScheduleEvent(EVENT_DRAGONS_BREATH, 20s, 30s);
     }
 
-    void OnSpellCast(SpellInfo const* spell) override
+    void OnSpellCast(SpellInfo const* spellInfo) override
     {
-        if (spell->Id == SPELL_DRAGONS_BREATH)
+        if (spellInfo->Id == SPELL_DRAGONS_BREATH)
             if (roll_chance_i(50))
                 Talk(SAY_DRAGONS_BREATH);
     }
 
-    void KilledUnit(Unit* victim) override
-    {
-        if (victim->GetTypeId() == TYPEID_PLAYER)
-            Talk(SAY_SLAY);
-    }
+    // Despawn is handled by spell, don't store anything
+    void JustSummoned(Creature* /*summon*/) override { }
 
     void EnterEvadeMode(EvadeReason why) override
     {
         // Fails probably because target is in evade mode (yes, she kills them on evade too). We'll kill them directly in their script for now
-        DoCastSelf(SPELL_QUELL_RAGING_FLAMES, true);
-        ScriptedAI::EnterEvadeMode(why);
+        DoCastSelf(SPELL_QUELL_RAGING_FLAMES);
+        BossAI::EnterEvadeMode(why);
     }
 
     void JustReachedHome() override
@@ -100,16 +109,19 @@ struct boss_nethermancer_sepethrea : public BossAI
         DoCastSelf(SPELL_FROST_ATTACK);
     }
 
+    void KilledUnit(Unit* victim) override
+    {
+        if (victim->GetTypeId() == TYPEID_PLAYER)
+            Talk(SAY_SLAY);
+    }
+
     void JustDied(Unit* /*killer*/) override
     {
         _JustDied();
         Talk(SAY_DEATH);
-        DoCastSelf(SPELL_QUELL_RAGING_FLAMES, true);
+        DoCastSelf(SPELL_QUELL_RAGING_FLAMES);
     }
 
-    // Despawn is handled by spell, don't store anything
-    void JustSummoned(Creature* /*summon*/) override { }
-
     void UpdateAI(uint32 diff) override
     {
         if (!UpdateVictim())
@@ -126,8 +138,6 @@ struct boss_nethermancer_sepethrea : public BossAI
             {
                 case EVENT_ARCANE_BLAST:
                     DoCastVictim(SPELL_ARCANE_BLAST);
-                    if (GetThreat(me->GetVictim()))
-                        ModifyThreatByPercent(me->GetVictim(), -50);
                     events.Repeat(15s, 25s);
                     break;
                 case EVENT_DRAGONS_BREATH:
@@ -149,47 +159,44 @@ struct boss_nethermancer_sepethrea : public BossAI
 // 20481 - Raging Flames
 struct npc_raging_flames : public ScriptedAI
 {
-    npc_raging_flames(Creature* creature) : ScriptedAI(creature) { }
+    using ScriptedAI::ScriptedAI;
 
     void InitializeAI() override
     {
         me->SetCorpseDelay(20, true);
     }
 
-    // It's more tricky actually
-    void FixateRandomTarget()
-    {
-        ResetThreatList();
-
-        if (TempSummon* summon = me->ToTempSummon())
-            if (Creature* summoner = summon->GetSummonerCreatureBase())
-                if (summoner->IsAIEnabled())
-                    if (Unit* target = summoner->AI()->SelectTarget(SelectTargetMethod::Random, 1, 100.0f, true, false))
-                        AddThreat(target, 1000000.0f);
-    }
-
     void JustAppeared() override
     {
         DoZoneInCombat();
+
         DoCastSelf(SPELL_RAGING_FLAMES_AREA_AURA);
         DoCastSelf(SPELL_INVIS_STEALTH_DETECTION);
-
-        FixateRandomTarget();
-
-        _scheduler.Schedule(15s, 25s, [this](TaskContext task)
-        {
-            DoCastSelf(SPELL_INFERNO);
-            FixateRandomTarget();
-
-            task.Repeat(20s, 30s);
-        });
     }
 
     void Reset() override
     {
         _scheduler.CancelAll();
     }
 
+    void JustEngagedWith(Unit* /*who*/) override
+    {
+        _scheduler
+            .Schedule(15s, 25s, [this](TaskContext task)
+            {
+                DoCastSelf(SPELL_INFERNO);
+                task.Repeat(20s, 30s);
+            })
+            .Schedule(0s, [this](TaskContext task)
+            {
+                ResetThreatList();
+
+                if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0, 100.0f))
+                    AddThreat(target, 1000000.0f);
+                task.Repeat(10s, 20s);
+            });
+    }
+
     void EnterEvadeMode(EvadeReason /*why*/) override
     {
         me->KillSelf();
@@ -209,32 +216,49 @@ struct npc_raging_flames : public ScriptedAI
     TaskScheduler _scheduler;
 };
 
+// 35314 - Arcane Blast
+class spell_nethermancer_sepethrea_arcane_blast : public SpellScript
+{
+    PrepareSpellScript(spell_nethermancer_sepethrea_arcane_blast);
+
+    void HandleAfterHit()
+    {
+        if (GetCaster()->CanHaveThreatList())
+            GetCaster()->GetThreatManager().ModifyThreatByPercent(GetHitUnit(), -50);
+    }
+
+    void Register() override
+    {
+        AfterHit += SpellHitFn(spell_nethermancer_sepethrea_arcane_blast::HandleAfterHit);
+    }
+};
+
 // 35268, 39346 - Inferno
 class spell_nethermancer_sepethrea_inferno : public AuraScript
 {
     PrepareAuraScript(spell_nethermancer_sepethrea_inferno);
 
-    bool Validate(SpellInfo const* /*spell*/) override
+    bool Validate(SpellInfo const* /*spellInfo*/) override
     {
         return ValidateSpellInfo({ SPELL_INFERNO_DAMAGE });
     }
 
-    void HandlePeriodic(AuraEffect const* aurEff)
+    void OnPeriodic(AuraEffect const* aurEff)
     {
-        CastSpellExtraArgs args(aurEff);
-        args.AddSpellBP0(aurEff->GetAmount());
-        GetTarget()->CastSpell(GetTarget(), SPELL_INFERNO_DAMAGE, args);
+        GetTarget()->CastSpell(nullptr, SPELL_INFERNO_DAMAGE, CastSpellExtraArgs()
+            .AddSpellMod(SPELLVALUE_BASE_POINT0, aurEff->GetAmount()));
     }
 
     void Register() override
     {
-        OnEffectPeriodic += AuraEffectPeriodicFn(spell_nethermancer_sepethrea_inferno::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
+        OnEffectPeriodic += AuraEffectPeriodicFn(spell_nethermancer_sepethrea_inferno::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
     }
 };
 
 void AddSC_boss_nethermancer_sepethrea()
 {
     RegisterMechanarCreatureAI(boss_nethermancer_sepethrea);
     RegisterMechanarCreatureAI(npc_raging_flames);
+    RegisterSpellScript(spell_nethermancer_sepethrea_arcane_blast);
     RegisterSpellScript(spell_nethermancer_sepethrea_inferno);
 }

src/server/scripts/Outland/TempestKeep/Mechanar/instance_mechanar.cpp

@@ -19,7 +19,7 @@
 #include "InstanceScript.h"
 #include "mechanar.h"
 
-static DoorData const doorData[] =
+static constexpr DoorData doorData[] =
 {
     { GO_DOOR_MOARG_1,          DATA_GATEWATCHER_IRON_HAND,     DOOR_TYPE_PASSAGE },
     { GO_DOOR_MOARG_2,          DATA_GATEWATCHER_GYROKILL,      DOOR_TYPE_PASSAGE },

src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h

@@ -23,7 +23,7 @@
 #define MechanarScriptName "instance_mechanar"
 #define DataHeader "MR"
 
-uint32 const EncounterCount             = 5;
+uint32 constexpr EncounterCount         = 5;
 
 enum MRDataTypes
 {