Skip to content

Commit bcf05ab

Browse files
committed
[s2834] Spawn Finkle Einhorn
(based on commit SD2[3109] - f828f73) Signed-off-by: Xfurry <xfurry@scriptdev2.com>
1 parent 7231fa0 commit bcf05ab

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

scripts/eastern_kingdoms/blackrock_spire/blackrock_spire.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ enum
2626
NPC_LORD_VICTOR_NEFARIUS = 10162,
2727
NPC_REND_BLACKHAND = 10429,
2828
NPC_GYTH = 10339,
29+
NPC_THE_BEAST = 10430,
2930
NPC_DRAKKISATH = 10363,
3031
NPC_CHROMATIC_WHELP = 10442, // related to Gyth arena event
3132
NPC_CHROMATIC_DRAGON = 10447,
@@ -117,8 +118,9 @@ class instance_blackrock_spire : public ScriptedInstance, private DialogueHelper
117118
void OnCreatureCreate(Creature* pCreature) override;
118119

119120
void OnCreatureDeath(Creature* pCreature) override;
120-
void OnCreatureEvade(Creature* pCreature);
121+
void OnCreatureEvade(Creature* pCreature) override;
121122
void OnCreatureEnterCombat(Creature* pCreature) override;
123+
void OnCreatureDespawn(Creature* pCreature) override;
122124

123125
void SetData(uint32 uiType, uint32 uiData) override;
124126
uint32 GetData(uint32 uiType) const override;

scripts/eastern_kingdoms/blackrock_spire/instance_blackrock_spire.cpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ enum
5353
SAY_ROOKERY_EVENT_START = -1229020,
5454
NPC_ROOKERY_GUARDIAN = 10258,
5555
NPC_ROOKERY_HATCHER = 10683,
56+
57+
// Spells
58+
SPELL_FINKLE_IS_EINHORN = 16710,
5659
};
5760

5861
/* Areatrigger
@@ -419,6 +422,12 @@ void instance_blackrock_spire::OnCreatureEnterCombat(Creature* pCreature)
419422
}
420423
}
421424

425+
void instance_blackrock_spire::OnCreatureDespawn(Creature* pCreature)
426+
{
427+
if (pCreature->GetEntry() == NPC_THE_BEAST)
428+
pCreature->CastSpell(pCreature, SPELL_FINKLE_IS_EINHORN, true);
429+
}
430+
422431
void instance_blackrock_spire::DoOpenUpperDoorIfCan(Player* pPlayer)
423432
{
424433
if (m_bUpperDoorOpened)

sd2_revision_nr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#ifndef __SD2_REVISION_NR_H__
22
#define __SD2_REVISION_NR_H__
3-
#define SD2_REVISION_NR "s2833"
3+
#define SD2_REVISION_NR "s2834"
44
#endif // __SD2_REVISION_NR_H__

0 commit comments

Comments
 (0)