mirror/azerothcore-wotlk
1
0
Fork 1
mirror of https://gitcode.com/GitHub_Trending/az/azerothcore-wotlk.git synced 2026-10-10 07:06:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/BlackTemple): Fix Illidan's Demon Form and Shadowfiend DoTs during the Maiev and death scenes (#28031)

Browse Source 
Co-authored-by: Claude <[email protected]>
This commit is contained in:
Crow
2026-10-09 15:06:27 -03:00
committed by GitHub
co-authored by Claude
parent 5cc7d51a7e
commit 326c711f64
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+32 -5
View File
@@ -231,7 +231,7 @@ struct boss_illidan_stormrage : public BossAI
ScheduleHealthCheckEvent(30, [&] { ScheduleHealthCheckEvent(30, [&] {
// Maiev Spawn Scene // Maiev Spawn Scene
scheduler.CancelAll(); scheduler.CancelAll();
if (me->HasAura(SPELL_DEMON_FORM)) if (IsInDemonFormOrTransforming())
DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM_BACK); DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM_BACK);
me->m_Events.CancelEventGroup(GROUP_DEMON_FORM); me->m_Events.CancelEventGroup(GROUP_DEMON_FORM);
DoAction(ACTION_SHADOW_PRISON); DoAction(ACTION_SHADOW_PRISON);
@@ -378,7 +378,7 @@ struct boss_illidan_stormrage : public BossAI
me->m_Events.CancelEventGroup(GROUP_DEMON_FORM); me->m_Events.CancelEventGroup(GROUP_DEMON_FORM);
scheduler.CancelAll(); scheduler.CancelAll();
if (me->HasAura(SPELL_DEMON_FORM)) if (IsInDemonFormOrTransforming())
DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM_BACK); DoAction(ACTION_ILLIDAN_DEMON_TRANSFORM_BACK);
_dying = true; _dying = true;
@@ -588,7 +588,7 @@ struct boss_illidan_stormrage : public BossAI
else else
ScheduleAbilities(PHASE_LANDING); ScheduleAbilities(PHASE_LANDING);
DoResetThreatList(); DoResetThreatList();
}, 60s); }, 60s, GROUP_DEMON_FORM);
} }
break; break;
case PHASE_MAIEV: case PHASE_MAIEV:
@@ -684,6 +684,13 @@ private:
bool _inCutscene; bool _inCutscene;
uint8 beamPosId; uint8 beamPosId;
// Demon Form is only applied partway through the transform, so check the transform auras too
bool IsInDemonFormOrTransforming() const
{
return me->HasAnyAuras(SPELL_DEMON_TRANSFORM_1, SPELL_DEMON_TRANSFORM_2, SPELL_DEMON_TRANSFORM_3,
SPELL_DEMON_FORM);
}
void CycleBeamPos(uint8 &beamPosId) void CycleBeamPos(uint8 &beamPosId)
{ {
uint8 newPos; uint8 newPos;
@@ -1426,9 +1433,19 @@ class spell_illidan_parasitic_shadowfiend_aura : public AuraScript
GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true); GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true);
} }
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
// The DoT ignores immunities, but Shadow Prison should still stop its damage
if (GetTarget()->HasAura(SPELL_SHADOW_PRISON))
PreventDefaultAction();
}
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_aura::HandleEffectRemove,
EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_parasitic_shadowfiend_aura::HandlePeriodic,
EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
} }
}; };
@@ -1464,9 +1481,19 @@ class spell_illidan_parasitic_shadowfiend_trigger_aura : public AuraScript
GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true); GetTarget()->CastSpell(GetTarget(), SPELL_SUMMON_PARASITIC_SHADOWFIENDS, true);
} }
void HandlePeriodic(AuraEffect const* /*aurEff*/)
{
// The DoT ignores immunities, but Shadow Prison should still stop its damage
if (GetTarget()->HasAura(SPELL_SHADOW_PRISON))
PreventDefaultAction();
}
void Register() override void Register() override
{ {
AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_trigger_aura::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_trigger_aura::HandleEffectRemove,
EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_parasitic_shadowfiend_trigger_aura::HandlePeriodic,
EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
} }
}; };