fix(Scripts/SunwellPlateau): Add Brutallus Flame Ring explosion (#21681)

azerothcore · Mar 10, 2025 · 5291632 · 5291632
1 parent ffe03f6
commit 5291632
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/data/sql/updates/pending_db_world/rev_1741564748117866104.sql b/data/sql/updates/pending_db_world/rev_1741564748117866104.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = -44873 AND `spell_effect` = 44874;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(-44873, 44874, 0, 'on Flame Ring removal cast Flame Ring explosion (Brutallus - Madrigosa)');
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -137,6 +137,7 @@ enum eMadrigosa
     EVENT_MAD_6                     = 6,
     EVENT_MAD_7                     = 7,
     EVENT_MAD_8                     = 8,
+    EVENT_MAD_8_1                   = 800,
     EVENT_MAD_9                     = 9,
     EVENT_MAD_10                    = 10,
     EVENT_MAD_11                    = 11,
@@ -166,7 +167,7 @@ enum eMadrigosa
 
     SPELL_BRUTALLUS_CHARGE          = 44884,
     SPELL_BRUTALLUS_FEL_FIREBALL    = 44844,
-    SPELL_BRUTALLUS_FLAME_RING      = 44874,
+    SPELL_BRUTALLUS_FLAME_RING      = 44873,
     SPELL_BRUTALLUS_BREAK_ICE       = 46637,
 };
 
@@ -261,6 +262,7 @@ struct npc_madrigosa : public NullCreatureAI
             me->CastSpell(me, SPELL_MADRIGOSA_FROST_BLAST, false);
             events.ScheduleEvent(EVENT_MAD_8, 3000);
             events.ScheduleEvent(EVENT_MAD_8, 5000);
+            events.ScheduleEvent(EVENT_MAD_8_1, 6000);
             events.ScheduleEvent(EVENT_MAD_8, 6500);
             events.ScheduleEvent(EVENT_MAD_8, 7500);
             events.ScheduleEvent(EVENT_MAD_8, 8500);
@@ -273,10 +275,13 @@ struct npc_madrigosa : public NullCreatureAI
             if (Creature* brutallus = instance->GetCreature(DATA_BRUTALLUS))
                 me->CastSpell(brutallus, SPELL_MADRIGOSA_FROSTBOLT, false);
             break;
+        case EVENT_MAD_8_1:
+            if (Creature* brutallus = instance->GetCreature(DATA_BRUTALLUS))
+                brutallus->CastSpell(brutallus, SPELL_BRUTALLUS_FLAME_RING, false);
+            break;
         case EVENT_MAD_9:
             if (Creature* brutallus = instance->GetCreature(DATA_BRUTALLUS))
             {
-                brutallus->CastSpell(brutallus, SPELL_BRUTALLUS_FLAME_RING, true);
                 brutallus->RemoveAllAuras();
                 brutallus->CastSpell(brutallus, SPELL_BRUTALLUS_FEL_FIREBALL, false);
                 brutallus->AI()->Talk(YELL_INTRO_BREAK_ICE);