sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Scripts/EmeraldDragons): Emerald dragons should 'enrage' at health per… (#12029)

Browse Source
This commit is contained in:
temperrr
2022-06-12 21:32:44 +02:00
committed by GitHub
parent 913bc19aa0
commit 491f73382b
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/World/boss_emerald_dragons.cpp
+9 -13
View File
@@ -262,9 +262,9 @@ public:
} }
// Summon druid spirits on 75%, 50% and 25% health // Summon druid spirits on 75%, 50% and 25% health
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if (!HealthAbovePct(100 - 25 * _stage)) if (me->HealthBelowPctDamaged(100 - (25 * _stage), damage))
{ {
Talk(SAY_YSONDRE_SUMMON_DRUIDS); Talk(SAY_YSONDRE_SUMMON_DRUIDS);
@@ -349,9 +349,9 @@ public:
WorldBossAI::EnterCombat(who); WorldBossAI::EnterCombat(who);
} }
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if (!HealthAbovePct(100 - 25 * _stage)) if (me->HealthBelowPctDamaged(100 - (25 * _stage), damage))
{ {
Talk(SAY_LETHON_DRAW_SPIRIT); Talk(SAY_LETHON_DRAW_SPIRIT);
DoCast(me, SPELL_DRAW_SPIRIT); DoCast(me, SPELL_DRAW_SPIRIT);
@@ -481,9 +481,9 @@ public:
WorldBossAI::EnterCombat(who); WorldBossAI::EnterCombat(who);
} }
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
if (!HealthAbovePct(100 - 25 * _stage)) if (me->HealthBelowPctDamaged(100 - (25 * _stage), damage))
{ {
Talk(SAY_EMERISS_CAST_CORRUPTION); Talk(SAY_EMERISS_CAST_CORRUPTION);
DoCast(me, SPELL_CORRUPTION_OF_EARTH, true); DoCast(me, SPELL_CORRUPTION_OF_EARTH, true);
@@ -541,7 +541,6 @@ uint32 const TaerarShadeSpells[] =
{ {
SPELL_SUMMON_SHADE_1, SPELL_SUMMON_SHADE_2, SPELL_SUMMON_SHADE_3 SPELL_SUMMON_SHADE_1, SPELL_SUMMON_SHADE_2, SPELL_SUMMON_SHADE_3
}; };
class boss_taerar : public CreatureScript class boss_taerar : public CreatureScript
{ {
public: public:
@@ -578,11 +577,11 @@ public:
--_shades; --_shades;
} }
void DamageTaken(Unit*, uint32& /*damage*/, DamageEffectType, SpellSchoolMask) override void DamageTaken(Unit*, uint32& damage, DamageEffectType, SpellSchoolMask) override
{ {
// At 75, 50 or 25 percent health, we need to activate the shades and go "banished" // At 75, 50 or 25 percent health, we need to activate the shades and go "banished"
// Note: _stage holds the amount of times they have been summoned // Note: _stage holds the amount of times they have been summoned
if (!_banished && !HealthAbovePct(100 - 25 * _stage)) if (!_banished && me->HealthBelowPctDamaged(100 - (25 * _stage), damage))
{ {
_banished = true; _banished = true;
_banishedTimer = 60000; _banishedTimer = 60000;
@@ -594,9 +593,8 @@ public:
uint32 count = sizeof(TaerarShadeSpells) / sizeof(uint32); uint32 count = sizeof(TaerarShadeSpells) / sizeof(uint32);
for (uint32 i = 0; i < count; ++i) for (uint32 i = 0; i < count; ++i)
DoCastVictim(TaerarShadeSpells[i], true); DoCast(TaerarShadeSpells[i]);
_shades += count; _shades += count;
DoCast(SPELL_SHADE); DoCast(SPELL_SHADE);
me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE); me->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NON_ATTACKABLE);
me->SetReactState(REACT_PASSIVE); me->SetReactState(REACT_PASSIVE);
@@ -604,7 +602,6 @@ public:
++_stage; ++_stage;
} }
} }
void ExecuteEvent(uint32 eventId) override void ExecuteEvent(uint32 eventId) override
{ {
switch (eventId) switch (eventId)
@@ -648,7 +645,6 @@ public:
return; return;
} }
emerald_dragonAI::UpdateAI(diff); emerald_dragonAI::UpdateAI(diff);
} }