[c3140] Update Lord Marrowgar - ICC

This implements the Bone Spike event and updates the Cold Flame behavior
Also set power to 0 for Saurfang on Reset()

(based on commit [3140] - 23ba944)

Signed-off-by: Xfurry <[email protected]>

Author: xfurry

scripts/northrend/icecrown_citadel/icecrown_citadel/boss_deathbringer_saurfang.cpp

@@ -150,6 +150,8 @@ struct boss_deathbringer_saurfangAI : public ScriptedAI
             m_uiBerserkTimer    = 6 * MINUTE * IN_MILLISECONDS;
 
         m_bIsFrenzied           = false;
+
+        m_creature->SetPower(m_creature->GetPowerType(), 0);
     }
 
     void Aggro(Unit* /*pWho*/) override

scripts/northrend/icecrown_citadel/icecrown_citadel/boss_lord_marrowgar.cpp

@@ -16,13 +16,14 @@
 
 /* ScriptData
 SDName: boss_lord_marrowgar
-SD%Complete: 75%
-SDComment: Bone Spike Spell requires vehicle support
+SD%Complete: 90%
+SDComment: Achiev NYI.
 SDCategory: Icecrown Citadel
 EndScriptData */
 
 #include "precompiled.h"
 #include "icecrown_citadel.h"
+#include "TemporarySummon.h"
 
 enum
 {
@@ -42,15 +43,17 @@ enum
     SPELL_BONE_STORM            = 69076,
     SPELL_COLDFLAME             = 69140,
     SPELL_COLDFLAME_STORM       = 72705,
-    SPELL_BONE_SPIKE            = 69057,
-    SPELL_BONE_SPIKE_STORM      = 73142,
+    SPELL_BONE_SPIKE            = 69057,                    // triggers spell 69062
+    SPELL_BONE_SPIKE_STORM      = 73142,                    // triggers spell 69062 / 72669 / 72670
 
     // summoned spells
     SPELL_COLDFLAME_AURA        = 69145,
     SPELL_IMPALED               = 69065,
 
     // npcs
-    NPC_BONE_SPIKE              = 38711,
+    NPC_BONE_SPIKE_1            = 36619,                    // summoned by spell 69062
+    NPC_BONE_SPIKE_2            = 38711,                    // summoned by spell 72670
+    NPC_BONE_SPIKE_3            = 38712,                    // summoned by spell 72669
     NPC_COLDFLAME               = 36672,
 
     // phases and max cold flame charges
@@ -256,8 +259,7 @@ struct boss_lord_marrowgarAI : public ScriptedAI
         }
 
         // Bone spike - different spells for the normal phase or storm phase
-        // ToDo: uncommnet this when vehicles and the Bone spike spells are properly supported by core
-        /*if (m_pInstance && (m_pInstance->IsHeroicDifficulty() || m_uiPhase == PHASE_NORMAL))
+        if (m_pInstance && (m_pInstance->IsHeroicDifficulty() || m_uiPhase == PHASE_NORMAL))
         {
             if (m_uiBoneSpikeTimer < uiDiff)
             {
@@ -274,7 +276,7 @@ struct boss_lord_marrowgarAI : public ScriptedAI
             }
             else
                 m_uiBoneSpikeTimer -= uiDiff;
-        }*/
+        }
 
         // Berserk
         if (m_uiBerserkTimer)
@@ -298,6 +300,87 @@ CreatureAI* GetAI_boss_lord_marrowgar(Creature* pCreature)
     return new boss_lord_marrowgarAI(pCreature);
 }
 
+/*######
+## npc_bone_spike
+######*/
+
+struct npc_bone_spikeAI : public Scripted_NoMovementAI
+{
+    npc_bone_spikeAI(Creature* pCreature) : Scripted_NoMovementAI(pCreature)
+    {
+        m_bHasImpaled = false;
+        Reset();
+    }
+
+    bool m_bHasImpaled;
+
+    void Reset() override { }
+
+    void AttackStart(Unit* /*pWho*/) override { }
+    void MoveInLineOfSight(Unit* /*pWho*/) override { }
+
+    void KilledUnit(Unit* pVictim) override
+    {
+        // remove the aura as it's death persistent (I wonder why...)
+        pVictim->RemoveAurasDueToSpell(SPELL_IMPALED);
+        m_creature->ForcedDespawn();
+    }
+
+    void JustDied(Unit* /*pKiller*/) override
+    {
+        if (m_creature->IsTemporarySummon())
+        {
+            TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+            // remove impale on death
+            if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                pSummoner->RemoveAurasDueToSpell(SPELL_IMPALED);
+        }
+    }
+
+    void UpdateAI(const uint32 /*uiDiff*/) override
+    {
+        if (!m_bHasImpaled)
+        {
+            if (m_creature->IsTemporarySummon())
+            {
+                TemporarySummon* pTemporary = (TemporarySummon*)m_creature;
+
+                // Impale player
+                if (Player* pSummoner = m_creature->GetMap()->GetPlayer(pTemporary->GetSummonerGuid()))
+                    DoCastSpellIfCan(pSummoner, SPELL_IMPALED);
+            }
+
+            m_bHasImpaled = true;
+        }
+    }
+};
+
+CreatureAI* GetAI_npc_bone_spike(Creature* pCreature)
+{
+    return new npc_bone_spikeAI(pCreature);
+}
+
+/*######
+## npc_coldflame
+######*/
+
+// TODO Remove this 'script' when combat can be proper prevented from core-side
+struct npc_coldflameAI : public ScriptedAI
+{
+    npc_coldflameAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
+
+    void Reset() override { }
+    void AttackStart(Unit* /*pWho*/) override { }
+    void MoveInLineOfSight(Unit* /*pWho*/) override { }
+    void UpdateAI(const uint32 /*uiDiff*/) override { }
+};
+
+CreatureAI* GetAI_npc_coldflame(Creature* pCreature)
+{
+    return new npc_coldflameAI(pCreature);
+}
+
 void AddSC_boss_lord_marrowgar()
 {
     Script* pNewScript;
@@ -306,4 +389,14 @@ void AddSC_boss_lord_marrowgar()
     pNewScript->Name = "boss_lord_marrowgar";
     pNewScript->GetAI = &GetAI_boss_lord_marrowgar;
     pNewScript->RegisterSelf();
+
+    pNewScript = new Script;
+    pNewScript->Name = "npc_bone_spike";
+    pNewScript->GetAI = &GetAI_npc_bone_spike;
+    pNewScript->RegisterSelf();
+
+    pNewScript = new Script;
+    pNewScript->Name = "npc_coldflame";
+    pNewScript->GetAI = &GetAI_npc_coldflame;
+    pNewScript->RegisterSelf();
 }

sd2_revision_nr.h

@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "3139"
+ #define SD2_REVISION_NR "3140"
 #endif // __SD2_REVISION_NR_H__

sql/mangos_scriptname_full.sql

@@ -756,6 +756,8 @@ UPDATE creature_template SET ScriptName='npc_scalawag_frog' WHERE entry=26503;
 /* ICECROWN CITADEL */
 UPDATE instance_template SET ScriptName='instance_icecrown_citadel' WHERE map=631;
 UPDATE creature_template SET ScriptName='boss_lord_marrowgar' WHERE entry=36612;
+UPDATE creature_template SET ScriptName='npc_bone_spike' WHERE entry IN (36619,38711,38712);
+UPDATE creature_template SET ScriptName='npc_coldflame' WHERE entry=36672;
 UPDATE creature_template SET ScriptName='boss_lady_deathwhisper' WHERE entry=36855;
 UPDATE creature_template SET ScriptName='boss_deathbringer_saurfang' WHERE entry=37813;
 UPDATE creature_template SET ScriptName='npc_queen_lanathel_intro' WHERE entry=38004;

sql/updates/r3140_mangos.sql

@@ -0,0 +1,2 @@
+UPDATE creature_template SET ScriptName='npc_bone_spike' WHERE entry IN (36619,38711,38712);
+UPDATE creature_template SET ScriptName='npc_coldflame' WHERE entry=36672;