++
This commit is contained in:
@@ -539,25 +539,6 @@ class spell_magtheridon_blaze_target : public SpellScript
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 30576 - Quake
|
|
||||||
class spell_magtheridon_quake_initial : public AuraScript
|
|
||||||
{
|
|
||||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
|
||||||
{
|
|
||||||
return ValidateSpellInfo({ SPELL_QUAKE_TARGET_SELECTOR });
|
|
||||||
}
|
|
||||||
|
|
||||||
void OnPeriodic(AuraEffect const* /*aurEff*/)
|
|
||||||
{
|
|
||||||
GetTarget()->CastSpell(GetTarget(), SPELL_QUAKE_TARGET_SELECTOR, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Register() override
|
|
||||||
{
|
|
||||||
OnEffectPeriodic += AuraEffectPeriodicFn(spell_magtheridon_quake_initial::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// 30572 - Quake
|
// 30572 - Quake
|
||||||
class spell_magtheridon_quake_target_selector : public SpellScript
|
class spell_magtheridon_quake_target_selector : public SpellScript
|
||||||
{
|
{
|
||||||
@@ -695,7 +676,6 @@ void AddSC_boss_magtheridon()
|
|||||||
RegisterMagtheridonsLairCreatureAI(npc_hellfire_channeler);
|
RegisterMagtheridonsLairCreatureAI(npc_hellfire_channeler);
|
||||||
RegisterMagtheridonsLairCreatureAI(npc_magtheridon_room);
|
RegisterMagtheridonsLairCreatureAI(npc_magtheridon_room);
|
||||||
RegisterSpellScript(spell_magtheridon_blaze_target);
|
RegisterSpellScript(spell_magtheridon_blaze_target);
|
||||||
RegisterSpellScript(spell_magtheridon_quake_initial);
|
|
||||||
RegisterSpellScript(spell_magtheridon_quake_target_selector);
|
RegisterSpellScript(spell_magtheridon_quake_target_selector);
|
||||||
RegisterSpellScript(spell_magtheridon_debris);
|
RegisterSpellScript(spell_magtheridon_debris);
|
||||||
RegisterSpellScript(spell_magtheridon_shadow_grasp_cube);
|
RegisterSpellScript(spell_magtheridon_shadow_grasp_cube);
|
||||||
|
|||||||
@@ -54,43 +54,7 @@ class spell_zangarmarsh_stormcrow_amulet : public AuraScript
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 31773, 31774, 31775, 31776 - As the Crow Flies Whisper Aura
|
|
||||||
class spell_zangarmarsh_whisper_aura : public AuraScript
|
|
||||||
{
|
|
||||||
bool Validate(SpellInfo const* /*spellInfo*/) override
|
|
||||||
{
|
|
||||||
return ValidateSpellInfo({ SPELL_WHISPER_AURA_5 });
|
|
||||||
}
|
|
||||||
|
|
||||||
void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
|
|
||||||
{
|
|
||||||
switch (GetId())
|
|
||||||
{
|
|
||||||
case SPELL_WHISPER_AURA_1:
|
|
||||||
GetTarget()->CastSpell(GetTarget(), SPELL_WHISPER_AURA_2, true);
|
|
||||||
break;
|
|
||||||
case SPELL_WHISPER_AURA_2:
|
|
||||||
GetTarget()->CastSpell(GetTarget(), SPELL_WHISPER_AURA_3, true);
|
|
||||||
break;
|
|
||||||
case SPELL_WHISPER_AURA_3:
|
|
||||||
GetTarget()->CastSpell(GetTarget(), SPELL_WHISPER_AURA_4, true);
|
|
||||||
break;
|
|
||||||
case SPELL_WHISPER_AURA_4:
|
|
||||||
GetTarget()->CastSpell(GetTarget(), SPELL_WHISPER_AURA_5, true);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Register() override
|
|
||||||
{
|
|
||||||
AfterEffectRemove += AuraEffectRemoveFn(spell_zangarmarsh_whisper_aura::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void AddSC_zangarmarsh()
|
void AddSC_zangarmarsh()
|
||||||
{
|
{
|
||||||
RegisterSpellScript(spell_zangarmarsh_stormcrow_amulet);
|
RegisterSpellScript(spell_zangarmarsh_stormcrow_amulet);
|
||||||
RegisterSpellScript(spell_zangarmarsh_whisper_aura);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1249,10 +1249,12 @@ class spell_warl_seed_of_corruption_generic : public AuraScript
|
|||||||
void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo)
|
void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo)
|
||||||
{
|
{
|
||||||
PreventDefaultAction();
|
PreventDefaultAction();
|
||||||
|
|
||||||
DamageInfo* damageInfo = eventInfo.GetDamageInfo();
|
DamageInfo* damageInfo = eventInfo.GetDamageInfo();
|
||||||
if (!damageInfo || !damageInfo->GetDamage())
|
if (!damageInfo || !damageInfo->GetDamage())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
// Track remaining damage threshold on the DoT effect amount
|
||||||
SpellEffectValue amount = aurEff->GetAmount() - damageInfo->GetDamage();
|
SpellEffectValue amount = aurEff->GetAmount() - damageInfo->GetDamage();
|
||||||
if (amount > 0)
|
if (amount > 0)
|
||||||
{
|
{
|
||||||
@@ -1271,7 +1273,7 @@ class spell_warl_seed_of_corruption_generic : public AuraScript
|
|||||||
|
|
||||||
void Register() override
|
void Register() override
|
||||||
{
|
{
|
||||||
OnEffectProc += AuraEffectProcFn(spell_warl_seed_of_corruption_generic::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
|
OnEffectProc += AuraEffectProcFn(spell_warl_seed_of_corruption_generic::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user