[s2834] Spawn Finkle Einhorn

xfurry · xfurry · commit bcf05ab0a05f · 2015-03-14T19:45:58.000+01:00
(based on commit SD2[3109] - f828f73)

Signed-off-by: Xfurry &lt;xfurry@scriptdev2.com&gt;
diff --git a/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h b/scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h
@@ -26,6 +26,7 @@ enum
     NPC_LORD_VICTOR_NEFARIUS    = 10162,
     NPC_REND_BLACKHAND          = 10429,
     NPC_GYTH                    = 10339,
+    NPC_THE_BEAST               = 10430,
     NPC_DRAKKISATH              = 10363,
     NPC_CHROMATIC_WHELP         = 10442,                    // related to Gyth arena event
     NPC_CHROMATIC_DRAGON        = 10447,
@@ -117,8 +118,9 @@ class instance_blackrock_spire : public ScriptedInstance, private DialogueHelper
         void OnCreatureCreate(Creature* pCreature) override;
 
         void OnCreatureDeath(Creature* pCreature) override;
-        void OnCreatureEvade(Creature* pCreature);
+        void OnCreatureEvade(Creature* pCreature) override;
         void OnCreatureEnterCombat(Creature* pCreature) override;
+        void OnCreatureDespawn(Creature* pCreature) override;
 
         void SetData(uint32 uiType, uint32 uiData) override;
         uint32 GetData(uint32 uiType) const override;
diff --git a/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp b/scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp
@@ -53,6 +53,9 @@ enum
     SAY_ROOKERY_EVENT_START     = -1229020,
     NPC_ROOKERY_GUARDIAN        = 10258,
     NPC_ROOKERY_HATCHER         = 10683,
+
+    // Spells
+    SPELL_FINKLE_IS_EINHORN     = 16710,
 };
 
 /* Areatrigger
@@ -419,6 +422,12 @@ void instance_blackrock_spire::OnCreatureEnterCombat(Creature* pCreature)
     }
 }
 
+void instance_blackrock_spire::OnCreatureDespawn(Creature* pCreature)
+{
+    if (pCreature->GetEntry() == NPC_THE_BEAST)
+        pCreature->CastSpell(pCreature, SPELL_FINKLE_IS_EINHORN, true);
+}
+
 void instance_blackrock_spire::DoOpenUpperDoorIfCan(Player* pPlayer)
 {
     if (m_bUpperDoorOpened)
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "s2833"
+ #define SD2_REVISION_NR "s2834"
 #endif // __SD2_REVISION_NR_H__
