fix(Core/Script): Felmyst (#2965)

Co-authored-by: Barbz <BarbzYHOOL@users.noreply.github.com>
This commit is contained in:
h0lysp4nk
2020-05-30 10:09:40 +01:00
committed by GitHub
parent 86f5c91427
commit 60b0c4201a
3 changed files with 56 additions and 8 deletions

View File

@@ -12,13 +12,13 @@
enum Yells
{
YELL_BIRTH = 0,
YELL_KILL = 1,
YELL_BREATH = 2,
YELL_TAKEOFF = 3,
YELL_BERSERK = 4,
YELL_DEATH = 5,
EMOTE_BREATH = 6
YELL_BIRTH = 0, // Glory to Kil'jaeden! Death to all who oppose!
YELL_KILL = 1, // I kill for the master! OR The end has come!
YELL_BREATH = 2, // Choke on your final breath
YELL_TAKEOFF = 3, // I am stronger than ever before!
YELL_BERSERK = 4, // No more hesitation! Your fates are written!
YELL_DEATH = 5, // Kil'jaeden will... prevail! AND Kalecgos line
EMOTE_BREATH = 6 // Felmyst takes a deep breath...
};
enum Spells
@@ -343,6 +343,7 @@ public:
Talk(EMOTE_BREATH);
break;
case EVENT_CORRUPT_TRIGGERS:
Talk(YELL_BREATH);
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(0));
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(500));
me->m_Events.AddEvent(new CorruptTriggers(me), me->m_Events.CalculateTime(1000));
@@ -508,6 +509,7 @@ class spell_felmyst_fog_of_corruption_charm : public SpellScriptLoader
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveAurasDueToSpell(SPELL_FOG_OF_CORRUPTION_CHARM);
GetTarget()->RemoveAurasDueToSpell(SPELL_FOG_OF_CORRUPTION_CHARM2);
Unit::Kill(GetCaster(), GetTarget(), false);
}

View File

@@ -27,7 +27,7 @@ enum Yells
SAY_GOOD_AGGRO = 0,
SAY_GOOD_NEAR_DEATH = 1,
SAY_GOOD_NEAR_DEATH2 = 2,
SAY_GOOD_MADRIGOSA = 3
SAY_GOOD_MADRIGOSA = 3 // Madrigosa deserved a far better fate. You did what had to be done, but this battle is far from over!
};
enum Spells