Scripts/Scholomance: Update scripts (#31333)

Author: offl

sql/updates/world/3.3.5/2025_11_08_01_world.sql

@@ -0,0 +1,27 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 16118;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(16118,0,0,"You think you can summon us? We are the ones that summon, not you! We bash you good for this and suck the marrow from your bones!",14,0,100,0,0,0,11968,0,"Kormok SAY_SPAWN"),
+(16118,1,0,"First Kormok crush your bones!  Then Kormok burn your soul!",12,0,100,0,0,0,11958,0,"Kormok SAY_AGGRO"),
+(16118,1,1,"You so little and puny... you no make good servants for Kormok!",12,0,100,0,0,0,11959,0,"Kormok SAY_AGGRO"),
+(16118,2,0,"We am free! Thank you little, puny ones.",14,0,100,0,0,0,11873,0,"Kormok SAY_DEATH"),
+(16118,3,0,"%s goes into a frenzy!",16,0,100,0,0,0,10645,0,"Kormok EMOTE_FRENZY");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 10432;
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 14516;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(14516,0,0,"ENOUGH - this ends now!  You fools will be added to my bone collection!",14,0,100,0,0,0,9784,0,"Death Knight Darkreaver");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 11261;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(11261,0,0,"The doctor is in!",12,0,100,0,0,0,6715,0,"Doctor Theolen Krastinov SAY_AGGRO"),
+(11261,1,0,"%s goes into a frenzy!",16,0,100,0,0,0,10645,0,"Doctor Theolen Krastinov EMOTE_FRENZY");
+
+DELETE FROM `creature_text` WHERE `CreatureID` = 10503;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(10503,0,0,"%s loosens her grasp on the journal she had been clutching.",16,0,100,0,0,0,11408,0,"Jandice Barov");
+
+UPDATE `waypoint_data` SET `move_type` = 1 WHERE `id` = 105061;
+
+UPDATE `creature_template` SET `unit_flags` = 832, `flags_extra` = `flags_extra`|512 WHERE `entry` = 10506;

src/server/scripts/EasternKingdoms/Scholomance/boss_death_knight_darkreaver.cpp

@@ -15,32 +15,109 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "scholomance.h"
 #include "ScriptedCreature.h"
 
+enum DarkreaverTexts
+{
+    SAY_SPAWN                     = 0
+};
+
 enum DarkreaverSpells
 {
-    SUMMON_FALLEN_CHARGER       = 23261
+    SPELL_SHADOW_BOLT             = 17393,
+    SPELL_CLEAVE                  = 15284,
+    SPELL_BLOOD_LEECH             = 22644,
+    SPELL_DOMINATE_MIND           = 7645,
+
+    SPELL_SUMMON_FALLEN_CHARGER   = 23261
+};
+
+enum DarkreaverEvents
+{
+    EVENT_SHADOW_BOLT             = 1,
+    EVENT_CLEAVE,
+    EVENT_BLOOD_LEECH,
+    EVENT_DOMINATE_MIND
 };
 
 // 14516 - Death Knight Darkreaver
 struct boss_death_knight_darkreaver : public ScriptedAI
 {
     boss_death_knight_darkreaver(Creature* creature) : ScriptedAI(creature) { }
 
+    void JustAppeared() override
+    {
+        Talk(SAY_SPAWN);
+    }
+
     void Reset() override
     {
+        _events.Reset();
+    }
+
+    void JustEngagedWith(Unit* /*who*/) override
+    {
+        _events.ScheduleEvent(EVENT_SHADOW_BOLT, 0s);
+        _events.ScheduleEvent(EVENT_CLEAVE, 5s, 10s);
+        _events.ScheduleEvent(EVENT_BLOOD_LEECH, 10s, 15s);
+        _events.ScheduleEvent(EVENT_DOMINATE_MIND, 10s, 15s);
     }
 
     void JustDied(Unit* /*killer*/) override
     {
-        DoCastSelf(SUMMON_FALLEN_CHARGER, true);
+        DoCastSelf(SPELL_SUMMON_FALLEN_CHARGER, true);
     }
 
-    void JustEngagedWith(Unit* /*who*/) override
+    void UpdateAI(uint32 diff) override
     {
+        if (!UpdateVictim())
+            return;
+
+        _events.Update(diff);
+
+        if (me->HasUnitState(UNIT_STATE_CASTING))
+            return;
+
+        while (uint32 eventId = _events.ExecuteEvent())
+        {
+            switch (eventId)
+            {
+                case EVENT_SHADOW_BOLT:
+                    DoCastVictim(SPELL_SHADOW_BOLT);
+                    _events.Repeat(5s, 10s);
+                    break;
+                case EVENT_CLEAVE:
+                    DoCastVictim(SPELL_CLEAVE);
+                    _events.Repeat(5s, 10s);
+                    break;
+                case EVENT_BLOOD_LEECH:
+                    DoCastSelf(SPELL_BLOOD_LEECH);
+                    _events.Repeat(15s, 25s);
+                    break;
+                case EVENT_DOMINATE_MIND:
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1))
+                        DoCast(target, SPELL_DOMINATE_MIND);
+                    _events.Repeat(15s, 20s);
+                    break;
+                default:
+                    break;
+            }
+
+            if (me->HasUnitState(UNIT_STATE_CASTING))
+                return;
+        }
+
+        DoMeleeAttackIfReady();
     }
+
+private:
+    EventMap _events;
 };
 
 void AddSC_boss_death_knight_darkreaver()

src/server/scripts/EasternKingdoms/Scholomance/boss_doctor_theolen_krastinov.cpp

@@ -15,13 +15,19 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "scholomance.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
 
 enum TheolenTexts
 {
-    EMOTE_FRENZY_KILL           = 0
+    SAY_AGGRO                   = 0,
+    EMOTE_FRENZY                = 1
 };
 
 enum TheolenSpells
@@ -33,22 +39,45 @@ enum TheolenSpells
 
 enum TheolenEvents
 {
-    EVENT_REND = 1,
+    EVENT_REND                  = 1,
     EVENT_BACKHAND,
     EVENT_FRENZY
 };
 
 // 11261 - Doctor Theolen Krastinov
 struct boss_doctor_theolen_krastinov : public BossAI
 {
-    boss_doctor_theolen_krastinov(Creature* creature) : BossAI(creature, DATA_DOCTOR_THEOLEN_KRASTINOV) { }
+    boss_doctor_theolen_krastinov(Creature* creature) : BossAI(creature, DATA_DOCTOR_THEOLEN_KRASTINOV), _frenzied(false) { }
+
+    void Reset() override
+    {
+        _Reset();
+        _frenzied = false;
+    }
 
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_REND, 8s);
-        events.ScheduleEvent(EVENT_BACKHAND, 9s);
-        events.ScheduleEvent(EVENT_FRENZY, 1s);
+
+        Talk(SAY_AGGRO);
+
+        events.ScheduleEvent(EVENT_REND, 5s, 15s);
+        events.ScheduleEvent(EVENT_BACKHAND, 5s, 15s);
+    }
+
+    void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
+    {
+        if (!_frenzied && me->HealthBelowPctDamaged(50, damage))
+        {
+            _frenzied = true;
+            events.ScheduleEvent(EVENT_FRENZY, 0s);
+        }
+    }
+
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_FRENZY)
+            Talk(EMOTE_FRENZY);
     }
 
     void UpdateAI(uint32 diff) override
@@ -67,16 +96,14 @@ struct boss_doctor_theolen_krastinov : public BossAI
             {
                 case EVENT_REND:
                     DoCastVictim(SPELL_REND);
-                    events.Repeat(10s);
+                    events.Repeat(15s, 20s);
                     break;
                 case EVENT_BACKHAND:
                     DoCastVictim(SPELL_BACKHAND);
-                    events.Repeat(10s);
+                    events.Repeat(10s, 20s);
                     break;
                 case EVENT_FRENZY:
                     DoCastSelf(SPELL_FRENZY);
-                    Talk(EMOTE_FRENZY_KILL);
-                    events.Repeat(120s);
                     break;
                 default:
                     break;
@@ -88,6 +115,9 @@ struct boss_doctor_theolen_krastinov : public BossAI
 
         DoMeleeAttackIfReady();
     }
+
+private:
+    bool _frenzied;
 };
 
 void AddSC_boss_theolenkrastinov()

src/server/scripts/EasternKingdoms/Scholomance/boss_illucia_barov.cpp

@@ -15,25 +15,30 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Timers requires to be revisited
+ */
+
 #include "ScriptMgr.h"
 #include "scholomance.h"
 #include "ScriptedCreature.h"
 
 enum IlluciaSpells
 {
     SPELL_CURSE_OF_AGONY        = 18671,
-    SPELL_DOMINATE              = 7645, // UNUSED YET added for documentation
+    SPELL_DOMINATE_MIND         = 14515,
     SPELL_FEAR                  = 12542,
-    SPELL_SHADOW_SHOCK          = 17234,
+    SPELL_SHADOW_SHOCK          = 17289,
     SPELL_SILENCE               = 12528
 };
 
 enum IlluciaEvents
 {
-    EVENT_CURSE_OF_AGONY = 1,
+    EVENT_CURSE_OF_AGONY        = 1,
+    EVENT_DOMINATE_MIND,
+    EVENT_FEAR,
     EVENT_SHADOW_SHOCK,
-    EVENT_SILENCE,
-    EVENT_FEAR
+    EVENT_SILENCE
 };
 
 // 10502 - Lady Illucia Barov
@@ -44,10 +49,12 @@ struct boss_illucia_barov : public BossAI
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 18s);
-        events.ScheduleEvent(EVENT_SHADOW_SHOCK, 9s);
-        events.ScheduleEvent(EVENT_SILENCE, 5s);
-        events.ScheduleEvent(EVENT_FEAR, 30s);
+
+        events.ScheduleEvent(EVENT_CURSE_OF_AGONY, 10s, 20s);
+        events.ScheduleEvent(EVENT_DOMINATE_MIND, 15s, 25s);
+        events.ScheduleEvent(EVENT_FEAR, 15s, 30s);
+        events.ScheduleEvent(EVENT_SHADOW_SHOCK, 10s, 15s);
+        events.ScheduleEvent(EVENT_SILENCE, 10s, 15s);
     }
 
     void UpdateAI(uint32 diff) override
@@ -65,20 +72,26 @@ struct boss_illucia_barov : public BossAI
             switch (eventId)
             {
                 case EVENT_CURSE_OF_AGONY:
-                    DoCastVictim(SPELL_CURSE_OF_AGONY);
-                    events.Repeat(30s);
+                    DoCastSelf(SPELL_CURSE_OF_AGONY);
+                    events.Repeat(20s, 30s);
+                    break;
+                case EVENT_DOMINATE_MIND:
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 1))
+                        DoCast(target, SPELL_DOMINATE_MIND);
+                    events.Repeat(25s, 40s);
+                    break;
+                case EVENT_FEAR:
+                    if (Unit* target = SelectTarget(SelectTargetMethod::Random, 0))
+                        DoCast(target, SPELL_FEAR);
+                    events.Repeat(15s, 25s);
                     break;
                 case EVENT_SHADOW_SHOCK:
-                    DoCast(SelectTarget(SelectTargetMethod::Random, 0, 100, true), SPELL_SHADOW_SHOCK);
-                    events.Repeat(12s);
+                    DoCastVictim(SPELL_SHADOW_SHOCK);
+                    events.Repeat(10s, 15s);
                     break;
                 case EVENT_SILENCE:
                     DoCastSelf(SPELL_SILENCE);
-                    events.Repeat(14s);
-                    break;
-                case EVENT_FEAR:
-                    DoCastVictim(SPELL_FEAR);
-                    events.Repeat(30s);
+                    events.Repeat(20s, 30s);
                     break;
                 default:
                     break;