From b3b635c6c85dcf3fdc60c55d51e3fc15424fa841 Mon Sep 17 00:00:00 2001
From: Jildor <Jildor@users.noreply.github.com>
Date: Mon, 9 Nov 2020 04:19:48 +0200
Subject: DB/Instance/Ulduar: Add missing spells for heroic mode

Closes #25637

Closes #25638

Closes #25639

Closes #25640

(cherry picked from commit ef9576c7bbb42e0aa818a606284da25ea15999c4)
---
 src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp    | 3 ++-
 src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 4 ++--
 src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp  | 5 +++--
 src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp   | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
index 8ba0b06e1de..6c98e1a7ca0 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
@@ -51,7 +51,6 @@ enum HodirYells
 enum HodirSpells
 {
     // Hodir
-    SPELL_FROZEN_BLOWS                           = 62478,
     SPELL_FLASH_FREEZE                           = 61968,
     SPELL_FLASH_FREEZE_VISUAL                    = 62148,
     SPELL_BITING_COLD                            = 62038,
@@ -94,6 +93,8 @@ enum HodirSpells
     SPELL_DISPEL_MAGIC                           = 63499,
 };
 
+#define SPELL_FROZEN_BLOWS RAID_MODE<uint32>(62478,63512)
+
 enum HodirNPC
 {
     NPC_ICE_BLOCK                                = 32938,
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
index accb18a1f86..6b55ec5d139 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp
@@ -35,7 +35,6 @@ EndScriptData */
 
 enum Spells
 {
-    SPELL_TWO_ARM_SMASH                 = 63356,
     SPELL_ONE_ARM_SMASH                 = 63573,
     SPELL_ARM_SWEEP                     = 63766,
     SPELL_STONE_SHOUT                   = 63716,
@@ -43,7 +42,6 @@ enum Spells
     SPELL_STONE_GRIP                    = 62166,
     SPELL_STONE_GRIP_CANCEL             = 65594,
     SPELL_SUMMON_RUBBLE                 = 63633,
-    SPELL_FALLING_RUBBLE                = 63821,
     SPELL_ARM_ENTER_VEHICLE             = 65343,
     SPELL_ARM_ENTER_VISUAL              = 64753,
 
@@ -61,6 +59,8 @@ enum Spells
     SPELL_BERSERK                       = 47008  // guess
 };
 
+#define SPELL_TWO_ARM_SMASH RAID_MODE<uint32>(63356,64003)
+#define SPELL_FALLING_RUBBLE RAID_MODE<uint32>(63821,64001)
 #define SPELL_ARM_DEAD_DAMAGE RAID_MODE<uint32>(63629,63979)
 
 enum NPCs
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
index 03aae53fd8a..aec939a8124 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
@@ -85,6 +85,7 @@ enum Spells
     // Leviathan MK II
     SPELL_FLAME_SUPPRESSANT_MK                  = 64570,
     SPELL_NAPALM_SHELL                          = 63666,
+    SPELL_NAPALM_SHELL_25                       = 65026,
     SPELL_FORCE_CAST_NAPALM_SHELL               = 64539,
     SPELL_PLASMA_BLAST                          = 62997,
     SPELL_SCRIPT_EFFECT_PLASMA_BLAST            = 64542,
@@ -1980,7 +1981,7 @@ class spell_mimiron_napalm_shell : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spell*/) override
             {
-                return ValidateSpellInfo({ SPELL_NAPALM_SHELL });
+                return ValidateSpellInfo({ SPELL_NAPALM_SHELL, SPELL_NAPALM_SHELL_25 });
             }
 
             void FilterTargets(std::list<WorldObject*>& targets)
@@ -2001,7 +2002,7 @@ class spell_mimiron_napalm_shell : public SpellScriptLoader
 
             void HandleScript(SpellEffIndex /*effIndex*/)
             {
-                GetCaster()->CastSpell(GetHitUnit(), SPELL_NAPALM_SHELL);
+                GetCaster()->CastSpell(GetHitUnit(), GetCaster()->GetMap()->Is25ManRaid() ? SPELL_NAPALM_SHELL_25 : SPELL_NAPALM_SHELL);
             }
 
             void Register() override
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
index de8224487da..ae7b4b35e86 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
@@ -82,9 +82,10 @@ enum Spells
     // Ancient Rune Giant
     SPELL_RUNIC_FORTIFICATION                   = 62942,
     SPELL_RUNE_DETONATION                       = 62526,
-    SPELL_STOMP                                 = 62411
 };
 
+#define SPELL_STOMP RAID_MODE<uint32>(62411,62413)
+
 enum Phases
 {
     PHASE_NULL,
-- 
cgit v1.2.3