Scripts/Arcatraz: Update Dalliah & Soccothrates (TrinityCore#31124)

* update timers, update combat AI, codestyle changes, reorder AI hooks

Author: offl

sql/updates/world/3.3.5/2025_07_08_01_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_dalliah_the_doomsayer_whirlwind';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(36142, 'spell_dalliah_the_doomsayer_whirlwind');

src/server/scripts/Outland/TempestKeep/arcatraz/boss_dalliah_the_doomsayer.cpp

@@ -15,13 +15,21 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * Whirlwind gets interrupted in lots of cases
+ * Conversation between creatures requires rechecks and improvements
+ */
+
 #include "ScriptMgr.h"
 #include "arcatraz.h"
 #include "InstanceScript.h"
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "SpellScript.h"
 
-enum Say
+enum DalliahTexts
 {
     // Dalliah the Doomsayer
     SAY_AGGRO                       = 1,
@@ -36,83 +44,112 @@ enum Say
     SAY_DALLIAH_25_PERCENT          = 5
 };
 
-enum Spells
+enum DalliahSpells
 {
     SPELL_GIFT_OF_THE_DOOMSAYER     = 36173,
     SPELL_WHIRLWIND                 = 36142,
     SPELL_HEAL                      = 36144,
-    SPELL_SHADOW_WAVE               = 39016  // Heroic only
+    SPELL_SHADOW_WAVE               = 39016,  // Heroic only
+
+    SPELL_DUMMY                     = 36177
 };
 
-enum Events
+enum DalliahEvents
 {
     EVENT_GIFT_OF_THE_DOOMSAYER     = 1,
-    EVENT_WHIRLWIND                 = 2,
-    EVENT_HEAL                      = 3,
-    EVENT_SHADOW_WAVE               = 4, // Heroic only
-    EVENT_ME_FIRST                  = 5,
-    EVENT_SOCCOTHRATES_DEATH        = 6
+    EVENT_WHIRLWIND,
+    EVENT_HEAL,
+    EVENT_SHADOW_WAVE,
+
+    EVENT_ME_FIRST,
+    EVENT_SOCCOTHRATES_DEATH
 };
 
+// 20885 - Dalliah the Doomsayer
 struct boss_dalliah_the_doomsayer : public BossAI
 {
-    boss_dalliah_the_doomsayer(Creature* creature) : BossAI(creature, DATA_DALLIAH)
-    {
-        soccothratesTaunt = false;
-        soccothratesDeath = false;
-    }
+    boss_dalliah_the_doomsayer(Creature* creature) : BossAI(creature, DATA_DALLIAH),
+        _soccothratesTaunt(false), _soccothratesDeath(false) { }
 
     void Reset() override
     {
         _Reset();
-        soccothratesTaunt = false;
-        soccothratesDeath = false;
-    }
-
-    void JustDied(Unit* /*killer*/) override
-    {
-        _JustDied();
-        Talk(SAY_DEATH);
-
-        if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
-            if (soccothrates->IsAlive() && !soccothrates->IsInCombat())
-                soccothrates->AI()->SetData(1, 1);
+        _soccothratesTaunt = false;
+        _soccothratesDeath = false;
     }
 
     void JustEngagedWith(Unit* who) override
     {
         BossAI::JustEngagedWith(who);
-        events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 1s, 4s);
-        events.ScheduleEvent(EVENT_WHIRLWIND, 7s, 9s);
+        events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 0s, 10s);
+        events.ScheduleEvent(EVENT_WHIRLWIND, 5s, 10s);
         if (IsHeroic())
-            events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
+            events.ScheduleEvent(EVENT_SHADOW_WAVE, 10s, 15s);
         events.ScheduleEvent(EVENT_ME_FIRST, 6s);
         Talk(SAY_AGGRO);
     }
 
-    void KilledUnit(Unit* /*victim*/) override
-    {
-        Talk(SAY_SLAY);
-    }
-
     void SetData(uint32 /*type*/, uint32 data) override
     {
         switch (data)
         {
             case 1:
                 events.ScheduleEvent(EVENT_SOCCOTHRATES_DEATH, 6s);
-                soccothratesDeath = true;
+                _soccothratesDeath = true;
                 break;
             default:
                 break;
         }
     }
 
+    void DamageTaken(Unit* /*attacker*/, uint32& damage, DamageEffectType /*damageType*/, SpellInfo const* /*spellInfo = nullptr*/) override
+    {
+        if (!_soccothratesTaunt && me->HealthBelowPctDamaged(25, damage))
+        {
+            _soccothratesTaunt = true;
+
+            if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
+                soccothrates->AI()->Talk(SAY_DALLIAH_25_PERCENT);
+        }
+    }
+
+    void SpellHit(WorldObject* /*caster*/, SpellInfo const* spellInfo) override
+    {
+        if (spellInfo->Id == SPELL_DUMMY)
+            events.ScheduleEvent(EVENT_HEAL, 0s);
+    }
+
+    void OnSpellCast(SpellInfo const* spell) override
+    {
+        if (spell->Id == SPELL_WHIRLWIND)
+            if (roll_chance_i(30))
+                Talk(SAY_WHIRLWIND);
+
+        if (spell->Id == sSpellMgr->GetSpellIdForDifficulty(SPELL_HEAL, me))
+            if (roll_chance_i(50))
+                Talk(SAY_HEAL);
+    }
+
+    void KilledUnit(Unit* /*victim*/) override
+    {
+        Talk(SAY_SLAY);
+    }
+
+    void JustDied(Unit* /*killer*/) override
+    {
+        _JustDied();
+        Talk(SAY_DEATH);
+
+        if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
+            if (soccothrates->IsAlive() && !soccothrates->IsInCombat())
+                soccothrates->AI()->SetData(1, 1);
+    }
+
     void UpdateAI(uint32 diff) override
     {
         if (!UpdateVictim())
         {
-            if (soccothratesDeath)
+            if (_soccothratesDeath)
             {
                 events.Update(diff);
 
@@ -142,23 +179,21 @@ struct boss_dalliah_the_doomsayer : public BossAI
             switch (eventId)
             {
                 case EVENT_GIFT_OF_THE_DOOMSAYER:
-                    DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER, true);
-                    events.ScheduleEvent(EVENT_GIFT_OF_THE_DOOMSAYER, 16s, 21s);
+                    DoCastVictim(SPELL_GIFT_OF_THE_DOOMSAYER);
+                    events.Repeat(10s, 20s);
                     break;
                 case EVENT_WHIRLWIND:
-                    DoCast(me, SPELL_WHIRLWIND);
-                    Talk(SAY_WHIRLWIND);
-                    events.ScheduleEvent(EVENT_WHIRLWIND, 19s, 21s);
-                    events.ScheduleEvent(EVENT_HEAL, 6s);
+                    DoCastSelf(SPELL_WHIRLWIND);
+                    events.Repeat(15s, 25s);
                     break;
                 case EVENT_HEAL:
-                    DoCast(me, SPELL_HEAL);
-                    Talk(SAY_HEAL);
+                    DoCastSelf(SPELL_HEAL);
                     break;
                 case EVENT_SHADOW_WAVE:
-                    DoCastVictim(SPELL_SHADOW_WAVE, true);
-                    events.ScheduleEvent(EVENT_SHADOW_WAVE, 11s, 16s);
+                    DoCastVictim(SPELL_SHADOW_WAVE);
+                    events.Repeat(10s, 15s);
                     break;
+
                 case EVENT_ME_FIRST:
                     if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
                         if (soccothrates->IsAlive() && !soccothrates->IsInCombat())
@@ -172,22 +207,39 @@ struct boss_dalliah_the_doomsayer : public BossAI
                 return;
         }
 
-        if (HealthBelowPct(25) && !soccothratesTaunt)
-        {
-            if (Creature* soccothrates = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_SOCCOTHRATES)))
-                soccothrates->AI()->Talk(SAY_DALLIAH_25_PERCENT);
-            soccothratesTaunt = true;
-        }
-
         DoMeleeAttackIfReady();
     }
 
 private:
-    bool soccothratesTaunt;
-    bool soccothratesDeath;
+    bool _soccothratesTaunt;
+    bool _soccothratesDeath;
+};
+
+// 36142 - Whirlwind
+class spell_dalliah_the_doomsayer_whirlwind : public AuraScript
+{
+    PrepareAuraScript(spell_dalliah_the_doomsayer_whirlwind);
+
+    bool Validate(SpellInfo const* /*spellInfo*/) override
+    {
+        return ValidateSpellInfo({ SPELL_DUMMY });
+    }
+
+    void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
+    {
+        // When Whirlwind ends, creature casts Dummy spell. When Dummy spell hits,
+        // creature casts Heal spell and this is how Heal after Whirlwind is handled
+        GetTarget()->CastSpell(GetTarget(), SPELL_DUMMY, true);
+    }
+
+    void Register() override
+    {
+        AfterEffectRemove += AuraEffectRemoveFn(spell_dalliah_the_doomsayer_whirlwind::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
+    }
 };
 
 void AddSC_boss_dalliah_the_doomsayer()
 {
     RegisterArcatrazCreatureAI(boss_dalliah_the_doomsayer);
+    RegisterSpellScript(spell_dalliah_the_doomsayer_whirlwind);
 }