Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Spells: remove PrepareSpellScript and PrepareAuraScript macros and make Hooklist use emplace behaivior (#174)

Browse Source
This commit is contained in:
Warpten authored and GitHub committed 2020-08-28 15:40:26 +02:00
1 parent 677990a1b8
commit 2b2fc5fb8a
252 files changed
+3275 -7394
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Spells/spell_dk.cpp
+62 -152
View File
@@ -110,8 +110,6 @@ enum DKSpellIcons
// 48707 - Anti-Magic Shell (on self)
class spell_dk_anti_magic_shell : public AuraScript
{
PrepareAuraScript(spell_dk_anti_magic_shell);
bool Load() override
{
absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster());
@@ -131,8 +129,8 @@ class spell_dk_anti_magic_shell : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_dk_anti_magic_shell::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_dk_anti_magic_shell::Absorb, EFFECT_0);
}
private:
int32 absorbPct;
@@ -142,8 +140,6 @@ private:
// 50461 - Anti-Magic Zone
class spell_dk_anti_magic_zone : public AuraScript
{
PrepareAuraScript(spell_dk_anti_magic_zone);
bool Load() override
{
absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster());
@@ -170,8 +166,8 @@ class spell_dk_anti_magic_zone : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_zone::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_zone::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_dk_anti_magic_zone::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_dk_anti_magic_zone::Absorb, EFFECT_0);
}
private:
uint32 absorbPct = 0;
@@ -180,8 +176,6 @@ private:
// 48721 - Blood Boil
class spell_dk_blood_boil : public SpellScript
{
PrepareSpellScript(spell_dk_blood_boil);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_BLOOD_BOIL_TRIGGERED });
@@ -204,7 +198,7 @@ class spell_dk_blood_boil : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_dk_blood_boil::HandleAfterHit);
AfterHit.Register(&spell_dk_blood_boil::HandleAfterHit);
}
private:
@@ -214,8 +208,6 @@ private:
// 81277 - Blood Gorged
class spell_dk_blood_gorged : public AuraScript
{
PrepareAuraScript(spell_dk_blood_gorged);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_BLOOD_BURST });
@@ -234,15 +226,13 @@ class spell_dk_blood_gorged : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dk_blood_gorged::HandleBloodBurst, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectApply.Register(&spell_dk_blood_gorged::HandleBloodBurst, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
}
};
// -48979 - Butchery
class spell_dk_butchery : public AuraScript
{
PrepareAuraScript(spell_dk_butchery);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_BUTCHERY });
@@ -256,14 +246,12 @@ class spell_dk_butchery : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_butchery::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dk_butchery::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_dk_death_and_decay : public AuraScript
{
PrepareAuraScript(spell_dk_death_and_decay);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_DEATH_AND_DECAY_DAMAGE });
@@ -277,15 +265,13 @@ class spell_dk_death_and_decay : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_death_and_decay::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_dk_death_and_decay::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 47541 - Death Coil
class spell_dk_death_coil : public SpellScript
{
PrepareSpellScript(spell_dk_death_coil);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -338,16 +324,14 @@ class spell_dk_death_coil : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dk_death_coil::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_dk_death_coil::CheckCast);
OnEffectHitTarget.Register(&spell_dk_death_coil::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 52751 - Death Gate
class spell_dk_death_gate : public SpellScript
{
PrepareSpellScript(spell_dk_death_gate);
SpellCastResult CheckClass()
{
if (GetCaster()->getClass() != CLASS_DEATH_KNIGHT)
@@ -368,16 +352,14 @@ class spell_dk_death_gate : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dk_death_gate::CheckClass);
OnEffectHitTarget += SpellEffectFn(spell_dk_death_gate::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnCheckCast.Register(&spell_dk_death_gate::CheckClass);
OnEffectHitTarget.Register(&spell_dk_death_gate::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 49560 - Death Grip
class spell_dk_death_grip : public SpellScript
{
PrepareSpellScript(spell_dk_death_grip);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
int32 damage = GetEffectValue();
@@ -391,7 +373,7 @@ class spell_dk_death_grip : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_dk_death_grip::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -399,8 +381,6 @@ class spell_dk_death_grip : public SpellScript
// 48743 - Death Pact
class spell_dk_death_pact : public SpellScript
{
PrepareSpellScript(spell_dk_death_pact);
SpellCastResult CheckCast()
{
// Check if we have valid targets, otherwise skip spell casting here
@@ -438,16 +418,14 @@ class spell_dk_death_pact : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dk_death_pact::CheckCast);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
OnCheckCast.Register(&spell_dk_death_pact::CheckCast);
OnObjectAreaTargetSelect.Register(&spell_dk_death_pact::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
}
};
// 49998 - Death Strike
class spell_dk_death_strike : public SpellScript
{
PrepareSpellScript(spell_dk_death_strike);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -491,15 +469,13 @@ class spell_dk_death_strike : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_dk_death_strike::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY);
}
};
// 89832 - Death Strike (Save damage taken in last 5 sec)
class spell_dk_death_strike_enabler : public AuraScript
{
PrepareAuraScript(spell_dk_death_strike_enabler);
bool Load() override
{
for (uint8 i = 0; i < 5; ++i)
@@ -550,11 +526,11 @@ class spell_dk_death_strike_enabler : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_death_strike_enabler::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dk_death_strike_enabler::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_dk_death_strike_enabler::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dk_death_strike_enabler::Update, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_death_strike_enabler::HandleCalcAmount, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dk_death_strike_enabler::CheckProc);
OnEffectProc.Register(&spell_dk_death_strike_enabler::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcPeriodic.Register(&spell_dk_death_strike_enabler::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectUpdatePeriodic.Register(&spell_dk_death_strike_enabler::Update, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcAmount.Register(&spell_dk_death_strike_enabler::HandleCalcAmount, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
uint32 _damagePerSecond[5];
@@ -563,8 +539,6 @@ private:
// 47496 - Explode, Ghoul spell for Corpse Explosion
class spell_dk_ghoul_explode : public SpellScript
{
PrepareSpellScript(spell_dk_ghoul_explode);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_CORPSE_EXPLOSION_TRIGGERED });
@@ -581,15 +555,13 @@ class spell_dk_ghoul_explode : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_dk_ghoul_explode::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 48792 - Icebound Fortitude
class spell_dk_icebound_fortitude : public AuraScript
{
PrepareAuraScript(spell_dk_icebound_fortitude);
bool Load() override
{
Unit* caster = GetCaster();
@@ -619,15 +591,13 @@ class spell_dk_icebound_fortitude : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
DoEffectCalcAmount.Register(&spell_dk_icebound_fortitude::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
}
};
// 73975 - Necrotic Strike
class spell_dk_necrotic_strike : public AuraScript
{
PrepareAuraScript(spell_dk_necrotic_strike);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool & /*canBeRecalculated*/)
{
if (Unit* caster = GetCaster())
@@ -636,15 +606,13 @@ class spell_dk_necrotic_strike : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_necrotic_strike::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB);
DoEffectCalcAmount.Register(&spell_dk_necrotic_strike::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB);
}
};
// ID - 50842 Pestilence
class spell_dk_pestilence : public SpellScript
{
PrepareSpellScript(spell_dk_pestilence);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -731,9 +699,9 @@ class spell_dk_pestilence : public SpellScript
void Register() override
{
BeforeCast += SpellCastFn(spell_dk_pestilence::HandleAuraApply);
OnEffectHitTarget += SpellEffectFn(spell_dk_pestilence::OnHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
AfterCast += SpellCastFn(spell_dk_pestilence::HandleAuraRemoval);
BeforeCast.Register(&spell_dk_pestilence::HandleAuraApply);
OnEffectHitTarget.Register(&spell_dk_pestilence::OnHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
AfterCast.Register(&spell_dk_pestilence::HandleAuraRemoval);
}
private:
@@ -745,8 +713,6 @@ private:
// 48265 - Unholy Presence
class spell_dk_presence : public AuraScript
{
PrepareAuraScript(spell_dk_presence);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -821,8 +787,8 @@ class spell_dk_presence : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dk_presence::HandlePresenceEffects, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dk_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dk_presence::HandlePresenceEffects, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dk_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -831,8 +797,6 @@ class spell_dk_presence : public AuraScript
// -50391 - Improved Unholy Presence
class spell_dk_improved_presence : public AuraScript
{
PrepareAuraScript(spell_dk_improved_presence);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -858,15 +822,13 @@ class spell_dk_improved_presence : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dk_improved_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL);
}
};
// 46584 - Raise Dead
class spell_dk_raise_dead : public SpellScript
{
PrepareSpellScript(spell_dk_raise_dead);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo(
@@ -901,15 +863,13 @@ class spell_dk_raise_dead : public SpellScript
void Register() override
{
OnCast += SpellCastFn(spell_dk_raise_dead::HandleRaiseDead);
OnCast.Register(&spell_dk_raise_dead::HandleRaiseDead);
}
};
// 59754 Rune Tap - Party
class spell_dk_rune_tap_party : public SpellScript
{
PrepareSpellScript(spell_dk_rune_tap_party);
void CheckTargets(std::list<WorldObject*>& targets)
{
targets.remove(GetCaster());
@@ -917,15 +877,13 @@ class spell_dk_rune_tap_party : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
OnObjectAreaTargetSelect.Register(&spell_dk_rune_tap_party::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
}
};
// 50421 - Scent of Blood
class spell_dk_scent_of_blood : public AuraScript
{
PrepareAuraScript(spell_dk_scent_of_blood);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_SCENT_OF_BLOOD });
@@ -940,15 +898,13 @@ class spell_dk_scent_of_blood : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_scent_of_blood::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_dk_scent_of_blood::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 55090 - Scourge Strike
class spell_dk_scourge_strike : public SpellScript
{
PrepareSpellScript(spell_dk_scourge_strike);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -977,7 +933,7 @@ class spell_dk_scourge_strike : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_dk_scourge_strike::HandleAfterHit);
AfterHit.Register(&spell_dk_scourge_strike::HandleAfterHit);
}
private:
float multiplier = 1.0f;
@@ -986,8 +942,6 @@ private:
// 55233 - Vampiric Blood
class spell_dk_vampiric_blood : public AuraScript
{
PrepareAuraScript(spell_dk_vampiric_blood);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = GetUnitOwner()->CountPctFromMaxHealth(amount);
@@ -995,7 +949,7 @@ class spell_dk_vampiric_blood : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH);
DoEffectCalcAmount.Register(&spell_dk_vampiric_blood::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH);
}
};
@@ -1003,8 +957,6 @@ class spell_dk_vampiric_blood : public AuraScript
// -52284 - Will of the Necropolis
class spell_dk_will_of_the_necropolis : public AuraScript
{
PrepareAuraScript(spell_dk_will_of_the_necropolis);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1029,16 +981,14 @@ class spell_dk_will_of_the_necropolis : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_will_of_the_necropolis::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dk_will_of_the_necropolis::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
DoCheckProc.Register(&spell_dk_will_of_the_necropolis::CheckProc);
OnEffectProc.Register(&spell_dk_will_of_the_necropolis::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
}
};
// 49576 - Death Grip Initial
class spell_dk_death_grip_initial : public SpellScript
{
PrepareSpellScript(spell_dk_death_grip_initial);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
@@ -1062,16 +1012,14 @@ class spell_dk_death_grip_initial : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dk_death_grip_initial::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_initial::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_dk_death_grip_initial::CheckCast);
OnEffectHitTarget.Register(&spell_dk_death_grip_initial::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// -48965 - Shadow Infusion
class spell_dk_shadow_infusion : public AuraScript
{
PrepareAuraScript(spell_dk_shadow_infusion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1109,16 +1057,14 @@ class spell_dk_shadow_infusion : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_shadow_infusion::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dk_shadow_infusion::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_dk_shadow_infusion::CheckProc);
OnEffectProc.Register(&spell_dk_shadow_infusion::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 63560 - Dark Transformation
class spell_dk_dark_transformation : public SpellScript
{
PrepareSpellScript(spell_dk_dark_transformation);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1141,15 +1087,13 @@ class spell_dk_dark_transformation : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_dk_dark_transformation::HandleLaunch, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectLaunchTarget.Register(&spell_dk_dark_transformation::HandleLaunch, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
// 93426 - Dark Transformation
class spell_dk_dark_transformation_aura : public AuraScript
{
PrepareAuraScript(spell_dk_dark_transformation_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_SHADOW_INFUSION });
@@ -1166,7 +1110,7 @@ class spell_dk_dark_transformation_aura : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_dark_transformation_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_dk_dark_transformation_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1174,8 +1118,6 @@ class spell_dk_dark_transformation_aura : public AuraScript
// -51459 - Runic Corruption
class spell_dk_runic_empowerment : public AuraScript
{
PrepareAuraScript(spell_dk_runic_empowerment);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1247,16 +1189,14 @@ class spell_dk_runic_empowerment : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_runic_empowerment::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dk_runic_empowerment::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dk_runic_empowerment::CheckProc);
OnEffectProc.Register(&spell_dk_runic_empowerment::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 49184 - Howling Blast
class spell_dk_howling_blast : public SpellScript
{
PrepareSpellScript(spell_dk_howling_blast);
void HandleDamage(SpellEffIndex /*effIndex*/)
{
if (GetExplTargetUnit() && GetHitUnit())
@@ -1266,14 +1206,12 @@ class spell_dk_howling_blast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_howling_blast::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_dk_howling_blast::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_dk_threat_of_thassarian : public AuraScript
{
PrepareAuraScript(spell_dk_threat_of_thassarian);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1337,15 +1275,13 @@ class spell_dk_threat_of_thassarian : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_threat_of_thassarian::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dk_threat_of_thassarian::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 56835 - Reaping (Passive)
class spell_dk_reaping : public AuraScript
{
PrepareAuraScript(spell_dk_reaping);
bool Load() override
{
return GetCaster()->IsPlayer();
@@ -1382,14 +1318,12 @@ class spell_dk_reaping : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_reaping::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectProc.Register(&spell_dk_reaping::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_dk_blood_rites : public AuraScript
{
PrepareAuraScript(spell_dk_blood_rites);
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -1411,14 +1345,12 @@ class spell_dk_blood_rites : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_blood_rites::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectProc.Register(&spell_dk_blood_rites::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
class spell_dk_crimson_scourge : public AuraScript
{
PrepareAuraScript(spell_dk_crimson_scourge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_BLOOD_PLAGUE });
@@ -1435,14 +1367,12 @@ class spell_dk_crimson_scourge : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_crimson_scourge::CheckProc);
DoCheckProc.Register(&spell_dk_crimson_scourge::CheckProc);
}
};
class spell_dk_army_of_the_dead : public AuraScript
{
PrepareAuraScript(spell_dk_army_of_the_dead);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
amount = 0;
@@ -1456,15 +1386,13 @@ class spell_dk_army_of_the_dead : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
DoEffectCalcAmount.Register(&spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN);
}
};
// -49588 Unholy Command
class spell_dk_unholy_command : public AuraScript
{
PrepareAuraScript(spell_dk_unholy_command);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_DEATH_GRIP_INITIAL });
@@ -1477,7 +1405,7 @@ class spell_dk_unholy_command : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_unholy_command::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER);
OnEffectProc.Register(&spell_dk_unholy_command::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER);
}
};
@@ -1485,8 +1413,6 @@ class spell_dk_unholy_command : public AuraScript
// 55095 - Frost Fever
class spell_dk_disease : public AuraScript
{
PrepareAuraScript(spell_dk_disease);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1531,16 +1457,14 @@ class spell_dk_disease : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_disease::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterDispel += AuraDispelFn(spell_dk_disease::HandleResilientInfection);
DoEffectCalcAmount.Register(&spell_dk_disease::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterDispel.Register(&spell_dk_disease::HandleResilientInfection);
}
};
// -55666 - Desecration
class spell_dk_desecration : public AuraScript
{
PrepareAuraScript(spell_dk_desecration);
bool CheckProc(ProcEventInfo& eventInfo)
{
SpellInfo const* triggerSpell = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[EFFECT_0].TriggerSpell);
@@ -1555,15 +1479,13 @@ class spell_dk_desecration : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_desecration::CheckProc);
DoCheckProc.Register(&spell_dk_desecration::CheckProc);
}
};
// -96269 - Death's Advance
class spell_dk_deaths_advance : public AuraScript
{
PrepareAuraScript(spell_dk_deaths_advance);
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
Player* player = GetTarget()->ToPlayer();
@@ -1585,14 +1507,12 @@ class spell_dk_deaths_advance : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_deaths_advance::CheckProc);
DoCheckProc.Register(&spell_dk_deaths_advance::CheckProc);
}
};
class spell_dk_deaths_advance_aura : public AuraScript
{
PrepareAuraScript(spell_dk_deaths_advance_aura);
void HandleDummyTick(AuraEffect const* /*aurEff*/)
{
Player* player = GetTarget()->ToPlayer();
@@ -1615,15 +1535,13 @@ class spell_dk_deaths_advance_aura : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_deaths_advance_aura::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_dk_deaths_advance_aura::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
// -51099 - Ebon Plaguebringer
class spell_dk_ebon_plaguebringer : public AuraScript
{
PrepareAuraScript(spell_dk_ebon_plaguebringer);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_EBON_PLAGUE });
@@ -1644,14 +1562,12 @@ class spell_dk_ebon_plaguebringer : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_ebon_plaguebringer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dk_ebon_plaguebringer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_dk_ghoul_taunt : public SpellScript
{
PrepareSpellScript(spell_dk_ghoul_taunt);
void HandleTaunt(SpellEffIndex /*effIndex*/)
{
if (GetHitCreature() && (GetHitCreature()->IsDungeonBoss() || GetHitCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_BOSS_MOB))
@@ -1663,15 +1579,13 @@ class spell_dk_ghoul_taunt : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_taunt::HandleTaunt, EFFECT_0, SPELL_EFFECT_ATTACK_ME);
OnEffectHitTarget.Register(&spell_dk_ghoul_taunt::HandleTaunt, EFFECT_0, SPELL_EFFECT_ATTACK_ME);
}
};
// 49194 - Unholy Blight
class spell_dk_unoly_blight : public AuraScript
{
PrepareAuraScript(spell_dk_unoly_blight);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DK_UNHOLY_BLIGHT_PERIODIC });
@@ -1686,15 +1600,13 @@ class spell_dk_unoly_blight : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dk_unoly_blight::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dk_unoly_blight::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 85948 - Festering Strike
class spell_dk_festering_strike : public SpellScript
{
PrepareSpellScript(spell_dk_festering_strike);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1734,15 +1646,13 @@ class spell_dk_festering_strike : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_festering_strike::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_dk_festering_strike::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 51124 - Killing Machine
class spell_dk_killing_machine : public SpellScript
{
PrepareSpellScript(spell_dk_killing_machine);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1761,7 +1671,7 @@ class spell_dk_killing_machine : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dk_killing_machine::HandleT11Bonus, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_dk_killing_machine::HandleT11Bonus, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/Spells/spell_druid.cpp
+73 -183
View File
@@ -136,8 +136,6 @@ enum MiscSpells
// 50334 - Berserk
class spell_dru_berserk : public AuraScript
{
PrepareAuraScript(spell_dru_berserk);
void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
// Remove cooldown on Mangle (bear)
@@ -150,15 +148,13 @@ class spell_dru_berserk : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_berserk::HandleEffectApply, EFFECT_1, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_berserk::HandleEffectApply, EFFECT_1, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
// 1850 - Dash
class spell_dru_dash : public SpellScript
{
PrepareSpellScript(spell_dru_dash);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -178,14 +174,12 @@ class spell_dru_dash : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_dash::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_dru_dash::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_dru_dash_AuraScript : public AuraScript
{
PrepareAuraScript(spell_dru_dash_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
// do not set speed if not in cat form
@@ -195,7 +189,7 @@ class spell_dru_dash_AuraScript : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED);
DoEffectCalcAmount.Register(&spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED);
}
};
@@ -203,8 +197,6 @@ class spell_dru_dash_AuraScript : public AuraScript
// 48518 - Eclipse (Lunar)
class spell_dru_eclipse : public AuraScript
{
PrepareAuraScript(spell_dru_eclipse);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -270,16 +262,14 @@ class spell_dru_eclipse : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_eclipse::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_eclipse::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
};
// 2912, 5176, 78674 - Starfire, Wrath, and Starsurge
class spell_dru_eclipse_energize : public SpellScript
{
PrepareSpellScript(spell_dru_eclipse_energize);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -393,17 +383,15 @@ class spell_dru_eclipse_energize : public SpellScript
void Register() override
{
if (m_scriptSpellId == SPELL_DRUID_MOONFIRE || m_scriptSpellId == SPELL_DRUID_SUNFIRE)
OnEffectLaunch += SpellEffectFn(spell_dru_eclipse_energize::HandleEnergize, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunch.Register(&spell_dru_eclipse_energize::HandleEnergize, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
else
OnEffectLaunch += SpellEffectFn(spell_dru_eclipse_energize::HandleEnergize, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunch.Register(&spell_dru_eclipse_energize::HandleEnergize, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 79577 - Eclipse Mastery Passive Driver
class spell_dru_eclipse_mastery_driver_passive : public AuraScript
{
PrepareAuraScript(spell_dru_eclipse_mastery_driver_passive);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -420,15 +408,13 @@ class spell_dru_eclipse_mastery_driver_passive : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_eclipse_mastery_driver_passive::CheckProc);
DoCheckProc.Register(&spell_dru_eclipse_mastery_driver_passive::CheckProc);
}
};
// 5229 - Enrage
class spell_dru_enrage : public AuraScript
{
PrepareAuraScript(spell_dru_enrage);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -478,16 +464,14 @@ class spell_dru_enrage : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_enrage::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_enrage::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_enrage::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_enrage::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL);
}
};
// 54846 - Glyph of Starfire
class spell_dru_glyph_of_starfire : public SpellScript
{
PrepareSpellScript(spell_dru_glyph_of_starfire);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_INCREASED_MOONFIRE_DURATION });
@@ -518,15 +502,13 @@ class spell_dru_glyph_of_starfire : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_glyph_of_starfire::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_dru_glyph_of_starfire::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 54845 - Glyph of Starfire
class spell_dru_glyph_of_starfire_proc : public AuraScript
{
PrepareAuraScript(spell_dru_glyph_of_starfire_proc);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_GLYPH_OF_STARFIRE });
@@ -553,8 +535,8 @@ class spell_dru_glyph_of_starfire_proc : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_glyph_of_starfire_proc::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dru_glyph_of_starfire_proc::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dru_glyph_of_starfire_proc::CheckProc);
OnEffectProc.Register(&spell_dru_glyph_of_starfire_proc::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
ObjectGuid _lastMoonFireTargetGuid;
@@ -564,8 +546,6 @@ private:
// 60779 - Idol of Lush Moss
class spell_dru_idol_lifebloom : public AuraScript
{
PrepareAuraScript(spell_dru_idol_lifebloom);
void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
{
if (!spellMod)
@@ -581,15 +561,13 @@ class spell_dru_idol_lifebloom : public AuraScript
void Register() override
{
DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcSpellMod.Register(&spell_dru_idol_lifebloom::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 29166 - Innervate
class spell_dru_innervate : public AuraScript
{
PrepareAuraScript(spell_dru_innervate);
void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{
Unit* target = GetUnitOwner();
@@ -627,15 +605,13 @@ class spell_dru_innervate : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_innervate::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE);
DoEffectCalcAmount.Register(&spell_dru_innervate::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE);
}
};
// 5570 - Insect Swarm
class spell_dru_insect_swarm : public AuraScript
{
PrepareAuraScript(spell_dru_insect_swarm);
void CalculateAmount(AuraEffect const* aurEff, int32 & amount, bool & /*canBeRecalculated*/)
{
if (Unit* caster = GetCaster())
@@ -645,7 +621,7 @@ class spell_dru_insect_swarm : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_insect_swarm::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
DoEffectCalcAmount.Register(&spell_dru_insect_swarm::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
@@ -653,8 +629,6 @@ class spell_dru_insect_swarm : public AuraScript
// 94447 - Lifebloom
class spell_dru_lifebloom : public AuraScript
{
PrepareAuraScript(spell_dru_lifebloom);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -716,16 +690,14 @@ class spell_dru_lifebloom : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_lifebloom::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterDispel += AuraDispelFn(spell_dru_lifebloom::HandleDispel);
AfterEffectRemove.Register(&spell_dru_lifebloom::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterDispel.Register(&spell_dru_lifebloom::HandleDispel);
}
};
// -48496 - Living Seed
class spell_dru_living_seed : public AuraScript
{
PrepareAuraScript(spell_dru_living_seed);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_PROC });
@@ -740,15 +712,13 @@ class spell_dru_living_seed : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_living_seed::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dru_living_seed::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 48504 - Living Seed (Proc)
class spell_dru_living_seed_proc : public AuraScript
{
PrepareAuraScript(spell_dru_living_seed_proc);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_HEAL });
@@ -762,7 +732,7 @@ class spell_dru_living_seed_proc : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dru_living_seed_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -770,8 +740,6 @@ class spell_dru_living_seed_proc : public AuraScript
// Updated 4.3.4
class spell_dru_rip : public AuraScript
{
PrepareAuraScript(spell_dru_rip);
bool Load() override
{
Unit* caster = GetCaster();
@@ -803,15 +771,13 @@ class spell_dru_rip : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_rip::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
DoEffectCalcAmount.Register(&spell_dru_rip::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
// 62606 - Savage Defense
class spell_dru_savage_defense : public AuraScript
{
PrepareAuraScript(spell_dru_savage_defense);
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -827,15 +793,13 @@ class spell_dru_savage_defense : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_savage_defense::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_dru_savage_defense::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 52610 - Savage Roar
class spell_dru_savage_roar : public SpellScript
{
PrepareSpellScript(spell_dru_savage_roar);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
@@ -847,14 +811,12 @@ class spell_dru_savage_roar : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar::CheckCast);
OnCheckCast.Register(&spell_dru_savage_roar::CheckCast);
}
};
class spell_dru_savage_roar_AuraScript : public AuraScript
{
PrepareAuraScript(spell_dru_savage_roar_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_SAVAGE_ROAR });
@@ -873,16 +835,14 @@ class spell_dru_savage_roar_AuraScript : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 50286 - Starfall (Dummy)
class spell_dru_starfall_dummy : public SpellScript
{
PrepareSpellScript(spell_dru_starfall_dummy);
void FilterTargets(std::list<WorldObject*>& targets)
{
Trinity::Containers::RandomResize(targets, 2);
@@ -908,16 +868,14 @@ class spell_dru_starfall_dummy : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_dru_starfall_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_dru_starfall_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// -78892 - Stampede
class spell_dru_stampede : public AuraScript
{
PrepareAuraScript(spell_dru_stampede);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -951,16 +909,14 @@ class spell_dru_stampede : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// 61336 - Survival Instincts
class spell_dru_survival_instincts : public SpellScript
{
PrepareSpellScript(spell_dru_survival_instincts);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
@@ -972,14 +928,12 @@ class spell_dru_survival_instincts : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts::CheckCast);
OnCheckCast.Register(&spell_dru_survival_instincts::CheckCast);
}
};
class spell_dru_survival_instincts_AuraScript : public AuraScript
{
PrepareAuraScript(spell_dru_survival_instincts_AuraScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_SURVIVAL_INSTINCTS });
@@ -997,16 +951,14 @@ class spell_dru_survival_instincts_AuraScript : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectApply.Register(&spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
AfterEffectRemove.Register(&spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
}
};
// 40121 - Swift Flight Form (Passive)
class spell_dru_swift_flight_passive : public AuraScript
{
PrepareAuraScript(spell_dru_swift_flight_passive);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1021,15 +973,13 @@ class spell_dru_swift_flight_passive : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED);
DoEffectCalcAmount.Register(&spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED);
}
};
// 33943 - Flight Form (Shapeshift)
class spell_dru_flight_form : public SpellScript
{
PrepareSpellScript(spell_dru_flight_form);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
@@ -1041,15 +991,13 @@ class spell_dru_flight_form : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_dru_flight_form::CheckCast);
OnCheckCast.Register(&spell_dru_flight_form::CheckCast);
}
};
// 40120 - Swift Flight Form (Shapeshift)
class spell_dru_swift_flight_form : public AuraScript
{
PrepareAuraScript(spell_dru_swift_flight_form);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1069,15 +1017,13 @@ class spell_dru_swift_flight_form : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_form::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT);
DoEffectCalcAmount.Register(&spell_dru_swift_flight_form::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT);
}
};
// 5217 - Tiger's Fury
class spell_dru_tiger_s_fury : public SpellScript
{
PrepareSpellScript(spell_dru_tiger_s_fury);
void OnHit()
{
if (AuraEffect const* aurEff = GetHitUnit()->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_1))
@@ -1086,15 +1032,13 @@ class spell_dru_tiger_s_fury : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_dru_tiger_s_fury::OnHit);
AfterHit.Register(&spell_dru_tiger_s_fury::OnHit);
}
};
// 61391 - Typhoon
class spell_dru_typhoon : public SpellScript
{
PrepareSpellScript(spell_dru_typhoon);
void HandleKnockBack(SpellEffIndex effIndex)
{
// Glyph of Typhoon
@@ -1104,15 +1048,13 @@ class spell_dru_typhoon : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_typhoon::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK);
OnEffectHitTarget.Register(&spell_dru_typhoon::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK);
}
};
// 70691 - Item T10 Restoration 4P Bonus
class spell_dru_t10_restoration_4p_bonus : public SpellScript
{
PrepareSpellScript(spell_dru_t10_restoration_4p_bonus);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1148,7 +1090,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_t10_restoration_4p_bonus::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_dru_t10_restoration_4p_bonus::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
}
};
@@ -1172,8 +1114,6 @@ class RaidCheck
// 48438 - Wild Growth
class spell_dru_wild_growth : public SpellScript
{
PrepareSpellScript(spell_dru_wild_growth);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_TREE_OF_LIFE });
@@ -1205,8 +1145,8 @@ class spell_dru_wild_growth : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_dru_wild_growth::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_dru_wild_growth::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
}
private:
@@ -1216,8 +1156,6 @@ private:
// 78675 - Solar Beam
class spell_dru_solar_beam : public AuraScript
{
PrepareAuraScript(spell_dru_solar_beam);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_SOLAR_BEAM_SILENCE });
@@ -1231,15 +1169,13 @@ class spell_dru_solar_beam : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
};
// -34151 - Efflorescence (Proc Aura)
class spell_dru_effloresence : public AuraScript
{
PrepareAuraScript(spell_dru_effloresence);
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
PreventDefaultAction();
@@ -1255,15 +1191,13 @@ class spell_dru_effloresence : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_effloresence::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_dru_effloresence::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 81262 - Efflorescence (Area Effect)
class spell_dru_effloresence_aoe : public AuraScript
{
PrepareAuraScript(spell_dru_effloresence_aoe);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_EFFLORESCENCE_HEAL });
@@ -1278,15 +1212,13 @@ class spell_dru_effloresence_aoe : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_effloresence_aoe::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_dru_effloresence_aoe::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 81269 - Efflorescence (Heal)
class spell_dru_effloresence_heal : public SpellScript
{
PrepareSpellScript(spell_dru_effloresence_heal);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_EFFLORESCENCE_AOE });
@@ -1312,16 +1244,14 @@ class spell_dru_effloresence_heal : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_effloresence_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_dru_effloresence_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect.Register(&spell_dru_effloresence_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget.Register(&spell_dru_effloresence_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
};
// 774 - Rejuvenation
class spell_dru_rejuvenation : public AuraScript
{
PrepareAuraScript(spell_dru_rejuvenation);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_NATURES_BOUNTY });
@@ -1360,16 +1290,14 @@ class spell_dru_rejuvenation : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
}
};
// 33891 - Tree of Life
class spell_dru_tree_of_life : public AuraScript
{
PrepareAuraScript(spell_dru_tree_of_life);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1403,16 +1331,14 @@ class spell_dru_tree_of_life : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL);
}
};
// 77495 - Harmony
class spell_dru_harmony : public AuraScript
{
PrepareAuraScript(spell_dru_harmony);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_HARMONY });
@@ -1427,15 +1353,13 @@ class spell_dru_harmony : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_harmony::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
OnEffectProc.Register(&spell_dru_harmony::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
}
};
// 17007 - Leader of the Pack
class spell_dru_leader_of_the_pack : public AuraScript
{
PrepareAuraScript(spell_dru_leader_of_the_pack);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1475,15 +1399,13 @@ class spell_dru_leader_of_the_pack : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_leader_of_the_pack::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dru_leader_of_the_pack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dru_leader_of_the_pack::CheckProc);
OnEffectProc.Register(&spell_dru_leader_of_the_pack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_dru_wild_mushroom : public SpellScript
{
PrepareSpellScript(spell_dru_wild_mushroom);
void HandleSummon()
{
Unit* caster = GetCaster();
@@ -1519,14 +1441,12 @@ class spell_dru_wild_mushroom : public SpellScript
void Register() override
{
AfterCast += SpellCastFn(spell_dru_wild_mushroom::HandleSummon);
AfterCast.Register(&spell_dru_wild_mushroom::HandleSummon);
}
};
class spell_dru_wild_mushroom_detonate : public SpellScript
{
PrepareSpellScript(spell_dru_wild_mushroom_detonate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1576,15 +1496,13 @@ class spell_dru_wild_mushroom_detonate : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_wild_mushroom_detonate::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_dru_wild_mushroom_detonate::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 16913 - Moonfire (Passive)
class spell_dru_moonfire : public AuraScript
{
PrepareAuraScript(spell_dru_moonfire);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1613,14 +1531,12 @@ class spell_dru_moonfire : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_moonfire::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_moonfire::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_dru_furor : public AuraScript
{
PrepareAuraScript(spell_dru_furor);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1651,16 +1567,14 @@ class spell_dru_furor : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_furor::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dru_furor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dru_furor::CheckProc);
OnEffectProc.Register(&spell_dru_furor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 22568 - Ferocious Bite
class spell_dru_ferocious_bite : public SpellScript
{
PrepareSpellScript(spell_dru_ferocious_bite);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_GLYPH_OF_FEROCIOUS_BITE });
@@ -1706,15 +1620,13 @@ class spell_dru_ferocious_bite : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_dru_ferocious_bite::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_dru_ferocious_bite::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// -33879 - Empowered Touch
class spell_dru_empowered_touch : public AuraScript
{
PrepareAuraScript(spell_dru_empowered_touch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_EMPOWERED_TOUCH_SCRIPT });
@@ -1734,16 +1646,14 @@ class spell_dru_empowered_touch : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_empowered_touch::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dru_empowered_touch::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dru_empowered_touch::CheckProc);
OnEffectProc.Register(&spell_dru_empowered_touch::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// 88433 - Empowered Touch
class spell_dru_empowered_touch_script : public SpellScript
{
PrepareSpellScript(spell_dru_empowered_touch_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_LIFEBLOOM });
@@ -1758,15 +1668,13 @@ class spell_dru_empowered_touch_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_empowered_touch_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_dru_empowered_touch_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 93400 - Shooting Stars
class spell_dru_shooting_stars : public SpellScript
{
PrepareSpellScript(spell_dru_shooting_stars);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_STARSURGE });
@@ -1779,15 +1687,13 @@ class spell_dru_shooting_stars : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_shooting_stars::HandleCooldownReset, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_dru_shooting_stars::HandleCooldownReset, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
// 80313 - Pulverize
class spell_dru_pulverize : public SpellScript
{
PrepareSpellScript(spell_dru_pulverize);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1823,15 +1729,13 @@ class spell_dru_pulverize : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_dru_pulverize::ChangeDamage, EFFECT_2, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectLaunchTarget.Register(&spell_dru_pulverize::ChangeDamage, EFFECT_2, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
}
};
// 22842 - Frenzied Regeneration
class spell_dru_frenzied_regeneration : public AuraScript
{
PrepareAuraScript(spell_dru_frenzied_regeneration);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_FRENZIED_REGENERATION_HEAL });
@@ -1864,16 +1768,14 @@ class spell_dru_frenzied_regeneration : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_frenzied_regeneration::HandleRegeneration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply += AuraEffectApplyFn(spell_dru_frenzied_regeneration::HandleHealthAfterApply, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH_2, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_dru_frenzied_regeneration::HandleRegeneration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply.Register(&spell_dru_frenzied_regeneration::HandleHealthAfterApply, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH_2, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_dru_stampeding_roar : public SpellScript
{
PrepareSpellScript(spell_dru_stampeding_roar);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1896,14 +1798,12 @@ class spell_dru_stampeding_roar : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_stampeding_roar::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_dru_stampeding_roar::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_dru_feral_swiftness_clear : public SpellScript
{
PrepareSpellScript(spell_dru_feral_swiftness_clear);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->RemoveAppliedAuras([](AuraApplication const* aurApp)->bool
@@ -1916,15 +1816,13 @@ class spell_dru_feral_swiftness_clear : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_feral_swiftness_clear::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_dru_feral_swiftness_clear::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// -80318 - Blood in the Water
class spell_dru_blood_in_the_water : public AuraScript
{
PrepareAuraScript(spell_dru_blood_in_the_water);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1956,16 +1854,14 @@ class spell_dru_blood_in_the_water : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dru_blood_in_the_water::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_dru_blood_in_the_water::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_dru_blood_in_the_water::CheckProc);
OnEffectProc.Register(&spell_dru_blood_in_the_water::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 80863 - Blood in the Water
class spell_dru_blood_in_the_water_script : public SpellScript
{
PrepareSpellScript(spell_dru_blood_in_the_water_script);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_RIP });
@@ -1980,15 +1876,13 @@ class spell_dru_blood_in_the_water_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_dru_blood_in_the_water_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_dru_blood_in_the_water_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 90164 - Astral Alignment
class spell_dru_astral_alignment : public AuraScript
{
PrepareAuraScript(spell_dru_astral_alignment);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -1997,15 +1891,13 @@ class spell_dru_astral_alignment : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_astral_alignment::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
OnEffectProc.Register(&spell_dru_astral_alignment::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
}
};
// 100977 - Harmony
class spell_dru_harmony_triggered : public AuraScript
{
PrepareAuraScript(spell_dru_harmony_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_BLOOM });
@@ -2018,15 +1910,13 @@ class spell_dru_harmony_triggered : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_dru_harmony_triggered::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_dru_harmony_triggered::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
// 90165 - Item - Druid T11 Feral 4P Bonus
class spell_dru_item_t11_feral_4p_bonus : public AuraScript
{
PrepareAuraScript(spell_dru_item_t11_feral_4p_bonus);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_DRUID_STRENGTH_OF_THE_PANTHER });
@@ -2040,7 +1930,7 @@ class spell_dru_item_t11_feral_4p_bonus : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_dru_item_t11_feral_4p_bonus::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
OnEffectProc.Register(&spell_dru_item_t11_feral_4p_bonus::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
}
};
src/server/scripts/Spells/spell_generic.cpp
+152 -379
View File
File diff suppressed because it is too large. Load diff
src/server/scripts/Spells/spell_holiday.cpp
+45 -113
View File
@@ -51,8 +51,6 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader
class spell_love_is_in_the_air_romantic_picnic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic_AuraScript);
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -104,8 +102,8 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply.Register(&spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -133,8 +131,6 @@ class spell_hallow_end_candy : public SpellScriptLoader
class spell_hallow_end_candy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hallow_end_candy_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(spells);
@@ -147,7 +143,7 @@ class spell_hallow_end_candy : public SpellScriptLoader
void Register() override
{
OnEffectHit += SpellEffectFn(spell_hallow_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHit.Register(&spell_hallow_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
private:
@@ -176,8 +172,6 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader
class spell_hallow_end_candy_pirate_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hallow_end_candy_pirate_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -201,8 +195,8 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hallow_end_candy_pirate_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_hallow_end_candy_pirate_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_hallow_end_candy_pirate_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_hallow_end_candy_pirate_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -234,8 +228,6 @@ class spell_hallow_end_trick : public SpellScriptLoader
class spell_hallow_end_trick_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hallow_end_trick_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -287,7 +279,7 @@ class spell_hallow_end_trick : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -315,8 +307,6 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader
class spell_hallow_end_trick_or_treat_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_TRICK, SPELL_TREAT, SPELL_TRICKED_OR_TREATED });
@@ -334,7 +324,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -351,8 +341,6 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader
class spell_hallow_end_tricky_treat_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -372,7 +360,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -403,8 +391,6 @@ public:
class spell_hallow_end_wand_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hallow_end_wand_SpellScript);
bool Validate(SpellInfo const* /*spellEntry*/) override
{
return ValidateSpellInfo(
@@ -453,7 +439,7 @@ public:
void Register() override
{
AfterHit += SpellHitFn(spell_hallow_end_wand_SpellScript::HandleScriptEffect);
AfterHit.Register(&spell_hallow_end_wand_SpellScript::HandleScriptEffect);
}
};
@@ -482,7 +468,6 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader
class spell_pilgrims_bounty_buff_food_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pilgrims_bounty_buff_food_AuraScript);
private:
uint32 const _triggeredSpellId;
@@ -504,7 +489,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
bool _handled;
@@ -538,8 +523,6 @@ class spell_pilgrims_bounty_feast_on : public SpellScriptLoader
class spell_pilgrims_bounty_feast_on_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pilgrims_bounty_feast_on_SpellScript);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -584,7 +567,7 @@ class spell_pilgrims_bounty_feast_on : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_feast_on_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_pilgrims_bounty_feast_on_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -611,8 +594,6 @@ class spell_pilgrims_bounty_turkey_tracker : public SpellScriptLoader
class spell_pilgrims_bounty_turkey_tracker_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pilgrims_bounty_turkey_tracker_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_KILL_COUNTER_VISUAL, SPELL_KILL_COUNTER_VISUAL_MAX });
@@ -656,7 +637,7 @@ class spell_pilgrims_bounty_turkey_tracker : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_turkey_tracker_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pilgrims_bounty_turkey_tracker_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -685,8 +666,6 @@ class spell_pilgrims_bounty_well_fed : public SpellScriptLoader
spell_pilgrims_bounty_well_fed_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { }
private:
PrepareSpellScript(spell_pilgrims_bounty_well_fed_SpellScript);
uint32 _triggeredSpellId;
bool Validate(SpellInfo const* /*spell*/) override
@@ -727,7 +706,7 @@ class spell_pilgrims_bounty_well_fed : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_well_fed_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pilgrims_bounty_well_fed_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -801,9 +780,6 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader
uint32 _triggeredSpellId2;
uint32 _triggeredSpellId3;
uint32 _triggeredSpellId4;
PrepareSpellScript(spell_pilgrims_bounty_on_plate_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -882,7 +858,7 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_on_plate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_pilgrims_bounty_on_plate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -911,8 +887,6 @@ class spell_pilgrims_bounty_a_serving_of : public SpellScriptLoader
class spell_pilgrims_bounty_a_serving_of_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pilgrims_bounty_a_serving_of_AuraScript);
private:
uint32 _triggeredSpellId;
@@ -954,8 +928,8 @@ class spell_pilgrims_bounty_a_serving_of : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_pilgrims_bounty_a_serving_of_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_pilgrims_bounty_a_serving_of_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_pilgrims_bounty_a_serving_of_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_pilgrims_bounty_a_serving_of_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -979,8 +953,6 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader
class spell_winter_veil_mistletoe_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1002,7 +974,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1036,8 +1008,6 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader
class spell_winter_veil_px_238_winter_wondervolt_SpellScript : public SpellScript
{
PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(WonderboltTransformSpells);
@@ -1059,7 +1029,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1097,8 +1067,6 @@ class spell_brewfest_giddyup : public SpellScriptLoader
class spell_brewfest_giddyup_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_giddyup_AuraScript);
void OnChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -1145,9 +1113,9 @@ class spell_brewfest_giddyup : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
OnEffectRemove += AuraEffectRemoveFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_giddyup_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectApply.Register(&spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
OnEffectRemove.Register(&spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK);
OnEffectPeriodic.Register(&spell_brewfest_giddyup_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1168,8 +1136,6 @@ class spell_brewfest_ram : public SpellScriptLoader
class spell_brewfest_ram_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_ram_AuraScript);
void OnPeriodic(AuraEffect const* aurEff)
{
Unit* target = GetTarget();
@@ -1206,7 +1172,7 @@ class spell_brewfest_ram : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_ram_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_brewfest_ram_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1224,8 +1190,6 @@ class spell_brewfest_ram_fatigue : public SpellScriptLoader
class spell_brewfest_ram_fatigue_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_ram_fatigue_AuraScript);
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -1244,7 +1208,7 @@ class spell_brewfest_ram_fatigue : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_brewfest_ram_fatigue_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_brewfest_ram_fatigue_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -1262,8 +1226,6 @@ class spell_brewfest_apple_trap : public SpellScriptLoader
class spell_brewfest_apple_trap_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_apple_trap_AuraScript);
void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->RemoveAura(SPELL_RAM_FATIGUE);
@@ -1271,7 +1233,7 @@ class spell_brewfest_apple_trap : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_brewfest_apple_trap_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_brewfest_apple_trap_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1289,8 +1251,6 @@ class spell_brewfest_exhausted_ram : public SpellScriptLoader
class spell_brewfest_exhausted_ram_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_exhausted_ram_AuraScript);
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* target = GetTarget();
@@ -1299,7 +1259,7 @@ class spell_brewfest_exhausted_ram : public SpellScriptLoader
void Register() override
{
OnEffectRemove += AuraEffectApplyFn(spell_brewfest_exhausted_ram_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_brewfest_exhausted_ram_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1317,8 +1277,6 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript
class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript
{
PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript);
void HandleForceCast(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -1329,7 +1287,7 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
OnEffectHitTarget.Register(&spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST);
}
};
@@ -1346,9 +1304,7 @@ public:
class spell_brewfest_relay_race_turn_in_SpellScript : public SpellScript
{
PrepareSpellScript(spell_brewfest_relay_race_turn_in_SpellScript);
void HandleDummy(SpellEffIndex effIndex)
void HandleDummy(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -1361,7 +1317,7 @@ public:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_turn_in_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_brewfest_relay_race_turn_in_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -1379,8 +1335,6 @@ class spell_brewfest_dismount_ram : public SpellScriptLoader
class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript
{
PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript);
void HandleScript(SpellEffIndex /*effIndex*/)
{
GetCaster()->RemoveAura(SPELL_RENTAL_RACING_RAM);
@@ -1388,7 +1342,7 @@ class spell_brewfest_dismount_ram : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1444,8 +1398,6 @@ class spell_brewfest_barker_bunny : public SpellScriptLoader
class spell_brewfest_barker_bunny_AuraScript : public AuraScript
{
PrepareAuraScript(spell_brewfest_barker_bunny_AuraScript);
bool Load() override
{
return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER;
@@ -1479,7 +1431,7 @@ class spell_brewfest_barker_bunny : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_brewfest_barker_bunny_AuraScript::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_brewfest_barker_bunny_AuraScript::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1506,8 +1458,6 @@ class spell_midsummer_braziers_hit : public SpellScriptLoader
class spell_midsummer_braziers_hit_AuraScript : public AuraScript
{
PrepareAuraScript(spell_midsummer_braziers_hit_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1537,7 +1487,7 @@ class spell_midsummer_braziers_hit : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_midsummer_braziers_hit_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAPPLY));
AfterEffectApply.Register(&spell_midsummer_braziers_hit_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAPPLY);
}
};
@@ -1563,8 +1513,6 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader
class spell_gen_ribbon_pole_dancer_check_AuraScript : public AuraScript
{
PrepareAuraScript(spell_gen_ribbon_pole_dancer_check_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1605,7 +1553,7 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_ribbon_pole_dancer_check_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_gen_ribbon_pole_dancer_check_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1645,8 +1593,6 @@ uint32 enterDeathMatchSpells[] =
class spell_darkmoon_island_deathmatch : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_deathmatch);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1677,7 +1623,7 @@ class spell_darkmoon_island_deathmatch : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_deathmatch::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_darkmoon_island_deathmatch::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -1690,8 +1636,6 @@ enum RingToss
class spell_darkmoon_island_ring_toss : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_ring_toss);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1740,8 +1684,8 @@ class spell_darkmoon_island_ring_toss : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_ring_toss::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast += SpellCastFn(spell_darkmoon_island_ring_toss::HandleAfterCast);
OnEffectHitTarget.Register(&spell_darkmoon_island_ring_toss::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
AfterCast.Register(&spell_darkmoon_island_ring_toss::HandleAfterCast);
}
private:
@@ -1769,8 +1713,6 @@ enum WhackAGnoll
class spell_darkmoon_island_whack_summon_aura : public AuraScript
{
PrepareAuraScript(spell_darkmoon_island_whack_summon_aura);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_GNOLL_AURA_OKAY_TO_HIT });
@@ -1783,7 +1725,7 @@ class spell_darkmoon_island_whack_summon_aura : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_darkmoon_island_whack_summon_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_darkmoon_island_whack_summon_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1810,8 +1752,6 @@ class GnollHolderTargetSelector
class spell_darkmoon_island_gnoll_aura_okay_to_hit : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_gnoll_aura_okay_to_hit);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1849,15 +1789,13 @@ class spell_darkmoon_island_gnoll_aura_okay_to_hit : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_gnoll_aura_okay_to_hit::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_gnoll_aura_okay_to_hit::HandleSummon, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_gnoll_aura_okay_to_hit::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_darkmoon_island_gnoll_aura_okay_to_hit::HandleSummon, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_darkmoon_island_whack_dummy : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_whack_dummy);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1876,14 +1814,12 @@ class spell_darkmoon_island_whack_dummy : public SpellScript
void Register() override
{
AfterCast += SpellCastFn(spell_darkmoon_island_whack_dummy::HandleDummy);
AfterCast.Register(&spell_darkmoon_island_whack_dummy::HandleDummy);
}
};
class spell_darkmoon_island_whack : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_whack);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1894,14 +1830,12 @@ class spell_darkmoon_island_whack : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY);
}
};
class spell_darkmoon_island_whack_a_gnoll : public AuraScript
{
PrepareAuraScript(spell_darkmoon_island_whack_a_gnoll);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1929,14 +1863,12 @@ class spell_darkmoon_island_whack_a_gnoll : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_darkmoon_island_whack_a_gnoll::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_darkmoon_island_whack_a_gnoll::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed : public SpellScript
{
PrepareSpellScript(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1953,10 +1885,10 @@ class spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed : public Spe
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_1, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY);
OnEffectHitTarget.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
src/server/scripts/Spells/spell_hunter.cpp
+65 -149
View File
@@ -111,8 +111,6 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader
class spell_hun_ancient_hysteria_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_ancient_hysteria_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -140,8 +138,8 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_ancient_hysteria_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit += SpellHitFn(spell_hun_ancient_hysteria_SpellScript::ApplyDebuff);
OnObjectAreaTargetSelect.Register(&spell_hun_ancient_hysteria_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit.Register(&spell_hun_ancient_hysteria_SpellScript::ApplyDebuff);
}
};
@@ -159,8 +157,6 @@ class spell_hun_chimera_shot : public SpellScriptLoader
class spell_hun_chimera_shot_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_chimera_shot_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_CHIMERA_SHOT_HEAL, SPELL_HUNTER_SERPENT_STING });
@@ -181,7 +177,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -199,8 +195,6 @@ class spell_hun_cobra_shot : public SpellScriptLoader
class spell_hun_cobra_shot_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_cobra_shot_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -249,8 +243,8 @@ class spell_hun_cobra_shot : public SpellScriptLoader
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleLaunch, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunch.Register(&spell_hun_cobra_shot_SpellScript::HandleLaunch, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -268,8 +262,6 @@ class spell_hun_disengage : public SpellScriptLoader
class spell_hun_disengage_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_disengage_SpellScript);
SpellCastResult CheckCast()
{
Unit* caster = GetCaster();
@@ -281,7 +273,7 @@ class spell_hun_disengage : public SpellScriptLoader
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast);
OnCheckCast.Register(&spell_hun_disengage_SpellScript::CheckCast);
}
};
@@ -299,8 +291,6 @@ class spell_hun_fire : public SpellScriptLoader
class spell_hun_fire_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_fire_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_AIMED_SHOT_INSTANT });
@@ -327,8 +317,8 @@ class spell_hun_fire : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_fire_AuraScript::CheckProc);
DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_fire_AuraScript::CheckProc);
DoEffectCalcSpellMod.Register(&spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -346,8 +336,6 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader
class spell_hun_improved_mend_pet_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_improved_mend_pet_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_MEND_PET });
@@ -366,8 +354,8 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_improved_mend_pet_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_improved_mend_pet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_improved_mend_pet_AuraScript::CheckProc);
OnEffectProc.Register(&spell_hun_improved_mend_pet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -380,8 +368,6 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader
// 53412 - Invigoration
class spell_hun_invigoration : public SpellScript
{
PrepareSpellScript(spell_hun_invigoration);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_INVIGORATION_TRIGGERED });
@@ -396,7 +382,7 @@ class spell_hun_invigoration : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_invigoration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -408,8 +394,6 @@ class spell_hun_last_stand_pet : public SpellScriptLoader
class spell_hun_last_stand_pet_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_last_stand_pet_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_PET_LAST_STAND_TRIGGERED });
@@ -424,7 +408,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -442,8 +426,6 @@ class spell_hun_lock_and_load : public SpellScriptLoader
class spell_hun_lock_and_load_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_lock_and_load_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -485,10 +467,10 @@ class spell_hun_lock_and_load : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_lock_and_load_AuraScript::CheckProc);
DoCheckProc.Register(&spell_hun_lock_and_load_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_TRAP_ACTIVATION>, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_PERIODIC>, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_TRAP_ACTIVATION>, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_hun_lock_and_load_AuraScript::HandleProcs<PROC_FLAG_DONE_PERIODIC>, EFFECT_1, SPELL_AURA_DUMMY);
}
};
@@ -506,8 +488,6 @@ class spell_hun_masters_call : public SpellScriptLoader
class spell_hun_masters_call_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_masters_call_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ SPELL_HUNTER_MASTERS_CALL_TRIGGERED, uint32(spellInfo->Effects[EFFECT_0].CalcValue()) });
@@ -536,8 +516,8 @@ class spell_hun_masters_call : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -555,8 +535,6 @@ class spell_hun_misdirection : public SpellScriptLoader
class spell_hun_misdirection_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_misdirection_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_MISDIRECTION_PROC });
@@ -576,8 +554,8 @@ class spell_hun_misdirection : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc += AuraEffectProcFn(spell_hun_misdirection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
AfterEffectRemove.Register(&spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc.Register(&spell_hun_misdirection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
@@ -595,8 +573,6 @@ class spell_hun_misdirection_proc : public SpellScriptLoader
class spell_hun_misdirection_proc_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_misdirection_proc_AuraScript);
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->GetThreatManager().UnregisterRedirectThreat(SPELL_HUNTER_MISDIRECTION);
@@ -604,7 +580,7 @@ class spell_hun_misdirection_proc : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -622,8 +598,6 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader
class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript);
bool Load() override
{
if (!GetCaster()->IsPet())
@@ -660,8 +634,8 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader
void Register() override
{
OnEffectHit += SpellEffectFn(spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast += SpellCheckCastFn(spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear);
OnEffectHit.Register(&spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear);
}
};
@@ -679,8 +653,6 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader
class spell_hun_pet_heart_of_the_phoenix_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript);
bool Load() override
{
if (!GetCaster()->IsPet())
@@ -706,7 +678,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -724,8 +696,6 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader
class spell_hun_rapid_recuperation_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_rapid_recuperation_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_RAPID_RECUPERATION });
@@ -751,8 +721,8 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleAbilityCast, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleFocusRegen, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_rapid_recuperation_AuraScript::HandleAbilityCast, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_hun_rapid_recuperation_AuraScript::HandleFocusRegen, EFFECT_1, SPELL_AURA_DUMMY);
}
};
@@ -770,8 +740,6 @@ class spell_hun_readiness : public SpellScriptLoader
class spell_hun_readiness_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_readiness_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -797,7 +765,7 @@ class spell_hun_readiness : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -815,8 +783,6 @@ class spell_hun_ready_set_aim : public SpellScriptLoader
class spell_hun_ready_set_aim_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_ready_set_aim_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_FIRE });
@@ -833,7 +799,7 @@ class spell_hun_ready_set_aim : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -851,8 +817,6 @@ class spell_hun_scatter_shot : public SpellScriptLoader
class spell_hun_scatter_shot_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_scatter_shot_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -869,7 +833,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -887,8 +851,6 @@ class spell_hun_sniper_training : public SpellScriptLoader
class spell_hun_sniper_training_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_sniper_training_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_SNIPER_TRAINING_R1, SPELL_HUNTER_SNIPER_TRAINING_BUFF_R1 });
@@ -926,8 +888,8 @@ class spell_hun_sniper_training : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectUpdatePeriodic.Register(&spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -945,8 +907,6 @@ class spell_hun_steady_shot : public SpellScriptLoader
class spell_hun_steady_shot_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_steady_shot_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -989,7 +949,7 @@ class spell_hun_steady_shot : public SpellScriptLoader
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_hun_steady_shot_SpellScript::HandleLaunch, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectLaunch.Register(&spell_hun_steady_shot_SpellScript::HandleLaunch, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
}
};
@@ -1007,8 +967,6 @@ class spell_hun_improved_steady_shot : public SpellScriptLoader
class spell_hun_improved_steady_shot_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_improved_steady_shot_AuraScript);
bool Load() override
{
_steadyShotCounter = 0;
@@ -1038,7 +996,7 @@ class spell_hun_improved_steady_shot : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_hun_improved_steady_shot_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_improved_steady_shot_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
@@ -1068,8 +1026,6 @@ class spell_hun_tame_beast : public SpellScriptLoader
class spell_hun_tame_beast_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_tame_beast_SpellScript);
SpellCastResult SendTameFailResult(PetTameFailureReason reason)
{
Player* player = GetCaster()->ToPlayer();
@@ -1122,7 +1078,7 @@ class spell_hun_tame_beast : public SpellScriptLoader
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast);
OnCheckCast.Register(&spell_hun_tame_beast_SpellScript::CheckCast);
}
};
@@ -1140,8 +1096,6 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader
class spell_hun_target_only_pet_and_owner_SpellScript : public SpellScript
{
PrepareSpellScript(spell_hun_target_only_pet_and_owner_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.clear();
@@ -1152,8 +1106,8 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY);
OnObjectAreaTargetSelect.Register(&spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
OnObjectAreaTargetSelect.Register(&spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY);
}
};
@@ -1171,8 +1125,6 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader
class spell_hun_thrill_of_the_hunt_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_thrill_of_the_hunt_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_THRILL_OF_THE_HUNT });
@@ -1189,7 +1141,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1202,8 +1154,6 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader
// -56333 - T.N.T.
class spell_hun_tnt : public AuraScript
{
PrepareAuraScript(spell_hun_tnt);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_LOCK_AND_LOAD });
@@ -1222,8 +1172,8 @@ class spell_hun_tnt : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_tnt::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_tnt::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_tnt::CheckProc);
OnEffectProc.Register(&spell_hun_tnt::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1235,8 +1185,6 @@ class spell_hun_wild_quiver : public SpellScriptLoader
class spell_hun_wild_quiver_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_wild_quiver_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_WILD_QUIVER_DAMAGE });
@@ -1257,8 +1205,8 @@ class spell_hun_wild_quiver : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_wild_quiver_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_wild_quiver_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_wild_quiver_AuraScript::CheckProc);
OnEffectProc.Register(&spell_hun_wild_quiver_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1271,8 +1219,6 @@ class spell_hun_wild_quiver : public SpellScriptLoader
// 1978 - Serpent Sting
class spell_hun_serpent_sting : public AuraScript
{
PrepareAuraScript(spell_hun_serpent_sting);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_SERPENT_STING_DAMAGE });
@@ -1293,7 +1239,7 @@ class spell_hun_serpent_sting : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hun_serpent_sting::HandleImprovedSerpentSting, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_hun_serpent_sting::HandleImprovedSerpentSting, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -1305,8 +1251,6 @@ class spell_hun_piercing_shots : public SpellScriptLoader
class spell_hun_piercing_shots_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_piercing_shots_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1352,8 +1296,8 @@ class spell_hun_piercing_shots : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_piercing_shots_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_piercing_shots_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_hun_piercing_shots_AuraScript::CheckProc);
OnEffectProc.Register(&spell_hun_piercing_shots_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -1371,8 +1315,6 @@ class spell_hun_master_marksman : public SpellScriptLoader
class spell_hun_master_marksman_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_master_marksman_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_STEADY_SHOT });
@@ -1385,7 +1327,7 @@ class spell_hun_master_marksman : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_master_marksman_AuraScript::CheckProc);
DoCheckProc.Register(&spell_hun_master_marksman_AuraScript::CheckProc);
}
};
@@ -1403,8 +1345,6 @@ class spell_hun_bombardment : public SpellScriptLoader
class spell_hun_bombardment_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_bombardment_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_MULTISHOT });
@@ -1417,7 +1357,7 @@ class spell_hun_bombardment : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_bombardment_AuraScript::CheckProc);
DoCheckProc.Register(&spell_hun_bombardment_AuraScript::CheckProc);
}
};
@@ -1429,8 +1369,6 @@ class spell_hun_bombardment : public SpellScriptLoader
class spell_hun_trap_launcher : public AuraScript
{
PrepareAuraScript(spell_hun_trap_launcher);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_STEADY_SHOT_TRIGGERED });
@@ -1448,16 +1386,14 @@ class spell_hun_trap_launcher : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hun_trap_launcher::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_trap_launcher::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_hun_trap_launcher::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_hun_trap_launcher::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL);
}
};
// 63067 - Glyph of Kill Shot
class spell_hun_glyph_of_kill_shot : public AuraScript
{
PrepareAuraScript(spell_hun_glyph_of_kill_shot);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_GLYPH_OF_KILL_SHOT_COOLDOWN });
@@ -1485,16 +1421,14 @@ class spell_hun_glyph_of_kill_shot : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_glyph_of_kill_shot::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_glyph_of_kill_shot::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_glyph_of_kill_shot::CheckProc);
OnEffectProc.Register(&spell_hun_glyph_of_kill_shot::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 51753 - Camouflage
class spell_hun_camouflage : public SpellScript
{
PrepareSpellScript(spell_hun_camouflage);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_CAMOUFLAGE_DURATION });
@@ -1514,15 +1448,13 @@ class spell_hun_camouflage : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_camouflage::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_hun_camouflage::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 51755 - Camouflage
class spell_hun_camouflage_duration : public AuraScript
{
PrepareAuraScript(spell_hun_camouflage_duration);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1545,16 +1477,14 @@ class spell_hun_camouflage_duration : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hun_camouflage_duration::AfterApply, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_camouflage_duration::AfterRemove, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_hun_camouflage_duration::AfterApply, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_hun_camouflage_duration::AfterRemove, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL);
}
};
// 80325 - Camouflage
class spell_hun_camouflage_triggered : public AuraScript
{
PrepareAuraScript(spell_hun_camouflage_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1581,15 +1511,13 @@ class spell_hun_camouflage_triggered : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_camouflage_triggered::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STEALTH, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_hun_camouflage_triggered::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STEALTH, AURA_EFFECT_HANDLE_REAL);
}
};
// -53241 - Marked for Death
class spell_hun_marked_for_death : public AuraScript
{
PrepareAuraScript(spell_hun_marked_for_death);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_HUNTER_MARKED_FOR_DEATH_TRIGGERED });
@@ -1608,16 +1536,14 @@ class spell_hun_marked_for_death : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_marked_for_death::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_marked_for_death::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_marked_for_death::CheckProc);
OnEffectProc.Register(&spell_hun_marked_for_death::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 82692 - Focus Fire
class spell_hun_focus_fire : public AuraScript
{
PrepareAuraScript(spell_hun_focus_fire);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1659,16 +1585,14 @@ class spell_hun_focus_fire : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_focus_fire::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RANGED_HASTE);
AfterEffectApply += AuraEffectApplyFn(spell_hun_focus_fire::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
DoEffectCalcAmount.Register(&spell_hun_focus_fire::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RANGED_HASTE);
AfterEffectApply.Register(&spell_hun_focus_fire::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
// 19615 - Frenzy Effect
class spell_hun_frenzy_effect : public AuraScript
{
PrepareAuraScript(spell_hun_frenzy_effect);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1694,16 +1618,14 @@ class spell_hun_frenzy_effect : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_hun_frenzy_effect::AfterApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_hun_frenzy_effect::AfterRemove, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_hun_frenzy_effect::AfterApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_hun_frenzy_effect::AfterRemove, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL);
}
};
// 34026 - Kill Command
class spell_hun_kill_command: public SpellScript
{
PrepareSpellScript(spell_hun_kill_command);
void HandleScriptEffect(SpellEffIndex effIndex)
{
Unit* caster = GetCaster();
@@ -1718,15 +1640,13 @@ class spell_hun_kill_command: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_kill_command::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_hun_kill_command::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 82726 - Fervor
class spell_hun_fervor : public SpellScript
{
PrepareSpellScript(spell_hun_fervor);
bool Load() override
{
return GetCaster()->IsPlayer();
@@ -1750,7 +1670,7 @@ class spell_hun_fervor : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_hun_fervor::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE);
OnEffectHitTarget.Register(&spell_hun_fervor::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE);
}
};
@@ -1763,8 +1683,6 @@ std::array<uint32, 2> const KillingStreakTriggerSpells =
// -82748 - Killing Streak
class spell_hun_killing_streak : public AuraScript
{
PrepareAuraScript(spell_hun_killing_streak);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1794,7 +1712,7 @@ class spell_hun_killing_streak : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_hun_killing_streak::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_killing_streak::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
@@ -1804,8 +1722,6 @@ private:
// -82898 - Crouching Tiger, Hidden Chimera
class spell_hun_crouching_tiger_hidden_chimera : public AuraScript
{
PrepareAuraScript(spell_hun_crouching_tiger_hidden_chimera);
bool Load() override
{
return GetCaster()->IsPlayer();
@@ -1845,9 +1761,9 @@ class spell_hun_crouching_tiger_hidden_chimera : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_hun_crouching_tiger_hidden_chimera::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_hun_crouching_tiger_hidden_chimera::HandleDisengageProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_hun_crouching_tiger_hidden_chimera::HandleDeterrenceProc, EFFECT_1, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_hun_crouching_tiger_hidden_chimera::CheckProc);
OnEffectProc.Register(&spell_hun_crouching_tiger_hidden_chimera::HandleDisengageProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_hun_crouching_tiger_hidden_chimera::HandleDeterrenceProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
src/server/scripts/Spells/spell_item.cpp
+128 -332
View File
File diff suppressed because it is too large. Load diff
src/server/scripts/Spells/spell_mage.cpp
+78 -172
View File
@@ -157,8 +157,6 @@ enum MiscSpells
// -31571 - Arcane Potency
class spell_mage_arcane_potency : public AuraScript
{
PrepareAuraScript(spell_mage_arcane_potency);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -188,7 +186,7 @@ class spell_mage_arcane_potency : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_arcane_potency::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_mage_arcane_potency::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -205,8 +203,6 @@ class spell_mage_blast_wave : public SpellScriptLoader
class spell_mage_blast_wave_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_blast_wave_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FLAMESTRIKE });
@@ -235,8 +231,8 @@ class spell_mage_blast_wave : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_blast_wave_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
AfterCast += SpellCastFn(spell_mage_blast_wave_SpellScript::HandleImprovedFlamestrike);
OnObjectAreaTargetSelect.Register(&spell_mage_blast_wave_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
AfterCast.Register(&spell_mage_blast_wave_SpellScript::HandleImprovedFlamestrike);
}
uint32 _targetCount = 0;
@@ -256,8 +252,6 @@ class spell_mage_blazing_speed : public SpellScriptLoader
class spell_mage_blazing_speed_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_blazing_speed_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_BLAZING_SPEED });
@@ -271,7 +265,7 @@ class spell_mage_blazing_speed : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_blazing_speed_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_mage_blazing_speed_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -290,8 +284,6 @@ class spell_mage_blizzard : public SpellScriptLoader
class spell_mage_blizzard_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_blizzard_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -315,7 +307,7 @@ class spell_mage_blizzard : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_blizzard_SpellScript::AddChillEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_mage_blizzard_SpellScript::AddChillEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -333,8 +325,6 @@ class spell_mage_cold_snap : public SpellScriptLoader
class spell_mage_cold_snap_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_cold_snap_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -352,7 +342,7 @@ class spell_mage_cold_snap : public SpellScriptLoader
void Register() override
{
OnEffectHit += SpellEffectFn(spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHit.Register(&spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -371,8 +361,6 @@ class spell_mage_cone_of_cold : public SpellScriptLoader
class spell_mage_cone_of_cold_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_cone_of_cold_SpellScript);
void HandleConeOfColdScript(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -387,7 +375,7 @@ class spell_mage_cone_of_cold : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
@@ -426,8 +414,6 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
class spell_mage_conjure_refreshment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_conjure_refreshment_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
for (uint8 i = 0; i < MAX_CONJURE_REFRESHMENT_SPELLS; ++i)
@@ -458,7 +444,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -471,8 +457,6 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
// -31661 - Dragon's Breath
class spell_mage_dragon_breath : public AuraScript
{
PrepareAuraScript(spell_mage_dragon_breath);
bool CheckProc(ProcEventInfo& eventInfo)
{
// Dont proc with Living Bomb explosion
@@ -484,7 +468,7 @@ class spell_mage_dragon_breath : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_dragon_breath::CheckProc);
DoCheckProc.Register(&spell_mage_dragon_breath::CheckProc);
}
};
@@ -496,8 +480,6 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader
class spell_mage_fire_frost_ward_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FROST_WARDING_TRIGGERED, SPELL_MAGE_FROST_WARDING_R1 });
@@ -537,8 +519,8 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0);
}
};
@@ -556,8 +538,6 @@ class spell_mage_focus_magic : public SpellScriptLoader
class spell_mage_focus_magic_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_focus_magic_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FOCUS_MAGIC_PROC });
@@ -577,8 +557,8 @@ class spell_mage_focus_magic : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_focus_magic_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
DoCheckProc.Register(&spell_mage_focus_magic_AuraScript::CheckProc);
OnEffectProc.Register(&spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
}
Unit* _procTarget = nullptr;
@@ -594,8 +574,6 @@ class spell_mage_focus_magic : public SpellScriptLoader
/// Updated 4.3.4
class spell_mage_frostbolt : public SpellScript
{
PrepareSpellScript(spell_mage_frostbolt);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -661,8 +639,8 @@ class spell_mage_frostbolt : public SpellScript
void Register() override
{
OnSpellStart += SpellCastFn(spell_mage_frostbolt::HandleEarlyFrost);
OnEffectHitTarget += SpellEffectFn(spell_mage_frostbolt::RecalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnSpellStart.Register(&spell_mage_frostbolt::HandleEarlyFrost);
OnEffectHitTarget.Register(&spell_mage_frostbolt::RecalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
private:
@@ -678,8 +656,6 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader
class spell_mage_glyph_of_ice_block_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_glyph_of_ice_block_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FROST_NOVA });
@@ -699,8 +675,8 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_glyph_of_ice_block_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_ice_block_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_glyph_of_ice_block_AuraScript::CheckProc);
OnEffectProc.Register(&spell_mage_glyph_of_ice_block_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -718,8 +694,6 @@ class spell_mage_glyph_of_icy_veins : public SpellScriptLoader
class spell_mage_glyph_of_icy_veins_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_glyph_of_icy_veins_AuraScript);
void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -730,7 +704,7 @@ class spell_mage_glyph_of_icy_veins : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_icy_veins_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_mage_glyph_of_icy_veins_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -748,8 +722,6 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader
class spell_mage_glyph_of_polymorph_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_glyph_of_polymorph_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH });
@@ -767,7 +739,7 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_mage_glyph_of_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -780,8 +752,6 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader
// 44457 - Living Bomb
class spell_mage_living_bomb : public AuraScript
{
PrepareAuraScript(spell_mage_living_bomb);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_1].CalcValue()) });
@@ -798,7 +768,7 @@ class spell_mage_living_bomb : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_mage_living_bomb::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -811,8 +781,6 @@ class spell_mage_ice_barrier : public SpellScriptLoader
class spell_mage_ice_barrier_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_ice_barrier_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = false;
@@ -833,9 +801,9 @@ class spell_mage_ice_barrier : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
DoEffectCalcAmount.Register(&spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectRemove.Register(&spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -848,8 +816,6 @@ class spell_mage_ice_barrier : public SpellScriptLoader
// -11119 - Ignite
class spell_mage_ignite : public AuraScript
{
PrepareAuraScript(spell_mage_ignite);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -894,8 +860,8 @@ class spell_mage_ignite : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_ignite::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_ignite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_ignite::CheckProc);
OnEffectProc.Register(&spell_mage_ignite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 543 - Mage Ward
@@ -907,8 +873,6 @@ class spell_mage_mage_ward : public SpellScriptLoader
class spell_mage_mage_ward_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_mage_ward_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = false;
@@ -931,8 +895,8 @@ class spell_mage_mage_ward : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_mage_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_mage_mage_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectAbsorb.Register(&spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0);
}
};
@@ -951,8 +915,6 @@ class spell_mage_mana_shield : public SpellScriptLoader
class spell_mage_mana_shield_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_mana_shield_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -991,9 +953,9 @@ class spell_mage_mana_shield : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_mana_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MANA_SHIELD);
AfterEffectManaShield += AuraEffectManaShieldFn(spell_mage_mana_shield_AuraScript::HandleAbsorb, EFFECT_0);
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_mana_shield_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MANA_SHIELD, AURA_EFFECT_HANDLE_REAL);
DoEffectCalcAmount.Register(&spell_mage_mana_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MANA_SHIELD);
AfterEffectManaShield.Register(&spell_mage_mana_shield_AuraScript::HandleAbsorb, EFFECT_0);
AfterEffectRemove.Register(&spell_mage_mana_shield_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MANA_SHIELD, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1006,8 +968,6 @@ class spell_mage_mana_shield : public SpellScriptLoader
// -29074 - Master of Elements
class spell_mage_master_of_elements : public AuraScript
{
PrepareAuraScript(spell_mage_master_of_elements);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE });
@@ -1032,16 +992,14 @@ class spell_mage_master_of_elements : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_master_of_elements::CheckProc);
OnEffectProc.Register(&spell_mage_master_of_elements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -86181 - Nether Vortex
class spell_mage_nether_vortex : public AuraScript
{
PrepareAuraScript(spell_mage_nether_vortex);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_SLOW });
@@ -1064,16 +1022,14 @@ class spell_mage_nether_vortex : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_nether_vortex::DoCheck);
OnEffectProc += AuraEffectProcFn(spell_mage_nether_vortex::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_nether_vortex::DoCheck);
OnEffectProc.Register(&spell_mage_nether_vortex::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -11175 - Permafrost
class spell_mage_permafrost : public AuraScript
{
PrepareAuraScript(spell_mage_permafrost);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1100,8 +1056,8 @@ class spell_mage_permafrost : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_permafrost::DoCheck);
OnEffectProc += AuraEffectProcFn(spell_mage_permafrost::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_permafrost::DoCheck);
OnEffectProc.Register(&spell_mage_permafrost::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1113,8 +1069,6 @@ class spell_mage_polymorph : public SpellScriptLoader
class spell_mage_polymorph_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_polymorph_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1153,8 +1107,8 @@ class spell_mage_polymorph : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_polymorph_AuraScript::DoCheck);
OnEffectProc += AuraEffectProcFn(spell_mage_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_CONFUSE);
DoCheckProc.Register(&spell_mage_polymorph_AuraScript::DoCheck);
OnEffectProc.Register(&spell_mage_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_CONFUSE);
}
private:
@@ -1181,8 +1135,6 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader
class spell_mage_polymorph_cast_visual_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript);
static const uint32 PolymorhForms[6];
bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -1201,7 +1153,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader
void Register() override
{
// add dummy effect spell handler to Polymorph visual
OnEffectHitTarget += SpellEffectFn(spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -1229,10 +1181,8 @@ class spell_mage_replenish_mana : public SpellScriptLoader
spell_mage_replenish_mana() : SpellScriptLoader("spell_mage_replenish_mana") { }
class spell_mage_replenish_mana_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_replenish_mana_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_IMPROVED_MANA_GEM_TRIGGERED });
}
@@ -1248,7 +1198,7 @@ class spell_mage_replenish_mana : public SpellScriptLoader
void Register() override
{
AfterCast += SpellCastFn(spell_mage_replenish_mana_SpellScript::HandleImprovedManaGem);
AfterCast.Register(&spell_mage_replenish_mana_SpellScript::HandleImprovedManaGem);
}
};
@@ -1267,8 +1217,6 @@ class spell_mage_ring_of_frost : public SpellScriptLoader
class spell_mage_ring_of_frost_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_ring_of_frost_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1321,8 +1269,8 @@ class spell_mage_ring_of_frost : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectApply += AuraEffectApplyFn(spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic.Register(&spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectApply.Register(&spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -1341,8 +1289,6 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader
class spell_mage_ring_of_frost_freeze_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_ring_of_frost_freeze_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_SUMMON, SPELL_MAGE_RING_OF_FROST_FREEZE });
@@ -1361,7 +1307,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
@@ -1372,8 +1318,6 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader
class spell_mage_ring_of_frost_freeze_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_ring_of_frost_freeze_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_DUMMY });
@@ -1388,7 +1332,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1406,8 +1350,6 @@ class spell_mage_time_warp : public SpellScriptLoader
class spell_mage_time_warp_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_time_warp_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1435,8 +1377,8 @@ class spell_mage_time_warp : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_time_warp_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit += SpellHitFn(spell_mage_time_warp_SpellScript::ApplyDebuff);
OnObjectAreaTargetSelect.Register(&spell_mage_time_warp_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit.Register(&spell_mage_time_warp_SpellScript::ApplyDebuff);
}
};
@@ -1454,10 +1396,8 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader
spell_mage_water_elemental_freeze() : SpellScriptLoader("spell_mage_water_elemental_freeze") { }
class spell_mage_water_elemental_freeze_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_water_elemental_freeze_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FINGERS_OF_FROST });
}
@@ -1485,8 +1425,8 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_water_elemental_freeze_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
AfterCast += SpellCastFn(spell_mage_water_elemental_freeze_SpellScript::HandleImprovedFreeze);
OnObjectAreaTargetSelect.Register(&spell_mage_water_elemental_freeze_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
AfterCast.Register(&spell_mage_water_elemental_freeze_SpellScript::HandleImprovedFreeze);
}
private:
@@ -1502,8 +1442,6 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader
// 79683 Arcane Missiles!
class spell_mage_arcane_missiles_trigger : public AuraScript
{
PrepareAuraScript(spell_mage_arcane_missiles_trigger);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1531,17 +1469,15 @@ class spell_mage_arcane_missiles_trigger : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_arcane_missiles_trigger::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectApply += AuraEffectApplyFn(spell_mage_arcane_missiles_trigger::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_arcane_missiles_trigger::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc.Register(&spell_mage_arcane_missiles_trigger::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectApply.Register(&spell_mage_arcane_missiles_trigger::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_mage_arcane_missiles_trigger::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 79684 Offensive State (DND)
class spell_mage_offensive_state_dnd : public AuraScript
{
PrepareAuraScript(spell_mage_offensive_state_dnd);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1585,7 +1521,7 @@ class spell_mage_offensive_state_dnd : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_offensive_state_dnd::CheckProc);
DoCheckProc.Register(&spell_mage_offensive_state_dnd::CheckProc);
}
};
@@ -1596,8 +1532,6 @@ public:
class spell_mage_early_frost_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_early_frost_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_EARLY_FROST_VISUAL });
@@ -1611,7 +1545,7 @@ public:
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_mage_early_frost_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_mage_early_frost_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1629,8 +1563,6 @@ class spell_mage_flame_orb: public SpellScriptLoader
class spell_mage_flame_orb_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_flame_orb_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1668,7 +1600,7 @@ class spell_mage_flame_orb: public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_flame_orb_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_mage_flame_orb_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
private:
@@ -1689,8 +1621,6 @@ class spell_mage_flame_orb_aoe_dummy: public SpellScriptLoader
class spell_mage_flame_orb_aoe_dummy_SpellScript : public SpellScript
{
PrepareSpellScript(spell_mage_flame_orb_aoe_dummy_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1751,8 +1681,8 @@ class spell_mage_flame_orb_aoe_dummy: public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_flame_orb_aoe_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_mage_flame_orb_aoe_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_mage_flame_orb_aoe_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_mage_flame_orb_aoe_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
private:
@@ -1773,8 +1703,6 @@ class spell_mage_hot_streak : public SpellScriptLoader
class spell_mage_hot_streak_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_hot_streak_AuraScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -1824,8 +1752,8 @@ class spell_mage_hot_streak : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_hot_streak_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_hot_streak_AuraScript::CheckProc);
OnEffectProc.Register(&spell_mage_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1843,8 +1771,6 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader
class spell_mage_improved_hot_streak_AuraScript : public AuraScript
{
PrepareAuraScript(spell_mage_improved_hot_streak_AuraScript);
uint8 criticalStrikesCounter;
bool Load() override
@@ -1897,8 +1823,8 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_mage_improved_hot_streak_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_mage_improved_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_mage_improved_hot_streak_AuraScript::CheckProc);
OnEffectProc.Register(&spell_mage_improved_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1911,8 +1837,6 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader
// 55342 - Mirror Image
class spell_mage_mirror_image : public SpellScript
{
PrepareSpellScript(spell_mage_mirror_image);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1943,14 +1867,12 @@ class spell_mage_mirror_image : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_mirror_image::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_mage_mirror_image::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
class spell_mage_mirror_image_AurasScript : public AuraScript
{
PrepareAuraScript(spell_mage_mirror_image_AurasScript);
void HandleEffectPeriodic(AuraEffect const* aurEff)
{
if (aurEff->GetTickNumber() == 1)
@@ -1959,7 +1881,7 @@ class spell_mage_mirror_image_AurasScript : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_mirror_image_AurasScript::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_mage_mirror_image_AurasScript::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1983,8 +1905,6 @@ class SummonerCheck
class spell_mage_initialize_images : public SpellScript
{
PrepareSpellScript(spell_mage_initialize_images);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -1995,14 +1915,12 @@ class spell_mage_initialize_images : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_initialize_images::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
OnObjectAreaTargetSelect.Register(&spell_mage_initialize_images::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
class spell_mage_deep_freeze : public SpellScript
{
PrepareSpellScript(spell_mage_deep_freeze);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_DEEP_FREEZE_DAMAGE });
@@ -2022,14 +1940,12 @@ class spell_mage_deep_freeze : public SpellScript
void Register() override
{
OnEffectLaunch += SpellEffectFn(spell_mage_deep_freeze::HandleDamage, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectLaunch.Register(&spell_mage_deep_freeze::HandleDamage, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_mage_fingers_of_frost_charges : public AuraScript
{
PrepareAuraScript(spell_mage_fingers_of_frost_charges);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -2038,15 +1954,13 @@ class spell_mage_fingers_of_frost_charges : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_fingers_of_frost_charges::HandleProc, EFFECT_0, SPELL_AURA_ABILITY_IGNORE_AURASTATE);
OnEffectProc.Register(&spell_mage_fingers_of_frost_charges::HandleProc, EFFECT_0, SPELL_AURA_ABILITY_IGNORE_AURASTATE);
}
};
// -34293 - Pyromaniac
class spell_mage_pyromaniac : public AuraScript
{
PrepareAuraScript(spell_mage_pyromaniac);
bool Load() override
{
_buffActive = false;
@@ -2102,9 +2016,9 @@ class spell_mage_pyromaniac : public AuraScript
void Register() override
{
DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_mage_pyromaniac::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_mage_pyromaniac::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_pyromaniac::HandlePeriodic, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcPeriodic.Register(&spell_mage_pyromaniac::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_mage_pyromaniac::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectPeriodic.Register(&spell_mage_pyromaniac::HandlePeriodic, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
GuidSet _dotTargetGuids;
@@ -2139,8 +2053,6 @@ private:
// -11103 - Impact
class spell_mage_impact : public AuraScript
{
PrepareAuraScript(spell_mage_impact);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_MAGE_FIRE_BLAST });
@@ -2153,15 +2065,13 @@ class spell_mage_impact : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_impact::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_mage_impact::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 12355 - Impact
class spell_mage_impact_triggered : public SpellScript
{
PrepareSpellScript(spell_mage_impact_triggered);
void RegisterFireDots(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -2204,8 +2114,8 @@ class spell_mage_impact_triggered : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_mage_impact_triggered::RegisterFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_mage_impact_triggered::SpeadFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectLaunchTarget.Register(&spell_mage_impact_triggered::RegisterFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mage_impact_triggered::SpeadFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
std::vector<Aura*> _fireDotEffects;
@@ -2214,8 +2124,6 @@ private:
// 11129 - Combustion
class spell_mage_combustion : public SpellScript
{
PrepareSpellScript(spell_mage_combustion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2263,7 +2171,7 @@ class spell_mage_combustion : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_combustion::HandleDotEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_mage_combustion::HandleDotEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
private:
@@ -2273,8 +2181,6 @@ private:
// 44614 - Frostfire Bolt
class spell_mage_frostfire_bolt : public SpellScript
{
PrepareSpellScript(spell_mage_frostfire_bolt);
void HandleGlyphSlow(SpellEffIndex effIndex)
{
Unit* caster = GetCaster();
@@ -2304,8 +2210,8 @@ class spell_mage_frostfire_bolt : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_mage_frostfire_bolt::HandleGlyphSlow, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget += SpellEffectFn(spell_mage_frostfire_bolt::HandleGlyphDot, EFFECT_2, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_mage_frostfire_bolt::HandleGlyphSlow, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_mage_frostfire_bolt::HandleGlyphDot, EFFECT_2, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/Spells/spell_paladin.cpp
+74 -168
View File
@@ -126,8 +126,6 @@ enum PaladinCreatures
class spell_pal_ardent_defender : public AuraScript
{
PrepareAuraScript(spell_pal_ardent_defender);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_ARDENT_DEFENDER_HEAL });
@@ -151,8 +149,8 @@ class spell_pal_ardent_defender : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_ardent_defender::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_pal_ardent_defender::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_pal_ardent_defender::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_pal_ardent_defender::Absorb, EFFECT_0);
}
};
@@ -164,8 +162,6 @@ class spell_pal_aura_mastery : public SpellScriptLoader
class spell_pal_aura_mastery_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_aura_mastery_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_AURA_MASTERY_IMMUNE });
@@ -183,8 +179,8 @@ class spell_pal_aura_mastery : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_pal_aura_mastery_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_pal_aura_mastery_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_pal_aura_mastery_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_pal_aura_mastery_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -202,8 +198,6 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader
class spell_pal_aura_mastery_immune_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_aura_mastery_immune_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_CONCENTRACTION_AURA });
@@ -216,7 +210,7 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader
void Register() override
{
DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_aura_mastery_immune_AuraScript::CheckAreaTarget);
DoCheckAreaTarget.Register(&spell_pal_aura_mastery_immune_AuraScript::CheckAreaTarget);
}
};
@@ -229,8 +223,6 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader
// 31884 - Avenging Wrath
class spell_pal_avenging_wrath : public AuraScript
{
PrepareAuraScript(spell_pal_avenging_wrath);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -254,8 +246,8 @@ class spell_pal_avenging_wrath : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_pal_avenging_wrath::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_pal_avenging_wrath::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_pal_avenging_wrath::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_pal_avenging_wrath::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -267,8 +259,6 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader
class spell_pal_blessing_of_faith_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -309,7 +299,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -327,8 +317,6 @@ class spell_pal_consecration : public SpellScriptLoader
class spell_pal_consecration_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_consecration_AuraScript);
bool Load() override
{
// Store the position of the initial Consecration cast for triggering the damage
@@ -357,7 +345,7 @@ class spell_pal_consecration : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pal_consecration_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_pal_consecration_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -375,8 +363,6 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
class spell_pal_divine_sacrifice_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_divine_sacrifice_AuraScript);
uint32 groupSize, minHpPct;
int32 remainingAmount;
@@ -413,7 +399,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
void Register() override
{
OnEffectSplit += AuraEffectSplitFn(spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0);
OnEffectSplit.Register(&spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0);
}
};
@@ -426,8 +412,6 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader
// 53385 - Divine Storm
class spell_pal_divine_storm : public SpellScript
{
PrepareSpellScript(spell_pal_divine_storm);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_DUMMY });
@@ -455,9 +439,9 @@ class spell_pal_divine_storm : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_pal_divine_storm::TriggerHeal);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm::HandleEnergize, EFFECT_0, SPELL_EFFECT_ENERGIZE);
AfterHit.Register(&spell_pal_divine_storm::TriggerHeal);
OnObjectAreaTargetSelect.Register(&spell_pal_divine_storm::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_pal_divine_storm::HandleEnergize, EFFECT_0, SPELL_EFFECT_ENERGIZE);
}
private:
@@ -467,8 +451,6 @@ private:
// 54171 - Divine Storm (Dummy)
class spell_pal_divine_storm_dummy : public SpellScript
{
PrepareSpellScript(spell_pal_divine_storm_dummy);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_HEAL });
@@ -490,8 +472,8 @@ class spell_pal_divine_storm_dummy : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm_dummy::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnEffectHitTarget.Register(&spell_pal_divine_storm_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_pal_divine_storm_dummy::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
}
private:
@@ -506,8 +488,6 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader
class spell_pal_exorcism_and_holy_wrath_damage_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_exorcism_and_holy_wrath_damage_AuraScript);
void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
{
if (!spellMod)
@@ -524,7 +504,7 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader
void Register() override
{
DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcSpellMod.Register(&spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -542,8 +522,6 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader
class spell_pal_eye_for_an_eye_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE });
@@ -558,7 +536,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_eye_for_an_eye_AuraScript::HandleEffectProc, EFFECT_0, m_scriptSpellId == SPELL_PALADIN_EYE_FOR_AN_EYE_RANK_1 ? SPELL_AURA_DUMMY : SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pal_eye_for_an_eye_AuraScript::HandleEffectProc, EFFECT_0, m_scriptSpellId == SPELL_PALADIN_EYE_FOR_AN_EYE_RANK_1 ? SPELL_AURA_DUMMY : SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -576,8 +554,6 @@ class spell_pal_grand_crusader : public SpellScriptLoader
class spell_pal_grand_crusader_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_grand_crusader_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_AVENGERS_SHIELD });
@@ -595,8 +571,8 @@ class spell_pal_grand_crusader : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_grand_crusader_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_grand_crusader_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_pal_grand_crusader_AuraScript::CheckProc);
OnEffectProc.Register(&spell_pal_grand_crusader_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -614,8 +590,6 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader
class spell_pal_glyph_of_holy_light_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_glyph_of_holy_light_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
uint32 const maxTargets = GetSpellInfo()->MaxAffectedTargets;
@@ -629,7 +603,7 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_glyph_of_holy_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_pal_glyph_of_holy_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
}
};
@@ -647,8 +621,6 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader
class spell_pal_hand_of_sacrifice_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_hand_of_sacrifice_AuraScript);
public:
spell_pal_hand_of_sacrifice_AuraScript()
{
@@ -680,7 +652,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader
void Register() override
{
OnEffectSplit += AuraEffectSplitFn(spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0);
OnEffectSplit.Register(&spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0);
}
};
@@ -698,8 +670,6 @@ class spell_pal_holy_shock : public SpellScriptLoader
class spell_pal_holy_shock_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_holy_shock_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
SpellInfo const* firstRankSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_SHOCK_R1);
@@ -751,8 +721,8 @@ class spell_pal_holy_shock : public SpellScriptLoader
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_holy_shock_SpellScript::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_pal_holy_shock_SpellScript::CheckCast);
OnEffectHitTarget.Register(&spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -772,8 +742,6 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader
class spell_pal_improved_aura_effect_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_improved_aura_effect_AuraScript);
bool CheckAreaTarget(Unit* target)
{
Unit::AuraApplicationMap& appliedAuras = target->GetAppliedAuras();
@@ -794,7 +762,7 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader
void Register() override
{
DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget);
DoCheckAreaTarget.Register(&spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget);
}
};
@@ -812,8 +780,6 @@ class spell_pal_item_healing_discount : public SpellScriptLoader
class spell_pal_item_healing_discount_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_item_healing_discount_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_ITEM_HEALING_TRANCE });
@@ -827,7 +793,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_item_healing_discount_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pal_item_healing_discount_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -841,8 +807,6 @@ class spell_pal_item_healing_discount : public SpellScriptLoader
/// Updated 4.3.4
class spell_pal_judgement : public SpellScript
{
PrepareSpellScript(spell_pal_judgement);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -896,15 +860,13 @@ class spell_pal_judgement : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_judgement::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_pal_judgement::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 633 - Lay on Hands
class spell_pal_lay_on_hands : public SpellScript
{
PrepareSpellScript(spell_pal_lay_on_hands);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -944,8 +906,8 @@ class spell_pal_lay_on_hands : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_pal_lay_on_hands::HandleExtraEffects, EFFECT_0, SPELL_EFFECT_HEAL_MAX_HEALTH);
OnCheckCast.Register(&spell_pal_lay_on_hands::CheckCast);
OnEffectHitTarget.Register(&spell_pal_lay_on_hands::HandleExtraEffects, EFFECT_0, SPELL_EFFECT_HEAL_MAX_HEALTH);
}
};
@@ -957,8 +919,6 @@ class spell_pal_righteous_defense : public SpellScriptLoader
class spell_pal_righteous_defense_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_righteous_defense_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT });
@@ -995,13 +955,13 @@ class spell_pal_righteous_defense : public SpellScriptLoader
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast);
OnCheckCast.Register(&spell_pal_righteous_defense_SpellScript::CheckCast);
//! WORKAROUND
//! target select will be executed in hitphase of effect 0
//! so we must handle trigger spell also in hit phase (default execution in launch phase)
//! see issue #3718
OnEffectLaunchTarget += SpellEffectFn(spell_pal_righteous_defense_SpellScript::HandleTriggerSpellLaunch, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectHitTarget += SpellEffectFn(spell_pal_righteous_defense_SpellScript::HandleTriggerSpellHit, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectLaunchTarget.Register(&spell_pal_righteous_defense_SpellScript::HandleTriggerSpellLaunch, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
OnEffectHitTarget.Register(&spell_pal_righteous_defense_SpellScript::HandleTriggerSpellHit, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL);
}
};
@@ -1020,8 +980,6 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader
class spell_pal_shield_of_the_righteous_SpellScript : public SpellScript
{
PrepareSpellScript(spell_pal_shield_of_the_righteous_SpellScript);
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_PLAYER)
@@ -1049,7 +1007,7 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_shield_of_the_righteous_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_pal_shield_of_the_righteous_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1063,8 +1021,6 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader
/// Updated 4.3.4
class spell_pal_templar_s_verdict : public SpellScript
{
PrepareSpellScript(spell_pal_templar_s_verdict);
bool Validate(SpellInfo const* /*spellEntry*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC });
@@ -1109,7 +1065,7 @@ class spell_pal_templar_s_verdict : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_pal_templar_s_verdict::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
OnEffectLaunchTarget.Register(&spell_pal_templar_s_verdict::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
}
};
@@ -1117,8 +1073,6 @@ class spell_pal_templar_s_verdict : public SpellScript
/// Updated 4.3.4
class spell_pal_seal_of_righteousness : public AuraScript
{
PrepareAuraScript(spell_pal_seal_of_righteousness);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1150,16 +1104,14 @@ class spell_pal_seal_of_righteousness : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_seal_of_righteousness::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_righteousness::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_seal_of_righteousness::CheckProc);
OnEffectProc.Register(&spell_pal_seal_of_righteousness::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 76669 - Illuminated Healing
class spell_pal_illuminated_healing : public AuraScript
{
PrepareAuraScript(spell_pal_illuminated_healing);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_ILLUMINATED_HEALING });
@@ -1189,7 +1141,7 @@ class spell_pal_illuminated_healing : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_illuminated_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pal_illuminated_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1201,8 +1153,6 @@ class spell_pal_hand_of_light : public SpellScriptLoader
class spell_pal_hand_of_light_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_hand_of_light_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1237,8 +1187,8 @@ class spell_pal_hand_of_light : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_hand_of_light_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_hand_of_light_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_pal_hand_of_light_AuraScript::CheckProc);
OnEffectProc.Register(&spell_pal_hand_of_light_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -1252,8 +1202,6 @@ class spell_pal_hand_of_light : public SpellScriptLoader
// 89901 - Judgements of the Bold (Passive)
class spell_pal_judgements : public AuraScript
{
PrepareAuraScript(spell_pal_judgements);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1284,15 +1232,13 @@ class spell_pal_judgements : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_judgements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pal_judgements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 879 - Exorcism
class spell_pal_exorcism : public SpellScript
{
PrepareSpellScript(spell_pal_exorcism);
void HandleDamage(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -1318,15 +1264,13 @@ class spell_pal_exorcism : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_pal_exorcism::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
AfterHit += SpellHitFn(spell_pal_exorcism::ApplyDotBonus);
OnEffectLaunchTarget.Register(&spell_pal_exorcism::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
AfterHit.Register(&spell_pal_exorcism::ApplyDotBonus);
}
};
class spell_pal_exorcism_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_exorcism_AuraScript);
void HandleGlyph(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Unit* caster = GetCaster())
@@ -1336,15 +1280,13 @@ class spell_pal_exorcism_AuraScript : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_pal_exorcism_AuraScript::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_pal_exorcism_AuraScript::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
// 31801 - Seal of Truth
class spell_pal_seal_of_truth : public AuraScript
{
PrepareAuraScript(spell_pal_seal_of_truth);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1371,15 +1313,13 @@ class spell_pal_seal_of_truth : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_truth::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pal_seal_of_truth::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -87168 - Long Arm of the Law
class spell_pal_long_arm_of_the_law : public AuraScript
{
PrepareAuraScript(spell_pal_long_arm_of_the_law);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_LONG_ARM_OF_THE_LAW });
@@ -1403,16 +1343,14 @@ class spell_pal_long_arm_of_the_law : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_long_arm_of_the_law::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_long_arm_of_the_law::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_long_arm_of_the_law::CheckProc);
OnEffectProc.Register(&spell_pal_long_arm_of_the_law::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 31876 - Communion
class spell_pal_communion : public AuraScript
{
PrepareAuraScript(spell_pal_communion);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GENERIC_REPLENISHMENT });
@@ -1426,15 +1364,13 @@ class spell_pal_communion : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_communion::HandleProc, EFFECT_1, SPELL_AURA_ADD_FLAT_MODIFIER);
OnEffectProc.Register(&spell_pal_communion::HandleProc, EFFECT_1, SPELL_AURA_ADD_FLAT_MODIFIER);
}
};
// 85285 - Sacred Shield
class spell_pal_sacred_shield : public AuraScript
{
PrepareAuraScript(spell_pal_sacred_shield);
bool CheckProc(ProcEventInfo& eventInfo)
{
if (DamageInfo* damage = eventInfo.GetDamageInfo())
@@ -1455,16 +1391,14 @@ class spell_pal_sacred_shield : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_sacred_shield::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_sacred_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_pal_sacred_shield::CheckProc);
OnEffectProc.Register(&spell_pal_sacred_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 85673 - Word of Glory
class spell_pal_word_of_glory: public SpellScript
{
PrepareSpellScript(spell_pal_word_of_glory);
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_PLAYER)
@@ -1521,15 +1455,13 @@ class spell_pal_word_of_glory: public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_pal_word_of_glory::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
AfterCast += SpellCastFn(spell_pal_word_of_glory::HandleEternalGlory);
OnEffectLaunchTarget.Register(&spell_pal_word_of_glory::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
AfterCast.Register(&spell_pal_word_of_glory::HandleEternalGlory);
}
};
class spell_pal_word_of_glory_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_word_of_glory_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC });
@@ -1557,16 +1489,14 @@ class spell_pal_word_of_glory_AuraScript : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_pal_word_of_glory_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_word_of_glory_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL);
OnEffectApply.Register(&spell_pal_word_of_glory_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
DoEffectCalcAmount.Register(&spell_pal_word_of_glory_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL);
}
};
// -85803 - Selfless Healer
class spell_pal_selfless_healer : public AuraScript
{
PrepareAuraScript(spell_pal_selfless_healer);
bool CheckProc(ProcEventInfo& eventInfo)
{
if (HealInfo* heal = eventInfo.GetHealInfo())
@@ -1586,16 +1516,14 @@ class spell_pal_selfless_healer : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_selfless_healer::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_selfless_healer::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_selfless_healer::CheckProc);
OnEffectProc.Register(&spell_pal_selfless_healer::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// -85117 - Divine Purpose
class spell_pal_divine_purpose : public AuraScript
{
PrepareAuraScript(spell_pal_divine_purpose);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC });
@@ -1621,15 +1549,13 @@ class spell_pal_divine_purpose : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_divine_purpose::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_divine_purpose::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_divine_purpose::CheckProc);
OnEffectProc.Register(&spell_pal_divine_purpose::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_pal_inquisition : public SpellScript
{
PrepareSpellScript(spell_pal_inquisition);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1662,14 +1588,12 @@ class spell_pal_inquisition : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_pal_inquisition::ChangeDuration);
AfterHit.Register(&spell_pal_inquisition::ChangeDuration);
}
};
class spell_pal_guardian_of_ancient_kings : public SpellScript
{
PrepareSpellScript(spell_pal_guardian_of_ancient_kings);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo(
@@ -1708,14 +1632,12 @@ class spell_pal_guardian_of_ancient_kings : public SpellScript
void Register() override
{
AfterCast += SpellCastFn(spell_pal_guardian_of_ancient_kings::HandleDummyEffect);
AfterCast.Register(&spell_pal_guardian_of_ancient_kings::HandleDummyEffect);
}
};
class spell_pal_ancient_healer : public AuraScript
{
PrepareAuraScript(spell_pal_ancient_healer);
bool Load() override
{
_procCount = 0;
@@ -1758,8 +1680,8 @@ class spell_pal_ancient_healer : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_ancient_healer::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_ancient_healer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_ancient_healer::CheckProc);
OnEffectProc.Register(&spell_pal_ancient_healer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
@@ -1768,8 +1690,6 @@ private:
class spell_pal_ancient_crusader : public AuraScript
{
PrepareAuraScript(spell_pal_ancient_crusader);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1808,15 +1728,13 @@ class spell_pal_ancient_crusader : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pal_ancient_crusader::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectRemove += AuraEffectRemoveFn(spell_pal_ancient_crusader::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc.Register(&spell_pal_ancient_crusader::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectRemove.Register(&spell_pal_ancient_crusader::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
class spell_pal_ancient_fury : public SpellScript
{
PrepareSpellScript(spell_pal_ancient_fury);
bool Load() override
{
_targetCount = 0;
@@ -1843,8 +1761,8 @@ class spell_pal_ancient_fury : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_ancient_fury::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnHit += SpellHitFn(spell_pal_ancient_fury::CalculateDamage);
OnObjectAreaTargetSelect.Register(&spell_pal_ancient_fury::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnHit.Register(&spell_pal_ancient_fury::CalculateDamage);
}
private:
@@ -1854,8 +1772,6 @@ private:
// 85222 - Light of Dawn
class spell_pal_light_of_dawn: public SpellScript
{
PrepareSpellScript(spell_pal_light_of_dawn);
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_PLAYER)
@@ -1897,17 +1813,15 @@ class spell_pal_light_of_dawn: public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_light_of_dawn::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectLaunchTarget += SpellEffectFn(spell_pal_light_of_dawn::BlockHeal, EFFECT_1, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_light_of_dawn::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ALLY);
OnEffectHitTarget.Register(&spell_pal_light_of_dawn::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectLaunchTarget.Register(&spell_pal_light_of_dawn::BlockHeal, EFFECT_1, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect.Register(&spell_pal_light_of_dawn::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ALLY);
}
};
// 82327 - Holy Radiance
class spell_pal_holy_radiance: public SpellScript
{
PrepareSpellScript(spell_pal_holy_radiance);
bool Load() override
{
if (GetCaster()->GetTypeId() != TYPEID_PLAYER)
@@ -1937,15 +1851,13 @@ private:
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_holy_radiance::HandleHeal, EFFECT_1, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_holy_radiance::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget.Register(&spell_pal_holy_radiance::HandleHeal, EFFECT_1, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect.Register(&spell_pal_holy_radiance::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY);
}
};
class spell_pal_holy_radiance_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pal_holy_radiance_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PALADIN_HOLY_RADIANCE_TRIGGERED });
@@ -1962,15 +1874,13 @@ private:
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pal_holy_radiance_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_pal_holy_radiance_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 53651 - Light's Beacon
class spell_pal_lights_beacon : public AuraScript
{
PrepareAuraScript(spell_pal_lights_beacon);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2006,16 +1916,14 @@ class spell_pal_lights_beacon : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pal_lights_beacon::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pal_lights_beacon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pal_lights_beacon::CheckProc);
OnEffectProc.Register(&spell_pal_lights_beacon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 1022 - Hand of Protection
class spell_pal_hand_of_protection : public SpellScript
{
PrepareSpellScript(spell_pal_hand_of_protection);
void HandleForbearance(SpellEffIndex /*effIndex*/)
{
// Serverside spell, so it's not sent in spell cast packets which gives us freedom of choice here
@@ -2026,15 +1934,13 @@ class spell_pal_hand_of_protection : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_hand_of_protection::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_pal_hand_of_protection::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
// 642 - Divine Shield
class spell_pal_divine_shield : public SpellScript
{
PrepareSpellScript(spell_pal_divine_shield);
void HandleForbearance(SpellEffIndex /*effIndex*/)
{
// Serverside spell, so it's not sent in spell cast packets which gives us freedom of choice here
@@ -2045,7 +1951,7 @@ class spell_pal_divine_shield : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pal_divine_shield::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_pal_divine_shield::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
src/server/scripts/Spells/spell_pet.cpp
+47 -91
View File
@@ -90,8 +90,6 @@ enum WarlockSpellIconId
class spell_warl_pet_scaling_01 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_01);
void CalculateStaminaAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -165,16 +163,14 @@ class spell_warl_pet_scaling_01 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
}
};
class spell_warl_pet_scaling_02 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_02);
void CalculateIntellectAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -234,16 +230,14 @@ class spell_warl_pet_scaling_02 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateIntellectAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateArmorAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateFireResistanceAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateIntellectAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateArmorAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateFireResistanceAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE);
}
};
class spell_warl_pet_scaling_03 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_03);
void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
{
// Formular: owner resistance of targeted school * 0.4
@@ -257,14 +251,12 @@ class spell_warl_pet_scaling_03 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_03::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE);
}
};
class spell_warl_pet_scaling_04 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_04);
void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
{
// Formular: owner resistance of targeted school * 0.4
@@ -292,15 +284,13 @@ class spell_warl_pet_scaling_04 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04::CalculatePowerRegen, EFFECT_1, SPELL_AURA_MOD_POWER_REGEN);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_04::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_04::CalculatePowerRegen, EFFECT_1, SPELL_AURA_MOD_POWER_REGEN);
}
};
class spell_warl_pet_scaling_05 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_05);
void CalculateMeleeHitChanceBonusAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -348,16 +338,14 @@ class spell_warl_pet_scaling_05 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE);
}
};
class spell_warl_pet_scaling_06 : public AuraScript
{
PrepareAuraScript(spell_warl_pet_scaling_06);
void CalculateCritChanceBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -377,15 +365,13 @@ class spell_warl_pet_scaling_06 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount.Register(&spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
}
};
class spell_warl_pet_passive : public AuraScript
{
PrepareAuraScript(spell_warl_pet_passive);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -435,8 +421,8 @@ class spell_warl_pet_passive : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
DoEffectCalcAmount.Register(&spell_warl_pet_passive::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
DoEffectCalcAmount.Register(&spell_warl_pet_passive::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
}
};
@@ -447,8 +433,6 @@ public:
class spell_sha_pet_scaling_04_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -490,8 +474,8 @@ public:
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
}
};
@@ -503,8 +487,6 @@ public:
class spell_hun_pet_scaling_01 : public AuraScript
{
PrepareAuraScript(spell_hun_pet_scaling_01);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -554,16 +536,14 @@ class spell_hun_pet_scaling_01 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
}
};
class spell_hun_pet_scaling_02 : public AuraScript
{
PrepareAuraScript(spell_hun_pet_scaling_02);
void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
{
// Formular: owner resistance of targeted school * 0.4
@@ -577,14 +557,12 @@ class spell_hun_pet_scaling_02 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_02::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE);
}
};
class spell_hun_pet_scaling_03 : public AuraScript
{
PrepareAuraScript(spell_hun_pet_scaling_03);
void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
{
// Formular: owner resistance of targeted school * 0.4
@@ -616,16 +594,14 @@ class spell_hun_pet_scaling_03 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateArmorAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateArmorAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE);
}
};
class spell_hun_pet_scaling_04 : public AuraScript
{
PrepareAuraScript(spell_hun_pet_scaling_04);
void CalculateMeleeHitChanceBonusAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -673,16 +649,14 @@ class spell_hun_pet_scaling_04 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE);
}
};
class spell_hun_pet_scaling_05 : public AuraScript
{
PrepareAuraScript(spell_hun_pet_scaling_05);
void CalculateCritChanceBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = true;
@@ -702,15 +676,13 @@ class spell_hun_pet_scaling_05 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount.Register(&spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW);
}
};
class spell_hun_pet_passive_crit : public AuraScript
{
PrepareAuraScript(spell_hun_pet_passive_crit);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -764,15 +736,13 @@ class spell_hun_pet_passive_crit : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
DoEffectCalcAmount.Register(&spell_hun_pet_passive_crit::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE);
DoEffectCalcAmount.Register(&spell_hun_pet_passive_crit::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT);
}
};
class spell_dk_avoidance_passive : public AuraScript
{
PrepareAuraScript(spell_dk_avoidance_passive);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -799,14 +769,12 @@ class spell_dk_avoidance_passive : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE);
DoEffectCalcAmount.Register(&spell_dk_avoidance_passive::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE);
}
};
class spell_dk_pet_scaling_01 : public AuraScript
{
PrepareAuraScript(spell_dk_pet_scaling_01);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -856,16 +824,14 @@ class spell_dk_pet_scaling_01 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_STAT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateStrengthAmount, EFFECT_1, SPELL_AURA_MOD_STAT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_STAT);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateStrengthAmount, EFFECT_1, SPELL_AURA_MOD_STAT);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
}
};
class spell_dk_pet_scaling_02 : public AuraScript
{
PrepareAuraScript(spell_dk_pet_scaling_02);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -889,14 +855,12 @@ class spell_dk_pet_scaling_02 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW);
}
};
class spell_dk_pet_scaling_03 : public AuraScript
{
PrepareAuraScript(spell_dk_pet_scaling_03);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -938,15 +902,13 @@ class spell_dk_pet_scaling_03 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_03::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_03::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE);
}
};
class spell_dk_pet_scaling_05 : public AuraScript
{
PrepareAuraScript(spell_dk_pet_scaling_05);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -974,15 +936,13 @@ class spell_dk_pet_scaling_05 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT);
DoEffectCalcAmount.Register(&spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE);
}
};
class spell_dk_rune_weapon_scaling_02 : public AuraScript
{
PrepareAuraScript(spell_dk_rune_weapon_scaling_02);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -1021,15 +981,13 @@ class spell_dk_rune_weapon_scaling_02 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW);
DoEffectCalcAmount.Register(&spell_dk_rune_weapon_scaling_02::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount.Register(&spell_dk_rune_weapon_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW);
}
};
class spell_mage_water_elemental_scaling_01 : public AuraScript
{
PrepareAuraScript(spell_mage_water_elemental_scaling_01);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -1081,16 +1039,14 @@ class spell_mage_water_elemental_scaling_01 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH);
DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER);
DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE);
}
};
class spell_mage_water_elemental_scaling_02 : public AuraScript
{
PrepareAuraScript(spell_mage_water_elemental_scaling_02);
bool Load() override
{
if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER)
@@ -1116,7 +1072,7 @@ class spell_mage_water_elemental_scaling_02 : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_02::CalculateManaAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY);
DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_02::CalculateManaAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY);
}
};
src/server/scripts/Spells/spell_priest.cpp
+71 -169
View File
@@ -157,8 +157,6 @@ class RaidCheck
class spell_pri_body_and_soul : public AuraScript
{
PrepareAuraScript(spell_pri_body_and_soul);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -191,16 +189,14 @@ class spell_pri_body_and_soul : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul::HandleEffectSpeedProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul::HandleEffectDispelProc, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pri_body_and_soul::HandleEffectSpeedProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pri_body_and_soul::HandleEffectDispelProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// 34861 - Circle of Healing
class spell_pri_circle_of_healing : public SpellScript
{
PrepareSpellScript(spell_pri_circle_of_healing);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING });
@@ -221,15 +217,13 @@ class spell_pri_circle_of_healing : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_circle_of_healing::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_pri_circle_of_healing::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
}
};
// 527 - Dispel magic
class spell_pri_dispel_magic : public SpellScript
{
PrepareSpellScript(spell_pri_dispel_magic);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -267,16 +261,14 @@ class spell_pri_dispel_magic : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pri_dispel_magic::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_pri_dispel_magic::AfterEffectHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_pri_dispel_magic::CheckCast);
OnEffectHitTarget.Register(&spell_pri_dispel_magic::AfterEffectHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// -47509 - Divine Aegis
class spell_pri_divine_aegis : public AuraScript
{
PrepareAuraScript(spell_pri_divine_aegis);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_AEGIS });
@@ -307,16 +299,14 @@ class spell_pri_divine_aegis : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_divine_aegis::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_divine_aegis::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_divine_aegis::CheckProc);
OnEffectProc.Register(&spell_pri_divine_aegis::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 64844 - Divine Hymn
class spell_pri_divine_hymn : public SpellScript
{
PrepareSpellScript(spell_pri_divine_hymn);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(RaidCheck(GetCaster()));
@@ -332,15 +322,13 @@ class spell_pri_divine_hymn : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_divine_hymn::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_pri_divine_hymn::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
// 55680 - Glyph of Prayer of Healing
class spell_pri_glyph_of_prayer_of_healing : public AuraScript
{
PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL });
@@ -357,14 +345,12 @@ class spell_pri_glyph_of_prayer_of_healing : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_glyph_of_prayer_of_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pri_glyph_of_prayer_of_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_pri_improved_power_word_shield : public AuraScript
{
PrepareAuraScript(spell_pri_improved_power_word_shield);
void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
{
if (!spellMod)
@@ -381,15 +367,13 @@ class spell_pri_improved_power_word_shield : public AuraScript
void Register() override
{
DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pri_improved_power_word_shield::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcSpellMod.Register(&spell_pri_improved_power_word_shield::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 37594 - Greater Heal Refund
class spell_pri_item_greater_heal_refund : public AuraScript
{
PrepareAuraScript(spell_pri_item_greater_heal_refund);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_ITEM_EFFICIENCY });
@@ -403,15 +387,13 @@ class spell_pri_item_greater_heal_refund : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_item_greater_heal_refund::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pri_item_greater_heal_refund::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 47788 - Guardian Spirit
class spell_pri_guardian_spirit : public AuraScript
{
PrepareAuraScript(spell_pri_guardian_spirit);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL });
@@ -446,8 +428,8 @@ class spell_pri_guardian_spirit : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_guardian_spirit::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_guardian_spirit::Absorb, EFFECT_1);
DoEffectCalcAmount.Register(&spell_pri_guardian_spirit::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_pri_guardian_spirit::Absorb, EFFECT_1);
}
private:
@@ -457,8 +439,6 @@ private:
// 64904 - Hymn of Hope
class spell_pri_hymn_of_hope : public SpellScript
{
PrepareSpellScript(spell_pri_hymn_of_hope);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(PowerCheck(POWER_MANA));
@@ -475,15 +455,13 @@ class spell_pri_hymn_of_hope : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_hymn_of_hope::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_pri_hymn_of_hope::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY);
}
};
// 92833 - Leap of Faith
class spell_pri_leap_of_faith_effect_trigger : public SpellScript
{
PrepareSpellScript(spell_pri_leap_of_faith_effect_trigger);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_LEAP_OF_FAITH_EFFECT });
@@ -501,15 +479,13 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_leap_of_faith_effect_trigger::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_pri_leap_of_faith_effect_trigger::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 7001 - Lightwell Renew
class spell_pri_lightwell_renew : public AuraScript
{
PrepareAuraScript(spell_pri_lightwell_renew);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
if (Unit* caster = GetCaster())
@@ -522,15 +498,13 @@ class spell_pri_lightwell_renew : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount.Register(&spell_pri_lightwell_renew::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
}
};
// 28305 - Mana Leech (Passive) (Priest Pet Aura)
class spell_pri_mana_leech : public AuraScript
{
PrepareAuraScript(spell_pri_mana_leech);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_MANA_LEECH_PROC });
@@ -550,8 +524,8 @@ class spell_pri_mana_leech : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_mana_leech::CheckProc);
OnEffectProc.Register(&spell_pri_mana_leech::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
Unit* _procTarget = nullptr;
@@ -560,8 +534,6 @@ class spell_pri_mana_leech : public AuraScript
// 49821 - Mind Sear
class spell_pri_mind_sear : public SpellScript
{
PrepareSpellScript(spell_pri_mind_sear);
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetChannelObjectGuid()));
@@ -569,15 +541,13 @@ class spell_pri_mind_sear : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_pri_mind_sear::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
// 47948 - Pain and Suffering (Proc)
class spell_pri_pain_and_suffering_proc : public SpellScript
{
PrepareSpellScript(spell_pri_pain_and_suffering_proc);
void HandleEffectScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -591,15 +561,13 @@ class spell_pri_pain_and_suffering_proc : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_pain_and_suffering_proc::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pri_pain_and_suffering_proc::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 47540 - Penance
class spell_pri_penance : public SpellScript
{
PrepareSpellScript(spell_pri_penance);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -655,16 +623,14 @@ class spell_pri_penance : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_penance::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast += SpellCheckCastFn(spell_pri_penance::CheckCast);
OnEffectHitTarget.Register(&spell_pri_penance::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_pri_penance::CheckCast);
}
};
// -47569 - Phantasm
class spell_pri_phantasm : public AuraScript
{
PrepareAuraScript(spell_pri_phantasm);
bool CheckProc(ProcEventInfo& /*eventInfo*/)
{
return roll_chance_i(GetEffect(EFFECT_0)->GetAmount());
@@ -678,16 +644,14 @@ class spell_pri_phantasm : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_phantasm::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_phantasm::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_phantasm::CheckProc);
OnEffectProc.Register(&spell_pri_phantasm::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 17 - Power Word: Shield
class spell_pri_power_word_shield : public SpellScript
{
PrepareSpellScript(spell_pri_power_word_shield);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_WEAKENED_SOUL });
@@ -701,14 +665,12 @@ class spell_pri_power_word_shield : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_power_word_shield::HandleWeakenedSoul, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_pri_power_word_shield::HandleWeakenedSoul, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
class spell_pri_power_word_shield_AuraScript : public AuraScript
{
PrepareAuraScript(spell_pri_power_word_shield_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -778,16 +740,14 @@ class spell_pri_power_word_shield_AuraScript : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0);
DoEffectCalcAmount.Register(&spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
AfterEffectAbsorb.Register(&spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0);
}
};
// 33110 - Prayer of Mending Heal
class spell_pri_prayer_of_mending_heal : public SpellScript
{
PrepareSpellScript(spell_pri_prayer_of_mending_heal);
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetOriginalCaster())
@@ -803,15 +763,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectHitTarget.Register(&spell_pri_prayer_of_mending_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
};
// 139 - Renew
class spell_pri_renew : public AuraScript
{
PrepareAuraScript(spell_pri_renew);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_TOUCH });
@@ -839,15 +797,13 @@ class spell_pri_renew : public AuraScript
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_pri_renew::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectApply.Register(&spell_pri_renew::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
// 32379 - Shadow Word: Death
class spell_pri_shadow_word_death : public SpellScript
{
PrepareSpellScript(spell_pri_shadow_word_death);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH });
@@ -889,16 +845,14 @@ class spell_pri_shadow_word_death : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_pri_shadow_word_death::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_pri_shadow_word_death::HandleSelfDamagingEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_pri_shadow_word_death::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_pri_shadow_word_death::HandleSelfDamagingEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 15473 - Shadowform
class spell_pri_shadowform : public AuraScript
{
PrepareAuraScript(spell_pri_shadowform);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -921,16 +875,14 @@ class spell_pri_shadowform : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_pri_shadowform::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadowform::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_pri_shadowform::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_pri_shadowform::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
// 15286 - Vampiric Embrace
class spell_pri_vampiric_embrace : public AuraScript
{
PrepareAuraScript(spell_pri_vampiric_embrace);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL });
@@ -953,16 +905,14 @@ class spell_pri_vampiric_embrace : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_embrace::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_embrace::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_vampiric_embrace::CheckProc);
OnEffectProc.Register(&spell_pri_vampiric_embrace::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 15290 - Vampiric Embrace (heal)
class spell_pri_vampiric_embrace_target : public SpellScript
{
PrepareSpellScript(spell_pri_vampiric_embrace_target);
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove(GetCaster());
@@ -970,15 +920,13 @@ class spell_pri_vampiric_embrace_target : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_vampiric_embrace_target::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
OnObjectAreaTargetSelect.Register(&spell_pri_vampiric_embrace_target::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY);
}
};
// 34914 - Vampiric Touch
class spell_pri_vampiric_touch : public AuraScript
{
PrepareAuraScript(spell_pri_vampiric_touch);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1012,16 +960,14 @@ class spell_pri_vampiric_touch : public AuraScript
void Register() override
{
AfterDispel += AuraDispelFn(spell_pri_vampiric_touch::HandleDispel);
DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_touch::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_touch::HandleEffectProc, EFFECT_2, SPELL_AURA_DUMMY);
AfterDispel.Register(&spell_pri_vampiric_touch::HandleDispel);
DoCheckProc.Register(&spell_pri_vampiric_touch::CheckProc);
OnEffectProc.Register(&spell_pri_vampiric_touch::HandleEffectProc, EFFECT_2, SPELL_AURA_DUMMY);
}
};
class spell_pri_echo_of_light : public AuraScript
{
PrepareAuraScript(spell_pri_echo_of_light);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1054,16 +1000,14 @@ class spell_pri_echo_of_light : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_echo_of_light::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_echo_of_light::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_echo_of_light::CheckProc);
OnEffectProc.Register(&spell_pri_echo_of_light::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 95740 - Shadow Orbs (Passive)
class spell_pri_shadow_orbs : public AuraScript
{
PrepareAuraScript(spell_pri_shadow_orbs);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo(
@@ -1096,16 +1040,14 @@ class spell_pri_shadow_orbs : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_shadow_orbs::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orbs::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_pri_shadow_orbs::CheckProc);
OnEffectProc.Register(&spell_pri_shadow_orbs::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 77486 - Shadow Orb Power (Passive)
class spell_pri_shadow_orb_power : public AuraScript
{
PrepareAuraScript(spell_pri_shadow_orb_power);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell });
@@ -1120,15 +1062,13 @@ class spell_pri_shadow_orb_power : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orb_power::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pri_shadow_orb_power::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 77487 - Shadow Orb
class spell_pri_shadow_orb : public AuraScript
{
PrepareAuraScript(spell_pri_shadow_orb);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1162,17 +1102,15 @@ class spell_pri_shadow_orb : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_pri_shadow_orb::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadow_orb::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orb::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
AfterEffectApply.Register(&spell_pri_shadow_orb::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_pri_shadow_orb::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectProc.Register(&spell_pri_shadow_orb::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 14751 - Chakra
class spell_pri_chakra : public AuraScript
{
PrepareAuraScript(spell_pri_chakra);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1236,16 +1174,14 @@ class spell_pri_chakra : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_pri_chakra::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectProc += AuraEffectProcFn(spell_pri_chakra::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER);
AfterEffectApply.Register(&spell_pri_chakra::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectProc.Register(&spell_pri_chakra::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER);
}
};
// 81206 - Chakra: Sanctuary
class spell_pri_chakra_sanctuary : public AuraScript
{
PrepareAuraScript(spell_pri_chakra_sanctuary);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1264,7 +1200,7 @@ class spell_pri_chakra_sanctuary : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_sanctuary::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_pri_chakra_sanctuary::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -1272,8 +1208,6 @@ class spell_pri_chakra_sanctuary : public AuraScript
// 81209 - Chakra: Chastise
class spell_pri_chakra_flow_removal: public AuraScript
{
PrepareAuraScript(spell_pri_chakra_flow_removal);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1292,17 +1226,15 @@ class spell_pri_chakra_flow_removal: public AuraScript
void Register() override
{
if (m_scriptSpellId == SPELL_PRIEST_CHAKRA_SERENITY)
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
else if (m_scriptSpellId == SPELL_PRIEST_CHAKRA_CHASTISE)
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
// 81585 - Chakra: Serenity
class spell_pri_chakra_serenity_script : public SpellScript
{
PrepareSpellScript(spell_pri_chakra_serenity_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_RENEW });
@@ -1316,15 +1248,13 @@ class spell_pri_chakra_serenity_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_chakra_serenity_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pri_chakra_serenity_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 88685 - Holy Word: Sanctuary
class spell_pri_holy_word_sanctuary : public AuraScript
{
PrepareAuraScript(spell_pri_holy_word_sanctuary);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_HOLY_WORD_SANCTUARY });
@@ -1338,15 +1268,13 @@ class spell_pri_holy_word_sanctuary : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_pri_holy_word_sanctuary::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_pri_holy_word_sanctuary::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 88686 - Holy Word: Sanctuary
class spell_pri_holy_word_sanctuary_triggered : public SpellScript
{
PrepareSpellScript(spell_pri_holy_word_sanctuary_triggered);
void HandleHeal(SpellEffIndex /*effIndex*/)
{
if (GetHitHeal() && _targets > 6)
@@ -1360,8 +1288,8 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_holy_word_sanctuary_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_pri_holy_word_sanctuary_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect.Register(&spell_pri_holy_word_sanctuary_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget.Register(&spell_pri_holy_word_sanctuary_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
private:
@@ -1371,8 +1299,6 @@ private:
// -81659 - Evangelism
class spell_pri_evangelism : public AuraScript
{
PrepareAuraScript(spell_pri_evangelism);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1411,15 +1337,13 @@ class spell_pri_evangelism : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_evangelism::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pri_evangelism::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 81660, 81661 - Evangelism (Triggered Effect) / 87117, 87118 - Dark Evangelism (Triggered Effect)
class spell_pri_evangelism_triggered : public AuraScript
{
PrepareAuraScript(spell_pri_evangelism_triggered);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1439,15 +1363,13 @@ class spell_pri_evangelism_triggered : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_pri_evangelism_triggered::AfterRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_pri_evangelism_triggered::AfterRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
// 87151 - Archangel
class spell_pri_archangel : public SpellScript
{
PrepareSpellScript(spell_pri_archangel);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1506,14 +1428,12 @@ class spell_pri_archangel : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_archangel::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pri_archangel::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
class spell_power_word_barrier : public AuraScript
{
PrepareAuraScript(spell_power_word_barrier);
bool Load() override
{
TempSummon* summon = GetCaster()->ToTempSummon();
@@ -1537,7 +1457,7 @@ class spell_power_word_barrier : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_power_word_barrier::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_power_word_barrier::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
private:
@@ -1547,8 +1467,6 @@ private:
// -89488 - Strength of Soul
class spell_pri_strength_of_soul : public AuraScript
{
PrepareAuraScript(spell_pri_strength_of_soul);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1582,14 +1500,12 @@ class spell_pri_strength_of_soul : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_strength_of_soul::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pri_strength_of_soul::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_pri_strength_of_soul_script : public SpellScript
{
PrepareSpellScript(spell_pri_strength_of_soul_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_WEAKENED_SOUL });
@@ -1603,15 +1519,13 @@ class spell_pri_strength_of_soul_script : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_strength_of_soul_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_pri_strength_of_soul_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// -14523 - Atonement
class spell_pri_atonement : public AuraScript
{
PrepareAuraScript(spell_pri_atonement);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1645,15 +1559,13 @@ class spell_pri_atonement : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_atonement::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_pri_atonement::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// Atonement (Healing)
class spell_pri_atonement_heal : public SpellScript
{
PrepareSpellScript(spell_pri_atonement_heal);
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(RaidCheck(GetCaster()));
@@ -1667,14 +1579,12 @@ class spell_pri_atonement_heal : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_atonement_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_pri_atonement_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
}
};
class spell_pri_spirit_of_redemption : public AuraScript
{
PrepareAuraScript(spell_pri_spirit_of_redemption);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_SPIRIT_OF_REDEMPTION_TRIGGERED });
@@ -1699,16 +1609,14 @@ class spell_pri_spirit_of_redemption : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_spirit_of_redemption::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_spirit_of_redemption::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_pri_spirit_of_redemption::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_pri_spirit_of_redemption::Absorb, EFFECT_0);
}
};
// 8092 - Mind Blast
class spell_pri_mind_blast : public SpellScript
{
PrepareSpellScript(spell_pri_mind_blast);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1746,16 +1654,14 @@ class spell_pri_mind_blast : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_mind_blast::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_pri_mind_blast::HandleImprovedMindBlast, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_pri_mind_blast::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_pri_mind_blast::HandleImprovedMindBlast, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 73510 - Mind Spike
class spell_pri_mind_spike : public SpellScript
{
PrepareSpellScript(spell_pri_mind_spike);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_EMPOWERED_SHADOW });
@@ -1778,15 +1684,13 @@ class spell_pri_mind_spike : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_pri_mind_spike::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_pri_mind_spike::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// -88994 - Masochism
class spell_pri_masochism : public AuraScript
{
PrepareAuraScript(spell_pri_masochism);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH });
@@ -1811,14 +1715,12 @@ class spell_pri_masochism : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_pri_masochism::CheckProc);
DoCheckProc.Register(&spell_pri_masochism::CheckProc);
}
};
class spell_pri_harnessed_shadows : public AuraScript
{
PrepareAuraScript(spell_pri_harnessed_shadows);
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ spellInfo->Effects[EFFECT_1].TriggerSpell });
@@ -1837,7 +1739,7 @@ class spell_pri_harnessed_shadows : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_pri_harnessed_shadows::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_pri_harnessed_shadows::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
src/server/scripts/Spells/spell_quest.cpp
+78 -211
View File
File diff suppressed because it is too large. Load diff
src/server/scripts/Spells/spell_rogue.cpp
+51 -118
View File
@@ -91,8 +91,6 @@ class spell_rog_blade_flurry : public SpellScriptLoader
class spell_rog_blade_flurry_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_blade_flurry_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK });
@@ -110,9 +108,9 @@ class spell_rog_blade_flurry : public SpellScriptLoader
void Register() override
{
if (m_scriptSpellId == SPELL_ROGUE_BLADE_FLURRY)
OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT);
OnEffectProc.Register(&spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT);
else
OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE);
OnEffectProc.Register(&spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE);
}
};
@@ -130,8 +128,6 @@ class spell_rog_cheat_death : public SpellScriptLoader
class spell_rog_cheat_death_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_cheat_death_AuraScript);
uint32 absorbChance = 0;
bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -172,8 +168,8 @@ class spell_rog_cheat_death : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0);
}
};
@@ -191,8 +187,6 @@ class spell_rog_crippling_poison : public SpellScriptLoader
class spell_rog_crippling_poison_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_crippling_poison_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_CRIPPLING_POISON });
@@ -206,7 +200,7 @@ class spell_rog_crippling_poison : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -224,8 +218,6 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader
class spell_rog_cut_to_the_chase_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_cut_to_the_chase_AuraScript);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
PreventDefaultAction();
@@ -235,7 +227,7 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -253,8 +245,6 @@ class spell_rog_deadly_poison : public SpellScriptLoader
class spell_rog_deadly_poison_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_deadly_poison_SpellScript);
bool Load() override
{
// at this point CastItem must already be initialized
@@ -328,8 +318,8 @@ class spell_rog_deadly_poison : public SpellScriptLoader
void Register() override
{
BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit);
AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit);
BeforeHit.Register(&spell_rog_deadly_poison_SpellScript::HandleBeforeHit);
AfterHit.Register(&spell_rog_deadly_poison_SpellScript::HandleAfterHit);
}
uint8 _stackAmount = 0;
@@ -351,8 +341,6 @@ class spell_rog_killing_spree : public SpellScriptLoader
class spell_rog_killing_spree_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_killing_spree_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty() || GetCaster()->GetVehicleBase())
@@ -368,8 +356,8 @@ class spell_rog_killing_spree : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rog_killing_spree_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_rog_killing_spree_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_rog_killing_spree_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_rog_killing_spree_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
@@ -380,8 +368,6 @@ class spell_rog_killing_spree : public SpellScriptLoader
class spell_rog_killing_spree_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_killing_spree_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -420,9 +406,9 @@ class spell_rog_killing_spree : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_rog_killing_spree_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_killing_spree_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectRemove += AuraEffectRemoveFn(spell_rog_killing_spree_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_rog_killing_spree_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_rog_killing_spree_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
AfterEffectRemove.Register(&spell_rog_killing_spree_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
public:
@@ -450,8 +436,6 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader
class spell_rog_master_of_subtlety_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_master_of_subtlety_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT });
@@ -467,7 +451,7 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_master_of_subtlety_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_rog_master_of_subtlety_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -485,8 +469,6 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader
class spell_rog_nerves_of_steel_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_nerves_of_steel_AuraScript);
public:
spell_rog_nerves_of_steel_AuraScript()
{
@@ -517,8 +499,8 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0);
}
};
@@ -536,8 +518,6 @@ class spell_rog_overkill : public SpellScriptLoader
class spell_rog_overkill_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_overkill_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_OVERKILL_POWER_REGEN });
@@ -553,7 +533,7 @@ class spell_rog_overkill : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_overkill_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_rog_overkill_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -571,8 +551,6 @@ class spell_rog_preparation : public SpellScriptLoader
class spell_rog_preparation_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_preparation_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -602,7 +580,7 @@ class spell_rog_preparation : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -620,8 +598,6 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader
class spell_rog_prey_on_the_weak_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_PREY_ON_THE_WEAK });
@@ -645,7 +621,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -658,8 +634,6 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader
// 73651 - Recuperate
class spell_rog_recuperate : public AuraScript
{
PrepareAuraScript(spell_rog_recuperate);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -693,9 +667,9 @@ class spell_rog_recuperate : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_recuperate::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_recuperate::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
AfterEffectApply += AuraEffectApplyFn(spell_rog_recuperate::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic.Register(&spell_rog_recuperate::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount.Register(&spell_rog_recuperate::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
AfterEffectApply.Register(&spell_rog_recuperate::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
public:
int32 Duration = 0;
@@ -704,8 +678,6 @@ public:
// -1943 - Rupture
class spell_rog_rupture : public AuraScript
{
PrepareAuraScript(spell_rog_rupture);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_REVEALING_STRIKE });
@@ -756,11 +728,10 @@ class spell_rog_rupture : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterEffectApply += AuraEffectApplyFn(spell_rog_rupture::ResetDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY);
AfterEffectApply += AuraEffectApplyFn(spell_rog_rupture::StoreOriginalDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
DoEffectCalcAmount.Register(&spell_rog_rupture::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
AfterEffectApply.Register(&spell_rog_rupture::ResetDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY);
AfterEffectApply.Register(&spell_rog_rupture::StoreOriginalDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
public:
// For Glyph of Backstab use
uint32 BonusDuration = 0;
@@ -775,8 +746,6 @@ class spell_rog_glyph_of_backstab_triggered : public SpellScriptLoader
class spell_rog_glyph_of_backstab_triggered_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_glyph_of_backstab_triggered_SpellScript);
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -811,7 +780,7 @@ class spell_rog_glyph_of_backstab_triggered : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_rog_glyph_of_backstab_triggered_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_rog_glyph_of_backstab_triggered_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -829,8 +798,6 @@ class spell_rog_shiv : public SpellScriptLoader
class spell_rog_shiv_SpellScript : public SpellScript
{
PrepareSpellScript(spell_rog_shiv_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -850,7 +817,7 @@ class spell_rog_shiv : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -868,8 +835,6 @@ class spell_rog_stealth : public SpellScriptLoader
class spell_rog_stealth_AuraScript : public AuraScript
{
PrepareAuraScript(spell_rog_stealth_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -914,8 +879,8 @@ class spell_rog_stealth : public SpellScriptLoader
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove += AuraEffectRemoveFn(spell_rog_stealth_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectRemove.Register(&spell_rog_stealth_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -928,8 +893,6 @@ class spell_rog_stealth : public SpellScriptLoader
// 57934 - Tricks of the Trade
class spell_rog_tricks_of_the_trade_aura : public AuraScript
{
PrepareAuraScript(spell_rog_tricks_of_the_trade_aura);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -961,8 +924,8 @@ class spell_rog_tricks_of_the_trade_aura : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_aura::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc += AuraEffectProcFn(spell_rog_tricks_of_the_trade_aura::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
AfterEffectRemove.Register(&spell_rog_tricks_of_the_trade_aura::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
OnEffectProc.Register(&spell_rog_tricks_of_the_trade_aura::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
ObjectGuid _redirectTarget;
@@ -972,8 +935,6 @@ public:
class spell_rog_tricks_of_the_trade : public SpellScript
{
PrepareSpellScript(spell_rog_tricks_of_the_trade);
void DoAfterHit()
{
if (Aura* aura = GetHitAura())
@@ -988,15 +949,13 @@ class spell_rog_tricks_of_the_trade : public SpellScript
void Register() override
{
AfterHit += SpellHitFn(spell_rog_tricks_of_the_trade::DoAfterHit);
AfterHit.Register(&spell_rog_tricks_of_the_trade::DoAfterHit);
}
};
// 59628 - Tricks of the Trade (Proc)
class spell_rog_tricks_of_the_trade_proc : public AuraScript
{
PrepareAuraScript(spell_rog_tricks_of_the_trade_proc);
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
GetTarget()->GetThreatManager().UnregisterRedirectThreat(SPELL_ROGUE_TRICKS_OF_THE_TRADE);
@@ -1004,15 +963,13 @@ class spell_rog_tricks_of_the_trade_proc : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_proc::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_rog_tricks_of_the_trade_proc::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// -51698 - Honor Among Thieves
class spell_rog_honor_among_thieves : public AuraScript
{
PrepareAuraScript(spell_rog_honor_among_thieves);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_HONOR_AMONG_THIEVES_TRIGGERED });
@@ -1033,15 +990,13 @@ class spell_rog_honor_among_thieves : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_honor_among_thieves::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_rog_honor_among_thieves::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 76806 - Main Gauche
class spell_rog_main_gauche : public AuraScript
{
PrepareAuraScript(spell_rog_main_gauche);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_MAIN_GAUCHE });
@@ -1076,15 +1031,13 @@ class spell_rog_main_gauche : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_rog_main_gauche::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_rog_main_gauche::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_rog_main_gauche::CheckProc);
OnEffectProc.Register(&spell_rog_main_gauche::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_rog_glyph_of_hemorrhage : public AuraScript
{
PrepareAuraScript(spell_rog_glyph_of_hemorrhage);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_GLYPH_HEMORRHAGE_TRIGGERED });
@@ -1108,15 +1061,13 @@ class spell_rog_glyph_of_hemorrhage : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_glyph_of_hemorrhage::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_rog_glyph_of_hemorrhage::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 2098 - Eviscerate
class spell_rog_eviscerate : public SpellScript
{
PrepareSpellScript(spell_rog_eviscerate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1181,16 +1132,14 @@ class spell_rog_eviscerate : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_rog_eviscerate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_rog_eviscerate::HandleSerratedBlades, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_rog_eviscerate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_rog_eviscerate::HandleSerratedBlades, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 32645 - Envenom
class spell_rog_envenom : public SpellScript
{
PrepareSpellScript(spell_rog_envenom);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_REVEALING_STRIKE });
@@ -1269,15 +1218,13 @@ class spell_rog_envenom : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_rog_envenom::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_rog_envenom::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 5171 - Slice and Dice
class spell_rog_slice_and_dice : public AuraScript
{
PrepareAuraScript(spell_rog_slice_and_dice);
void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/)
{
Duration = aurEff->GetBase()->GetDuration();
@@ -1285,7 +1232,7 @@ class spell_rog_slice_and_dice : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_rog_slice_and_dice::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
AfterEffectApply.Register(&spell_rog_slice_and_dice::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
public:
int32 Duration = 0;
@@ -1294,8 +1241,6 @@ public:
// -79121 - Deadly Momentum
class spell_rog_deadly_momentum : public AuraScript
{
PrepareAuraScript(spell_rog_deadly_momentum);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
Unit* target = GetTarget();
@@ -1313,15 +1258,13 @@ class spell_rog_deadly_momentum : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_deadly_momentum::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
OnEffectProc.Register(&spell_rog_deadly_momentum::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
}
};
// 6770 - Sap
class spell_rog_sap: public AuraScript
{
PrepareAuraScript(spell_rog_sap);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_BLACKJACK_R1 });
@@ -1339,15 +1282,13 @@ class spell_rog_sap: public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_rog_sap::HandleBlackJack, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_rog_sap::HandleBlackJack, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL);
}
};
// -14168 - Improved Expose Armor
class spell_rog_improved_expose_armor : public AuraScript
{
PrepareAuraScript(spell_rog_improved_expose_armor);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1380,16 +1321,14 @@ class spell_rog_improved_expose_armor : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_rog_improved_expose_armor::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_rog_improved_expose_armor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_rog_improved_expose_armor::CheckProc);
OnEffectProc.Register(&spell_rog_improved_expose_armor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -14158 - Murderous Intent
class spell_rog_murderous_intent : public AuraScript
{
PrepareAuraScript(spell_rog_murderous_intent);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_ROGUE_MURDEROUS_INTENT });
@@ -1408,16 +1347,14 @@ class spell_rog_murderous_intent : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_rog_murderous_intent::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_rog_murderous_intent::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_rog_murderous_intent::CheckProc);
OnEffectProc.Register(&spell_rog_murderous_intent::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -35541 - Combat Potency
class spell_rog_combat_potency : public AuraScript
{
PrepareAuraScript(spell_rog_combat_potency);
bool CheckProc(ProcEventInfo& eventInfo)
{
if (eventInfo.GetSpellInfo())
@@ -1430,15 +1367,13 @@ class spell_rog_combat_potency : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_rog_combat_potency::CheckProc);
DoCheckProc.Register(&spell_rog_combat_potency::CheckProc);
}
};
// -79095 - Restless Blades
class spell_rog_restless_blades : public AuraScript
{
PrepareAuraScript(spell_rog_restless_blades);
bool Load() override
{
return GetUnitOwner()->IsPlayer();
@@ -1469,15 +1404,13 @@ class spell_rog_restless_blades : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_rog_restless_blades::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_rog_restless_blades::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -84652 - Bandit's Guile
class spell_rog_bandits_guile : public AuraScript
{
PrepareAuraScript(spell_rog_bandits_guile);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1533,8 +1466,8 @@ class spell_rog_bandits_guile : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_rog_bandits_guile::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_rog_bandits_guile::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_rog_bandits_guile::CheckProc);
OnEffectProc.Register(&spell_rog_bandits_guile::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
ObjectGuid _recentTargetGUID;
src/server/scripts/Spells/spell_shaman.cpp
+70 -166
View File
@@ -141,8 +141,6 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader
class spell_sha_ancestral_awakening_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_ancestral_awakening_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES });
@@ -158,7 +156,7 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -177,8 +175,6 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader
class spell_sha_ancestral_awakening_proc_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC });
@@ -203,8 +199,8 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_ancestral_awakening_proc_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnObjectAreaTargetSelect.Register(&spell_sha_ancestral_awakening_proc_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnEffectHitTarget.Register(&spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -223,8 +219,6 @@ class spell_sha_bloodlust : public SpellScriptLoader
class spell_sha_bloodlust_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_bloodlust_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -250,10 +244,10 @@ class spell_sha_bloodlust : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit += SpellHitFn(spell_sha_bloodlust_SpellScript::ApplyDebuff);
OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit.Register(&spell_sha_bloodlust_SpellScript::ApplyDebuff);
}
};
@@ -272,8 +266,6 @@ class spell_sha_chain_heal : public SpellScriptLoader
class spell_sha_chain_heal_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_chain_heal_SpellScript);
public:
spell_sha_chain_heal_SpellScript()
{
@@ -307,7 +299,7 @@ class spell_sha_chain_heal : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectHitTarget.Register(&spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
bool firstHeal;
@@ -324,8 +316,6 @@ class spell_sha_chain_heal : public SpellScriptLoader
// 974 - Earth Shield
class spell_sha_earth_shield : public AuraScript
{
PrepareAuraScript(spell_sha_earth_shield);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_EARTH_SHIELD_HEAL });
@@ -350,7 +340,7 @@ class spell_sha_earth_shield : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_earth_shield::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_earth_shield::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -363,8 +353,6 @@ class spell_sha_earthbind_totem : public SpellScriptLoader
class spell_sha_earthbind_totem_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_earthbind_totem_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM, SPELL_SHAMAN_TOTEM_EARTHEN_POWER });
@@ -397,8 +385,8 @@ class spell_sha_earthbind_totem : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectApply += AuraEffectApplyFn(spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectApply.Register(&spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -433,8 +421,6 @@ class spell_sha_earthen_power : public SpellScriptLoader
class spell_sha_earthen_power_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_earthen_power_SpellScript);
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(EarthenPowerTargetSelector());
@@ -442,7 +428,7 @@ class spell_sha_earthen_power : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
OnObjectAreaTargetSelect.Register(&spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY);
}
};
@@ -460,8 +446,6 @@ class spell_sha_feedback : public SpellScriptLoader
class spell_sha_feedback_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_feedback_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY });
@@ -476,7 +460,7 @@ class spell_sha_feedback : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -490,8 +474,6 @@ class spell_sha_feedback : public SpellScriptLoader
/// Updated 4.3.4
class spell_sha_fire_nova : public SpellScript
{
PrepareSpellScript(spell_sha_fire_nova);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY });
@@ -507,15 +489,13 @@ class spell_sha_fire_nova : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_sha_fire_nova::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 8349 - Fire Nova
class spell_sha_fire_nova_damage : public SpellScript
{
PrepareSpellScript(spell_sha_fire_nova_damage);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (targets.empty())
@@ -531,8 +511,8 @@ class spell_sha_fire_nova_damage : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_fire_nova_damage::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_fire_nova_damage::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_sha_fire_nova_damage::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_sha_fire_nova_damage::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY);
}
};
@@ -545,8 +525,6 @@ class spell_sha_flame_shock : public SpellScriptLoader
class spell_sha_flame_shock_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_flame_shock_AuraScript);
bool Validate(SpellInfo const* /*spell*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_FLOWS_R1, SPELL_SHAMAN_LAVA_FLOWS_TRIGGERED_R1 });
@@ -571,7 +549,7 @@ class spell_sha_flame_shock : public SpellScriptLoader
void Register() override
{
AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel);
AfterDispel.Register(&spell_sha_flame_shock_AuraScript::HandleDispel);
}
};
@@ -590,8 +568,6 @@ class spell_sha_focused_insight : public SpellScriptLoader
class spell_sha_focused_insight_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_focused_insight_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_FOCUSED_INSIGHT });
@@ -614,8 +590,8 @@ class spell_sha_focused_insight : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_focused_insight_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_focused_insight_AuraScript::CheckProc);
OnEffectProc.Register(&spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -633,8 +609,6 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader
class spell_sha_glyph_of_healing_wave_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_glyph_of_healing_wave_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE });
@@ -656,8 +630,8 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_glyph_of_healing_wave_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_glyph_of_healing_wave_AuraScript::CheckProc);
OnEffectProc.Register(&spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -671,8 +645,6 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader
/// Updated 4.3.4
class spell_sha_healing_stream_totem : public SpellScript
{
PrepareSpellScript(spell_sha_healing_stream_totem);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL });
@@ -697,7 +669,7 @@ class spell_sha_healing_stream_totem : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_sha_healing_stream_totem::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -710,8 +682,6 @@ class spell_sha_heroism : public SpellScriptLoader
class spell_sha_heroism_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_heroism_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -737,10 +707,10 @@ class spell_sha_heroism : public SpellScriptLoader
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit += SpellHitFn(spell_sha_heroism_SpellScript::ApplyDebuff);
OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID);
OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID);
AfterHit.Register(&spell_sha_heroism_SpellScript::ApplyDebuff);
}
};
@@ -758,8 +728,6 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader
class spell_sha_item_lightning_shield_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD });
@@ -773,7 +741,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -791,8 +759,6 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader
class spell_sha_item_lightning_shield_trigger_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_MANA_SURGE });
@@ -806,7 +772,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -824,8 +790,6 @@ class spell_sha_item_mana_surge : public SpellScriptLoader
class spell_sha_item_mana_surge_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_item_mana_surge_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE });
@@ -842,7 +806,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -860,8 +824,6 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader
class spell_sha_item_t10_elemental_2p_bonus_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_item_t10_elemental_2p_bonus_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY });
@@ -876,7 +838,7 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_item_t10_elemental_2p_bonus_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_item_t10_elemental_2p_bonus_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -890,8 +852,6 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader
/// Updated 4.3.4
class spell_sha_lava_lash : public SpellScript
{
PrepareSpellScript(spell_sha_lava_lash);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -938,14 +898,12 @@ class spell_sha_lava_lash : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_sha_lava_lash::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
OnEffectLaunchTarget.Register(&spell_sha_lava_lash::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
}
};
class spell_sha_lava_lash_script : public SpellScript
{
PrepareSpellScript(spell_sha_lava_lash_script);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_FLAME_SHOCK });
@@ -987,8 +945,8 @@ class spell_sha_lava_lash_script : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_lava_lash_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnObjectAreaTargetSelect.Register(&spell_sha_lava_lash_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_sha_lava_lash_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -999,8 +957,6 @@ class spell_sha_lava_surge : public SpellScriptLoader
class spell_sha_lava_surge_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_lava_surge_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_SURGE });
@@ -1014,7 +970,7 @@ class spell_sha_lava_surge : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1031,8 +987,6 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader
class spell_sha_lava_surge_proc_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST });
@@ -1050,7 +1004,7 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -1070,8 +1024,6 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader
class spell_sha_mana_tide_totem_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_mana_tide_totem_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
// @TODO: Exclude the "short term" buffs from the stat value
@@ -1082,7 +1034,7 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT);
DoEffectCalcAmount.Register(&spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT);
}
};
@@ -1100,8 +1052,6 @@ class spell_sha_nature_guardian : public SpellScriptLoader
class spell_sha_nature_guardian_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_nature_guardian_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_NATURE_GUARDIAN });
@@ -1133,8 +1083,8 @@ class spell_sha_nature_guardian : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_nature_guardian_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_sha_nature_guardian_AuraScript::CheckProc);
OnEffectProc.Register(&spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -1147,8 +1097,6 @@ class spell_sha_nature_guardian : public SpellScriptLoader
// -88756 - Rolling Thunder
class spell_sha_rolling_thunder : public AuraScript
{
PrepareAuraScript(spell_sha_rolling_thunder);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1182,8 +1130,8 @@ class spell_sha_rolling_thunder : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_rolling_thunder::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_rolling_thunder::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
DoCheckProc.Register(&spell_sha_rolling_thunder::CheckProc);
OnEffectProc.Register(&spell_sha_rolling_thunder::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -1195,8 +1143,6 @@ class spell_sha_telluric_currents : public SpellScriptLoader
class spell_sha_telluric_currents_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_telluric_currents_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TELLURIC_CURRENTS });
@@ -1212,7 +1158,7 @@ class spell_sha_telluric_currents : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1225,8 +1171,6 @@ class spell_sha_telluric_currents : public SpellScriptLoader
// 51490 - Thunderstorm
class spell_sha_thunderstorm : public SpellScript
{
PrepareSpellScript(spell_sha_thunderstorm);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_THUNDERSTORM_SLOW });
@@ -1250,7 +1194,7 @@ class spell_sha_thunderstorm : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK);
OnEffectHitTarget.Register(&spell_sha_thunderstorm::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK);
}
};
@@ -1262,8 +1206,6 @@ class spell_sha_tidal_waves : public SpellScriptLoader
class spell_sha_tidal_waves_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_tidal_waves_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES });
@@ -1280,7 +1222,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1298,8 +1240,6 @@ public:
class spell_sha_totemic_mastery_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_totemic_mastery_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_TOTEMIC_MASTERY });
@@ -1318,7 +1258,7 @@ public:
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_totemic_mastery_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
OnEffectPeriodic.Register(&spell_sha_totemic_mastery_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL);
}
};
@@ -1331,8 +1271,6 @@ public:
// 77222 - Elemental Overload
class spell_sha_elemental_overload : public AuraScript
{
PrepareAuraScript(spell_sha_elemental_overload);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1385,8 +1323,8 @@ class spell_sha_elemental_overload : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_elemental_overload::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_elemental_overload::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_elemental_overload::CheckProc);
OnEffectProc.Register(&spell_sha_elemental_overload::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1398,8 +1336,6 @@ class spell_sha_ancestral_resolve : public SpellScriptLoader
class sspell_sha_ancestral_resolve_AuraScript : public AuraScript
{
PrepareAuraScript(sspell_sha_ancestral_resolve_AuraScript);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
amount = -1;
@@ -1418,8 +1354,8 @@ class spell_sha_ancestral_resolve : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(sspell_sha_ancestral_resolve_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb += AuraEffectAbsorbFn(sspell_sha_ancestral_resolve_AuraScript::Absorb, EFFECT_0);
DoEffectCalcAmount.Register(&sspell_sha_ancestral_resolve_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
OnEffectAbsorb.Register(&sspell_sha_ancestral_resolve_AuraScript::Absorb, EFFECT_0);
}
};
@@ -1437,8 +1373,6 @@ class spell_sha_resurgence : public SpellScriptLoader
class spell_sha_resurgence_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_resurgence_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1487,8 +1421,8 @@ class spell_sha_resurgence : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_resurgence_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_resurgence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_resurgence_AuraScript::CheckProc);
OnEffectProc.Register(&spell_sha_resurgence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1506,8 +1440,6 @@ class spell_sha_ancestral_healing : public SpellScriptLoader
class spell_sha_ancestral_healing_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_ancestral_healing_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_VIGOR });
@@ -1537,8 +1469,8 @@ class spell_sha_ancestral_healing : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_healing_AuraScript::HandleAncestralFortitude, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_healing_AuraScript::HandleAncestralVigor, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_ancestral_healing_AuraScript::HandleAncestralFortitude, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_sha_ancestral_healing_AuraScript::HandleAncestralVigor, EFFECT_1, SPELL_AURA_DUMMY);
}
};
@@ -1556,8 +1488,6 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader
class spell_sha_cleanse_spirit_SpellScript : public SpellScript
{
PrepareSpellScript(spell_sha_cleanse_spirit_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1600,7 +1530,7 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader
void Register() override
{
OnEffectSuccessfulDispel += SpellEffectFn(spell_sha_cleanse_spirit_SpellScript::HandleDispel, EFFECT_0, SPELL_EFFECT_DISPEL);
OnEffectSuccessfulDispel.Register(&spell_sha_cleanse_spirit_SpellScript::HandleDispel, EFFECT_0, SPELL_EFFECT_DISPEL);
}
};
@@ -1613,8 +1543,6 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader
// 8042 - Earth Shock
class spell_sha_earth_shock : public SpellScript
{
PrepareSpellScript(spell_sha_earth_shock);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1656,7 +1584,7 @@ class spell_sha_earth_shock : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_sha_earth_shock::HandleFulmination, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_sha_earth_shock::HandleFulmination, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1668,8 +1596,6 @@ class spell_sha_healing_rain : public SpellScriptLoader
class spell_sha_healing_rain_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_healing_rain_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_HEALING_RAIN_TRIGGERED });
@@ -1683,7 +1609,7 @@ class spell_sha_healing_rain : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_healing_rain_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_sha_healing_rain_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -1696,8 +1622,6 @@ class spell_sha_healing_rain : public SpellScriptLoader
// 73921 - Healing Rain Triggered
class spell_sha_healing_rain_triggered : public SpellScript
{
PrepareSpellScript(spell_sha_healing_rain_triggered);
void FilterTargets(std::list<WorldObject*>& unitList)
{
_targets = unitList.size();
@@ -1711,8 +1635,8 @@ class spell_sha_healing_rain_triggered : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_healing_rain_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget += SpellEffectFn(spell_sha_healing_rain_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnObjectAreaTargetSelect.Register(&spell_sha_healing_rain_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY);
OnEffectHitTarget.Register(&spell_sha_healing_rain_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
private:
uint8 _targets = 0;
@@ -1725,8 +1649,6 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader
class spell_sha_earthliving_weapon_AuraScript : public AuraScript
{
PrepareAuraScript(spell_sha_earthliving_weapon_AuraScript);
bool CheckProc(ProcEventInfo& eventInfo)
{
// Blessing of the Eternals
@@ -1741,7 +1663,7 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_earthliving_weapon_AuraScript::CheckProc);
DoCheckProc.Register(&spell_sha_earthliving_weapon_AuraScript::CheckProc);
}
};
@@ -1754,8 +1676,6 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader
// 10400 - Flametongue Weapon (Passive)
class spell_sha_flametongue_weapon : public AuraScript
{
PrepareAuraScript(spell_sha_flametongue_weapon);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1821,16 +1741,14 @@ class spell_sha_flametongue_weapon : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_flametongue_weapon::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_flametongue_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_flametongue_weapon::CheckProc);
OnEffectProc.Register(&spell_sha_flametongue_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 33757 - Windfury Weapon (Passive)
class spell_sha_windfury_weapon : public AuraScript
{
PrepareAuraScript(spell_sha_windfury_weapon);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1888,15 +1806,13 @@ class spell_sha_windfury_weapon : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_windfury_weapon::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_windfury_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_windfury_weapon::CheckProc);
OnEffectProc.Register(&spell_sha_windfury_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_sha_unleash_elements : public SpellScript
{
PrepareSpellScript(spell_sha_unleash_elements);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1965,15 +1881,13 @@ class spell_sha_unleash_elements : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_unleash_elements::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_sha_unleash_elements::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// -51525 - Static Shock
class spell_sha_static_shock : public AuraScript
{
PrepareAuraScript(spell_sha_static_shock);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_LIGHTNING_SHIELD_DAMAGE });
@@ -1996,16 +1910,14 @@ class spell_sha_static_shock : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_sha_static_shock::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_sha_static_shock::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_sha_static_shock::CheckProc);
OnEffectProc.Register(&spell_sha_static_shock::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// -63373 - Frozen Power
class spell_sha_frozen_power : public AuraScript
{
PrepareAuraScript(spell_sha_frozen_power);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_FREEZE });
@@ -2031,15 +1943,13 @@ class spell_sha_frozen_power : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_sha_frozen_power::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_sha_frozen_power::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
// 61882 - Earthquake
class spell_sha_earthquake : public AuraScript
{
PrepareAuraScript(spell_sha_earthquake);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_EARTHQUAKE_DAMAGE });
@@ -2053,15 +1963,13 @@ class spell_sha_earthquake : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthquake::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_sha_earthquake::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 77478 - Earthquake
class spell_sha_earthquake_damage : public SpellScript
{
PrepareSpellScript(spell_sha_earthquake_damage);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_EARTHQUAKE_STUN });
@@ -2076,15 +1984,13 @@ class spell_sha_earthquake_damage : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_earthquake_damage::HandleKnockdown, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_sha_earthquake_damage::HandleKnockdown, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 324 - Lightning Shield
class spell_sha_lightning_shield : public AuraScript
{
PrepareAuraScript(spell_sha_lightning_shield);
void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
if (GetTarget()->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_LIGHTNING_SHIELD, EFFECT_0))
@@ -2094,14 +2000,12 @@ class spell_sha_lightning_shield : public AuraScript
void Register() override
{
AfterEffectProc += AuraEffectProcFn(spell_sha_lightning_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
AfterEffectProc.Register(&spell_sha_lightning_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_sha_searing_bolt : public SpellScript
{
PrepareSpellScript(spell_sha_searing_bolt);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_SHAMAN_SEARING_FLAMES_DAMAGE });
@@ -2121,7 +2025,7 @@ class spell_sha_searing_bolt : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_sha_searing_bolt::HandleSearingFlames, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_sha_searing_bolt::HandleSearingFlames, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
src/server/scripts/Spells/spell_warlock.cpp
+60 -148
View File
@@ -133,8 +133,6 @@ enum MiscSpells
// -85113 - Aftermath
class spell_warl_aftermath : public AuraScript
{
PrepareAuraScript(spell_warl_aftermath);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -156,7 +154,7 @@ class spell_warl_aftermath : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_aftermath::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_warl_aftermath::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -168,8 +166,6 @@ class spell_warl_banish : public SpellScriptLoader
class spell_warl_banish_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_banish_SpellScript);
public:
spell_warl_banish_SpellScript()
{
@@ -202,8 +198,8 @@ class spell_warl_banish : public SpellScriptLoader
void Register() override
{
BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish);
AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura);
BeforeHit.Register(&spell_warl_banish_SpellScript::HandleBanish);
AfterHit.Register(&spell_warl_banish_SpellScript::RemoveAura);
}
bool _removed;
@@ -218,8 +214,6 @@ class spell_warl_banish : public SpellScriptLoader
// 17962 - Conflagrate
class spell_warl_conflagrate : public SpellScript
{
PrepareSpellScript(spell_warl_conflagrate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_IMMOLATE });
@@ -237,7 +231,7 @@ class spell_warl_conflagrate : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_conflagrate::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_warl_conflagrate::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -249,8 +243,6 @@ class spell_warl_create_healthstone : public SpellScriptLoader
class spell_warl_create_healthstone_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_create_healthstone_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_CREATE_HEALTHSTONE });
@@ -268,7 +260,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -287,8 +279,6 @@ class spell_warl_bane_of_doom : public SpellScriptLoader
class spell_warl_curse_of_doom_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_curse_of_doom_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_BANE_OF_DOOM_EFFECT });
@@ -313,7 +303,7 @@ class spell_warl_bane_of_doom : public SpellScriptLoader
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -332,8 +322,6 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader
class spell_warl_demonic_circle_summon_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_demonic_circle_summon_AuraScript);
void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode)
{
// If effect is removed by expire remove the summoned demonic circle too.
@@ -365,8 +353,8 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader
void Register() override
{
OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectRemove.Register(&spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectPeriodic.Register(&spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
@@ -385,8 +373,6 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader
class spell_warl_demonic_circle_teleport_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_demonic_circle_teleport_AuraScript);
void HandleTeleport(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (Player* player = GetTarget()->ToPlayer())
@@ -401,7 +387,7 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL);
OnEffectApply.Register(&spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -419,8 +405,6 @@ class spell_warl_demon_soul : public SpellScriptLoader
class spell_warl_demon_soul_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_demon_soul_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -467,7 +451,7 @@ class spell_warl_demon_soul : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -486,8 +470,6 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
class spell_warl_demonic_empowerment_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -538,7 +520,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -557,8 +539,6 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader
class spell_warl_everlasting_affliction_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_everlasting_affliction_SpellScript);
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -576,7 +556,7 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -594,8 +574,6 @@ class spell_warl_fel_flame : public SpellScriptLoader
class spell_warl_fel_flame_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_fel_flame_SpellScript);
void OnHitTarget(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -613,7 +591,7 @@ class spell_warl_fel_flame : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
@@ -631,8 +609,6 @@ class spell_warl_fel_synergy : public SpellScriptLoader
class spell_warl_fel_synergy_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_fel_synergy_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_FEL_SYNERGY_HEAL });
@@ -653,8 +629,8 @@ class spell_warl_fel_synergy : public SpellScriptLoader
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warl_fel_synergy_AuraScript::CheckProc);
OnEffectProc.Register(&spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -672,8 +648,6 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader
class spell_warl_glyph_of_shadowflame_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME });
@@ -687,7 +661,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_glyph_of_shadowflame_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_warl_glyph_of_shadowflame_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -706,8 +680,6 @@ class spell_warl_haunt : public SpellScriptLoader
class spell_warl_haunt_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_haunt_SpellScript);
void HandleAfterHit()
{
if (Aura* aura = GetHitAura())
@@ -717,14 +689,12 @@ class spell_warl_haunt : public SpellScriptLoader
void Register() override
{
AfterHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleAfterHit);
AfterHit.Register(&spell_warl_haunt_SpellScript::HandleAfterHit);
}
};
class spell_warl_haunt_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_haunt_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_HAUNT_HEAL });
@@ -741,7 +711,7 @@ class spell_warl_haunt : public SpellScriptLoader
void Register() override
{
OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
OnEffectRemove.Register(&spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK);
}
};
@@ -765,8 +735,6 @@ class spell_warl_health_funnel : public SpellScriptLoader
class spell_warl_health_funnel_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_health_funnel_AuraScript);
void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
Unit* caster = GetCaster();
@@ -806,9 +774,9 @@ class spell_warl_health_funnel : public SpellScriptLoader
void Register() override
{
OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_health_funnel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH);
OnEffectApply.Register(&spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL);
OnEffectRemove.Register(&spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL);
OnEffectPeriodic.Register(&spell_warl_health_funnel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH);
}
};
@@ -826,8 +794,6 @@ class spell_warl_healthstone_heal : public SpellScriptLoader
class spell_warl_healthstone_heal_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_healthstone_heal_SpellScript);
void HandleOnHit()
{
int32 heal = int32(CalculatePct(GetCaster()->GetCreateHealth(), GetHitHeal()));
@@ -836,7 +802,7 @@ class spell_warl_healthstone_heal : public SpellScriptLoader
void Register() override
{
OnHit += SpellHitFn(spell_warl_healthstone_heal_SpellScript::HandleOnHit);
OnHit.Register(&spell_warl_healthstone_heal_SpellScript::HandleOnHit);
}
};
@@ -849,8 +815,6 @@ class spell_warl_healthstone_heal : public SpellScriptLoader
// -18119 - Improved Soul Fire
class spell_warl_improved_soul_fire : public AuraScript
{
PrepareAuraScript(spell_warl_improved_soul_fire);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -869,7 +833,7 @@ class spell_warl_improved_soul_fire : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_improved_soul_fire::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_warl_improved_soul_fire::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -882,8 +846,6 @@ class spell_warl_life_tap : public SpellScriptLoader
class spell_warl_life_tap_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_life_tap_SpellScript);
bool Load() override
{
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
@@ -930,8 +892,8 @@ class spell_warl_life_tap : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast);
OnEffectHitTarget.Register(&spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnCheckCast.Register(&spell_warl_life_tap_SpellScript::CheckCast);
}
};
@@ -950,8 +912,6 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader
class spell_warl_nether_ward_overrride_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_nether_ward_overrride_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -972,7 +932,7 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_nether_ward_overrride_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS);
DoEffectCalcAmount.Register(&spell_warl_nether_ward_overrride_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS);
}
};
@@ -990,8 +950,6 @@ class spell_warl_seduction : public SpellScriptLoader
class spell_warl_seduction_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_seduction_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SUCCUBUS, SPELL_PRIEST_SHADOW_WORD_DEATH });
@@ -1013,7 +971,7 @@ class spell_warl_seduction : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_seduction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
OnEffectHitTarget.Register(&spell_warl_seduction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
}
};
@@ -1026,8 +984,6 @@ class spell_warl_seduction : public SpellScriptLoader
// 27243 - Seed of Corruption
class spell_warl_seed_of_corruption : public AuraScript
{
PrepareAuraScript(spell_warl_seed_of_corruption);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1114,10 +1070,10 @@ class spell_warl_seed_of_corruption : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_warl_seed_of_corruption::HandleSoulburnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_seed_of_corruption::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
DoCheckProc += AuraCheckProcFn(spell_warl_seed_of_corruption::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_seed_of_corruption::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
AfterEffectApply.Register(&spell_warl_seed_of_corruption::HandleSoulburnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_seed_of_corruption::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
DoCheckProc.Register(&spell_warl_seed_of_corruption::CheckProc);
OnEffectProc.Register(&spell_warl_seed_of_corruption::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
private:
bool _affectedBySoulburn = false;
@@ -1127,8 +1083,6 @@ private:
// 87385 - Seed of Corruption (explosion damage)
class spell_warl_seed_of_corruption_aoe : public SpellScript
{
PrepareSpellScript(spell_warl_seed_of_corruption_aoe);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1147,7 +1101,7 @@ class spell_warl_seed_of_corruption_aoe : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_seed_of_corruption_aoe::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_warl_seed_of_corruption_aoe::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1160,8 +1114,6 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader
class spell_warl_shadow_trance_proc_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_shadow_trance_proc_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_SHADOW_TRANCE });
@@ -1175,7 +1127,7 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -1188,8 +1140,6 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader
// 6229 - Shadow Ward
class spell_warl_shadow_ward : public AuraScript
{
PrepareAuraScript(spell_warl_shadow_ward);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated)
{
canBeRecalculated = false;
@@ -1205,15 +1155,13 @@ class spell_warl_shadow_ward : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
DoEffectCalcAmount.Register(&spell_warl_shadow_ward::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB);
}
};
// -30293 - Soul Leech
class spell_warl_soul_leech : public AuraScript
{
PrepareAuraScript(spell_warl_soul_leech);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_GEN_REPLENISHMENT });
@@ -1226,7 +1174,7 @@ class spell_warl_soul_leech : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_soul_leech::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
OnEffectProc.Register(&spell_warl_soul_leech::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE);
}
};
@@ -1238,8 +1186,6 @@ class spell_warl_soul_swap : public SpellScriptLoader
class spell_warl_soul_swap_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_soul_swap_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1258,7 +1204,7 @@ class spell_warl_soul_swap : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1278,8 +1224,6 @@ class spell_warl_soul_swap_override : public SpellScriptLoader
class spell_warl_soul_swap_override_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_soul_swap_override_AuraScript);
bool Load() override
{
_swapCaster = nullptr;
@@ -1315,8 +1259,6 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader
class spell_warl_soul_swap_dot_marker_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_soul_swap_dot_marker_SpellScript);
typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript;
void HandleHit(SpellEffIndex effIndex)
@@ -1349,7 +1291,7 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -1367,9 +1309,7 @@ public:
class spell_warl_soul_swap_exhale_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_soul_swap_exhale_SpellScript);
typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript;
typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript;
bool Validate(SpellInfo const* /*spellInfo*/) override
{
@@ -1430,8 +1370,8 @@ public:
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_warl_soul_swap_exhale_SpellScript::CheckCast);
OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnCheckCast.Register(&spell_warl_soul_swap_exhale_SpellScript::CheckCast);
OnEffectHitTarget.Register(&spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
@@ -1450,8 +1390,6 @@ class spell_warl_soulshatter : public SpellScriptLoader
class spell_warl_soulshatter_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_soulshatter_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_SOULSHATTER_EFFECT });
@@ -1467,7 +1405,7 @@ class spell_warl_soulshatter : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
@@ -1486,8 +1424,6 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
class spell_warl_unstable_affliction_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_unstable_affliction_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL });
@@ -1506,7 +1442,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
void Register() override
{
AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel);
AfterDispel.Register(&spell_warl_unstable_affliction_AuraScript::HandleDispel);
}
};
@@ -1524,8 +1460,6 @@ class spell_warl_drain_life : public SpellScriptLoader
class spell_warl_drain_life_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_drain_life_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
{
return ValidateSpellInfo({ SPELL_WARLOCK_DRAIN_LIFE_HEAL });
@@ -1550,7 +1484,7 @@ class spell_warl_drain_life : public SpellScriptLoader
void Register()
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_drain_life_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
OnEffectPeriodic.Register(&spell_warl_drain_life_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
@@ -1568,8 +1502,6 @@ class spell_warl_drain_life_heal : public SpellScriptLoader
class spell_warl_drain_life_heal_SpellScript : public SpellScript
{
PrepareSpellScript(spell_warl_drain_life_heal_SpellScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1615,7 +1547,7 @@ class spell_warl_drain_life_heal : public SpellScriptLoader
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warl_drain_life_heal_SpellScript::HandleSoulSiphon, EFFECT_0, SPELL_EFFECT_HEAL_PCT);
OnEffectHitTarget.Register(&spell_warl_drain_life_heal_SpellScript::HandleSoulSiphon, EFFECT_0, SPELL_EFFECT_HEAL_PCT);
}
};
@@ -1633,8 +1565,6 @@ class spell_warl_drain_soul : public SpellScriptLoader
class spell_warl_drain_soul_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_drain_soul_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/)
{
return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_SHARD_ENERGIZE });
@@ -1650,7 +1580,7 @@ class spell_warl_drain_soul : public SpellScriptLoader
void Register()
{
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_drain_soul_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_drain_soul_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
}
};
@@ -1668,8 +1598,6 @@ class spell_warl_fel_armor : public SpellScriptLoader
class spell_warl_fel_armor_AuraScript : public AuraScript
{
PrepareAuraScript(spell_warl_fel_armor_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_FEL_ARMOR_HEAL });
@@ -1685,7 +1613,7 @@ class spell_warl_fel_armor : public SpellScriptLoader
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warl_fel_armor_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
OnEffectProc.Register(&spell_warl_fel_armor_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY);
}
};
@@ -1697,8 +1625,6 @@ class spell_warl_fel_armor : public SpellScriptLoader
class spell_warl_soul_harvest : public AuraScript
{
PrepareAuraScript(spell_warl_soul_harvest);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_HARVEST_ENERGIZE });
@@ -1712,15 +1638,13 @@ class spell_warl_soul_harvest : public AuraScript
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_soul_harvest::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic.Register(&spell_warl_soul_harvest::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
}
};
// 74434 - Soulburn
class spell_warl_soulburn : public AuraScript
{
PrepareAuraScript(spell_warl_soulburn);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1785,18 +1709,16 @@ class spell_warl_soulburn : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_soulburn::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_soulburn::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
AfterEffectApply += AuraEffectApplyFn(spell_warl_soulburn::HandleSeedOfCorruptionDummyApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_soulburn::HandleSeedOfCorruptionDummyRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
DoCheckProc.Register(&spell_warl_soulburn::CheckProc);
OnEffectProc.Register(&spell_warl_soulburn::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER);
AfterEffectApply.Register(&spell_warl_soulburn::HandleSeedOfCorruptionDummyApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_soulburn::HandleSeedOfCorruptionDummyRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL);
}
};
// 29722 - Incinerate
class spell_warl_incinerate : public SpellScript
{
PrepareSpellScript(spell_warl_incinerate);
void HandleDamageBonus(SpellEffIndex /*effIndex*/)
{
int32 bp = GetEffectValue();
@@ -1818,15 +1740,13 @@ class spell_warl_incinerate : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warl_incinerate::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warl_incinerate::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 29341 - Shadowburn
class spell_warl_shadowburn : public AuraScript
{
PrepareAuraScript(spell_warl_shadowburn);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_SHARD });
@@ -1845,15 +1765,13 @@ class spell_warl_shadowburn : public AuraScript
void Register() override
{
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_shadowburn::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_shadowburn::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// -91986 - Burning Embers
class spell_warl_burning_embers : public AuraScript
{
PrepareAuraScript(spell_warl_burning_embers);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARLOCK_BURNING_EMBERS_DAMAGE });
@@ -1878,16 +1796,14 @@ class spell_warl_burning_embers : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_burning_embers::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_burning_embers::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warl_burning_embers::CheckProc);
OnEffectProc.Register(&spell_warl_burning_embers::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 50796 - Chaos Bolt
class spell_warl_chaos_bolt : public SpellScript
{
PrepareSpellScript(spell_warl_chaos_bolt);
void HandleDamageBonus(SpellEffIndex /*effIndex*/)
{
int32 bp = GetEffectValue();
@@ -1902,15 +1818,13 @@ class spell_warl_chaos_bolt : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warl_chaos_bolt::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warl_chaos_bolt::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// -18179 - Jinx
class spell_warl_jinx : public AuraScript
{
PrepareAuraScript(spell_warl_jinx);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -1936,16 +1850,14 @@ class spell_warl_jinx : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warl_jinx::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warl_jinx::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warl_jinx::CheckProc);
OnEffectProc.Register(&spell_warl_jinx::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 702 - Curse of Weakness
class spell_warl_curse_of_weakness : public AuraScript
{
PrepareAuraScript(spell_warl_curse_of_weakness);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -2002,8 +1914,8 @@ class spell_warl_curse_of_weakness : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_warl_curse_of_weakness::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_weakness::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectApply.Register(&spell_warl_curse_of_weakness::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove.Register(&spell_warl_curse_of_weakness::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL);
}
private:
uint32 _debuffSpellId = 0;
src/server/scripts/Spells/spell_warrior.cpp
+48 -117
View File
@@ -95,8 +95,6 @@ enum MiscSpells
// 23881 - Bloodthirst
class spell_warr_bloodthirst : public SpellScript
{
PrepareSpellScript(spell_warr_bloodthirst);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST });
@@ -116,8 +114,8 @@ class spell_warr_bloodthirst : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_bloodthirst::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHit += SpellEffectFn(spell_warr_bloodthirst::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectLaunchTarget.Register(&spell_warr_bloodthirst::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHit.Register(&spell_warr_bloodthirst::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
@@ -125,8 +123,6 @@ class spell_warr_bloodthirst : public SpellScript
// 23880 - Bloodthirst
class spell_warr_bloodthirst_heal : public SpellScript
{
PrepareSpellScript(spell_warr_bloodthirst_heal);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST_DAMAGE });
@@ -140,15 +136,13 @@ class spell_warr_bloodthirst_heal : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
OnEffectHitTarget.Register(&spell_warr_bloodthirst_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL);
}
};
/// Updated 4.3.4
class spell_warr_charge : public SpellScript
{
PrepareSpellScript(spell_warr_charge);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -181,16 +175,14 @@ class spell_warr_charge : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_charge::HandleStun, EFFECT_0, SPELL_EFFECT_CHARGE);
OnEffectHitTarget += SpellEffectFn(spell_warr_charge::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_warr_charge::HandleStun, EFFECT_0, SPELL_EFFECT_CHARGE);
OnEffectHitTarget.Register(&spell_warr_charge::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY);
}
};
/// Updated 4.3.4
class spell_warr_concussion_blow : public SpellScript
{
PrepareSpellScript(spell_warr_concussion_blow);
void HandleDummy(SpellEffIndex /*effIndex*/)
{
SetEffectValue(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetSpellInfo()->Effects[EFFECT_2].CalcValue()));
@@ -198,15 +190,13 @@ class spell_warr_concussion_blow : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_concussion_blow::HandleDummy, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warr_concussion_blow::HandleDummy, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 86346 - Colossus Smash
class spell_warr_colossus_smash : public SpellScript
{
PrepareSpellScript(spell_warr_colossus_smash);
void HandleGlyphEffect(SpellEffIndex /*effIndex*/)
{
if (Unit* caster = GetCaster())
@@ -216,7 +206,7 @@ class spell_warr_colossus_smash : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_colossus_smash::HandleGlyphEffect, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectHitTarget.Register(&spell_warr_colossus_smash::HandleGlyphEffect, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
}
};
@@ -224,8 +214,6 @@ class spell_warr_colossus_smash : public SpellScript
// -12834 - Deep Wounds
class spell_warr_deep_wounds : public AuraScript
{
PrepareAuraScript(spell_warr_deep_wounds);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC });
@@ -250,15 +238,13 @@ class spell_warr_deep_wounds : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warr_deep_wounds::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_warr_deep_wounds::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
/// Updated 4.3.4
class spell_warr_execute : public SpellScript
{
PrepareSpellScript(spell_warr_execute);
void HandleEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
@@ -287,15 +273,13 @@ class spell_warr_execute : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_execute::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warr_execute::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
// 58387 - Glyph of Sunder Armor
class spell_warr_glyph_of_sunder_armor : public AuraScript
{
PrepareAuraScript(spell_warr_glyph_of_sunder_armor);
void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod)
{
if (!spellMod)
@@ -312,15 +296,13 @@ class spell_warr_glyph_of_sunder_armor : public AuraScript
void Register() override
{
DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_warr_glyph_of_sunder_armor::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
DoEffectCalcSpellMod.Register(&spell_warr_glyph_of_sunder_armor::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 5246 - Intimidating Shout
class spell_warr_intimidating_shout : public SpellScript
{
PrepareSpellScript(spell_warr_intimidating_shout);
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove(GetExplTargetWorldObject());
@@ -328,16 +310,14 @@ class spell_warr_intimidating_shout : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_warr_intimidating_shout::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY);
OnObjectAreaTargetSelect.Register(&spell_warr_intimidating_shout::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY);
}
};
// -84583 Lambs to the Slaughter
class spell_warr_lambs_to_the_slaughter : public AuraScript
{
PrepareAuraScript(spell_warr_lambs_to_the_slaughter);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_MORTAL_STRIKE, SPELL_WARRIOR_REND });
@@ -352,7 +332,7 @@ class spell_warr_lambs_to_the_slaughter : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warr_lambs_to_the_slaughter::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_warr_lambs_to_the_slaughter::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
@@ -360,8 +340,6 @@ class spell_warr_lambs_to_the_slaughter : public AuraScript
// 12975 - Last Stand
class spell_warr_last_stand : public SpellScript
{
PrepareSpellScript(spell_warr_last_stand);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_LAST_STAND_TRIGGERED });
@@ -377,15 +355,13 @@ class spell_warr_last_stand : public SpellScript
void Register() override
{
// add dummy effect spell handler to Last Stand
OnEffectHit += SpellEffectFn(spell_warr_last_stand::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHit.Register(&spell_warr_last_stand::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 7384 - Overpower
class spell_warr_overpower : public SpellScript
{
PrepareSpellScript(spell_warr_overpower);
void HandleEffect(SpellEffIndex /*effIndex*/)
{
uint32 spellId = 0;
@@ -404,15 +380,13 @@ class spell_warr_overpower : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_overpower::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY);
OnEffectHitTarget.Register(&spell_warr_overpower::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY);
}
};
// 97462 - Rallying Cry
class spell_warr_rallying_cry : public SpellScript
{
PrepareSpellScript(spell_warr_rallying_cry);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_RALLYING_CRY });
@@ -432,15 +406,13 @@ class spell_warr_rallying_cry : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_rallying_cry::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectHitTarget.Register(&spell_warr_rallying_cry::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
// 94009 - Rend
class spell_warr_rend : public AuraScript
{
PrepareAuraScript(spell_warr_rend);
void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated)
{
if (Unit* caster = GetCaster())
@@ -459,15 +431,13 @@ class spell_warr_rend : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
DoEffectCalcAmount.Register(&spell_warr_rend::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
}
};
// 20230 - Retaliation
class spell_warr_retaliation : public AuraScript
{
PrepareAuraScript(spell_warr_retaliation);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_RETALIATION_DAMAGE });
@@ -487,16 +457,14 @@ class spell_warr_retaliation : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_retaliation::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_retaliation::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warr_retaliation::CheckProc);
OnEffectProc.Register(&spell_warr_retaliation::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
// 64380, 65941 - Shattering Throw
class spell_warr_shattering_throw : public SpellScript
{
PrepareSpellScript(spell_warr_shattering_throw);
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
@@ -508,15 +476,13 @@ class spell_warr_shattering_throw : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warr_shattering_throw::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
/// Updated 4.3.4
class spell_warr_slam : public SpellScript
{
PrepareSpellScript(spell_warr_slam);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -543,14 +509,12 @@ class spell_warr_slam : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_slam::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
OnEffectLaunchTarget.Register(&spell_warr_slam::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY);
}
};
class spell_warr_slam_triggered : public SpellScript
{
PrepareSpellScript(spell_warr_slam_triggered);
bool Load() override
{
_bloodsurgeBonusActive = GetCaster()->HasAura(SPELL_WARRIOR_BLOODSURGE, GetCaster()->GetGUID());
@@ -583,7 +547,7 @@ class spell_warr_slam_triggered : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_slam_triggered::HandleBonusDamage, EFFECT_1, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warr_slam_triggered::HandleBonusDamage, EFFECT_1, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE);
}
private:
bool _bloodsurgeBonusActive = false;
@@ -591,8 +555,6 @@ private:
class spell_warr_second_wind_proc : public AuraScript
{
PrepareAuraScript(spell_warr_second_wind_proc);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -631,15 +593,13 @@ class spell_warr_second_wind_proc : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_second_wind_proc::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_second_wind_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warr_second_wind_proc::CheckProc);
OnEffectProc.Register(&spell_warr_second_wind_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_warr_second_wind_trigger : public AuraScript
{
PrepareAuraScript(spell_warr_second_wind_trigger);
void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/)
{
amount = int32(GetUnitOwner()->CountPctFromMaxHealth(amount));
@@ -647,15 +607,13 @@ class spell_warr_second_wind_trigger : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_second_wind_trigger::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount.Register(&spell_warr_second_wind_trigger::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL);
}
};
// 52437 - Sudden Death
class spell_warr_sudden_death : public AuraScript
{
PrepareAuraScript(spell_warr_sudden_death);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_COLOSSUS_SMASH });
@@ -670,15 +628,13 @@ class spell_warr_sudden_death : public AuraScript
void Register() override
{
AfterEffectApply += AuraEffectRemoveFn(spell_warr_sudden_death::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); // correct?
AfterEffectApply.Register(&spell_warr_sudden_death::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
}
};
// 12328, 18765, 35429 - Sweeping Strikes
class spell_warr_sweeping_strikes : public AuraScript
{
PrepareAuraScript(spell_warr_sweeping_strikes);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -715,8 +671,8 @@ class spell_warr_sweeping_strikes : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warr_sweeping_strikes::CheckProc);
OnEffectProc.Register(&spell_warr_sweeping_strikes::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
private:
Unit* _procTarget = nullptr;
@@ -724,10 +680,7 @@ private:
// -46951 - Sword and Board
class spell_warr_sword_and_board : public AuraScript
{
PrepareAuraScript(spell_warr_sword_and_board);
private:
{private:
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_SHIELD_SLAM });
@@ -742,15 +695,13 @@ private:
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warr_sword_and_board::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_warr_sword_and_board::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
// 34428 - Victory Rush
class spell_warr_victory_rush : public SpellScript
{
PrepareSpellScript(spell_warr_victory_rush);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo(
@@ -791,16 +742,14 @@ class spell_warr_victory_rush : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_victory_rush::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget += SpellEffectFn(spell_warr_victory_rush::HandleImpendingVictoryHeal, EFFECT_2, SPELL_EFFECT_HEAL_PCT);
OnEffectLaunchTarget.Register(&spell_warr_victory_rush::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectHitTarget.Register(&spell_warr_victory_rush::HandleImpendingVictoryHeal, EFFECT_2, SPELL_EFFECT_HEAL_PCT);
}
};
// 50720 - Vigilance
class spell_warr_vigilance : public AuraScript
{
PrepareAuraScript(spell_warr_vigilance);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_VENGEANCE });
@@ -832,9 +781,9 @@ class spell_warr_vigilance : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_vigilance::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_vigilance::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectRemove += AuraEffectRemoveFn(spell_warr_vigilance::HandleRemove, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
DoCheckProc.Register(&spell_warr_vigilance::CheckProc);
OnEffectProc.Register(&spell_warr_vigilance::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectRemove.Register(&spell_warr_vigilance::HandleRemove, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL);
}
private:
Unit* _procTarget = nullptr;
@@ -843,8 +792,6 @@ private:
// 50725 Vigilance
class spell_warr_vigilance_trigger : public SpellScript
{
PrepareSpellScript(spell_warr_vigilance_trigger);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_TAUNT });
@@ -861,15 +808,13 @@ class spell_warr_vigilance_trigger : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_vigilance_trigger::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget.Register(&spell_warr_vigilance_trigger::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
// 76838 - Strikes of Opportunity
class spell_warr_strikes_of_opportunity : public AuraScript
{
PrepareAuraScript(spell_warr_strikes_of_opportunity);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_OPPORTUNITY_STRIKE });
@@ -890,15 +835,13 @@ class spell_warr_strikes_of_opportunity : public AuraScript
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_warr_strikes_of_opportunity::CheckProc);
OnEffectProc += AuraEffectProcFn(spell_warr_strikes_of_opportunity::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
DoCheckProc.Register(&spell_warr_strikes_of_opportunity::CheckProc);
OnEffectProc.Register(&spell_warr_strikes_of_opportunity::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
class spell_warr_thunder_clap : public SpellScript
{
PrepareSpellScript(spell_warr_thunder_clap);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_REND });
@@ -929,8 +872,8 @@ class spell_warr_thunder_clap : public SpellScript
void Register() override
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_thunder_clap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget += SpellEffectFn(spell_warr_thunder_clap::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
OnObjectAreaTargetSelect.Register(&spell_warr_thunder_clap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
OnEffectHitTarget.Register(&spell_warr_thunder_clap::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
}
private:
@@ -939,8 +882,6 @@ private:
class spell_warr_shield_specialization : public AuraScript
{
PrepareAuraScript(spell_warr_shield_specialization);
void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo)
{
if (eventInfo.GetHitMask() & PROC_HIT_REFLECT)
@@ -957,14 +898,12 @@ class spell_warr_shield_specialization : public AuraScript
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_warr_shield_specialization::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL);
OnEffectProc.Register(&spell_warr_shield_specialization::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL);
}
};
class spell_warr_blood_craze : public AuraScript
{
PrepareAuraScript(spell_warr_blood_craze);
void HandleCalcAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/)
{
int32 bp = GetSpellInfo()->Effects[EFFECT_0].BasePoints / 2;
@@ -974,15 +913,13 @@ class spell_warr_blood_craze : public AuraScript
void Register() override
{
DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_blood_craze::HandleCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
DoEffectCalcAmount.Register(&spell_warr_blood_craze::HandleCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL);
}
};
// 46968 - Shockwave
class spell_warr_shockwave : public SpellScript
{
PrepareSpellScript(spell_warr_shockwave);
void HandleDamage(SpellEffIndex /*effIndex*/)
{
SetEffectValue(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetSpellInfo()->Effects[EFFECT_2].CalcValue()));
@@ -990,14 +927,12 @@ class spell_warr_shockwave : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_shockwave::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
OnEffectLaunchTarget.Register(&spell_warr_shockwave::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE);
}
};
class spell_warr_devastate : public SpellScript
{
PrepareSpellScript(spell_warr_devastate);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
return ValidateSpellInfo({ SPELL_WARRIOR_SUNDER_ARMOR });
@@ -1018,15 +953,13 @@ class spell_warr_devastate : public SpellScript
void Register() override
{
OnEffectLaunchTarget += SpellEffectFn(spell_warr_devastate::HandleDamageBonus, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectHitTarget += SpellEffectFn(spell_warr_devastate::HandleSunderArmor, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectLaunchTarget.Register(&spell_warr_devastate::HandleDamageBonus, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
OnEffectHitTarget.Register(&spell_warr_devastate::HandleSunderArmor, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
}
};
class spell_warr_whirlwind : public SpellScript
{
PrepareSpellScript(spell_warr_whirlwind);
void CountTargets(SpellEffIndex /*effIndex*/)
{
_hitTargets++;
@@ -1043,8 +976,8 @@ class spell_warr_whirlwind : public SpellScript
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_warr_whirlwind::CountTargets, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
AfterCast += SpellCastFn(spell_warr_whirlwind::HandleCooldownReduction);
OnEffectHitTarget.Register(&spell_warr_whirlwind::CountTargets, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG);
AfterCast.Register(&spell_warr_whirlwind::HandleCooldownReduction);
}
private:
uint8 _hitTargets = 0;
@@ -1052,8 +985,6 @@ private:
class spell_warr_heroic_leap : public SpellScript
{
PrepareSpellScript(spell_warr_heroic_leap);
SpellCastResult CheckLocation()
{
// The client shows an area as unreachable once the target destination is 4 yards above your position
@@ -1065,7 +996,7 @@ class spell_warr_heroic_leap : public SpellScript
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_warr_heroic_leap::CheckLocation);
OnCheckCast.Register(&spell_warr_heroic_leap::CheckLocation);
}
};