diff options
Diffstat (limited to 'src/server/scripts/Spells')
| -rw-r--r-- | src/server/scripts/Spells/spell_azerite.cpp | 44 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dh.cpp | 20 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 54 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_druid.cpp | 100 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_evoker.cpp | 12 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 298 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_hunter.cpp | 50 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 250 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_mage.cpp | 90 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_monk.cpp | 24 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 84 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_pet.cpp | 44 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 94 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_quest.cpp | 117 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_rogue.cpp | 56 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_shaman.cpp | 110 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 66 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warrior.cpp | 50 |
18 files changed, 0 insertions, 1563 deletions
diff --git a/src/server/scripts/Spells/spell_azerite.cpp b/src/server/scripts/Spells/spell_azerite.cpp index 3fa21120fa0..cc375591d3b 100644 --- a/src/server/scripts/Spells/spell_azerite.cpp +++ b/src/server/scripts/Spells/spell_azerite.cpp @@ -27,8 +27,6 @@ class spell_azerite_gen_aura_calc_from_2nd_effect_triggered_spell : public AuraScript { - PrepareAuraScript(spell_azerite_gen_aura_calc_from_2nd_effect_triggered_spell); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_1).TriggerSpell }); @@ -55,8 +53,6 @@ class spell_azerite_gen_aura_calc_from_2nd_effect_triggered_spell : public AuraS // 270658 - Azerite Fortification class spell_item_azerite_fortification : public AuraScript { - PrepareAuraScript(spell_item_azerite_fortification); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { Spell const* procSpell = eventInfo.GetProcSpell(); @@ -84,8 +80,6 @@ enum StrengthInNumbers // 271548 - Strength in Numbers class spell_item_strength_in_numbers : public SpellScript { - PrepareSpellScript(spell_item_strength_in_numbers); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STRENGTH_IN_NUMBERS_TRAIT, SPELL_STRENGTH_IN_NUMBERS_BUFF }); @@ -115,8 +109,6 @@ enum BlessedPortents // 271843 - Blessed Portents class spell_item_blessed_portents : public AuraScript { - PrepareAuraScript(spell_item_blessed_portents); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLESSED_PORTENTS_TRAIT, SPELL_BLESSED_PORTENTS_HEAL }); @@ -149,8 +141,6 @@ enum ConcentratedMending // 272260 - Concentrated Mending class spell_item_concentrated_mending : public AuraScript { - PrepareAuraScript(spell_item_concentrated_mending); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CONCENTRATED_MENDING_TRAIT }); @@ -180,8 +170,6 @@ enum BracingChill // 272276 - Bracing Chill class spell_item_bracing_chill_proc : public AuraScript { - PrepareAuraScript(spell_item_bracing_chill_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BRACING_CHILL_TRAIT, SPELL_BRACING_CHILL_HEAL, SPELL_BRACING_CHILL_SEARCH_JUMP_TARGET }); @@ -219,8 +207,6 @@ class spell_item_bracing_chill_proc : public AuraScript // 272436 - Bracing Chill class spell_item_bracing_chill_search_jump_target : public SpellScript { - PrepareSpellScript(spell_item_bracing_chill_search_jump_target); - void FilterTarget(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -260,8 +246,6 @@ class spell_item_bracing_chill_search_jump_target : public SpellScript // 272837 - Trample the Weak class spell_item_trample_the_weak : public AuraScript { - PrepareAuraScript(spell_item_trample_the_weak); - bool CheckHealthPct(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetActor()->GetHealthPct() > eventInfo.GetActionTarget()->GetHealthPct(); @@ -276,8 +260,6 @@ class spell_item_trample_the_weak : public AuraScript // 272892 - Wracking Brilliance class spell_item_wracking_brilliance : public AuraScript { - PrepareAuraScript(spell_item_wracking_brilliance); - enum { SPELL_AGONY_SOUL_SHARD_GAIN = 210067 @@ -317,8 +299,6 @@ enum OrbitalPrecision // 275514 - Orbital Precision class spell_item_orbital_precision : public AuraScript { - PrepareAuraScript(spell_item_orbital_precision); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FROZEN_ORB }); @@ -343,8 +323,6 @@ enum BlurOfTalons // 277966 - Blur of Talons class spell_item_blur_of_talons : public AuraScript { - PrepareAuraScript(spell_item_blur_of_talons); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_COORDINATED_ASSAULT }); @@ -364,8 +342,6 @@ class spell_item_blur_of_talons : public AuraScript // 278519 - Divine Right class spell_item_divine_right : public AuraScript { - PrepareAuraScript(spell_item_divine_right); - bool CheckHealthPct(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetProcTarget()->HasAuraState(AURA_STATE_WOUNDED_20_PERCENT, eventInfo.GetSpellInfo(), eventInfo.GetActor()); @@ -380,8 +356,6 @@ class spell_item_divine_right : public AuraScript // 280409 - Blood Rite class spell_item_blood_rite : public AuraScript { - PrepareAuraScript(spell_item_blood_rite); - void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*procInfo*/) { RefreshDuration(); @@ -396,8 +370,6 @@ class spell_item_blood_rite : public AuraScript // 281843 - Tradewinds class spell_item_tradewinds : public AuraScript { - PrepareAuraScript(spell_item_tradewinds); - enum { SPELL_TRADEWINDS_ALLY_BUFF = 281844 @@ -424,8 +396,6 @@ class spell_item_tradewinds : public AuraScript // 287379 - Bastion of Might class spell_item_bastion_of_might : public SpellScript { - PrepareSpellScript(spell_item_bastion_of_might); - enum { SPELL_WARRIOR_IGNORE_PAIN = 190456 @@ -450,8 +420,6 @@ class spell_item_bastion_of_might : public SpellScript // 287650 - Echoing Blades class spell_item_echoing_blades : public AuraScript { - PrepareAuraScript(spell_item_echoing_blades); - void PrepareProc(ProcEventInfo& eventInfo) { if (eventInfo.GetProcSpell()) @@ -486,8 +454,6 @@ class spell_item_echoing_blades : public AuraScript // 287653 - Echoing Blades class spell_item_echoing_blades_damage : public SpellScript { - PrepareSpellScript(spell_item_echoing_blades_damage); - enum { SPELL_ECHOING_BLADES_TRAIT = 287649 @@ -519,8 +485,6 @@ class spell_item_echoing_blades_damage : public SpellScript // 288882 - Hour of Reaping class spell_item_hour_of_reaping : public AuraScript { - PrepareAuraScript(spell_item_hour_of_reaping); - enum { SPELL_DH_SOUL_BARRIER = 263648 @@ -551,8 +515,6 @@ class spell_item_hour_of_reaping : public AuraScript // 304086 - Azerite Fortification class spell_item_conflict_wearer_on_stun_proc : public AuraScript { - PrepareAuraScript(spell_item_conflict_wearer_on_stun_proc); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { Spell const* procSpell = eventInfo.GetProcSpell(); @@ -572,8 +534,6 @@ class spell_item_conflict_wearer_on_stun_proc : public AuraScript // 305723 - Strife (Azerite Essence) class spell_item_conflict_rank3 : public AuraScript { - PrepareAuraScript(spell_item_conflict_rank3); - bool CheckProc(ProcEventInfo& eventInfo) { if (eventInfo.GetHitMask() & (PROC_HIT_INTERRUPT | PROC_HIT_DISPEL)) @@ -607,8 +567,6 @@ class spell_item_conflict_rank3 : public AuraScript // 277253 - Heart of Azeroth class spell_item_heart_of_azeroth : public AuraScript { - PrepareAuraScript(spell_item_heart_of_azeroth); - void SetEquippedFlag(AuraEffect const* /*effect*/, AuraEffectHandleModes /*mode*/) { SetState(true); @@ -641,8 +599,6 @@ class spell_item_heart_of_azeroth : public AuraScript // 315176 - Grasping Tendrils class spell_item_corruption_grasping_tendrils : public AuraScript { - PrepareAuraScript(spell_item_corruption_grasping_tendrils); - bool Load() override { return GetUnitOwner()->IsPlayer(); diff --git a/src/server/scripts/Spells/spell_dh.cpp b/src/server/scripts/Spells/spell_dh.cpp index 207861c3539..16c6385e8b7 100644 --- a/src/server/scripts/Spells/spell_dh.cpp +++ b/src/server/scripts/Spells/spell_dh.cpp @@ -175,8 +175,6 @@ enum DemonHunterSpells // 197125 - Chaos Strike class spell_dh_chaos_strike : public AuraScript { - PrepareAuraScript(spell_dh_chaos_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_CHAOS_STRIKE_ENERGIZE }); @@ -200,8 +198,6 @@ class spell_dh_chaos_strike : public AuraScript // 206416 - First Blood class spell_dh_first_blood : public AuraScript { - PrepareAuraScript(spell_dh_first_blood); - public: ObjectGuid const& GetFirstTarget() const { return _firstTargetGUID; } void SetFirstTarget(ObjectGuid const& targetGuid) { _firstTargetGUID = targetGuid; } @@ -219,8 +215,6 @@ private: // 210152 - Death Sweep class spell_dh_blade_dance : public SpellScript { - PrepareSpellScript(spell_dh_blade_dance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_FIRST_BLOOD }); @@ -268,8 +262,6 @@ class spell_dh_blade_dance : public SpellScript // 210155 - Death Sweep class spell_dh_blade_dance_damage : public SpellScript { - PrepareSpellScript(spell_dh_blade_dance_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_FIRST_BLOOD }); @@ -323,8 +315,6 @@ public: // 208673 - Sigil of Chains class spell_dh_sigil_of_chains : public SpellScript { - PrepareSpellScript(spell_dh_sigil_of_chains); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_SIGIL_OF_CHAINS_SLOW, SPELL_DH_SIGIL_OF_CHAINS_GRIP }); @@ -363,8 +353,6 @@ struct areatrigger_dh_sigil_of_chains : AreaTriggerAI // 131347 - Glide class spell_dh_glide : public SpellScript { - PrepareSpellScript(spell_dh_glide); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_GLIDE_KNOCKBACK, SPELL_DH_GLIDE_DURATION, SPELL_DH_VENGEFUL_RETREAT_TRIGGER, SPELL_DH_FEL_RUSH }); @@ -405,8 +393,6 @@ class spell_dh_glide : public SpellScript // 131347 - Glide class spell_dh_glide_AuraScript : public AuraScript { - PrepareAuraScript(spell_dh_glide_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_GLIDE_DURATION }); @@ -426,8 +412,6 @@ class spell_dh_glide_AuraScript : public AuraScript // 197154 - Glide class spell_dh_glide_timer : public AuraScript { - PrepareAuraScript(spell_dh_glide_timer); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_GLIDE }); @@ -447,8 +431,6 @@ class spell_dh_glide_timer : public AuraScript // 391166 - Soul Furnace class spell_dh_soul_furnace : public AuraScript { - PrepareAuraScript(spell_dh_soul_furnace); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DH_SOUL_FURNACE_DAMAGE_BUFF }); @@ -472,8 +454,6 @@ class spell_dh_soul_furnace : public AuraScript // 339424 - Soul Furnace class spell_dh_soul_furnace_conduit : public AuraScript { - PrepareAuraScript(spell_dh_soul_furnace_conduit); - void CalculateSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod) { if (aurEff->GetAmount() == 10) diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index 7f54053b765..c37de92d958 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -89,8 +89,6 @@ enum Misc // 70656 - Advantage (T10 4P Melee Bonus) class spell_dk_advantage_t10_4p : public AuraScript { - PrepareAuraScript(spell_dk_advantage_t10_4p); - bool CheckProc(ProcEventInfo& eventInfo) { if (Unit* caster = eventInfo.GetActor()) @@ -118,8 +116,6 @@ class spell_dk_advantage_t10_4p : public AuraScript // 48707 - Anti-Magic Shell class spell_dk_anti_magic_shell : public AuraScript { - PrepareAuraScript(spell_dk_anti_magic_shell); - public: spell_dk_anti_magic_shell() { @@ -196,8 +192,6 @@ static uint32 const ArmyTransforms[] /// 6.x, does this belong here or in spell_generic? where do we cast this? sniffs say this is only cast when caster has glyph of foul menagerie. class spell_dk_army_transform : public SpellScript { - PrepareSpellScript(spell_dk_army_transform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_GLYPH_OF_FOUL_MENAGERIE }); @@ -232,8 +226,6 @@ class spell_dk_army_transform : public SpellScript // 50842 - 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_PLAGUE }); @@ -254,8 +246,6 @@ class spell_dk_blood_boil : public SpellScript /// 7.1.5 class spell_dk_dancing_rune_weapon : public AuraScript { - PrepareAuraScript(spell_dk_dancing_rune_weapon); - bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_DK_DANCING_RUNE_WEAPON)) @@ -308,8 +298,6 @@ class spell_dk_dancing_rune_weapon : public AuraScript // 43265 - Death and Decay class spell_dk_death_and_decay : public SpellScript { - PrepareSpellScript(spell_dk_death_and_decay); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_TIGHTENING_GRASP, SPELL_DK_TIGHTENING_GRASP_SLOW }); @@ -331,8 +319,6 @@ class spell_dk_death_and_decay : public SpellScript // 43265 - Death and Decay (Aura) class spell_dk_death_and_decay_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_death_and_decay_AuraScript); - void HandleDummyTick(AuraEffect const* aurEff) { if (Unit* caster = GetCaster()) @@ -348,8 +334,6 @@ class spell_dk_death_and_decay_AuraScript : public AuraScript // 47541 - Death Coil class spell_dk_death_coil : public SpellScript { - PrepareSpellScript(spell_dk_death_coil); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DK_DEATH_COIL_DAMAGE, SPELL_DK_UNHOLY, SPELL_DK_UNHOLY_VIGOR }); @@ -372,8 +356,6 @@ class spell_dk_death_coil : public SpellScript // 52751 - Death Gate class spell_dk_death_gate : public SpellScript { - PrepareSpellScript(spell_dk_death_gate); - SpellCastResult CheckClass() { if (GetCaster()->GetClass() != CLASS_DEATH_KNIGHT) @@ -402,8 +384,6 @@ class spell_dk_death_gate : public SpellScript // 49576 - Death Grip Initial class spell_dk_death_grip_initial : public SpellScript { - PrepareSpellScript(spell_dk_death_grip_initial); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -443,8 +423,6 @@ class spell_dk_death_grip_initial : public SpellScript // 48743 - Death Pact class spell_dk_death_pact : public AuraScript { - PrepareAuraScript(spell_dk_death_pact); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }); @@ -465,8 +443,6 @@ class spell_dk_death_pact : public AuraScript // 49998 - Death Strike class spell_dk_death_strike : public SpellScript { - PrepareSpellScript(spell_dk_death_strike); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -518,8 +494,6 @@ class spell_dk_death_strike : public SpellScript // 89832 - Death Strike Enabler - SPELL_DK_DEATH_STRIKE_ENABLER class spell_dk_death_strike_enabler : public AuraScript { - PrepareAuraScript(spell_dk_death_strike_enabler); - // Amount of seconds we calculate damage over constexpr static uint8 LAST_SECONDS = 5; @@ -561,8 +535,6 @@ private: // 85948 - Festering Strike class spell_dk_festering_strike : public SpellScript { - PrepareSpellScript(spell_dk_festering_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_FESTERING_WOUND }); @@ -582,8 +554,6 @@ class spell_dk_festering_strike : public SpellScript // 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 }) && ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }); @@ -613,8 +583,6 @@ class spell_dk_ghoul_explode : public SpellScript // 69961 - Glyph of Scourge Strike class spell_dk_glyph_of_scourge_strike_script : public SpellScript { - PrepareSpellScript(spell_dk_glyph_of_scourge_strike_script); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -653,8 +621,6 @@ class spell_dk_glyph_of_scourge_strike_script : public SpellScript // 49184 - Howling Blast class spell_dk_howling_blast : public SpellScript { - PrepareSpellScript(spell_dk_howling_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_FROST_FEVER }); @@ -674,8 +640,6 @@ class spell_dk_howling_blast : public SpellScript // 206940 - Mark of Blood class spell_dk_mark_of_blood : public AuraScript { - PrepareAuraScript(spell_dk_mark_of_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_MARK_OF_BLOOD_HEAL }); @@ -697,8 +661,6 @@ class spell_dk_mark_of_blood : public AuraScript // 207346 - Necrosis class spell_dk_necrosis : public AuraScript { - PrepareAuraScript(spell_dk_necrosis); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_NECROSIS_EFFECT }); @@ -719,8 +681,6 @@ class spell_dk_necrosis : public AuraScript // 207256 - Obliteration class spell_dk_obliteration : public AuraScript { - PrepareAuraScript(spell_dk_obliteration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_OBLITERATION, SPELL_DK_OBLITERATION_RUNE_ENERGIZE, SPELL_DK_KILLING_MACHINE_PROC }) @@ -747,8 +707,6 @@ class spell_dk_obliteration : public AuraScript /// 6.x, does this belong here or in spell_generic? apply this in creature_template_addon? sniffs say this is always cast on raise dead. class spell_dk_pet_geist_transform : public SpellScript { - PrepareSpellScript(spell_dk_pet_geist_transform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_GLYPH_OF_THE_GEIST }); @@ -778,8 +736,6 @@ class spell_dk_pet_geist_transform : public SpellScript /// 6.x, does this belong here or in spell_generic? apply this in creature_template_addon? sniffs say this is always cast on raise dead. class spell_dk_pet_skeleton_transform : public SpellScript { - PrepareSpellScript(spell_dk_pet_skeleton_transform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_GLYPH_OF_THE_SKELETON }); @@ -804,8 +760,6 @@ class spell_dk_pet_skeleton_transform : public SpellScript /// 7.1.5 class spell_dk_pvp_4p_bonus : public AuraScript { - PrepareAuraScript(spell_dk_pvp_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_RUNIC_RETURN }); @@ -836,8 +790,6 @@ class spell_dk_pvp_4p_bonus : public AuraScript // 46584 - Raise Dead class spell_dk_raise_dead : public SpellScript { - PrepareSpellScript(spell_dk_raise_dead); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_RAISE_DEAD_SUMMON, SPELL_DK_SLUDGE_BELCHER, SPELL_DK_SLUDGE_BELCHER_SUMMON }); @@ -861,8 +813,6 @@ class spell_dk_raise_dead : public SpellScript // 59057 - Rime class spell_dk_rime : public AuraScript { - PrepareAuraScript(spell_dk_rime); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo({ SPELL_DK_FROST_SCYTHE }); @@ -886,8 +836,6 @@ class spell_dk_rime : public AuraScript // 242057 - Rune Empowered class spell_dk_t20_2p_rune_empowered : public AuraScript { - PrepareAuraScript(spell_dk_t20_2p_rune_empowered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_PILLAR_OF_FROST, SPELL_DK_BREATH_OF_SINDRAGOSA }); @@ -932,8 +880,6 @@ class spell_dk_t20_2p_rune_empowered : public AuraScript // 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); diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index ad8a35fa3c2..e6d66f2fcf8 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -121,8 +121,6 @@ private: class spell_dru_base_transformer : public SpellScript { - PrepareSpellScript(spell_dru_base_transformer); - protected: bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -150,8 +148,6 @@ protected: // 22812 - Barkskin class spell_dru_barkskin : public AuraScript { - PrepareAuraScript(spell_dru_barkskin); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BRAMBLES_PASSIVE }); @@ -173,8 +169,6 @@ class spell_dru_barkskin : public AuraScript // 50334 - Berserk class spell_dru_berserk : public spell_dru_base_transformer { - PrepareSpellScript(spell_dru_berserk); - bool Validate(SpellInfo const* spellInfo) override { if (!spell_dru_base_transformer::Validate(spellInfo)) @@ -203,8 +197,6 @@ protected: // 203953 - Brambles - SPELL_DRUID_BRAMBLES_PASSIVE class spell_dru_brambles : public AuraScript { - PrepareAuraScript(spell_dru_brambles); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BRAMBLES_REFLECT, SPELL_DRUID_BRAMBLES_DAMAGE_AURA }); @@ -234,8 +226,6 @@ class spell_dru_brambles : public AuraScript // 155835 - Bristling Fur class spell_dru_bristling_fur : public AuraScript { - PrepareAuraScript(spell_dru_bristling_fur); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BRISTLING_FUR_GAIN_RAGE }); @@ -262,8 +252,6 @@ class spell_dru_bristling_fur : public AuraScript // 768 - CatForm - SPELL_DRUID_CAT_FORM class spell_dru_cat_form : public AuraScript { - PrepareAuraScript(spell_dru_cat_form); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_PROWL }); @@ -283,8 +271,6 @@ class spell_dru_cat_form : public AuraScript // 1850 - Dash class spell_dru_dash : public AuraScript { - PrepareAuraScript(spell_dru_dash); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { // do not set speed if not in cat form @@ -314,8 +300,6 @@ public: // 48517 Eclipse (Solar) + 48518 Eclipse (Lunar) class spell_dru_eclipse_aura : public AuraScript { - PrepareAuraScript(spell_dru_eclipse_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_ECLIPSE_LUNAR_SPELL_CNT, SPELL_DRUID_ECLIPSE_SOLAR_SPELL_CNT, SPELL_DRUID_ECLIPSE_DUMMY }); @@ -340,8 +324,6 @@ class spell_dru_eclipse_aura : public AuraScript // 79577 - Eclipse - SPELL_DRUID_ECLIPSE_DUMMY class spell_dru_eclipse_dummy : public AuraScript { - PrepareAuraScript(spell_dru_eclipse_dummy); - class InitializeEclipseCountersEvent : public BasicEvent { public: @@ -431,8 +413,6 @@ private: // 329910 - Eclipse out of combat - SPELL_DRUID_ECLIPSE_OOC class spell_dru_eclipse_ooc : public AuraScript { - PrepareAuraScript(spell_dru_eclipse_ooc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_ECLIPSE_DUMMY, SPELL_DRUID_ECLIPSE_SOLAR_SPELL_CNT, SPELL_DRUID_ECLIPSE_LUNAR_SPELL_CNT }); @@ -462,8 +442,6 @@ class spell_dru_eclipse_ooc : public AuraScript // 203974 - Earthwarden class spell_dru_earthwarden : public AuraScript { - PrepareAuraScript(spell_dru_earthwarden); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_THRASH_CAT, SPELL_DRUID_THRASH_BEAR, SPELL_DRUID_EARTHWARDEN_AURA }); @@ -485,8 +463,6 @@ class spell_dru_earthwarden : public AuraScript // 102359 - Mass Entanglement class spell_dru_entangling_roots : public SpellScript { - PrepareSpellScript(spell_dru_entangling_roots); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_CURIOUS_BRAMBLEPATCH }); @@ -514,8 +490,6 @@ class spell_dru_entangling_roots : public SpellScript class spell_dru_entangling_roots_aura : public AuraScript { - PrepareAuraScript(spell_dru_entangling_roots_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_ENTANGLING_ROOTS, SPELL_DRUID_MASS_ENTANGLEMENT }); @@ -541,8 +515,6 @@ class spell_dru_entangling_roots_aura : public AuraScript // 22568 - Ferocious Bite class spell_dru_ferocious_bite : public SpellScript { - PrepareSpellScript(spell_dru_ferocious_bite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellEffect({ { SPELL_DRUID_INCARNATION_KING_OF_THE_JUNGLE, EFFECT_1 } }); @@ -590,8 +562,6 @@ private: // 37336 - Druid Forms Trinket class spell_dru_forms_trinket : public AuraScript { - PrepareAuraScript(spell_dru_forms_trinket); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -665,8 +635,6 @@ class spell_dru_forms_trinket : public AuraScript // 203964 - Galactic Guardian class spell_dru_galactic_guardian : public AuraScript { - PrepareAuraScript(spell_dru_galactic_guardian); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_GALACTIC_GUARDIAN_AURA }); @@ -695,8 +663,6 @@ class spell_dru_galactic_guardian : public AuraScript // 24858 - Moonkin Form class spell_dru_glyph_of_stars : public AuraScript { - PrepareAuraScript(spell_dru_glyph_of_stars); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_GLYPH_OF_STARS, SPELL_DRUID_GLYPH_OF_STARS_VISUAL }); @@ -724,8 +690,6 @@ class spell_dru_glyph_of_stars : public AuraScript // 210706 - Gore class spell_dru_gore : public AuraScript { - PrepareAuraScript(spell_dru_gore); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_GORE_PROC, SPELL_DRUID_MANGLE }); @@ -760,8 +724,6 @@ protected: // 29166 - Innervate class spell_dru_innervate : public SpellScript { - PrepareSpellScript(spell_dru_innervate); - SpellCastResult CheckCast() { Player* target = Object::ToPlayer(GetExplTargetUnit()); @@ -797,8 +759,6 @@ class spell_dru_innervate : public SpellScript // 40442 - Druid Tier 6 Trinket class spell_dru_item_t6_trinket : public AuraScript { - PrepareAuraScript(spell_dru_item_t6_trinket); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -853,8 +813,6 @@ class spell_dru_item_t6_trinket : public AuraScript // 33763 - Lifebloom class spell_dru_lifebloom : public AuraScript { - PrepareAuraScript(spell_dru_lifebloom); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_LIFEBLOOM_FINAL_HEAL }); @@ -876,8 +834,6 @@ class spell_dru_lifebloom : public AuraScript // 155580 - Lunar Inspiration class spell_dru_lunar_inspiration : public AuraScript { - PrepareAuraScript(spell_dru_lunar_inspiration); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_LUNAR_INSPIRATION_OVERRIDE }); @@ -903,8 +859,6 @@ class spell_dru_lunar_inspiration : public AuraScript // 8921 - Moonfire class spell_dru_moonfire : public SpellScript { - PrepareSpellScript(spell_dru_moonfire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_MOONFIRE_DAMAGE }); @@ -924,8 +878,6 @@ class spell_dru_moonfire : public SpellScript // 16864 - Omen of Clarity class spell_dru_omen_of_clarity : public AuraScript { - PrepareAuraScript(spell_dru_omen_of_clarity); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BALANCE_T10_BONUS, SPELL_DRUID_BALANCE_T10_BONUS_PROC }); @@ -954,8 +906,6 @@ protected: // 1079 - Rip class spell_dru_rip : public AuraScript { - PrepareAuraScript(spell_dru_rip); - bool Load() override { Unit* caster = GetCaster(); @@ -991,8 +941,6 @@ class spell_dru_rip : public AuraScript // 52610 - Savage Roar class spell_dru_savage_roar : public SpellScript { - PrepareSpellScript(spell_dru_savage_roar); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -1010,8 +958,6 @@ class spell_dru_savage_roar : public SpellScript class spell_dru_savage_roar_aura : public AuraScript { - PrepareAuraScript(spell_dru_savage_roar_aura); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_SAVAGE_ROAR }); @@ -1040,8 +986,6 @@ class spell_dru_savage_roar_aura : public AuraScript // 164812 - Moonfire class spell_dru_shooting_stars : public AuraScript { - PrepareAuraScript(spell_dru_shooting_stars); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_SHOOTING_STARS, SPELL_DRUID_SHOOTING_STARS_DAMAGE }); @@ -1064,8 +1008,6 @@ class spell_dru_shooting_stars : public AuraScript // 106839 - Skull Bash class spell_dru_skull_bash : public SpellScript { - PrepareSpellScript(spell_dru_skull_bash); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_SKULL_BASH_CHARGE, SPELL_DRUID_SKULL_BASH_INTERRUPT }); @@ -1093,8 +1035,6 @@ protected: // 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); @@ -1129,8 +1069,6 @@ class spell_dru_starfall_dummy : public SpellScript // 384667 - Sudden Ambush class spell_dru_sudden_ambush : public AuraScript { - PrepareAuraScript(spell_dru_sudden_ambush); - bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& procInfo) { Spell const* procSpell = procInfo.GetProcSpell(); @@ -1153,8 +1091,6 @@ class spell_dru_sudden_ambush : public AuraScript // 93402 - Sunfire class spell_dru_sunfire : public SpellScript { - PrepareSpellScript(spell_dru_sunfire); - void HandleOnHit(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetHitUnit(), SPELL_DRUID_SUNFIRE_DAMAGE, true); @@ -1169,8 +1105,6 @@ class spell_dru_sunfire : public SpellScript // 61336 - Survival Instincts class spell_dru_survival_instincts : public AuraScript { - PrepareAuraScript(spell_dru_survival_instincts); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_SURVIVAL_INSTINCTS }); @@ -1196,8 +1130,6 @@ class spell_dru_survival_instincts : public AuraScript // 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; @@ -1219,8 +1151,6 @@ class spell_dru_swift_flight_passive : public AuraScript // 28744 - Regrowth class spell_dru_t3_6p_bonus : public AuraScript { - PrepareAuraScript(spell_dru_t3_6p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BLESSING_OF_THE_CLAW }); @@ -1241,8 +1171,6 @@ class spell_dru_t3_6p_bonus : public AuraScript // 28719 - Healing Touch class spell_dru_t3_8p_bonus : public AuraScript { - PrepareAuraScript(spell_dru_t3_8p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_EXHILARATE }); @@ -1277,8 +1205,6 @@ class spell_dru_t3_8p_bonus : public AuraScript // 37295 - Mana Restore class spell_dru_t4_2p_bonus : public AuraScript { - PrepareAuraScript(spell_dru_t4_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_INFUSION }); @@ -1299,8 +1225,6 @@ class spell_dru_t4_2p_bonus : public AuraScript // 70723 - Item - Druid T10 Balance 4P Bonus class spell_dru_t10_balance_4p_bonus : public AuraScript { - PrepareAuraScript(spell_dru_t10_balance_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_LANGUISH }); @@ -1337,8 +1261,6 @@ class spell_dru_t10_balance_4p_bonus : public AuraScript // 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; @@ -1381,8 +1303,6 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScript // 70664 - Druid T10 Restoration 4P Bonus (Rejuvenation) class spell_dru_t10_restoration_4p_bonus_dummy : public AuraScript { - PrepareAuraScript(spell_dru_t10_restoration_4p_bonus_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_REJUVENATION_T10_PROC }); @@ -1424,8 +1344,6 @@ class spell_dru_t10_restoration_4p_bonus_dummy : public AuraScript // 77758 - Thrash class spell_dru_thrash : public SpellScript { - PrepareSpellScript(spell_dru_thrash); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_THRASH_BEAR_AURA }); @@ -1450,8 +1368,6 @@ class spell_dru_thrash : public SpellScript // 192090 - Thrash (Aura) - SPELL_DRUID_THRASH_BEAR_AURA class spell_dru_thrash_aura : public AuraScript { - PrepareAuraScript(spell_dru_thrash_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BLOOD_FRENZY_AURA, SPELL_DRUID_BLOOD_FRENZY_RAGE_GAIN }); @@ -1476,8 +1392,6 @@ class spell_dru_thrash_aura : public AuraScript // 165961 - Stag Form class spell_dru_travel_form : public AuraScript { - PrepareAuraScript(spell_dru_travel_form); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_FORM_STAG, SPELL_DRUID_FORM_AQUATIC_PASSIVE, SPELL_DRUID_FORM_AQUATIC, SPELL_DRUID_FORM_FLIGHT, SPELL_DRUID_FORM_SWIFT_FLIGHT }); @@ -1557,8 +1471,6 @@ private: // 783 - Travel Form (dummy) class spell_dru_travel_form_dummy : public SpellScript { - PrepareSpellScript(spell_dru_travel_form_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_FORM_AQUATIC_PASSIVE, SPELL_DRUID_FORM_AQUATIC, SPELL_DRUID_FORM_STAG }); @@ -1584,8 +1496,6 @@ class spell_dru_travel_form_dummy : public SpellScript class spell_dru_travel_form_dummy_aura : public AuraScript { - PrepareAuraScript(spell_dru_travel_form_dummy_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_FORM_STAG, SPELL_DRUID_FORM_AQUATIC, SPELL_DRUID_FORM_FLIGHT, SPELL_DRUID_FORM_SWIFT_FLIGHT }); @@ -1632,8 +1542,6 @@ protected: // 252216 - Tiger Dash (Aura) class spell_dru_tiger_dash_aura : public AuraScript { - PrepareAuraScript(spell_dru_tiger_dash_aura); - void HandlePeriodic(AuraEffect const* aurEff) { if (AuraEffect* effRunSpeed = GetEffect(EFFECT_0)) @@ -1652,8 +1560,6 @@ class spell_dru_tiger_dash_aura : public AuraScript // 48438 - Wild Growth class spell_dru_wild_growth : public SpellScript { - PrepareSpellScript(spell_dru_wild_growth); - bool Validate(SpellInfo const* spellInfo) override { if (!ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) || spellInfo->GetEffect(EFFECT_2).IsEffect() || spellInfo->GetEffect(EFFECT_2).CalcValue() <= 0) @@ -1692,8 +1598,6 @@ class spell_dru_wild_growth : public SpellScript class spell_dru_wild_growth_aura : public AuraScript { - PrepareAuraScript(spell_dru_wild_growth_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_RESTORATION_T10_2P_BONUS }); @@ -1727,8 +1631,6 @@ class spell_dru_wild_growth_aura : public AuraScript // 145108 - Ysera's Gift class spell_dru_yseras_gift : public AuraScript { - PrepareAuraScript(spell_dru_yseras_gift); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1757,8 +1659,6 @@ class spell_dru_yseras_gift : public AuraScript // 145110 - Ysera's Gift (heal) class spell_dru_yseras_gift_group_heal : public SpellScript { - PrepareSpellScript(spell_dru_yseras_gift_group_heal); - void SelectTargets(std::list<WorldObject*>& targets) { Trinity::SelectRandomInjuredTargets(targets, 1, true); diff --git a/src/server/scripts/Spells/spell_evoker.cpp b/src/server/scripts/Spells/spell_evoker.cpp index 9bf320f04c6..8004f4115e7 100644 --- a/src/server/scripts/Spells/spell_evoker.cpp +++ b/src/server/scripts/Spells/spell_evoker.cpp @@ -51,8 +51,6 @@ enum EvokerSpellLabels // 362969 - Azure Strike (blue) class spell_evo_azure_strike : public SpellScript { - PrepareSpellScript(spell_evo_azure_strike); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove(GetExplTargetUnit()); @@ -69,8 +67,6 @@ class spell_evo_azure_strike : public SpellScript // 370455 - Charged Blast class spell_evo_charged_blast : public AuraScript { - PrepareAuraScript(spell_evo_charged_blast); - bool CheckProc(ProcEventInfo& procInfo) { return procInfo.GetSpellInfo() && procInfo.GetSpellInfo()->HasLabel(SPELL_LABEL_EVOKER_BLUE); @@ -85,8 +81,6 @@ class spell_evo_charged_blast : public AuraScript // 358733 - Glide (Racial) class spell_evo_glide : public SpellScript { - PrepareSpellScript(spell_evo_glide); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EVOKER_GLIDE_KNOCKBACK, SPELL_EVOKER_HOVER, SPELL_EVOKER_SOAR_RACIAL }); @@ -124,8 +118,6 @@ class spell_evo_glide : public SpellScript // 361469 - Living Flame (Red) class spell_evo_living_flame : public SpellScript { - PrepareSpellScript(spell_evo_living_flame); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_EVOKER_LIVING_FLAME_DAMAGE, SPELL_EVOKER_LIVING_FLAME_HEAL, SPELL_EVOKER_ENERGIZING_FLAME }); @@ -165,8 +157,6 @@ class spell_evo_living_flame : public SpellScript // 381773 - Permeating Chill class spell_evo_permeating_chill : public AuraScript { - PrepareAuraScript(spell_evo_permeating_chill); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EVOKER_PERMEATING_CHILL_TALENT }); @@ -197,8 +187,6 @@ class spell_evo_permeating_chill : public AuraScript // 393568 - Pyre class spell_evo_pyre : public SpellScript { - PrepareSpellScript(spell_evo_pyre); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_EVOKER_PYRE_DAMAGE }); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 7257fc43cb9..be1fd4ae318 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -51,8 +51,6 @@ class spell_gen_absorb0_hitlimit1 : public AuraScript { - PrepareAuraScript(spell_gen_absorb0_hitlimit1); - uint32 limit = 0; bool Load() override @@ -85,8 +83,6 @@ enum AdaptiveWarding class spell_gen_adaptive_warding : public AuraScript { - PrepareAuraScript(spell_gen_adaptive_warding); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -156,8 +152,6 @@ class spell_gen_adaptive_warding : public AuraScript class spell_gen_allow_cast_from_item_only : public SpellScript { - PrepareSpellScript(spell_gen_allow_cast_from_item_only); - SpellCastResult CheckRequirement() { if (!GetCastItem()) @@ -180,8 +174,6 @@ enum AnimalBloodPoolSpell // 46221 - Animal Blood class spell_gen_animal_blood : public AuraScript { - PrepareAuraScript(spell_gen_animal_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SPAWN_BLOOD_POOL }); @@ -210,8 +202,6 @@ class spell_gen_animal_blood : public AuraScript // 63471 - Spawn Blood Pool class spell_spawn_blood_pool : public SpellScript { - PrepareSpellScript(spell_spawn_blood_pool); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -247,8 +237,6 @@ class spell_spawn_blood_pool : public SpellScript // 72623 Drink class spell_gen_arena_drink : public AuraScript { - PrepareAuraScript(spell_gen_arena_drink); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -333,8 +321,6 @@ class spell_gen_arena_drink : public AuraScript // 28313 - Aura of Fear class spell_gen_aura_of_fear : public AuraScript { - PrepareAuraScript(spell_gen_aura_of_fear); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -357,8 +343,6 @@ class spell_gen_aura_of_fear : public AuraScript class spell_gen_av_drekthar_presence : public AuraScript { - PrepareAuraScript(spell_gen_av_drekthar_presence); - bool CheckAreaTarget(Unit* target) { switch (target->GetEntry()) @@ -394,8 +378,6 @@ enum GenericBandage class spell_gen_bandage : public SpellScript { - PrepareSpellScript(spell_gen_bandage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RECENTLY_BANDAGED }); @@ -427,8 +409,6 @@ class spell_gen_bandage : public SpellScript // 193970 - Mercenary Shapeshift class spell_gen_battleground_mercenary_shapeshift : public AuraScript { - PrepareAuraScript(spell_gen_battleground_mercenary_shapeshift); - using OtherFactionRacePriorityList = std::array<Races, 3>; inline static std::unordered_map<Races, OtherFactionRacePriorityList> const RaceInfo = @@ -597,8 +577,6 @@ enum BloodReserve class spell_gen_blood_reserve : public AuraScript { - PrepareAuraScript(spell_gen_blood_reserve); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_BLOOD_RESERVE_HEAL }); @@ -640,8 +618,6 @@ enum Bonked class spell_gen_bonked : public SpellScript { - PrepareSpellScript(spell_gen_bonked); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -700,8 +676,6 @@ enum BreakShieldSpells class spell_gen_break_shield: public SpellScript { - PrepareSpellScript(spell_gen_break_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ 62552, 62719, 64100, 66482 }); @@ -770,8 +744,6 @@ class spell_gen_break_shield: public SpellScript // 48750 - Burning Depths Necrolyte Image class spell_gen_burning_depths_necrolyte_image : public AuraScript { - PrepareAuraScript(spell_gen_burning_depths_necrolyte_image); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) @@ -803,8 +775,6 @@ enum CannibalizeSpells class spell_gen_cannibalize : public SpellScript { - PrepareSpellScript(spell_gen_cannibalize); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CANNIBALIZE_TRIGGERED }); @@ -841,8 +811,6 @@ class spell_gen_cannibalize : public SpellScript // 66020 Chains of Ice class spell_gen_chains_of_ice : public AuraScript { - PrepareAuraScript(spell_gen_chains_of_ice); - void UpdatePeriodic(AuraEffect* aurEff) { // Get 0 effect aura @@ -867,8 +835,6 @@ enum ChaosBlast class spell_gen_chaos_blast : public SpellScript { - PrepareSpellScript(spell_gen_chaos_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAOS_BLAST }); @@ -895,8 +861,6 @@ class spell_gen_chaos_blast : public SpellScript // 28471 - ClearAll class spell_clear_all : public SpellScript { - PrepareSpellScript(spell_clear_all); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -916,8 +880,6 @@ enum Clone class spell_gen_clone : public SpellScript { - PrepareSpellScript(spell_gen_clone); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -953,8 +915,6 @@ enum CloneWeaponSpells class spell_gen_clone_weapon : public SpellScript { - PrepareSpellScript(spell_gen_clone_weapon); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -969,8 +929,6 @@ class spell_gen_clone_weapon : public SpellScript class spell_gen_clone_weapon_aura : public AuraScript { - PrepareAuraScript(spell_gen_clone_weapon_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1074,8 +1032,6 @@ class spell_gen_clone_weapon_aura : public AuraScript class spell_gen_count_pct_from_max_hp : public SpellScript { - PrepareSpellScript(spell_gen_count_pct_from_max_hp); - public: spell_gen_count_pct_from_max_hp(int32 damagePct = 0) : SpellScript(), _damagePct(damagePct) { } @@ -1100,8 +1056,6 @@ private: // 64208 - Consumption class spell_gen_consumption : public SpellScript { - PrepareSpellScript(spell_gen_consumption); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { Creature* caster = GetCaster()->ToCreature(); @@ -1131,8 +1085,6 @@ enum CreateLanceSpells class spell_gen_create_lance : public SpellScript { - PrepareSpellScript(spell_gen_create_lance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1174,8 +1126,6 @@ enum DalaranDisguiseSpells class spell_gen_dalaran_disguise : public SpellScript { - PrepareSpellScript(spell_gen_dalaran_disguise); - bool Validate(SpellInfo const* spellInfo) override { switch (spellInfo->Id) @@ -1231,8 +1181,6 @@ class spell_gen_dalaran_disguise : public SpellScript class spell_gen_decay_over_time_spell : public SpellScript { - PrepareSpellScript(spell_gen_decay_over_time_spell); - void ModAuraStack() { if (Aura* aur = GetHitAura()) @@ -1247,8 +1195,6 @@ class spell_gen_decay_over_time_spell : public SpellScript class spell_gen_decay_over_time_aura : public AuraScript { - PrepareAuraScript(spell_gen_decay_over_time_aura); - protected: spell_gen_decay_over_time_aura() = default; @@ -1279,8 +1225,6 @@ enum FungalDecay // 32065 - Fungal Decay class spell_gen_decay_over_time_fungal_decay : public spell_gen_decay_over_time_aura { - PrepareAuraScript(spell_gen_decay_over_time_fungal_decay); - void ModDuration(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // only on actual reapply, not on stack decay @@ -1301,7 +1245,6 @@ class spell_gen_decay_over_time_fungal_decay : public spell_gen_decay_over_time_ // 36659 - Tail Sting class spell_gen_decay_over_time_tail_sting : public spell_gen_decay_over_time_aura { - PrepareAuraScript(spell_gen_decay_over_time_tail_sting); }; enum DefendVisuals @@ -1313,8 +1256,6 @@ enum DefendVisuals class spell_gen_defend : public AuraScript { - PrepareAuraScript(spell_gen_defend); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1384,8 +1325,6 @@ class spell_gen_defend : public AuraScript class spell_gen_despawn_aura : public AuraScript { - PrepareAuraScript(spell_gen_despawn_aura); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -1401,8 +1340,6 @@ class spell_gen_despawn_aura : public AuraScript /// @todo: migrate spells to spell_gen_despawn_target, then remove this class spell_gen_despawn_self : public SpellScript { - PrepareSpellScript(spell_gen_despawn_self); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1422,8 +1359,6 @@ class spell_gen_despawn_self : public SpellScript class spell_gen_despawn_target : public SpellScript { - PrepareSpellScript(spell_gen_despawn_target); - void HandleDespawn(SpellEffIndex /*effIndex*/) { if (GetEffectInfo().IsEffect(SPELL_EFFECT_DUMMY) || GetEffectInfo().IsEffect(SPELL_EFFECT_SCRIPT_EFFECT)) @@ -1445,8 +1380,6 @@ enum DivineStormSpell // 70769 Divine Storm! class spell_gen_divine_storm_cd_reset : public SpellScript { - PrepareSpellScript(spell_gen_divine_storm_cd_reset); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1470,8 +1403,6 @@ class spell_gen_divine_storm_cd_reset : public SpellScript class spell_gen_ds_flush_knockback : public SpellScript { - PrepareSpellScript(spell_gen_ds_flush_knockback); - void HandleScript(SpellEffIndex /*effIndex*/) { // Here the target is the water spout and determines the position where the player is knocked from @@ -1496,8 +1427,6 @@ class spell_gen_ds_flush_knockback : public SpellScript class spell_gen_dungeon_credit : public SpellScript { - PrepareSpellScript(spell_gen_dungeon_credit); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1540,8 +1469,6 @@ enum EtherealPet // 50051 - Ethereal Pet Aura class spell_ethereal_pet_aura : public AuraScript { - PrepareAuraScript(spell_ethereal_pet_aura); - bool CheckProc(ProcEventInfo& eventInfo) { uint32 levelDiff = std::abs(GetTarget()->GetLevel() - eventInfo.GetProcTarget()->GetLevel()); @@ -1574,8 +1501,6 @@ class spell_ethereal_pet_aura : public AuraScript // 50052 - Ethereal Pet onSummon class spell_ethereal_pet_onsummon : public SpellScript { - PrepareSpellScript(spell_ethereal_pet_onsummon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PROC_TRIGGER_ON_KILL_AURA }); @@ -1596,8 +1521,6 @@ class spell_ethereal_pet_onsummon : public SpellScript // 50055 - Ethereal Pet Aura Remove class spell_ethereal_pet_aura_remove : public SpellScript { - PrepareSpellScript(spell_ethereal_pet_aura_remove); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ETHEREAL_PET_AURA }); @@ -1617,8 +1540,6 @@ class spell_ethereal_pet_aura_remove : public SpellScript // 50101 - Ethereal Pet OnKill Steal Essence class spell_steal_essence_visual : public AuraScript { - PrepareAuraScript(spell_steal_essence_visual); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1662,8 +1583,6 @@ enum Feast 66477 - Bountiful Feast */ class spell_gen_feast : public SpellScript { - PrepareSpellScript(spell_gen_feast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1739,8 +1658,6 @@ than already exists class spell_gen_feign_death_all_flags : public AuraScript { - PrepareAuraScript(spell_gen_feign_death_all_flags); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1772,8 +1689,6 @@ class spell_gen_feign_death_all_flags : public AuraScript class spell_gen_feign_death_all_flags_uninteractible : public AuraScript { - PrepareAuraScript(spell_gen_feign_death_all_flags_uninteractible); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1811,8 +1726,6 @@ class spell_gen_feign_death_all_flags_uninteractible : public AuraScript // 51329 - Feign Death class spell_gen_feign_death_no_dyn_flag : public AuraScript { - PrepareAuraScript(spell_gen_feign_death_no_dyn_flag); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1843,8 +1756,6 @@ class spell_gen_feign_death_no_dyn_flag : public AuraScript // 58951 - Permanent Feign Death class spell_gen_feign_death_no_prevent_emotes : public AuraScript { - PrepareAuraScript(spell_gen_feign_death_no_prevent_emotes); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1882,8 +1793,6 @@ enum FuriousRage // 35491 - Furious Rage class spell_gen_furious_rage : public AuraScript { - PrepareAuraScript(spell_gen_furious_rage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXHAUSTION }) && @@ -1917,8 +1826,6 @@ class spell_gen_furious_rage : public AuraScript // 46642 - 5,000 Gold class spell_gen_5000_gold : public SpellScript { - PrepareSpellScript(spell_gen_5000_gold); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -1940,8 +1847,6 @@ enum FishingSpells // 131474 - Fishing class spell_gen_fishing : public SpellScript { - PrepareSpellScript(spell_gen_fishing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FISHING_NO_FISHING_POLE, SPELL_FISHING_WITH_POLE }); @@ -1980,8 +1885,6 @@ enum TransporterBackfires class spell_gen_gadgetzan_transporter_backfire : public SpellScript { - PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2020,8 +1923,6 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScript // 121093 - Monk class spell_gen_gift_of_naaru : public AuraScript { - PrepareAuraScript(spell_gen_gift_of_naaru); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -2052,8 +1953,6 @@ enum GnomishTransporter class spell_gen_gnomish_transporter : public SpellScript { - PrepareSpellScript(spell_gen_gnomish_transporter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2077,8 +1976,6 @@ class spell_gen_gnomish_transporter : public SpellScript // 69641 - Gryphon/Wyvern Pet - Mounting Check Aura class spell_gen_gryphon_wyvern_mount_check : public AuraScript { - PrepareAuraScript(spell_gen_gryphon_wyvern_mount_check); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -2109,8 +2006,6 @@ class spell_gen_gryphon_wyvern_mount_check : public AuraScript 41582 - Hate to Zero (Should be added, Melee) */ class spell_gen_hate_to_zero : public SpellScript { - PrepareSpellScript(spell_gen_hate_to_zero); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetCaster()->CanHaveThreatList()) @@ -2127,8 +2022,6 @@ class spell_gen_hate_to_zero : public SpellScript // 63984 - Hate to Zero class spell_gen_hate_to_zero_caster_target : public SpellScript { - PrepareSpellScript(spell_gen_hate_to_zero_caster_target); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2145,8 +2038,6 @@ class spell_gen_hate_to_zero_caster_target : public SpellScript // 19707 - Hate to 50% class spell_gen_hate_to_50 : public SpellScript { - PrepareSpellScript(spell_gen_hate_to_50); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetCaster()->CanHaveThreatList()) @@ -2162,8 +2053,6 @@ class spell_gen_hate_to_50 : public SpellScript // 26886 - Hate to 75% class spell_gen_hate_to_75 : public SpellScript { - PrepareSpellScript(spell_gen_hate_to_75); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetCaster()->CanHaveThreatList()) @@ -2185,8 +2074,6 @@ enum Interrupt // 44835 - Maim Interrupt class spell_gen_interrupt : public AuraScript { - PrepareAuraScript(spell_gen_interrupt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_THROW_INTERRUPT }); @@ -2206,8 +2093,6 @@ class spell_gen_interrupt : public AuraScript class spell_gen_increase_stats_buff : public SpellScript { - PrepareSpellScript(spell_gen_increase_stats_buff); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->IsInRaidWith(GetCaster())) @@ -2233,8 +2118,6 @@ enum GenericLifebloom class spell_gen_lifebloom : public AuraScript { - PrepareAuraScript(spell_gen_lifebloom); - public: spell_gen_lifebloom(uint32 spellId) : AuraScript(), _spellId(spellId) { } @@ -2314,8 +2197,6 @@ enum ChargeSpells class spell_gen_mounted_charge : public SpellScript { - PrepareSpellScript(spell_gen_mounted_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ 62552, 62719, 64100, 66482 }); @@ -2427,8 +2308,6 @@ enum MossCoveredFeet // 31399 Moss Covered Feet class spell_gen_moss_covered_feet : public AuraScript { - PrepareAuraScript(spell_gen_moss_covered_feet); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FALL_DOWN }); @@ -2454,8 +2333,6 @@ enum Netherbloom : uint32 // 28702 - Netherbloom class spell_gen_netherbloom : public SpellScript { - PrepareSpellScript(spell_gen_netherbloom); - bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < 5; ++i) @@ -2502,8 +2379,6 @@ enum NightmareVine // 28720 - Nightmare Vine class spell_gen_nightmare_vine : public SpellScript { - PrepareSpellScript(spell_gen_nightmare_vine); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NIGHTMARE_POLLEN }); @@ -2530,8 +2405,6 @@ class spell_gen_nightmare_vine : public SpellScript // 27746 - Nitrous Boost class spell_gen_nitrous_boost : public AuraScript { - PrepareAuraScript(spell_gen_nitrous_boost); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -2561,8 +2434,6 @@ enum ObsidianArmor // 27539 - Obsidian Armor class spell_gen_obsidian_armor : public AuraScript { - PrepareAuraScript(spell_gen_obsidian_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2627,8 +2498,6 @@ class spell_gen_obsidian_armor : public AuraScript class spell_gen_oracle_wolvar_reputation : public SpellScript { - PrepareSpellScript(spell_gen_oracle_wolvar_reputation); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -2672,8 +2541,6 @@ enum OrcDisguiseSpells class spell_gen_orc_disguise : public SpellScript { - PrepareSpellScript(spell_gen_orc_disguise); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2711,8 +2578,6 @@ enum ParalyticPoison // 35201 - Paralytic Poison class spell_gen_paralytic_poison : public AuraScript { - PrepareAuraScript(spell_gen_paralytic_poison); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYSIS }); @@ -2734,8 +2599,6 @@ class spell_gen_paralytic_poison : public AuraScript class spell_gen_prevent_emotes : public AuraScript { - PrepareAuraScript(spell_gen_prevent_emotes); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -2757,8 +2620,6 @@ class spell_gen_prevent_emotes : public AuraScript class spell_gen_player_say : public SpellScript { - PrepareSpellScript(spell_gen_player_say); - bool Validate(SpellInfo const* spellInfo) override { return sBroadcastTextStore.HasRecord(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue())); @@ -2779,8 +2640,6 @@ class spell_gen_player_say : public SpellScript class spell_gen_proc_below_pct_damaged : public AuraScript { - PrepareAuraScript(spell_gen_proc_below_pct_damaged); - bool CheckProc(ProcEventInfo& eventInfo) { DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -2803,8 +2662,6 @@ class spell_gen_proc_below_pct_damaged : public AuraScript class spell_gen_proc_charge_drop_only : public AuraScript { - PrepareAuraScript(spell_gen_proc_charge_drop_only); - void HandleChargeDrop(ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -2825,8 +2682,6 @@ enum ParachuteSpells // 45472 Parachute class spell_gen_parachute : public AuraScript { - PrepareAuraScript(spell_gen_parachute); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2861,8 +2716,6 @@ enum PetSummoned class spell_gen_pet_summoned : public SpellScript { - PrepareSpellScript(spell_gen_pet_summoned); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2908,8 +2761,6 @@ class spell_gen_pet_summoned : public SpellScript // 36553 - PetWait class spell_gen_pet_wait : public SpellScript { - PrepareSpellScript(spell_gen_pet_wait); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->GetMotionMaster()->Clear(); @@ -2929,8 +2780,6 @@ enum ProfessionResearch class spell_gen_profession_research : public SpellScript { - PrepareSpellScript(spell_gen_profession_research); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2980,8 +2829,6 @@ enum TrinketSpells class spell_gen_pvp_trinket : public SpellScript { - PrepareSpellScript(spell_gen_pvp_trinket); - void TriggerAnimation() { Player* caster = GetCaster()->ToPlayer(); @@ -3007,8 +2854,6 @@ class spell_gen_pvp_trinket : public SpellScript class spell_gen_remove_flight_auras : public SpellScript { - PrepareSpellScript(spell_gen_remove_flight_auras); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -3027,8 +2872,6 @@ class spell_gen_remove_flight_auras : public SpellScript // 20589 - Escape artist class spell_gen_remove_impairing_auras : public SpellScript { - PrepareSpellScript(spell_gen_remove_impairing_auras); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { GetHitUnit()->RemoveMovementImpairingAuras(true); @@ -3044,8 +2887,6 @@ class spell_gen_remove_impairing_auras : public SpellScript // 24379 - Restoration class spell_gen_restoration : public AuraScript { - PrepareAuraScript(spell_gen_restoration); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -3078,8 +2919,6 @@ class spell_gen_restoration : public AuraScript // 62418 Impale class spell_gen_remove_on_health_pct : public AuraScript { - PrepareAuraScript(spell_gen_remove_on_health_pct); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -3109,8 +2948,6 @@ class spell_gen_remove_on_health_pct : public AuraScript // 59262 Grievous Wound class spell_gen_remove_on_full_health : public AuraScript { - PrepareAuraScript(spell_gen_remove_on_full_health); - void PeriodicTick(AuraEffect const* aurEff) { // if it has only periodic effect, allow 1 tick @@ -3135,8 +2972,6 @@ class spell_gen_remove_on_full_health : public AuraScript // 71316 - Glacial Strike class spell_gen_remove_on_full_health_pct : public AuraScript { - PrepareAuraScript(spell_gen_remove_on_full_health_pct); - void PeriodicTick(AuraEffect const* /*aurEff*/) { // they apply damage so no need to check for ticks here @@ -3174,8 +3009,6 @@ public: class spell_gen_replenishment : public SpellScript { - PrepareSpellScript(spell_gen_replenishment); - void RemoveInvalidTargets(std::list<WorldObject*>& targets) { // In arenas Replenishment may only affect the caster @@ -3208,8 +3041,6 @@ class spell_gen_replenishment : public SpellScript class spell_gen_replenishment_aura : public AuraScript { - PrepareAuraScript(spell_gen_replenishment_aura); - bool Load() override { return GetUnitOwner()->GetPowerType() == POWER_MANA; @@ -3243,8 +3074,6 @@ enum RunningWildMountIds class spell_gen_running_wild : public SpellScript { - PrepareSpellScript(spell_gen_running_wild); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ALTERED_FORM }); @@ -3265,8 +3094,6 @@ class spell_gen_running_wild : public SpellScript class spell_gen_running_wild_aura : public AuraScript { - PrepareAuraScript(spell_gen_running_wild_aura); - bool Validate(SpellInfo const* /*spell*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(DISPLAYID_HIDDEN_MOUNT)) @@ -3294,8 +3121,6 @@ class spell_gen_running_wild_aura : public AuraScript class spell_gen_two_forms : public SpellScript { - PrepareSpellScript(spell_gen_two_forms); - SpellCastResult CheckCast() { if (GetCaster()->IsInCombat()) @@ -3333,8 +3158,6 @@ class spell_gen_two_forms : public SpellScript class spell_gen_darkflight : public SpellScript { - PrepareSpellScript(spell_gen_darkflight); - void TriggerTransform() { GetCaster()->CastSpell(GetCaster(), SPELL_ALTERED_FORM, TRIGGERED_FULL_MASK); @@ -3353,8 +3176,6 @@ enum SeaforiumSpells class spell_gen_seaforium_blast : public SpellScript { - PrepareSpellScript(spell_gen_seaforium_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT }); @@ -3383,8 +3204,6 @@ static Emote const EmoteArray[] = { EMOTE_ONESHOT_CHEER, EMOTE_ONESHOT_EXCLAMATI class spell_gen_spectator_cheer_trigger : public SpellScript { - PrepareSpellScript(spell_gen_spectator_cheer_trigger); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (roll_chance_i(40)) @@ -3399,8 +3218,6 @@ class spell_gen_spectator_cheer_trigger : public SpellScript class spell_gen_spirit_healer_res : public SpellScript { - PrepareSpellScript(spell_gen_spirit_healer_res); - bool Load() override { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3432,8 +3249,6 @@ enum TournamentMountsSpells class spell_gen_summon_tournament_mount : public SpellScript { - PrepareSpellScript(spell_gen_summon_tournament_mount); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LANCE_EQUIPPED }); @@ -3462,8 +3277,6 @@ class spell_gen_summon_tournament_mount : public SpellScript // 41213, 43416, 69222, 73076 - Throw Shield class spell_gen_throw_shield : public SpellScript { - PrepareSpellScript(spell_gen_throw_shield); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3484,8 +3297,6 @@ enum MountedDuelSpells class spell_gen_tournament_duel : public SpellScript { - PrepareSpellScript(spell_gen_tournament_duel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3520,8 +3331,6 @@ class spell_gen_tournament_duel : public SpellScript class spell_gen_tournament_pennant : public AuraScript { - PrepareAuraScript(spell_gen_tournament_pennant); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3550,8 +3359,6 @@ enum Teleporting class spell_gen_teleporting : public SpellScript { - PrepareSpellScript(spell_gen_teleporting); - void HandleScript(SpellEffIndex /* effIndex */) { Unit* target = GetHitUnit(); @@ -3574,8 +3381,6 @@ class spell_gen_teleporting : public SpellScript class spell_gen_trigger_exclude_caster_aura_spell : public SpellScript { - PrepareSpellScript(spell_gen_trigger_exclude_caster_aura_spell); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->ExcludeCasterAuraSpell }); @@ -3595,8 +3400,6 @@ class spell_gen_trigger_exclude_caster_aura_spell : public SpellScript class spell_gen_trigger_exclude_target_aura_spell : public SpellScript { - PrepareSpellScript(spell_gen_trigger_exclude_target_aura_spell); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->ExcludeTargetAuraSpell }); @@ -3624,8 +3427,6 @@ enum PvPTrinketTriggeredSpells template <uint32 TriggeredSpellId> class spell_pvp_trinket_wotf_shared_cd : public SpellScript { - PrepareSpellScript(spell_pvp_trinket_wotf_shared_cd); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ TriggeredSpellId }); @@ -3669,8 +3470,6 @@ enum FriendOrFowl class spell_gen_turkey_marker : public AuraScript { - PrepareAuraScript(spell_gen_turkey_marker); - void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { // store stack apply times, so we can pop them while they expire @@ -3718,8 +3517,6 @@ enum FoamSword class spell_gen_upper_deck_create_foam_sword : public SpellScript { - PrepareSpellScript(spell_gen_upper_deck_create_foam_sword); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) @@ -3751,8 +3548,6 @@ enum VampiricTouch // 60501 - Vampiric Touch class spell_gen_vampiric_touch : public AuraScript { - PrepareAuraScript(spell_gen_vampiric_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VAMPIRIC_TOUCH_HEAL }); @@ -3784,8 +3579,6 @@ enum VehicleScaling class spell_gen_vehicle_scaling : public AuraScript { - PrepareAuraScript(spell_gen_vehicle_scaling); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3833,8 +3626,6 @@ enum VendorBarkTrigger class spell_gen_vendor_bark_trigger : public SpellScript { - PrepareSpellScript(spell_gen_vendor_bark_trigger); - void HandleDummy(SpellEffIndex /* effIndex */) { if (Creature* vendor = GetCaster()->ToCreature()) @@ -3850,8 +3641,6 @@ class spell_gen_vendor_bark_trigger : public SpellScript class spell_gen_wg_water : public SpellScript { - PrepareSpellScript(spell_gen_wg_water); - SpellCastResult CheckCast() { if (!GetSpellInfo()->CheckTargetCreatureType(GetCaster())) @@ -3872,8 +3661,6 @@ enum WhisperGulchYoggSaronWhisper class spell_gen_whisper_gulch_yogg_saron_whisper : public AuraScript { - PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_YOGG_SARON_WHISPER_DUMMY }); @@ -3893,8 +3680,6 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public AuraScript class spell_gen_whisper_to_controller : public SpellScript { - PrepareSpellScript(spell_gen_whisper_to_controller); - bool Validate(SpellInfo const* spellInfo) override { return sBroadcastTextStore.HasRecord(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue())); @@ -3926,8 +3711,6 @@ enum WhisperToControllerTexts // 60709 - MOTI, Redux: Past You's Whisper to Controller - Random class spell_gen_whisper_to_controller_random : public SpellScript { - PrepareSpellScript(spell_gen_whisper_to_controller_random); - public: spell_gen_whisper_to_controller_random(uint32 text) : SpellScript(), _text(text) { } @@ -3954,8 +3737,6 @@ private: class spell_gen_eject_all_passengers : public SpellScript { - PrepareSpellScript(spell_gen_eject_all_passengers); - void RemoveVehicleAuras() { if (Vehicle* vehicle = GetHitUnit()->GetVehicleKit()) @@ -3970,8 +3751,6 @@ class spell_gen_eject_all_passengers : public SpellScript class spell_gen_eject_passenger : public SpellScript { - PrepareSpellScript(spell_gen_eject_passenger); - bool Validate(SpellInfo const* spellInfo) override { if (!ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } })) @@ -3998,8 +3777,6 @@ class spell_gen_eject_passenger : public SpellScript class spell_gen_eject_passenger_with_seatId : public SpellScript { - PrepareSpellScript(spell_gen_eject_passenger_with_seatId); - public: spell_gen_eject_passenger_with_seatId(uint8 seatId) : SpellScript(), _seatId(seatId) { } @@ -4028,8 +3805,6 @@ enum GMFreeze class spell_gen_gm_freeze : public AuraScript { - PrepareAuraScript(spell_gen_gm_freeze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GM_FREEZE }); @@ -4083,8 +3858,6 @@ class spell_gen_gm_freeze : public AuraScript class spell_gen_stand : public SpellScript { - PrepareSpellScript(spell_gen_stand); - void HandleScript(SpellEffIndex /*eff*/) { Creature* target = GetHitCreature(); @@ -4191,8 +3964,6 @@ enum RequiredMixologySpells class spell_gen_mixology_bonus : public AuraScript { - PrepareAuraScript(spell_gen_mixology_bonus); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_MIXOLOGY }) && ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }); @@ -4396,8 +4167,6 @@ enum LandmineKnockbackAchievement class spell_gen_landmine_knockback_achievement : public SpellScript { - PrepareSpellScript(spell_gen_landmine_knockback_achievement); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -4419,8 +4188,6 @@ class spell_gen_landmine_knockback_achievement : public SpellScript // 34098 - ClearAllDebuffs class spell_gen_clear_debuffs : public SpellScript { - PrepareSpellScript(spell_gen_clear_debuffs); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -4447,8 +4214,6 @@ enum PonySpells class spell_gen_pony_mount_check : public AuraScript { - PrepareAuraScript(spell_gen_pony_mount_check); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* caster = GetCaster(); @@ -4508,8 +4273,6 @@ private: // 40349 - Corrupting Plague class spell_corrupting_plague_aura : public AuraScript { - PrepareAuraScript(spell_corrupting_plague_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CORRUPTING_PLAGUE }); @@ -4566,8 +4329,6 @@ private: // 40306 - Stasis Field class spell_stasis_field_aura : public AuraScript { - PrepareAuraScript(spell_stasis_field_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STASIS_FIELD }); @@ -4601,8 +4362,6 @@ enum SiegeTankControl class spell_gen_vehicle_control_link : public AuraScript { - PrepareAuraScript(spell_gen_vehicle_control_link); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAurasDueToSpell(SPELL_SIEGE_TANK_CONTROL); //aurEff->GetAmount() @@ -4626,8 +4385,6 @@ enum FreezingCircleMisc // 34779 - Freezing Circle class spell_freezing_circle : public SpellScript { - PrepareSpellScript(spell_freezing_circle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4664,8 +4421,6 @@ class spell_freezing_circle : public SpellScript // Used for some spells cast by vehicles or charmed creatures that do not send a cooldown event on their own class spell_gen_charmed_unit_spell_cooldown : public SpellScript { - PrepareSpellScript(spell_gen_charmed_unit_spell_cooldown); - void HandleCast() { Unit* caster = GetCaster(); @@ -4693,8 +4448,6 @@ enum CannonBlast class spell_gen_cannon_blast : public SpellScript { - PrepareSpellScript(spell_gen_cannon_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CANNON_BLAST }); @@ -4717,8 +4470,6 @@ class spell_gen_cannon_blast : public SpellScript // 37751 - Submerged class spell_gen_submerged : public SpellScript { - PrepareSpellScript(spell_gen_submerged); - void HandleScript(SpellEffIndex /*eff*/) { if (Creature* target = GetHitCreature()) @@ -4734,8 +4485,6 @@ class spell_gen_submerged : public SpellScript // 169869 - Transformation Sickness class spell_gen_decimatus_transformation_sickness : public SpellScript { - PrepareSpellScript(spell_gen_decimatus_transformation_sickness); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -4751,8 +4500,6 @@ class spell_gen_decimatus_transformation_sickness : public SpellScript // 189491 - Summon Towering Infernal. class spell_gen_anetheron_summon_towering_infernal : public SpellScript { - PrepareSpellScript(spell_gen_anetheron_summon_towering_infernal); - void HandleDummy(SpellEffIndex /* effIndex */) { GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); @@ -4783,8 +4530,6 @@ class MarkTargetHellfireFilter class spell_gen_mark_of_kazrogal_hellfire : public SpellScript { - PrepareSpellScript(spell_gen_mark_of_kazrogal_hellfire); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(MarkTargetHellfireFilter()); @@ -4798,8 +4543,6 @@ class spell_gen_mark_of_kazrogal_hellfire : public SpellScript class spell_gen_mark_of_kazrogal_hellfire_aura : public AuraScript { - PrepareAuraScript(spell_gen_mark_of_kazrogal_hellfire_aura); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_KAZROGAL_DAMAGE_HELLFIRE }); @@ -4825,8 +4568,6 @@ class spell_gen_mark_of_kazrogal_hellfire_aura : public AuraScript class spell_gen_azgalor_rain_of_fire_hellfire_citadel : public SpellScript { - PrepareSpellScript(spell_gen_azgalor_rain_of_fire_hellfire_citadel); - void HandleDummy(SpellEffIndex /* effIndex */) { GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue()), true); @@ -4847,8 +4588,6 @@ enum AuraProcRemoveSpells // 99947 - Face Rage class spell_gen_face_rage : public AuraScript { - PrepareAuraScript(spell_gen_face_rage); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_FACE_RAGE }) @@ -4869,8 +4608,6 @@ class spell_gen_face_rage : public AuraScript // 187213 - Impatient Mind class spell_gen_impatient_mind : public AuraScript { - PrepareAuraScript(spell_gen_impatient_mind); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_IMPATIENT_MIND }); @@ -4890,8 +4627,6 @@ class spell_gen_impatient_mind : public AuraScript // 209352 - Boost 2.0 [Paladin+Priest] - Watch for Shield class spell_gen_boost_2_0_paladin_priest_watch_for_shield : public AuraScript { - PrepareAuraScript(spell_gen_boost_2_0_paladin_priest_watch_for_shield); - static constexpr uint32 SPELL_POWER_WORD_SHIELD = 17; static constexpr uint32 SPELL_DIVINE_SHIELD = 642; @@ -4916,8 +4651,6 @@ class spell_gen_boost_2_0_paladin_priest_watch_for_shield : public AuraScript // 282559 - Enlisted class spell_gen_war_mode_enlisted : public AuraScript { - PrepareAuraScript(spell_gen_war_mode_enlisted); - void CalcWarModeBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { Player* target = GetUnitOwner()->ToPlayer(); @@ -4988,8 +4721,6 @@ BindLocation const OrgrimmarInnLoc(1, 1573.18f, -4441.62f, 16.06f, 1.81828403472 class spell_defender_of_azeroth_death_gate_selector : public SpellScript { - PrepareSpellScript(spell_defender_of_azeroth_death_gate_selector); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -5024,8 +4755,6 @@ class spell_defender_of_azeroth_death_gate_selector : public SpellScript class spell_defender_of_azeroth_speak_with_mograine : public SpellScript { - PrepareSpellScript(spell_defender_of_azeroth_speak_with_mograine); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (!GetCaster()) @@ -5054,8 +4783,6 @@ class spell_defender_of_azeroth_speak_with_mograine : public SpellScript // 118301 - Summon Battle Pet class spell_summon_battle_pet : public SpellScript { - PrepareSpellScript(spell_summon_battle_pet); - void HandleSummon(SpellEffIndex effIndex) { uint32 creatureId = uint32(GetSpellValue()->EffectBasePoints[effIndex]); @@ -5082,8 +4809,6 @@ class spell_summon_battle_pet : public SpellScript // 132334 - Trainer Heal Cooldown (SERVERSIDE) class spell_gen_trainer_heal_cooldown : public AuraScript { - PrepareAuraScript(spell_gen_trainer_heal_cooldown); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ BattlePets::SPELL_REVIVE_BATTLE_PETS }); @@ -5124,8 +4849,6 @@ class spell_gen_trainer_heal_cooldown : public AuraScript // 45313 - Anchor Here class spell_gen_anchor_here : public SpellScript { - PrepareSpellScript(spell_gen_anchor_here); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitCreature()) @@ -5141,8 +4864,6 @@ class spell_gen_anchor_here : public SpellScript // 147066 - (Serverside/Non-DB2) Generic - Mount Check Aura class spell_gen_mount_check_aura : public AuraScript { - PrepareAuraScript(spell_gen_mount_check_aura); - void OnPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -5188,8 +4909,6 @@ enum AncestralCallSpells // 274738 - Ancestral Call (Mag'har Orc Racial) class spell_gen_ancestral_call : public SpellScript { - PrepareSpellScript(spell_gen_ancestral_call); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -5220,8 +4939,6 @@ class spell_gen_ancestral_call : public SpellScript // 83477 - Eject Passengers 3-8 class spell_gen_eject_passengers_3_8 : public SpellScript { - PrepareSpellScript(spell_gen_eject_passengers_3_8); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Vehicle* vehicle = GetHitUnit()->GetVehicleKit(); @@ -5244,8 +4961,6 @@ class spell_gen_eject_passengers_3_8 : public SpellScript // 83781 - Reverse Cast Ride Vehicle class spell_gen_reverse_cast_target_to_caster_triggered: public SpellScript { - PrepareSpellScript(spell_gen_reverse_cast_target_to_caster_triggered); - void HandleScript(SpellEffIndex effIndex) { GetHitUnit()->CastSpell(GetCaster(), GetSpellInfo()->GetEffect(effIndex).CalcValue(), true); @@ -5263,8 +4978,6 @@ class spell_gen_reverse_cast_target_to_caster_triggered: public SpellScript // 160938 - Despawn All Summons (Garrison Intro Only) class spell_gen_despawn_all_summons_owned_by_caster : public SpellScript { - PrepareSpellScript(spell_gen_despawn_all_summons_owned_by_caster); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -5300,8 +5013,6 @@ enum SkinningLearningSpell // 8613 - Skinning class spell_gen_skinning : public SpellScript { - PrepareSpellScript(spell_gen_skinning); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -5386,7 +5097,6 @@ enum BloodlustExhaustionSpell : uint32 // 381301 - Feral Hide Drums class spell_gen_bloodlust : public SpellScript { - PrepareSpellScript(spell_gen_bloodlust); public: spell_gen_bloodlust(uint32 exhaustionSpellId) : _exhaustionSpellId(exhaustionSpellId) { } @@ -5439,8 +5149,6 @@ private: // 22012 - Spirit Heal class spell_gen_spirit_heal_aoe : public SpellScript { - PrepareSpellScript(spell_gen_spirit_heal_aoe); - void FilterTargets(std::list<WorldObject*>& targets) { Unit* caster = GetCaster(); @@ -5465,8 +5173,6 @@ class spell_gen_spirit_heal_personal : public AuraScript { static constexpr uint32 SPELL_SPIRIT_HEAL_EFFECT = 156763; - PrepareAuraScript(spell_gen_spirit_heal_personal); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) @@ -5510,8 +5216,6 @@ private: // 22011 - Spirit Heal Channel class spell_gen_spirit_heal_channel : public AuraScript { - PrepareAuraScript(spell_gen_spirit_heal_channel); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) @@ -5530,8 +5234,6 @@ class spell_gen_spirit_heal_channel : public AuraScript // 2584 - Waiting to Resurrect class spell_gen_waiting_to_resurrect : public AuraScript { - PrepareAuraScript(spell_gen_waiting_to_resurrect); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Player* targetPlayer = GetTarget()->ToPlayer(); diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 258faa9f23c..499c289c70e 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -71,8 +71,6 @@ enum MiscSpells // 131894 - A Murder of Crows class spell_hun_a_murder_of_crows : public AuraScript { - PrepareAuraScript(spell_hun_a_murder_of_crows); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -114,8 +112,6 @@ class spell_hun_a_murder_of_crows : public AuraScript // 186257 - Aspect of the Cheetah class spell_hun_aspect_cheetah : public AuraScript { - PrepareAuraScript(spell_hun_aspect_cheetah); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -139,8 +135,6 @@ class spell_hun_aspect_cheetah : public AuraScript // 378750 - Cobra Sting class spell_hun_cobra_sting : public AuraScript { - PrepareAuraScript(spell_hun_cobra_sting); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -160,8 +154,6 @@ class spell_hun_cobra_sting : public AuraScript // 109304 - Exhilaration class spell_hun_exhilaration : public SpellScript { - PrepareSpellScript(spell_hun_exhilaration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_EXHILARATION_R2, SPELL_HUNTER_LONE_WOLF }); @@ -182,8 +174,6 @@ class spell_hun_exhilaration : public SpellScript // 212431 - Explosive Shot class spell_hun_explosive_shot : public AuraScript { - PrepareAuraScript(spell_hun_explosive_shot); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_EXPLOSIVE_SHOT_DAMAGE }); @@ -204,8 +194,6 @@ class spell_hun_explosive_shot : public AuraScript // 212658 - Hunting Party class spell_hun_hunting_party : public AuraScript { - PrepareAuraScript(spell_hun_hunting_party); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -231,8 +219,6 @@ class spell_hun_hunting_party : public AuraScript // 53478 - Last Stand Pet class spell_hun_last_stand_pet : public SpellScript { - PrepareSpellScript(spell_hun_last_stand_pet); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_PET_LAST_STAND_TRIGGERED }); @@ -255,8 +241,6 @@ class spell_hun_last_stand_pet : public SpellScript // 378016 - Latent Poison class spell_hun_latent_poison_damage : public SpellScript { - PrepareSpellScript(spell_hun_latent_poison_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_LATENT_POISON_STACK }); @@ -283,8 +267,6 @@ class spell_hun_latent_poison_damage : public SpellScript // 259387 - Mongoose Bite class spell_hun_latent_poison_trigger : public SpellScript { - PrepareSpellScript(spell_hun_latent_poison_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_LATENT_POISON_STACK, SPELL_HUNTER_LATENT_POISON_DAMAGE }); @@ -305,8 +287,6 @@ class spell_hun_latent_poison_trigger : public SpellScript // 336904 - Latent Poison Injectors class spell_hun_latent_poison_injectors_damage : public SpellScript { - PrepareSpellScript(spell_hun_latent_poison_injectors_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_LATENT_POISON_INJECTORS_STACK }); @@ -331,8 +311,6 @@ class spell_hun_latent_poison_injectors_damage : public SpellScript // 259387 - Mongoose Bite class spell_hun_latent_poison_injectors_trigger : public SpellScript { - PrepareSpellScript(spell_hun_latent_poison_injectors_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_LATENT_POISON_INJECTORS_STACK, SPELL_HUNTER_LATENT_POISON_INJECTORS_DAMAGE }); @@ -353,8 +331,6 @@ class spell_hun_latent_poison_injectors_trigger : public SpellScript // 53271 - Masters Call class spell_hun_masters_call : public SpellScript { - PrepareSpellScript(spell_hun_masters_call); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) @@ -421,8 +397,6 @@ class spell_hun_masters_call : public SpellScript // 34477 - Misdirection class spell_hun_misdirection : public AuraScript { - PrepareAuraScript(spell_hun_misdirection); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_MISDIRECTION_PROC }); @@ -453,8 +427,6 @@ class spell_hun_misdirection : public AuraScript // 35079 - Misdirection (Proc) class spell_hun_misdirection_proc : public AuraScript { - PrepareAuraScript(spell_hun_misdirection_proc); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetThreatManager().UnregisterRedirectThreat(SPELL_HUNTER_MISDIRECTION); @@ -469,8 +441,6 @@ class spell_hun_misdirection_proc : public AuraScript // 2643 - Multi-Shot class spell_hun_multi_shot : public SpellScript { - PrepareSpellScript(spell_hun_multi_shot); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_MULTI_SHOT_FOCUS }); @@ -497,8 +467,6 @@ class spell_hun_multi_shot : public SpellScript // 55709 - Pet Heart of the Phoenix class spell_hun_pet_heart_of_the_phoenix : public SpellScript { - PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix); - bool Load() override { if (!GetCaster()->IsPet()) @@ -535,8 +503,6 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScript // 781 - Disengage class spell_hun_posthaste : public SpellScript { - PrepareSpellScript(spell_hun_posthaste); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_POSTHASTE_TALENT, SPELL_HUNTER_POSTHASTE_INCREASE_SPEED }); @@ -560,8 +526,6 @@ class spell_hun_posthaste : public SpellScript // 257044 - Rapid Fire class spell_hun_rapid_fire : public AuraScript { - PrepareAuraScript(spell_hun_rapid_fire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_RAPID_FIRE_DAMAGE }); @@ -582,8 +546,6 @@ class spell_hun_rapid_fire : public AuraScript // 257045 - Rapid Fire Damage class spell_hun_rapid_fire_damage : public SpellScript { - PrepareSpellScript(spell_hun_rapid_fire_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_RAPID_FIRE_ENERGIZE }); @@ -603,8 +565,6 @@ class spell_hun_rapid_fire_damage : public SpellScript // 53480 - Roar of Sacrifice class spell_hun_roar_of_sacrifice : public AuraScript { - PrepareAuraScript(spell_hun_roar_of_sacrifice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROAR_OF_SACRIFICE_TRIGGERED }); @@ -641,8 +601,6 @@ class spell_hun_roar_of_sacrifice : public AuraScript // 37506 - Scatter Shot class spell_hun_scatter_shot : public SpellScript { - PrepareSpellScript(spell_hun_scatter_shot); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -666,8 +624,6 @@ class spell_hun_scatter_shot : public SpellScript // 56641 - Steady Shot class spell_hun_steady_shot : public SpellScript { - PrepareSpellScript(spell_hun_steady_shot); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_STEADY_SHOT_FOCUS }); @@ -692,8 +648,6 @@ class spell_hun_steady_shot : public SpellScript // 1515 - Tame Beast class spell_hun_tame_beast : public SpellScript { - PrepareSpellScript(spell_hun_tame_beast); - static constexpr uint32 CallPetSpellIds[MAX_ACTIVE_PETS] = { 883, @@ -770,8 +724,6 @@ class spell_hun_tame_beast : public SpellScript // 67151 - Item - Hunter T9 4P Bonus (Steady Shot) class spell_hun_t9_4p_bonus : public AuraScript { - PrepareAuraScript(spell_hun_t9_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_T9_4P_GREATNESS }); @@ -802,8 +754,6 @@ class spell_hun_t9_4p_bonus : public AuraScript // 394366 - Find The Mark class spell_hun_t29_2p_marksmanship_bonus : public AuraScript { - PrepareAuraScript(spell_hun_t29_2p_marksmanship_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellEffect({ { SPELL_HUNTER_T29_2P_MARKSMANSHIP_DAMAGE, EFFECT_0 } }) diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 52baf698325..81f90e8fd7c 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -60,8 +60,6 @@ class spell_item_trigger_spell : public SpellScriptLoader class spell_item_trigger_spell_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_trigger_spell_SpellScript); - uint32 _triggeredSpellId; public: @@ -100,8 +98,6 @@ enum AegisOfPreservation // 23780 - Aegis of Preservation class spell_item_aegis_of_preservation : public AuraScript { - PrepareAuraScript(spell_item_aegis_of_preservation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AEGIS_HEAL }); @@ -127,8 +123,6 @@ enum ZezzaksShard // 38554 - Absorb Eye of Grillok (31463: Zezzak's Shard) class spell_item_absorb_eye_of_grillok : public AuraScript { - PrepareAuraScript(spell_item_absorb_eye_of_grillok); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EYE_OF_GRILLOK }); @@ -162,8 +156,6 @@ enum LowerCityPrayerbook // 37877 - Blessing of Faith class spell_item_blessing_of_faith : public SpellScript { - PrepareSpellScript(spell_item_blessing_of_faith); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -227,8 +219,6 @@ enum AlchemistStone // 17619 - Alchemist Stone class spell_item_alchemist_stone : public AuraScript { - PrepareAuraScript(spell_item_alchemist_stone); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -292,8 +282,6 @@ class spell_item_anger_capacitor : public SpellScriptLoader template <uint8 Stacks> class spell_item_anger_capacitor_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_anger_capacitor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -345,8 +333,6 @@ class spell_item_anger_capacitor : public SpellScriptLoader // 26400 - Arcane Shroud class spell_item_arcane_shroud : public AuraScript { - PrepareAuraScript(spell_item_arcane_shroud); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { int32 diff = GetUnitOwner()->GetLevel() - 60; @@ -382,8 +368,6 @@ enum AuraOfMadness // 39446 - Aura of Madness class spell_item_aura_of_madness : public AuraScript { - PrepareAuraScript(spell_item_aura_of_madness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -448,8 +432,6 @@ class spell_item_aura_of_madness : public AuraScript // 41404 - Dementia class spell_item_dementia : public AuraScript { - PrepareAuraScript(spell_item_dementia); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -479,8 +461,6 @@ enum BrittleArmor class spell_item_brittle_armor : public SpellScript { - PrepareSpellScript(spell_item_brittle_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BRITTLE_ARMOR }); @@ -505,8 +485,6 @@ enum BlessingOfAncientKings class spell_item_blessing_of_ancient_kings : public AuraScript { - PrepareAuraScript(spell_item_blessing_of_ancient_kings); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PROTECTION_OF_ANCIENT_KINGS }); @@ -552,8 +530,6 @@ class spell_item_blessing_of_ancient_kings : public AuraScript // 64415 Val'anyr Hammer of Ancient Kings - Equip Effect class spell_item_valanyr_hammer_of_ancient_kings : public AuraScript { - PrepareAuraScript(spell_item_valanyr_hammer_of_ancient_kings); - bool CheckProc(ProcEventInfo& eventInfo) { return eventInfo.GetHealInfo() && eventInfo.GetHealInfo()->GetEffectiveHeal() > 0; @@ -573,8 +549,6 @@ enum DeadlyPrecision // 71564 - Deadly Precision class spell_item_deadly_precision : public AuraScript { - PrepareAuraScript(spell_item_deadly_precision); - void HandleStackDrop(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -590,8 +564,6 @@ class spell_item_deadly_precision : public AuraScript // 71563 - Deadly Precision Dummy class spell_item_deadly_precision_dummy : public SpellScript { - PrepareSpellScript(spell_item_deadly_precision_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEADLY_PRECISION }); @@ -640,8 +612,6 @@ class spell_item_deathbringers_will : public SpellScriptLoader template <uint32 Strength, uint32 Agility, uint32 AttackPower, uint32 Critical, uint32 Haste> class spell_item_deathbringers_will_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_deathbringers_will_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -709,8 +679,6 @@ class spell_item_deathbringers_will : public SpellScriptLoader // 47770 - Roll Dice class spell_item_decahedral_dwarven_dice : public SpellScript { - PrepareSpellScript(spell_item_decahedral_dwarven_dice); - enum { TEXT_DECAHEDRAL_DWARVEN_DICE = 26147 @@ -753,8 +721,6 @@ enum GoblinBombDispenser // 23134 - Goblin Bomb class spell_item_goblin_bomb_dispenser : public SpellScript { - PrepareSpellScript(spell_item_goblin_bomb_dispenser); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_GOBLIN_BOMB, SPELL_MALFUNCTION_EXPLOSION }); @@ -783,8 +749,6 @@ enum GoblinWeatherMachine // 46203 - Goblin Weather Machine class spell_item_goblin_weather_machine : public SpellScript { - PrepareSpellScript(spell_item_goblin_weather_machine); - void HandleScript(SpellEffIndex /* effIndex */) { Unit* target = GetHitUnit(); @@ -816,8 +780,6 @@ class spell_item_defibrillate : public SpellScriptLoader class spell_item_defibrillate_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_defibrillate_SpellScript); - public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } @@ -864,8 +826,6 @@ enum DesperateDefense // 33896 - Desperate Defense class spell_item_desperate_defense : public AuraScript { - PrepareAuraScript(spell_item_desperate_defense); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DESPERATE_RAGE }); @@ -897,8 +857,6 @@ enum DeviateFishSpells class spell_item_deviate_fish : public SpellScript { - PrepareSpellScript(spell_item_deviate_fish); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -948,8 +906,6 @@ private: class spell_item_party_time : public AuraScript { - PrepareAuraScript(spell_item_party_time); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Player* player = GetOwner()->ToPlayer(); @@ -980,8 +936,6 @@ enum DireBrew // 51010 - Dire Brew class spell_item_dire_brew : public AuraScript { - PrepareAuraScript(spell_item_dire_brew); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1016,8 +970,6 @@ enum DiscerningEyeBeastMisc // 59915 - Discerning Eye of the Beast Dummy class spell_item_discerning_eye_beast_dummy : public AuraScript { - PrepareAuraScript(spell_item_discerning_eye_beast_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DISCERNING_EYE_BEAST }); @@ -1038,8 +990,6 @@ class spell_item_discerning_eye_beast_dummy : public AuraScript // 71610, 71641 - Echoes of Light (Althor's Abacus) class spell_item_echoes_of_light : public SpellScript { - PrepareSpellScript(spell_item_echoes_of_light); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.size() < 2) @@ -1061,8 +1011,6 @@ class spell_item_echoes_of_light : public SpellScript // 30427 - Extract Gas (23821: Zapthrottle Mote Extractor) class spell_item_extract_gas : public AuraScript { - PrepareAuraScript(spell_item_extract_gas); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1098,8 +1046,6 @@ enum FateRuneOfUnsurpassedVigor class spell_item_fate_rune_of_unsurpassed_vigor : public AuraScript { - PrepareAuraScript(spell_item_fate_rune_of_unsurpassed_vigor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_UNSURPASSED_VIGOR }); @@ -1133,8 +1079,6 @@ enum Feast 66476 - Bountiful Feast */ class spell_item_feast : public SpellScript { - PrepareSpellScript(spell_item_feast); - public: spell_item_feast(uint32 text) : SpellScript(), _text(text) { } @@ -1169,8 +1113,6 @@ enum FlaskOfTheNorthSpells class spell_item_flask_of_the_north : public SpellScript { - PrepareSpellScript(spell_item_flask_of_the_north); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLASK_OF_THE_NORTH_SP, SPELL_FLASK_OF_THE_NORTH_AP, SPELL_FLASK_OF_THE_NORTH_STR }); @@ -1230,8 +1172,6 @@ enum FrozenShadoweave // Frozen Shadoweave set 3p bonus class spell_item_frozen_shadoweave : public AuraScript { - PrepareAuraScript(spell_item_frozen_shadoweave); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOWMEND }); @@ -1266,8 +1206,6 @@ enum GnomishDeathRay class spell_item_gnomish_death_ray : public SpellScript { - PrepareSpellScript(spell_item_gnomish_death_ray); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GNOMISH_DEATH_RAY_SELF, SPELL_GNOMISH_DEATH_RAY_TARGET }); @@ -1300,8 +1238,6 @@ enum HarmPreventionBelt class spell_item_harm_prevention_belt : public AuraScript { - PrepareAuraScript(spell_item_harm_prevention_belt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FORCEFIELD_COLLAPSE }); @@ -1339,8 +1275,6 @@ enum Heartpierce template <uint32 Energy, uint32 Mana, uint32 Rage, uint32 RunicPower> class spell_item_heartpierce : public AuraScript { - PrepareAuraScript(spell_item_heartpierce); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1394,8 +1328,6 @@ enum HourglassSand // 23645 - Hourglass Sand class spell_item_hourglass_sand : public SpellScript { - PrepareSpellScript(spell_item_hourglass_sand); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BROOD_AFFLICTION_BRONZE }); @@ -1415,8 +1347,6 @@ class spell_item_hourglass_sand : public SpellScript // 40971 - Bonus Healing (Crystal Spire of Karabor) class spell_item_crystal_spire_of_karabor : public AuraScript { - PrepareAuraScript(spell_item_crystal_spire_of_karabor); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }); @@ -1452,8 +1382,6 @@ enum MakeAWish class spell_item_make_a_wish : public SpellScript { - PrepareSpellScript(spell_item_make_a_wish); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1501,8 +1429,6 @@ enum MarkOfConquest // 33510 - Health Restore class spell_item_mark_of_conquest : public AuraScript { - PrepareAuraScript(spell_item_mark_of_conquest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_CONQUEST_ENERGIZE }); @@ -1533,8 +1459,6 @@ enum MercurialShield class spell_item_mercurial_shield : public SpellScript { - PrepareSpellScript(spell_item_mercurial_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MERCURIAL_SHIELD }); @@ -1587,8 +1511,6 @@ std::array<uint32, 20> const CreateFortuneSpells = // 40802 Mingo's Fortune Generator class spell_item_mingos_fortune_generator : public SpellScript { - PrepareSpellScript(spell_item_mingos_fortune_generator); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CreateFortuneSpells); @@ -1613,8 +1535,6 @@ enum NecroticTouch class spell_item_necrotic_touch : public AuraScript { - PrepareAuraScript(spell_item_necrotic_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ITEM_NECROTIC_TOUCH_PROC }); @@ -1655,8 +1575,6 @@ enum NetOMaticSpells class spell_item_net_o_matic : public SpellScript { - PrepareSpellScript(spell_item_net_o_matic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1699,8 +1617,6 @@ enum NoggenfoggerElixirSpells class spell_item_noggenfogger_elixir : public SpellScript { - PrepareSpellScript(spell_item_noggenfogger_elixir); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1738,8 +1654,6 @@ class spell_item_noggenfogger_elixir : public SpellScript // 29601 - Enlightenment (Pendant of the Violet Eye) class spell_item_pendant_of_the_violet_eye : public AuraScript { - PrepareAuraScript(spell_item_pendant_of_the_violet_eye); - bool CheckProc(ProcEventInfo& eventInfo) { if (Spell const* spell = eventInfo.GetProcSpell()) @@ -1767,8 +1681,6 @@ enum PersistentShieldMisc // 26467 - Persistent Shield class spell_item_persistent_shield : public AuraScript { - PrepareAuraScript(spell_item_persistent_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PERSISTENT_SHIELD_TRIGGERED }); @@ -1812,8 +1724,6 @@ enum PetHealing // Warlock T5 2P Bonus class spell_item_pet_healing : public AuraScript { - PrepareAuraScript(spell_item_pet_healing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEALTH_LINK }); @@ -1840,8 +1750,6 @@ class spell_item_pet_healing : public AuraScript // 17512 - Piccolo of the Flaming Fire class spell_item_piccolo_of_the_flaming_fire : public SpellScript { - PrepareSpellScript(spell_item_piccolo_of_the_flaming_fire); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1863,8 +1771,6 @@ enum PowerCircle // 45043 - Power Circle (Shifting Naaru Sliver) class spell_item_power_circle : public AuraScript { - PrepareAuraScript(spell_item_power_circle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LIMITLESS_POWER }); @@ -1908,8 +1814,6 @@ enum SavoryDeviateDelight class spell_item_savory_deviate_delight : public SpellScript { - PrepareSpellScript(spell_item_savory_deviate_delight); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1961,8 +1865,6 @@ enum ScrollOfRecall class spell_item_scroll_of_recall : public SpellScript { - PrepareSpellScript(spell_item_scroll_of_recall); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2024,8 +1926,6 @@ enum TransporterSpells // 23442 - Dimensional Ripper - Everlook class spell_item_dimensional_ripper_everlook : public SpellScript { - PrepareSpellScript(spell_item_dimensional_ripper_everlook); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TRANSPORTER_MALFUNCTION_FIRE, SPELL_EVIL_TWIN }); @@ -2059,8 +1959,6 @@ class spell_item_dimensional_ripper_everlook : public SpellScript // 36941 - Ultrasafe Transporter: Toshley's Station class spell_item_ultrasafe_transporter : public SpellScript { - PrepareSpellScript(spell_item_ultrasafe_transporter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2131,8 +2029,6 @@ class spell_item_ultrasafe_transporter : public SpellScript // 36890 - Dimensional Ripper - Area 52 class spell_item_dimensional_ripper_area52 : public SpellScript { - PrepareSpellScript(spell_item_dimensional_ripper_area52); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2197,8 +2093,6 @@ enum ShadowsFate class spell_item_unsated_craving : public AuraScript { - PrepareAuraScript(spell_item_unsated_craving); - bool CheckProc(ProcEventInfo& procInfo) { Unit* caster = procInfo.GetActor(); @@ -2220,8 +2114,6 @@ class spell_item_unsated_craving : public AuraScript class spell_item_shadows_fate : public AuraScript { - PrepareAuraScript(spell_item_shadows_fate); - void HandleProc(ProcEventInfo& procInfo) { PreventDefaultAction(); @@ -2252,8 +2144,6 @@ enum Shadowmourne // 71903 - Item - Shadowmourne Legendary class spell_item_shadowmourne : public AuraScript { - PrepareAuraScript(spell_item_shadowmourne); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2303,8 +2193,6 @@ class spell_item_shadowmourne : public AuraScript // 71905 - Soul Fragment class spell_item_shadowmourne_soul_fragment : public AuraScript { - PrepareAuraScript(spell_item_shadowmourne_soul_fragment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2364,8 +2252,6 @@ enum SixDemonBagSpells class spell_item_six_demon_bag : public SpellScript { - PrepareSpellScript(spell_item_six_demon_bag); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2424,8 +2310,6 @@ enum SwiftHandJusticeMisc // 59906 - Swift Hand of Justice Dummy class spell_item_swift_hand_justice_dummy : public AuraScript { - PrepareAuraScript(spell_item_swift_hand_justice_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWIFT_HAND_OF_JUSTICE_HEAL }); @@ -2450,8 +2334,6 @@ class spell_item_swift_hand_justice_dummy : public AuraScript // 28862 - The Eye of Diminution class spell_item_the_eye_of_diminution : public AuraScript { - PrepareAuraScript(spell_item_the_eye_of_diminution); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { int32 diff = GetUnitOwner()->GetLevel() - 60; @@ -2476,8 +2358,6 @@ enum UnderbellyElixirSpells class spell_item_underbelly_elixir : public SpellScript { - PrepareSpellScript(spell_item_underbelly_elixir); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2539,8 +2419,6 @@ uint32 const WormholeTargetLocations[] = // 126755 - Wormhole: Pandaria class spell_item_wormhole_pandaria : public SpellScript { - PrepareSpellScript(spell_item_wormhole_pandaria); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(WormholeTargetLocations); @@ -2562,8 +2440,6 @@ class spell_item_wormhole_pandaria : public SpellScript // 47776 - Roll 'dem Bones class spell_item_worn_troll_dice : public SpellScript { - PrepareSpellScript(spell_item_worn_troll_dice); - enum { TEXT_WORN_TROLL_DICE = 26152 @@ -2608,8 +2484,6 @@ enum AirRifleSpells class spell_item_red_rider_air_rifle : public SpellScript { - PrepareSpellScript(spell_item_red_rider_air_rifle); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -2645,8 +2519,6 @@ class spell_item_red_rider_air_rifle : public SpellScript class spell_item_book_of_glyph_mastery : public SpellScript { - PrepareSpellScript(spell_item_book_of_glyph_mastery); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2688,8 +2560,6 @@ enum GiftOfTheHarvester class spell_item_gift_of_the_harvester : public SpellScript { - PrepareSpellScript(spell_item_gift_of_the_harvester); - SpellCastResult CheckRequirement() { std::list<TempSummon*> ghouls; @@ -2718,8 +2588,6 @@ enum Sinkholes class spell_item_map_of_the_geyser_fields : public SpellScript { - PrepareSpellScript(spell_item_map_of_the_geyser_fields); - SpellCastResult CheckSinkholes() { Unit* caster = GetCaster(); @@ -2747,8 +2615,6 @@ enum VanquishedClutchesSpells class spell_item_vanquished_clutches : public SpellScript { - PrepareSpellScript(spell_item_vanquished_clutches); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2790,8 +2656,6 @@ enum AshbringerSounds class spell_item_ashbringer : public SpellScript { - PrepareSpellScript(spell_item_ashbringer); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2829,8 +2693,6 @@ enum MagicEater // 58886 - Food class spell_magic_eater_food : public AuraScript { - PrepareAuraScript(spell_magic_eater_food); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -2872,8 +2734,6 @@ enum PurifyHelboarMeat class spell_item_purify_helboar_meat : public SpellScript { - PrepareSpellScript(spell_item_purify_helboar_meat); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2908,8 +2768,6 @@ enum NighInvulnerability class spell_item_nigh_invulnerability : public SpellScript { - PrepareSpellScript(spell_item_nigh_invulnerability); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NIGH_INVULNERABILITY, SPELL_COMPLETE_VULNERABILITY }); @@ -2941,8 +2799,6 @@ enum Poultryzer class spell_item_poultryizer : public SpellScript { - PrepareSpellScript(spell_item_poultryizer); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POULTRYIZER_SUCCESS, SPELL_POULTRYIZER_BACKFIRE }); @@ -2968,8 +2824,6 @@ enum SocretharsStone class spell_item_socrethars_stone : public SpellScript { - PrepareSpellScript(spell_item_socrethars_stone); - bool Load() override { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); @@ -3010,8 +2864,6 @@ enum DemonBroiledSurprise class spell_item_demon_broiled_surprise : public SpellScript { - PrepareSpellScript(spell_item_demon_broiled_surprise); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CREATE_DEMON_BROILED_SURPRISE }) && @@ -3056,8 +2908,6 @@ enum CompleteRaptorCapture class spell_item_complete_raptor_capture : public SpellScript { - PrepareSpellScript(spell_item_complete_raptor_capture); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RAPTOR_CAPTURE_CREDIT }); @@ -3089,8 +2939,6 @@ enum ImpaleLeviroth class spell_item_impale_leviroth : public SpellScript { - PrepareSpellScript(spell_item_impale_leviroth); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) @@ -3123,8 +2971,6 @@ enum LifegivingGem // 23725 - Gift of Life class spell_item_lifegiving_gem : public SpellScript { - PrepareSpellScript(spell_item_lifegiving_gem); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GIFT_OF_LIFE_1, SPELL_GIFT_OF_LIFE_2 }); @@ -3152,8 +2998,6 @@ enum NitroBoosts class spell_item_nitro_boosts : public SpellScript { - PrepareSpellScript(spell_item_nitro_boosts); - bool Load() override { if (!GetCastItem()) @@ -3183,8 +3027,6 @@ class spell_item_nitro_boosts : public SpellScript class spell_item_nitro_boosts_backfire : public AuraScript { - PrepareAuraScript(spell_item_nitro_boosts_backfire); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NITRO_BOOSTS_PARACHUTE }); @@ -3225,8 +3067,6 @@ enum RocketBoots class spell_item_rocket_boots : public SpellScript { - PrepareSpellScript(spell_item_rocket_boots); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3264,8 +3104,6 @@ class spell_item_rocket_boots : public SpellScript // 67489 - Runic Healing Injector class spell_item_runic_healing_injector : public SpellScript { - PrepareSpellScript(spell_item_runic_healing_injector); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3292,8 +3130,6 @@ enum PygmyOil class spell_item_pygmy_oil : public SpellScript { - PrepareSpellScript(spell_item_pygmy_oil); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PYGMY_OIL_PYGMY_AURA, SPELL_PYGMY_OIL_SMALLER_AURA }); @@ -3325,8 +3161,6 @@ class spell_item_pygmy_oil : public SpellScript class spell_item_unusual_compass : public SpellScript { - PrepareSpellScript(spell_item_unusual_compass); - void HandleDummy(SpellEffIndex /* effIndex */) { Unit* caster = GetCaster(); @@ -3349,8 +3183,6 @@ enum ChickenCover class spell_item_chicken_cover : public SpellScript { - PrepareSpellScript(spell_item_chicken_cover); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3384,8 +3216,6 @@ class spell_item_chicken_cover : public SpellScript class spell_item_muisek_vessel : public SpellScript { - PrepareSpellScript(spell_item_muisek_vessel); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -3405,8 +3235,6 @@ enum GreatmothersSoulcather }; class spell_item_greatmothers_soulcatcher : public SpellScript { - PrepareSpellScript(spell_item_greatmothers_soulcatcher); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitUnit()) @@ -3442,8 +3270,6 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader template <uint32 HealProc, uint32 DamageProc> class spell_item_shard_of_the_scale_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_shard_of_the_scale_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3488,8 +3314,6 @@ enum SoulPreserver class spell_item_soul_preserver : public AuraScript { - PrepareAuraScript(spell_item_soul_preserver); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3570,8 +3394,6 @@ class spell_item_sunwell_neck : public SpellScriptLoader template <uint32 Aldors, uint32 Scryers> class spell_item_sunwell_neck_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_sunwell_neck_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ Aldors, Scryers }) && @@ -3615,8 +3437,6 @@ class spell_item_sunwell_neck : public SpellScriptLoader class spell_item_toy_train_set_pulse : public SpellScript { - PrepareSpellScript(spell_item_toy_train_set_pulse); - void HandleDummy(SpellEffIndex /*index*/) { if (Player* target = GetHitUnit()->ToPlayer()) @@ -3651,8 +3471,6 @@ enum DeathChoiceSpells class spell_item_death_choice : public AuraScript { - PrepareAuraScript(spell_item_death_choice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3727,8 +3545,6 @@ public: class spell_item_trinket_stack_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_trinket_stack_AuraScript); - public: spell_item_trinket_stack_AuraScript(uint32 stackSpell, uint32 triggerSpell) : _stackSpell(stackSpell), _triggerSpell(triggerSpell) { @@ -3796,8 +3612,6 @@ enum DarkmoonCardSpells class spell_item_darkmoon_card_greatness : public AuraScript { - PrepareAuraScript(spell_item_darkmoon_card_greatness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3864,8 +3678,6 @@ enum ManaDrainSpells class spell_item_mana_drain : public AuraScript { - PrepareAuraScript(spell_item_mana_drain); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3905,8 +3717,6 @@ enum TauntFlag // 51640 - Taunt Flag Targeting class spell_item_taunt_flag_targeting : public SpellScript { - PrepareSpellScript(spell_item_taunt_flag_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TAUNT_FLAG }) && @@ -3955,8 +3765,6 @@ enum MirrensDrinkingHat // 29830 - Mirren's Drinking Hat class spell_item_mirrens_drinking_hat : public SpellScript { - PrepareSpellScript(spell_item_mirrens_drinking_hat); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { uint32 spellId = 0; @@ -3996,8 +3804,6 @@ enum MindControlCap class spell_item_mind_control_cap : public SpellScript { - PrepareSpellScript(spell_item_mind_control_cap); - bool Load() override { if (!GetCastItem()) @@ -4038,8 +3844,6 @@ enum UniversalRemote class spell_item_universal_remote : public SpellScript { - PrepareSpellScript(spell_item_universal_remote); - bool Load() override { if (!GetCastItem()) @@ -4093,8 +3897,6 @@ class spell_item_zandalarian_charm : public SpellScriptLoader friend class spell_item_zandalarian_charm; spell_item_zandalarian_charm_AuraScript(uint32 SpellId) : AuraScript(), _spellId(SpellId) { } - PrepareAuraScript(spell_item_zandalarian_charm_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ _spellId }); @@ -4135,8 +3937,6 @@ class spell_item_zandalarian_charm : public SpellScriptLoader class spell_item_artifical_stamina : public AuraScript { - PrepareAuraScript(spell_item_artifical_stamina); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -4161,8 +3961,6 @@ class spell_item_artifical_stamina : public AuraScript class spell_item_artifical_damage : public AuraScript { - PrepareAuraScript(spell_item_artifical_damage); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -4198,8 +3996,6 @@ enum AuraProcRemoveSpells // 28200 - Ascendance class spell_item_talisman_of_ascendance : public AuraScript { - PrepareAuraScript(spell_item_talisman_of_ascendance); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TALISMAN_OF_ASCENDANCE }); @@ -4219,8 +4015,6 @@ class spell_item_talisman_of_ascendance : public AuraScript // 29602 - Jom Gabbar class spell_item_jom_gabbar : public AuraScript { - PrepareAuraScript(spell_item_jom_gabbar); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_JOM_GABBAR }); @@ -4240,8 +4034,6 @@ class spell_item_jom_gabbar : public AuraScript // 45040 - Battle Trance class spell_item_battle_trance : public AuraScript { - PrepareAuraScript(spell_item_battle_trance); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BATTLE_TRANCE }); @@ -4261,8 +4053,6 @@ class spell_item_battle_trance : public AuraScript // 90900 - World-Queller Focus class spell_item_world_queller_focus : public AuraScript { - PrepareAuraScript(spell_item_world_queller_focus); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_WORLD_QUELLER_FOCUS }); @@ -4286,8 +4076,6 @@ class spell_item_world_queller_focus : public AuraScript // 127278 - Golden Water Strider class spell_item_water_strider : public AuraScript { - PrepareAuraScript(spell_item_water_strider); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -4308,8 +4096,6 @@ class spell_item_water_strider : public AuraScript // 145738 - Brutal Kinship class spell_item_brutal_kinship : public AuraScript { - PrepareAuraScript(spell_item_brutal_kinship); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BRUTAL_KINSHIP_1, SPELL_BRUTAL_KINSHIP_2 }); @@ -4329,8 +4115,6 @@ class spell_item_brutal_kinship : public AuraScript // 45051 - Mad Alchemist's Potion (34440) class spell_item_mad_alchemists_potion : public SpellScript { - PrepareSpellScript(spell_item_mad_alchemists_potion); - void SecondaryEffect() { std::vector<uint32> availableElixirs = @@ -4400,8 +4184,6 @@ class spell_item_mad_alchemists_potion : public SpellScript // 53750 - Crazy Alchemist's Potion (40077) class spell_item_crazy_alchemists_potion : public SpellScript { - PrepareSpellScript(spell_item_crazy_alchemists_potion); - void SecondaryEffect() { std::vector<uint32> availableElixirs = @@ -4446,8 +4228,6 @@ enum Eggnog // 21149 - Egg Nog class spell_item_eggnog : public SpellScript { - PrepareSpellScript(spell_item_eggnog); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EGG_NOG_REINDEER, SPELL_EGG_NOG_SNOWMAN}); @@ -4475,8 +4255,6 @@ enum SephuzsSecret // 236763 - Sephuz's Secret class spell_item_sephuzs_secret : public AuraScript { - PrepareAuraScript(spell_item_sephuzs_secret); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEPHUZS_SECRET_COOLDOWN }); @@ -4538,8 +4316,6 @@ enum AmalgamsSeventhSpine // 215266 - Fragile Echoes class spell_item_amalgams_seventh_spine : public AuraScript { - PrepareAuraScript(spell_item_amalgams_seventh_spine); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -4607,8 +4383,6 @@ class spell_item_amalgams_seventh_spine : public AuraScript // 215267 - Fragile Echo class spell_item_amalgams_seventh_spine_mana_restore : public AuraScript { - PrepareAuraScript(spell_item_amalgams_seventh_spine_mana_restore); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FRAGILE_ECHO_ENERGIZE }); @@ -4636,8 +4410,6 @@ class spell_item_amalgams_seventh_spine_mana_restore : public AuraScript // 228445 - March of the Legion class spell_item_set_march_of_the_legion : public AuraScript { - PrepareAuraScript(spell_item_set_march_of_the_legion); - bool IsDemon(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->GetCreatureType() == CREATURE_TYPE_DEMON; @@ -4652,8 +4424,6 @@ class spell_item_set_march_of_the_legion : public AuraScript // 234113 - Arrogance (used by item 142171 - Seal of Darkshire Nobility) class spell_item_seal_of_darkshire_nobility : public AuraScript { - PrepareAuraScript(spell_item_seal_of_darkshire_nobility); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) @@ -4674,8 +4444,6 @@ class spell_item_seal_of_darkshire_nobility : public AuraScript // 247625 - March of the Legion class spell_item_lightblood_elixir : public AuraScript { - PrepareAuraScript(spell_item_lightblood_elixir); - bool IsDemon(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetProcTarget() && eventInfo.GetProcTarget()->GetCreatureType() == CREATURE_TYPE_DEMON; @@ -4695,8 +4463,6 @@ enum HighfathersMachination // 253287 - Highfather's Timekeeping class spell_item_highfathers_machination : public AuraScript { - PrepareAuraScript(spell_item_highfathers_machination); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HIGHFATHERS_TIMEKEEPING_HEAL }); @@ -4730,8 +4496,6 @@ enum SeepingScourgewing // 253323 - Shadow Strike class spell_item_seeping_scourgewing : public AuraScript { - PrepareAuraScript(spell_item_seeping_scourgewing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_STRIKE_AOE_CHECK }); @@ -4752,8 +4516,6 @@ class spell_item_seeping_scourgewing : public AuraScript // 255861 - Shadow Strike class spell_item_seeping_scourgewing_aoe_check : public SpellScript { - PrepareSpellScript(spell_item_seeping_scourgewing_aoe_check); - void TriggerAdditionalDamage() { if (GetUnitTargetCountForEffect(EFFECT_0) > 1) @@ -4777,8 +4539,6 @@ class spell_item_seeping_scourgewing_aoe_check : public SpellScript // 295175 - Spiteful Binding class spell_item_grips_of_forsaken_sanity : public AuraScript { - PrepareAuraScript(spell_item_grips_of_forsaken_sanity); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -4798,8 +4558,6 @@ class spell_item_grips_of_forsaken_sanity : public AuraScript // 302385 - Resurrect Health class spell_item_zanjir_scaleguard_greatcloak : public AuraScript { - PrepareAuraScript(spell_item_zanjir_scaleguard_greatcloak); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetSpellInfo() && eventInfo.GetSpellInfo()->HasEffect(SPELL_EFFECT_RESURRECT); @@ -4822,8 +4580,6 @@ enum ShiverVenomSpell : uint32 // 303361 Shivering Lance class spell_item_shiver_venom_weapon_proc : public AuraScript { - PrepareAuraScript(spell_item_shiver_venom_weapon_proc); - public: spell_item_shiver_venom_weapon_proc(ShiverVenomSpell additionalProcSpellId) : _additionalProcSpellId(additionalProcSpellId) { } @@ -4852,8 +4608,6 @@ private: // 302774 - Arcane Tempest class spell_item_phial_of_the_arcane_tempest_damage : public SpellScript { - PrepareSpellScript(spell_item_phial_of_the_arcane_tempest_damage); - void ModifyStacks() { if (GetUnitTargetCountForEffect(EFFECT_0) != 1 || !GetTriggeringSpell()) @@ -4875,8 +4629,6 @@ class spell_item_phial_of_the_arcane_tempest_damage : public SpellScript // 302769 - Arcane Tempest class spell_item_phial_of_the_arcane_tempest_periodic : public AuraScript { - PrepareAuraScript(spell_item_phial_of_the_arcane_tempest_periodic); - void CalculatePeriod(AuraEffect const* /*aurEff*/, bool& /*isPeriodic*/, int32& period) { period -= (GetStackAmount() - 1) * 300; @@ -4892,8 +4644,6 @@ class spell_item_phial_of_the_arcane_tempest_periodic : public AuraScript // 410964 - Mettle class spell_item_infurious_crafted_gear_mettle : public AuraScript { - PrepareAuraScript(spell_item_infurious_crafted_gear_mettle); - static constexpr uint32 SPELL_METTLE_COOLDOWN = 410532; bool Validate(SpellInfo const* /*spellInfo*/) override diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 4aecdc4fef9..1294032263a 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -100,8 +100,6 @@ enum MageSpells // 342246 - Alter Time Aura class spell_mage_alter_time_aura : public AuraScript { - PrepareAuraScript(spell_mage_alter_time_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -151,8 +149,6 @@ private: // 342247 - Alter Time Active class spell_mage_alter_time_active : public SpellScript { - PrepareSpellScript(spell_mage_alter_time_active); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -178,8 +174,6 @@ class spell_mage_alter_time_active : public SpellScript // 44425 - Arcane Barrage class spell_mage_arcane_barrage : public SpellScript { - PrepareSpellScript(spell_mage_arcane_barrage); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_MAGE_ARCANE_BARRAGE_R3, SPELL_MAGE_ARCANE_BARRAGE_ENERGIZE }) @@ -220,8 +214,6 @@ class spell_mage_arcane_barrage : public SpellScript // 195302 - Arcane Charge class spell_mage_arcane_charge_clear : public SpellScript { - PrepareSpellScript(spell_mage_arcane_charge_clear); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_ARCANE_CHARGE }); @@ -241,8 +233,6 @@ class spell_mage_arcane_charge_clear : public SpellScript // 1449 - Arcane Explosion class spell_mage_arcane_explosion : public SpellScript { - PrepareSpellScript(spell_mage_arcane_explosion); - bool Validate(SpellInfo const* spellInfo) override { if (!ValidateSpellInfo({ SPELL_MAGE_ARCANE_MAGE, SPELL_MAGE_REVERBERATE })) @@ -290,8 +280,6 @@ class spell_mage_arcane_explosion : public SpellScript // 235313 - Blazing Barrier class spell_mage_blazing_barrier : public AuraScript { - PrepareAuraScript(spell_mage_blazing_barrier); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_BLAZING_BARRIER_TRIGGER }); @@ -349,8 +337,6 @@ private: // 190357 - Blizzard (Damage) class spell_mage_blizzard_damage : public SpellScript { - PrepareSpellScript(spell_mage_blizzard_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_BLIZZARD_SLOW }); @@ -370,8 +356,6 @@ class spell_mage_blizzard_damage : public SpellScript // 198063 - Burning Determination class spell_mage_burning_determination : public AuraScript { - PrepareAuraScript(spell_mage_burning_determination); - bool CheckProc(ProcEventInfo& eventInfo) { if (SpellInfo const* spellInfo = eventInfo.GetSpellInfo()) @@ -390,8 +374,6 @@ class spell_mage_burning_determination : public AuraScript // 86949 - Cauterize class spell_mage_cauterize : public SpellScript { - PrepareSpellScript(spell_mage_cauterize); - void SuppressSpeedBuff(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -405,8 +387,6 @@ class spell_mage_cauterize : public SpellScript class spell_mage_cauterize_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_cauterize_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) && ValidateSpellInfo @@ -445,8 +425,6 @@ class spell_mage_cauterize_AuraScript : public AuraScript // 235219 - Cold Snap class spell_mage_cold_snap : public SpellScript { - PrepareSpellScript(spell_mage_cold_snap); - static uint32 constexpr SpellsToReset[] = { SPELL_MAGE_CONE_OF_COLD, @@ -502,8 +480,6 @@ private: // 153595 - Comet Storm (launch) class spell_mage_comet_storm : public SpellScript { - PrepareSpellScript(spell_mage_comet_storm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_COMET_STORM_VISUAL }); @@ -523,8 +499,6 @@ class spell_mage_comet_storm : public SpellScript // 228601 - Comet Storm (damage) class spell_mage_comet_storm_damage : public SpellScript { - PrepareSpellScript(spell_mage_comet_storm_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_COMET_STORM_DAMAGE }); @@ -545,8 +519,6 @@ class spell_mage_comet_storm_damage : public SpellScript // 120 - Cone of Cold class spell_mage_cone_of_cold : public SpellScript { - PrepareSpellScript(spell_mage_cone_of_cold); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_CONE_OF_COLD_SLOW }); @@ -566,8 +538,6 @@ class spell_mage_cone_of_cold : public SpellScript // 190336 - Conjure Refreshment class spell_mage_conjure_refreshment : public SpellScript { - PrepareSpellScript(spell_mage_conjure_refreshment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -598,8 +568,6 @@ class spell_mage_conjure_refreshment : public SpellScript // 410939 - Ethereal Blink class spell_mage_ethereal_blink : public AuraScript { - PrepareAuraScript(spell_mage_ethereal_blink); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_BLINK, SPELL_MAGE_SHIMMER }); @@ -624,8 +592,6 @@ class spell_mage_ethereal_blink : public AuraScript // 410941 - Ethereal Blink class spell_mage_ethereal_blink_triggered : public SpellScript { - PrepareSpellScript(spell_mage_ethereal_blink_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_BLINK, SPELL_MAGE_SHIMMER, SPELL_MAGE_SLOW }) @@ -687,8 +653,6 @@ class spell_mage_ethereal_blink_triggered : public SpellScript // 383395 - Feel the Burn class spell_mage_feel_the_burn : public AuraScript { - PrepareAuraScript(spell_mage_feel_the_burn); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FEEL_THE_BURN }); @@ -712,8 +676,6 @@ class spell_mage_feel_the_burn : public AuraScript // 112965 - Fingers of Frost class spell_mage_fingers_of_frost : public AuraScript { - PrepareAuraScript(spell_mage_fingers_of_frost); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FINGERS_OF_FROST }); @@ -749,8 +711,6 @@ class spell_mage_fingers_of_frost : public AuraScript // 11366 - Pyroblast class spell_mage_firestarter : public SpellScript { - PrepareSpellScript(spell_mage_firestarter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FIRESTARTER }); @@ -772,8 +732,6 @@ class spell_mage_firestarter : public SpellScript // 321712 - Pyroblast class spell_mage_firestarter_dots : public AuraScript { - PrepareAuraScript(spell_mage_firestarter_dots); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FIRESTARTER }); @@ -795,8 +753,6 @@ class spell_mage_firestarter_dots : public AuraScript // 205029 - Flame On class spell_mage_flame_on : public AuraScript { - PrepareAuraScript(spell_mage_flame_on); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_MAGE_FIRE_BLAST }) @@ -819,8 +775,6 @@ class spell_mage_flame_on : public AuraScript // 116 - Frostbolt class spell_mage_frostbolt : public SpellScript { - PrepareSpellScript(spell_mage_frostbolt); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MAGE_CHILLED }); @@ -841,8 +795,6 @@ class spell_mage_frostbolt : public SpellScript // 386737 - Hyper Impact class spell_mage_hyper_impact : public AuraScript { - PrepareAuraScript(spell_mage_hyper_impact); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_SUPERNOVA }); @@ -862,8 +814,6 @@ class spell_mage_hyper_impact : public AuraScript // 11426 - Ice Barrier class spell_mage_ice_barrier : public AuraScript { - PrepareAuraScript(spell_mage_ice_barrier); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -898,8 +848,6 @@ class spell_mage_ice_barrier : public AuraScript // 45438 - Ice Block class spell_mage_ice_block : public SpellScript { - PrepareSpellScript(spell_mage_ice_block); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_EVERWARM_SOCKS }); @@ -928,8 +876,6 @@ class spell_mage_ice_block : public SpellScript // Ice Lance - 30455 class spell_mage_ice_lance : public SpellScript { - PrepareSpellScript(spell_mage_ice_lance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -988,8 +934,6 @@ class spell_mage_ice_lance : public SpellScript // 228598 - Ice Lance class spell_mage_ice_lance_damage : public SpellScript { - PrepareSpellScript(spell_mage_ice_lance_damage); - void ApplyDamageMultiplier(SpellEffIndex /*effIndex*/) { SpellValue const* spellValue = GetSpellValue(); @@ -1011,8 +955,6 @@ class spell_mage_ice_lance_damage : public SpellScript // 12846 - Ignite class spell_mage_ignite : public AuraScript { - PrepareAuraScript(spell_mage_ignite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_IGNITE }); @@ -1049,8 +991,6 @@ class spell_mage_ignite : public AuraScript // 61062 - Improved Mana Gems class spell_mage_imp_mana_gems : public AuraScript { - PrepareAuraScript(spell_mage_imp_mana_gems); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_MANA_SURGE }); @@ -1071,8 +1011,6 @@ class spell_mage_imp_mana_gems : public AuraScript // 1463 - Incanter's Flow class spell_mage_incanters_flow : public AuraScript { - PrepareAuraScript(spell_mage_incanters_flow); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_INCANTERS_FLOW }); @@ -1113,8 +1051,6 @@ private: // 44457 - Living Bomb class spell_mage_living_bomb : public SpellScript { - PrepareSpellScript(spell_mage_living_bomb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_LIVING_BOMB_PERIODIC }); @@ -1135,8 +1071,6 @@ class spell_mage_living_bomb : public SpellScript // 44461 - Living Bomb class spell_mage_living_bomb_explosion : public SpellScript { - PrepareSpellScript(spell_mage_living_bomb_explosion); - bool Validate(SpellInfo const* spellInfo) override { return spellInfo->NeedsExplicitUnitTarget() && ValidateSpellInfo({ SPELL_MAGE_LIVING_BOMB_PERIODIC }); @@ -1163,8 +1097,6 @@ class spell_mage_living_bomb_explosion : public SpellScript // 217694 - Living Bomb class spell_mage_living_bomb_periodic : public AuraScript { - PrepareAuraScript(spell_mage_living_bomb_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_LIVING_BOMB_EXPLOSION }); @@ -1194,8 +1126,6 @@ enum SilvermoonPolymorph // 32826 - Polymorph (Visual) class spell_mage_polymorph_visual : public SpellScript { - PrepareSpellScript(spell_mage_polymorph_visual); - static const uint32 PolymorhForms[6]; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -1230,8 +1160,6 @@ uint32 const spell_mage_polymorph_visual::PolymorhForms[6] = // 235450 - Prismatic Barrier class spell_mage_prismatic_barrier : public AuraScript { - PrepareAuraScript(spell_mage_prismatic_barrier); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_5 } }); @@ -1253,8 +1181,6 @@ class spell_mage_prismatic_barrier : public AuraScript // 376103 - Radiant Spark class spell_mage_radiant_spark : public AuraScript { - PrepareAuraScript(spell_mage_radiant_spark); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_RADIANT_SPARK_PROC_BLOCKER }); @@ -1285,8 +1211,6 @@ class spell_mage_radiant_spark : public AuraScript // 205021 - Ray of Frost class spell_mage_ray_of_frost : public SpellScript { - PrepareSpellScript(spell_mage_ray_of_frost); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_MAGE_RAY_OF_FROST_FINGERS_OF_FROST }); @@ -1306,8 +1230,6 @@ class spell_mage_ray_of_frost : public SpellScript class spell_mage_ray_of_frost_aura : public AuraScript { - PrepareAuraScript(spell_mage_ray_of_frost_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_MAGE_RAY_OF_FROST_BONUS, SPELL_MAGE_RAY_OF_FROST_FINGERS_OF_FROST }); @@ -1338,8 +1260,6 @@ class spell_mage_ray_of_frost_aura : public AuraScript // 136511 - Ring of Frost class spell_mage_ring_of_frost : public AuraScript { - PrepareAuraScript(spell_mage_ring_of_frost); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_SUMMON, SPELL_MAGE_RING_OF_FROST_FREEZE }) @@ -1395,8 +1315,6 @@ private: // 82691 - Ring of Frost (freeze efect) class spell_mage_ring_of_frost_freeze : public SpellScript { - PrepareSpellScript(spell_mage_ring_of_frost_freeze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_SUMMON, SPELL_MAGE_RING_OF_FROST_FREEZE }) @@ -1426,8 +1344,6 @@ class spell_mage_ring_of_frost_freeze : public SpellScript 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 }); @@ -1449,8 +1365,6 @@ class spell_mage_ring_of_frost_freeze_AuraScript : public AuraScript // 157980 - Supernova class spell_mage_supernova : public SpellScript { - PrepareSpellScript(spell_mage_supernova); - void HandleDamage(SpellEffIndex /*effIndex*/) { if (GetExplTargetUnit() == GetHitUnit()) @@ -1470,8 +1384,6 @@ class spell_mage_supernova : public SpellScript // 210824 - Touch of the Magi (Aura) class spell_mage_touch_of_the_magi_aura : public AuraScript { - PrepareAuraScript(spell_mage_touch_of_the_magi_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_TOUCH_OF_THE_MAGI_EXPLODE }); @@ -1511,8 +1423,6 @@ class spell_mage_touch_of_the_magi_aura : public AuraScript // 33395 Water Elemental's Freeze class spell_mage_water_elemental_freeze : public SpellScript { - PrepareSpellScript(spell_mage_water_elemental_freeze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FINGERS_OF_FROST }); diff --git a/src/server/scripts/Spells/spell_monk.cpp b/src/server/scripts/Spells/spell_monk.cpp index 8c707b5c8a4..6e66c820454 100644 --- a/src/server/scripts/Spells/spell_monk.cpp +++ b/src/server/scripts/Spells/spell_monk.cpp @@ -56,8 +56,6 @@ enum MonkSpells // 117952 - Crackling Jade Lightning class spell_monk_crackling_jade_lightning : public AuraScript { - PrepareAuraScript(spell_monk_crackling_jade_lightning); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -83,8 +81,6 @@ class spell_monk_crackling_jade_lightning : public AuraScript // 117959 - Crackling Jade Lightning class spell_monk_crackling_jade_lightning_knockback_proc_aura : public AuraScript { - PrepareAuraScript(spell_monk_crackling_jade_lightning_knockback_proc_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -125,8 +121,6 @@ class spell_monk_crackling_jade_lightning_knockback_proc_aura : public AuraScrip // 116849 - Life Cocoon class spell_monk_life_cocoon : public SpellScript { - PrepareSpellScript(spell_monk_life_cocoon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_CALMING_COALESCENCE }); @@ -156,8 +150,6 @@ class spell_monk_life_cocoon : public SpellScript // 392972 - Open Palm Strikes class spell_monk_open_palm_strikes : public AuraScript { - PrepareAuraScript(spell_monk_open_palm_strikes); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellEffect({ { SPELL_MONK_OPEN_PALM_STRIKES_TALENT, EFFECT_1} }); @@ -178,8 +170,6 @@ class spell_monk_open_palm_strikes : public AuraScript // 121817 - Power Strike class spell_monk_power_strike_periodic : public AuraScript { - PrepareAuraScript(spell_monk_power_strike_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_POWER_STRIKE_PROC }); @@ -199,8 +189,6 @@ class spell_monk_power_strike_periodic : public AuraScript // 129914 - Power Strike Proc class spell_monk_power_strike_proc : public AuraScript { - PrepareAuraScript(spell_monk_power_strike_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_POWER_STRIKE_ENERGIZE }); @@ -220,8 +208,6 @@ class spell_monk_power_strike_proc : public AuraScript // 115546 - Provoke class spell_monk_provoke : public SpellScript { - PrepareSpellScript(spell_monk_provoke); - static uint32 const BlackOxStatusEntry = 61146; bool Validate(SpellInfo const* spellInfo) override @@ -269,8 +255,6 @@ class spell_monk_provoke : public SpellScript // 109132 - Roll class spell_monk_roll : public SpellScript { - PrepareSpellScript(spell_monk_roll); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_ROLL_BACKWARD, SPELL_MONK_ROLL_FORWARD, SPELL_MONK_NO_FEATHER_FALL }); @@ -301,8 +285,6 @@ class spell_monk_roll : public SpellScript // 109131 - Roll (backward) class spell_monk_roll_aura : public AuraScript { - PrepareAuraScript(spell_monk_roll_aura); - void CalcMovementAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { amount += 100; @@ -358,8 +340,6 @@ static constexpr SpellEffIndex AuraStaggerEffectTotal = EFFECT_1; // 115069 - Stagger class spell_monk_stagger : public AuraScript { - PrepareAuraScript(spell_monk_stagger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_STAGGER_LIGHT, SPELL_MONK_STAGGER_MODERATE, SPELL_MONK_STAGGER_HEAVY }); @@ -467,8 +447,6 @@ private: // 124255 - Stagger - SPELL_MONK_STAGGER_DAMAGE_AURA class spell_monk_stagger_damage_aura : public AuraScript { - PrepareAuraScript(spell_monk_stagger_damage_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_STAGGER_LIGHT, SPELL_MONK_STAGGER_MODERATE, SPELL_MONK_STAGGER_HEAVY }); @@ -497,8 +475,6 @@ class spell_monk_stagger_damage_aura : public AuraScript // 124273, 124274, 124275 - Light/Moderate/Heavy Stagger - SPELL_MONK_STAGGER_LIGHT / SPELL_MONK_STAGGER_MODERATE / SPELL_MONK_STAGGER_HEAVY class spell_monk_stagger_debuff_aura : public AuraScript { - PrepareAuraScript(spell_monk_stagger_debuff_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MONK_STAGGER_DAMAGE_AURA }) diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 56eef5f4931..f0d865b7e5a 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -135,8 +135,6 @@ enum PaladinSpellLabel // 267344 - Art of War class spell_pal_art_of_war : public AuraScript { - PrepareAuraScript(spell_pal_art_of_war); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ART_OF_WAR_TRIGGERED, SPELL_PALADIN_BLADE_OF_JUSTICE }); @@ -224,8 +222,6 @@ class spell_pal_ardent_defender : public SpellScriptLoader class spell_pal_ardent_defender_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_ardent_defender_AuraScript); - uint32 _absorbPct = 0; uint32 _healPct = 0; @@ -300,8 +296,6 @@ class spell_pal_ardent_defender : public SpellScriptLoader // 248033 - Awakening class spell_pal_awakening : public AuraScript { - PrepareAuraScript(spell_pal_awakening); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_PALADIN_AVENGING_WRATH }) @@ -342,8 +336,6 @@ class spell_pal_awakening : public AuraScript // 204018 - Blessing of Spellwarding class spell_pal_blessing_of_protection : public SpellScript { - PrepareSpellScript(spell_pal_blessing_of_protection); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -382,8 +374,6 @@ class spell_pal_blessing_of_protection : public SpellScript // 115750 - Blinding Light class spell_pal_blinding_light : public SpellScript { - PrepareSpellScript(spell_pal_blinding_light); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_BLINDING_LIGHT_EFFECT }); @@ -404,8 +394,6 @@ class spell_pal_blinding_light : public SpellScript // 26573 - Consecration class spell_pal_consecration : public AuraScript { - PrepareAuraScript(spell_pal_consecration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -462,8 +450,6 @@ struct areatrigger_pal_consecration : AreaTriggerAI // 196926 - Crusader Might class spell_pal_crusader_might : public AuraScript { - PrepareAuraScript(spell_pal_crusader_might); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_HOLY_SHOCK }); @@ -483,8 +469,6 @@ class spell_pal_crusader_might : public AuraScript // 406833 - Crusading Strikes class spell_pal_crusading_strikes : public AuraScript { - PrepareAuraScript(spell_pal_crusading_strikes); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_CRUSADING_STRIKES_ENERGIZE }); @@ -510,8 +494,6 @@ class spell_pal_crusading_strikes : public AuraScript // 223817 - 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_TRIGGERED }); @@ -545,8 +527,6 @@ class spell_pal_divine_purpose : public AuraScript // 642 - Divine Shield class spell_pal_divine_shield : public SpellScript { - PrepareSpellScript(spell_pal_divine_shield); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -591,8 +571,6 @@ class spell_pal_divine_shield : public SpellScript // 190784 - Divine Steed class spell_pal_divine_steed : public SpellScript { - PrepareSpellScript(spell_pal_divine_steed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -655,8 +633,6 @@ class spell_pal_divine_steed : public SpellScript // 53385 - Divine Storm class spell_pal_divine_storm : public SpellScript { - PrepareSpellScript(spell_pal_divine_storm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sSpellVisualKitStore.HasRecord(PALADIN_VISUAL_KIT_DIVINE_STORM); @@ -676,8 +652,6 @@ class spell_pal_divine_storm : public SpellScript // 205191 - Eye for an Eye class spell_pal_eye_for_an_eye : public AuraScript { - PrepareAuraScript(spell_pal_eye_for_an_eye); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_EYE_FOR_AN_EYE_TRIGGERED }); @@ -697,8 +671,6 @@ class spell_pal_eye_for_an_eye : public AuraScript // 234299 - Fist of Justice class spell_pal_fist_of_justice : public AuraScript { - PrepareAuraScript(spell_pal_fist_of_justice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_HAMMER_OF_JUSTICE }); @@ -729,8 +701,6 @@ class spell_pal_fist_of_justice : public AuraScript // -85043 - Grand Crusader class spell_pal_grand_crusader : public AuraScript { - PrepareAuraScript(spell_pal_grand_crusader); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_AVENGERS_SHIELD }); @@ -756,8 +726,6 @@ class spell_pal_grand_crusader : public AuraScript // 54968 - Glyph of Holy Light class spell_pal_glyph_of_holy_light : public SpellScript { - PrepareSpellScript(spell_pal_glyph_of_holy_light); - void FilterTargets(std::list<WorldObject*>& targets) { uint32 const maxTargets = GetSpellInfo()->MaxAffectedTargets; @@ -778,8 +746,6 @@ class spell_pal_glyph_of_holy_light : public SpellScript // 53595 - Hammer of the Righteous struct spell_pal_hammer_of_the_righteous : public SpellScript { - PrepareSpellScript(spell_pal_hammer_of_the_righteous); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -804,8 +770,6 @@ struct spell_pal_hammer_of_the_righteous : public SpellScript // 6940 - Hand of Sacrifice class spell_pal_hand_of_sacrifice : public AuraScript { - PrepareAuraScript(spell_pal_hand_of_sacrifice); - public: spell_pal_hand_of_sacrifice() { @@ -844,8 +808,6 @@ private: // 54149 - Infusion of Light class spell_pal_infusion_of_light : public AuraScript { - PrepareAuraScript(spell_pal_infusion_of_light); - static constexpr flag128 HolyLightSpellClassMask = { 0, 0, 0x400 }; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -882,8 +844,6 @@ class spell_pal_infusion_of_light : public AuraScript // 327193 - Moment of Glory class spell_pal_moment_of_glory : public SpellScript { - PrepareSpellScript(spell_pal_moment_of_glory); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_AVENGERS_SHIELD }); @@ -903,8 +863,6 @@ class spell_pal_moment_of_glory : public SpellScript // 20271/275779/275773 - Judgement (Retribution/Protection/Holy) class spell_pal_judgment : public SpellScript { - PrepareSpellScript(spell_pal_judgment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -936,8 +894,6 @@ class spell_pal_judgment : public SpellScript // 114165 - Holy Prism class spell_pal_holy_prism : public SpellScript { - PrepareSpellScript(spell_pal_holy_prism); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_PALADIN_HOLY_PRISM_TARGET_ALLY, SPELL_PALADIN_HOLY_PRISM_TARGET_ENEMY, SPELL_PALADIN_HOLY_PRISM_TARGET_BEAM_VISUAL }); @@ -963,8 +919,6 @@ class spell_pal_holy_prism : public SpellScript // 114871 - Holy Prism (Heal) class spell_pal_holy_prism_selector : public SpellScript { - PrepareSpellScript(spell_pal_holy_prism_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_PALADIN_HOLY_PRISM_TARGET_ALLY, SPELL_PALADIN_HOLY_PRISM_AREA_BEAM_VISUAL }); @@ -1025,8 +979,6 @@ private: // 20473 - Holy Shock class spell_pal_holy_shock : public SpellScript { - PrepareSpellScript(spell_pal_holy_shock); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1081,8 +1033,6 @@ class spell_pal_holy_shock : public SpellScript // 25912 - Holy Shock class spell_pal_holy_shock_damage_visual : public SpellScript { - PrepareSpellScript(spell_pal_holy_shock_damage_visual); - bool Validate(SpellInfo const*) override { return sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_DAMAGE) @@ -1103,8 +1053,6 @@ class spell_pal_holy_shock_damage_visual : public SpellScript // 25914 - Holy Shock class spell_pal_holy_shock_heal_visual : public SpellScript { - PrepareSpellScript(spell_pal_holy_shock_heal_visual); - bool Validate(SpellInfo const*) override { return sSpellVisualStore.HasRecord(PALADIN_VISUAL_SPELL_HOLY_SHOCK_HEAL) @@ -1125,8 +1073,6 @@ class spell_pal_holy_shock_heal_visual : public SpellScript // 37705 - Healing Discount class spell_pal_item_healing_discount : public AuraScript { - PrepareAuraScript(spell_pal_item_healing_discount); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ITEM_HEALING_TRANCE }); @@ -1147,8 +1093,6 @@ class spell_pal_item_healing_discount : public AuraScript // 40470 - Paladin Tier 6 Trinket class spell_pal_item_t6_trinket : public AuraScript { - PrepareAuraScript(spell_pal_item_t6_trinket); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1196,8 +1140,6 @@ class spell_pal_item_t6_trinket : public AuraScript // 633 - Lay on Hands class spell_pal_lay_on_hands : public SpellScript { - PrepareSpellScript(spell_pal_lay_on_hands); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -1236,8 +1178,6 @@ class spell_pal_lay_on_hands : public SpellScript // 53651 - Light's Beacon - Beacon of Light class spell_pal_light_s_beacon : public AuraScript { - PrepareAuraScript(spell_pal_light_s_beacon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_BEACON_OF_LIGHT, SPELL_PALADIN_BEACON_OF_LIGHT_HEAL }); @@ -1290,8 +1230,6 @@ class spell_pal_light_s_beacon : public AuraScript // 122773 - Light's Hammer class spell_pal_light_hammer_init_summon : public SpellScript { - PrepareSpellScript(spell_pal_light_hammer_init_summon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1324,8 +1262,6 @@ class spell_pal_light_hammer_init_summon : public SpellScript // 114918 - Light's Hammer (Periodic) class spell_pal_light_hammer_periodic : public AuraScript { - PrepareAuraScript(spell_pal_light_hammer_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1354,8 +1290,6 @@ class spell_pal_light_hammer_periodic : public AuraScript // 204074 - Righteous Protector class spell_pal_righteous_protector : public AuraScript { - PrepareAuraScript(spell_pal_righteous_protector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_AVENGING_WRATH, SPELL_PALADIN_GUARDIAN_OF_ANCIENT_KINGS }); @@ -1391,8 +1325,6 @@ class spell_pal_righteous_protector : public AuraScript // 267610 - Righteous Verdict class spell_pal_righteous_verdict : public AuraScript { - PrepareAuraScript(spell_pal_righteous_verdict); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_PALADIN_RIGHTEOUS_VERDICT_AURA }); @@ -1412,8 +1344,6 @@ class spell_pal_righteous_verdict : public AuraScript // 85804 - Selfless Healer class spell_pal_selfless_healer : public AuraScript { - PrepareAuraScript(spell_pal_selfless_healer); - bool CheckEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { if (Spell const* procSpell = eventInfo.GetProcSpell()) @@ -1431,8 +1361,6 @@ class spell_pal_selfless_healer : public AuraScript // 184662 - Shield of Vengeance class spell_pal_shield_of_vengeance : public AuraScript { - PrepareAuraScript(spell_pal_shield_of_vengeance); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_PALADIN_SHIELD_OF_VENGEANCE_DAMAGE }) && ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -1465,8 +1393,6 @@ class spell_pal_shield_of_vengeance : public AuraScript // 85256 - Templar's Verdict class spell_pal_templar_s_verdict : public SpellScript { - PrepareSpellScript(spell_pal_templar_s_verdict); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_PALADIN_TEMPLAR_VERDICT_DAMAGE }); @@ -1486,8 +1412,6 @@ class spell_pal_templar_s_verdict : public SpellScript // 28789 - Holy Power class spell_pal_t3_6p_bonus : public AuraScript { - PrepareAuraScript(spell_pal_t3_6p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1542,8 +1466,6 @@ class spell_pal_t3_6p_bonus : public AuraScript // 64890 - Item - Paladin T8 Holy 2P Bonus class spell_pal_t8_2p_bonus : public AuraScript { - PrepareAuraScript(spell_pal_t8_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_HOLY_MENDING }); @@ -1580,8 +1502,6 @@ class spell_pal_t8_2p_bonus : public AuraScript // 405547 - Paladin Protection 10.1 Class Set 2pc class spell_pal_t30_2p_protection_bonus : public AuraScript { - PrepareAuraScript(spell_pal_t30_2p_protection_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_T30_2P_HEARTFIRE_DAMAGE }); @@ -1609,8 +1529,6 @@ class spell_pal_t30_2p_protection_bonus : public AuraScript // 408461 - Heartfire class spell_pal_t30_2p_protection_bonus_heal : public AuraScript { - PrepareAuraScript(spell_pal_t30_2p_protection_bonus_heal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_T30_2P_HEARTFIRE_HEAL }); @@ -1638,8 +1556,6 @@ class spell_pal_t30_2p_protection_bonus_heal : public AuraScript // 269569 - Zeal class spell_pal_zeal : public AuraScript { - PrepareAuraScript(spell_pal_zeal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ZEAL_AURA }); diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index dc9d588a6a4..c7d5ebb7ffa 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -93,8 +93,6 @@ class spell_gen_pet_calculate : public SpellScriptLoader class spell_gen_pet_calculate_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_pet_calculate_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -223,8 +221,6 @@ public: class spell_warl_pet_scaling_01_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_01_AuraScript); - public: spell_warl_pet_scaling_01_AuraScript() { @@ -366,8 +362,6 @@ public: class spell_warl_pet_scaling_02_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_02_AuraScript); - public: spell_warl_pet_scaling_02_AuraScript() { @@ -481,8 +475,6 @@ public: class spell_warl_pet_scaling_03_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_03_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -544,8 +536,6 @@ public: class spell_warl_pet_scaling_04_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_04_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -583,8 +573,6 @@ public: class spell_warl_pet_scaling_05_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_05_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -658,8 +646,6 @@ public: class spell_warl_pet_passive_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_passive_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -727,8 +713,6 @@ public: class spell_warl_pet_passive_damage_done_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_passive_damage_done_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -778,8 +762,6 @@ public: class spell_warl_pet_passive_voidwalker_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_pet_passive_voidwalker_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -815,8 +797,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) @@ -874,8 +854,6 @@ public: class spell_hun_pet_scaling_01_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_01_AuraScript); - public: spell_hun_pet_scaling_01_AuraScript() { @@ -1005,8 +983,6 @@ public: class spell_hun_pet_scaling_02_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_02_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1083,8 +1059,6 @@ public: class spell_hun_pet_scaling_03_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_03_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1161,8 +1135,6 @@ public: class spell_hun_pet_scaling_04_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_04_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1242,8 +1214,6 @@ public: class spell_hun_pet_passive_crit_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_passive_crit_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1309,8 +1279,6 @@ public: class spell_hun_pet_passive_damage_done_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_pet_passive_damage_done_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1349,8 +1317,6 @@ public: class spell_hun_animal_handler_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_animal_handler_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1390,8 +1356,6 @@ public: class spell_dk_avoidance_passive_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_avoidance_passive_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1434,8 +1398,6 @@ public: class spell_dk_pet_scaling_01_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_01_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1511,8 +1473,6 @@ public: class spell_dk_pet_scaling_02_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_02_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1554,8 +1514,6 @@ public: class spell_dk_pet_scaling_03_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_03_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1617,8 +1575,6 @@ public: class spell_dk_rune_weapon_scaling_02_AuraScript : public AuraScript { - PrepareAuraScript(spell_dk_rune_weapon_scaling_02_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 7ceea4776a2..1b3fc16ff3c 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -155,8 +155,6 @@ class RaidCheck // 121536 - Angelic Feather talent class spell_pri_angelic_feather_trigger : public SpellScript { - PrepareSpellScript(spell_pri_angelic_feather_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ANGELIC_FEATHER_AREATRIGGER }); @@ -221,8 +219,6 @@ struct areatrigger_pri_angelic_feather : AreaTriggerAI // 26169 - Oracle Healing Bonus class spell_pri_aq_3p_bonus : public AuraScript { - PrepareAuraScript(spell_pri_aq_3p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ORACULAR_HEAL }); @@ -253,8 +249,6 @@ class spell_pri_aq_3p_bonus : public AuraScript // 81749 - Atonement class spell_pri_atonement : public AuraScript { - PrepareAuraScript(spell_pri_atonement); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_PRIEST_ATONEMENT_HEAL, SPELL_PRIEST_SINS_OF_THE_MANY }) @@ -321,8 +315,6 @@ public: // 194384, 214206 - Atonement class spell_pri_atonement_triggered : public AuraScript { - PrepareAuraScript(spell_pri_atonement_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ATONEMENT }); @@ -357,8 +349,6 @@ class spell_pri_atonement_triggered : public AuraScript // 204883 - Circle of Healing class spell_pri_circle_of_healing : public SpellScript { - PrepareSpellScript(spell_pri_circle_of_healing); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -384,8 +374,6 @@ class spell_pri_circle_of_healing : public SpellScript // 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())); @@ -408,8 +396,6 @@ class spell_pri_divine_hymn : public SpellScript // 122121 - Divine Star (Shadow) class spell_pri_divine_star_shadow : public SpellScript { - PrepareSpellScript(spell_pri_divine_star_shadow); - void HandleHitTarget(SpellEffIndex effIndex) { Unit* caster = GetCaster(); @@ -546,8 +532,6 @@ private: // 391339 - Empowered Renew class spell_pri_empowered_renew : public AuraScript { - PrepareAuraScript(spell_pri_empowered_renew); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_RENEW, SPELL_PRIEST_EMPOWERED_RENEW_HEAL }) @@ -577,8 +561,6 @@ class spell_pri_empowered_renew : public AuraScript // 47788 - Guardian Spirit class spell_pri_guardian_spirit : public AuraScript { - PrepareAuraScript(spell_pri_guardian_spirit); - uint32 healPct = 0; bool Validate(SpellInfo const* spellInfo) override @@ -623,8 +605,6 @@ class spell_pri_guardian_spirit : public AuraScript // 120644 - Halo (Shadow) class spell_pri_halo_shadow : public SpellScript { - PrepareSpellScript(spell_pri_halo_shadow); - void HandleHitTarget(SpellEffIndex effIndex) { Unit* caster = GetCaster(); @@ -662,8 +642,6 @@ struct areatrigger_pri_halo : AreaTriggerAI // 391154 - Holy Mending class spell_pri_holy_mending : public AuraScript { - PrepareAuraScript(spell_pri_holy_mending); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_RENEW, SPELL_PRIEST_HOLY_MENDING_HEAL }); @@ -689,8 +667,6 @@ class spell_pri_holy_mending : public AuraScript // 63733 - Holy Words class spell_pri_holy_words : public AuraScript { - PrepareAuraScript(spell_pri_holy_words); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -758,8 +734,6 @@ class spell_pri_holy_words : public AuraScript // 40438 - Priest Tier 6 Trinket class spell_pri_item_t6_trinket : public AuraScript { - PrepareAuraScript(spell_pri_item_t6_trinket); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_BLESSING, SPELL_PRIEST_DIVINE_WRATH }); @@ -785,8 +759,6 @@ class spell_pri_item_t6_trinket : public AuraScript // 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 }); @@ -811,8 +783,6 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScript // 1706 - Levitate class spell_pri_levitate : public SpellScript { - PrepareSpellScript(spell_pri_levitate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_LEVITATE_EFFECT }); @@ -832,8 +802,6 @@ class spell_pri_levitate : public SpellScript // 205369 - Mind Bomb class spell_pri_mind_bomb : public AuraScript { - PrepareAuraScript(spell_pri_mind_bomb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_MIND_BOMB_STUN }); @@ -855,8 +823,6 @@ class spell_pri_mind_bomb : public AuraScript // 390686 - Painful Punishment class spell_pri_painful_punishment : public AuraScript { - PrepareAuraScript(spell_pri_painful_punishment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -892,8 +858,6 @@ class spell_pri_painful_punishment : public AuraScript // 400169 - Dark Reprimand class spell_pri_penance : public SpellScript { - PrepareSpellScript(spell_pri_penance); - public: spell_pri_penance(uint32 damageSpellId, uint32 healingSpellId) : _damageSpellId(damageSpellId), _healingSpellId(healingSpellId) { @@ -951,8 +915,6 @@ private: // 373129 - Dark Reprimand (Channel Damage), 400171 - Dark Reprimand (Channel Healing) class spell_pri_penance_or_dark_reprimand_channeled : public AuraScript { - PrepareAuraScript(spell_pri_penance_or_dark_reprimand_channeled); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_OF_THE_DARK_SIDE }); @@ -973,8 +935,6 @@ class spell_pri_penance_or_dark_reprimand_channeled : public AuraScript // 198069 - Power of the Dark Side class spell_pri_power_of_the_dark_side : public AuraScript { - PrepareAuraScript(spell_pri_power_of_the_dark_side); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_OF_THE_DARK_SIDE_TINT }); @@ -1003,8 +963,6 @@ class spell_pri_power_of_the_dark_side : public AuraScript // 373130 - Dark Reprimand (Damage) class spell_pri_power_of_the_dark_side_damage_bonus : public SpellScript { - PrepareSpellScript(spell_pri_power_of_the_dark_side_damage_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_OF_THE_DARK_SIDE }); @@ -1034,8 +992,6 @@ class spell_pri_power_of_the_dark_side_damage_bonus : public SpellScript // 400187 - Dark Reprimand (Healing) class spell_pri_power_of_the_dark_side_healing_bonus : public SpellScript { - PrepareSpellScript(spell_pri_power_of_the_dark_side_healing_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_OF_THE_DARK_SIDE }); @@ -1064,8 +1020,6 @@ class spell_pri_power_of_the_dark_side_healing_bonus : public SpellScript // 194509 - Power Word: Radiance class spell_pri_power_word_radiance : public SpellScript { - PrepareSpellScript(spell_pri_power_word_radiance); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_PRIEST_ATONEMENT, SPELL_PRIEST_ATONEMENT_TRIGGERED, SPELL_PRIEST_TRINITY }) @@ -1135,8 +1089,6 @@ private: // 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 }); @@ -1172,8 +1124,6 @@ class spell_pri_power_word_shield : public SpellScript class spell_pri_power_word_shield_aura : public AuraScript { - PrepareAuraScript(spell_pri_power_word_shield_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1265,8 +1215,6 @@ class spell_pri_power_word_shield_aura : public AuraScript // 129250 - Power Word: Solace class spell_pri_power_word_solace : public SpellScript { - PrepareSpellScript(spell_pri_power_word_solace); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_WORD_SOLACE_ENERGIZE }); @@ -1322,8 +1270,6 @@ protected: // 411097 - Priest Holy 10.1 Class Set 2pc (Chooser) class spell_pri_prayer_of_mending_dummy : public spell_pri_prayer_of_mending_SpellScriptBase { - PrepareSpellScript(spell_pri_prayer_of_mending_dummy); - void FilterTargets(std::list<WorldObject*>& targets) { Trinity::SelectRandomInjuredTargets(targets, 1, true); @@ -1346,8 +1292,6 @@ class spell_pri_prayer_of_mending_dummy : public spell_pri_prayer_of_mending_Spe // 41635 - Prayer of Mending (Aura) class spell_pri_prayer_of_mending_aura : public AuraScript { - PrepareAuraScript(spell_pri_prayer_of_mending_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1407,8 +1351,6 @@ private: class spell_pri_prayer_of_mending : public SpellScript { - PrepareSpellScript(spell_pri_prayer_of_mending); - void HandleEffectDummy(SpellEffIndex /*effIndex*/) { Aura* aura = GetHitAura(); @@ -1432,8 +1374,6 @@ class spell_pri_prayer_of_mending : public SpellScript // 155793 - Prayer of Mending (Jump) class spell_pri_prayer_of_mending_jump : public spell_pri_prayer_of_mending_SpellScriptBase { - PrepareSpellScript(spell_pri_prayer_of_mending_jump); - void FilterTargets(std::list<WorldObject*>& targets) { // Note: priority list is a) players b) non-player units. Also, this spell became smartheal in WoD. @@ -1459,8 +1399,6 @@ class spell_pri_prayer_of_mending_jump : public spell_pri_prayer_of_mending_Spel // 33110 - Prayer of Mending (Heal) class spell_pri_prayer_of_mending_heal : public spell_pri_prayer_of_mending_SpellScriptBase { - PrepareSpellScript(spell_pri_prayer_of_mending_heal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1510,8 +1448,6 @@ class spell_pri_prayer_of_mending_heal : public spell_pri_prayer_of_mending_Spel // 405554 - Priest Holy 10.1 Class Set 2pc class spell_pri_holy_10_1_class_set_2pc : public AuraScript { - PrepareAuraScript(spell_pri_holy_10_1_class_set_2pc); - bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { return roll_chance_i(aurEff->GetAmount()); @@ -1535,8 +1471,6 @@ class spell_pri_holy_10_1_class_set_2pc : public AuraScript // Called by Penance - 47540, Dark Reprimand - 400169 class spell_pri_purge_the_wicked : public SpellScript { - PrepareSpellScript(spell_pri_purge_the_wicked); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1564,8 +1498,6 @@ class spell_pri_purge_the_wicked : public SpellScript // 204215 - Purge the Wicked class spell_pri_purge_the_wicked_dummy : public SpellScript { - PrepareSpellScript(spell_pri_purge_the_wicked_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_PURGE_THE_WICKED_PERIODIC, SPELL_PRIEST_REVEL_IN_PURITY }) @@ -1637,8 +1569,6 @@ class spell_pri_purge_the_wicked_dummy : public SpellScript // 47536 - Rapture class spell_pri_rapture : public SpellScript { - PrepareSpellScript(spell_pri_rapture); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_POWER_WORD_SHIELD }); @@ -1672,8 +1602,6 @@ private: // 280391 - Sins of the Many class spell_pri_sins_of_the_many : public AuraScript { - PrepareAuraScript(spell_pri_sins_of_the_many); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SINS_OF_THE_MANY }); @@ -1699,8 +1627,6 @@ class spell_pri_sins_of_the_many : public AuraScript // 20711 - Spirit of Redemption 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 }); @@ -1724,8 +1650,6 @@ class spell_pri_spirit_of_redemption : public AuraScript // 186263 - Shadow Mend class spell_pri_shadow_mend : public SpellScript { - PrepareSpellScript(spell_pri_shadow_mend); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1773,8 +1697,6 @@ class spell_pri_shadow_mend : public SpellScript // 187464 - Shadow Mend (Damage) class spell_pri_shadow_mend_periodic_damage : public AuraScript { - PrepareAuraScript(spell_pri_shadow_mend_periodic_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_MEND_DAMAGE }); @@ -1814,8 +1736,6 @@ class spell_pri_shadow_mend_periodic_damage : public AuraScript // 28809 - Greater Heal class spell_pri_t3_4p_bonus : public AuraScript { - PrepareAuraScript(spell_pri_t3_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ARMOR_OF_FAITH }); @@ -1836,8 +1756,6 @@ class spell_pri_t3_4p_bonus : public AuraScript // 37594 - Greater Heal Refund class spell_pri_t5_heal_2p_bonus : public AuraScript { - PrepareAuraScript(spell_pri_t5_heal_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ITEM_EFFICIENCY }); @@ -1870,8 +1788,6 @@ class spell_pri_t5_heal_2p_bonus : public AuraScript // 70770 - Item - Priest T10 Healer 2P Bonus class spell_pri_t10_heal_2p_bonus : public AuraScript { - PrepareAuraScript(spell_pri_t10_heal_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_BLESSED_HEALING }); @@ -1908,8 +1824,6 @@ class spell_pri_t10_heal_2p_bonus : public AuraScript // 200128 - Trail of Light class spell_pri_trail_of_light : public AuraScript { - PrepareAuraScript(spell_pri_trail_of_light); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_TRAIL_OF_LIGHT_HEAL }); @@ -1967,8 +1881,6 @@ private: // 265259 - Twist of Fate (Discipline) class spell_pri_twist_of_fate : public AuraScript { - PrepareAuraScript(spell_pri_twist_of_fate); - bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { return eventInfo.GetProcTarget()->GetHealthPct() < aurEff->GetAmount(); @@ -1983,8 +1895,6 @@ class spell_pri_twist_of_fate : public AuraScript // 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 }); @@ -2022,8 +1932,6 @@ class spell_pri_vampiric_embrace : public AuraScript // 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()); @@ -2038,8 +1946,6 @@ class spell_pri_vampiric_embrace_target : public SpellScript // 34914 - Vampiric Touch class spell_pri_vampiric_touch : public AuraScript { - PrepareAuraScript(spell_pri_vampiric_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_VAMPIRIC_TOUCH_DISPEL, SPELL_GEN_REPLENISHMENT }); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index b8d8706476d..a3ed5250767 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -34,7 +34,6 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript { - PrepareSpellScript(spell_generic_quest_update_entry_SpellScript); private: uint16 _spellEffect; uint8 _effIndex; @@ -95,8 +94,6 @@ enum ThaumaturgyChannel // 9712 - Thaumaturgy Channel class spell_q2203_thaumaturgy_channel : public AuraScript { - PrepareAuraScript(spell_q2203_thaumaturgy_channel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_THAUMATURGY_CHANNEL }); @@ -130,8 +127,6 @@ constexpr Milliseconds Quest6124_6129_DESPAWN_TIME = 30s; // 19512 - Apply Salve class spell_q6124_6129_apply_salve : public SpellScript { - PrepareSpellScript(spell_q6124_6129_apply_salve); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -200,8 +195,6 @@ enum Quest11396_11399Data // 43874 - Scourge Mur'gul Camp: Force Shield Arcane Purple x3 class spell_q11396_11399_force_shield_arcane_purple_x3 : public AuraScript { - PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -224,8 +217,6 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public AuraScript // 50133 - Scourging Crystal Controller class spell_q11396_11399_scourging_crystal_controller : public SpellScript { - PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3, SPELL_SCOURGING_CRYSTAL_CONTROLLER }); @@ -249,8 +240,6 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScript // 43882 - Scourging Crystal Controller Dummy class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript { - PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3 }); @@ -307,8 +296,6 @@ enum Quest11730Data // 46023 - The Ultrasonic Screwdriver class spell_q11730_ultrasonic_screwdriver : public SpellScript { - PrepareSpellScript(spell_q11730_ultrasonic_screwdriver); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); @@ -372,8 +359,6 @@ enum Quest12459Data // 49587 - Seeds of Nature's Wrath class spell_q12459_seeds_of_natures_wrath : public SpellScript { - PrepareSpellScript(spell_q12459_seeds_of_natures_wrath); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* creatureTarget = GetHitCreature()) @@ -408,8 +393,6 @@ enum Quest12634Data // 51840 - Despawn Fruit Tosser class spell_q12634_despawn_fruit_tosser : public SpellScript { - PrepareSpellScript(spell_q12634_despawn_fruit_tosser); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo( @@ -455,8 +438,6 @@ enum Quest12851Data // 54798 - FLAMING Arrow Triggered Effect class spell_q12851_going_bearback : public AuraScript { - PrepareAuraScript(spell_q12851_going_bearback); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -500,8 +481,6 @@ enum Quest12659Data // 52090 - Ahunae's Knife class spell_q12659_ahunaes_knife : public SpellScript { - PrepareSpellScript(spell_q12659_ahunaes_knife); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -531,8 +510,6 @@ enum SalvagingLifesStength // 54190 - Lifeblood Dummy class spell_q12805_lifeblood_dummy : public SpellScript { - PrepareSpellScript(spell_q12805_lifeblood_dummy); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -572,8 +549,6 @@ enum BattleStandard // 59643 - Plant Horde Battle Standard class spell_q13280_13283_plant_battle_standard : public SpellScript { - PrepareSpellScript(spell_q13280_13283_plant_battle_standard); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -601,8 +576,6 @@ class spell_q13280_13283_plant_battle_standard : public SpellScript // 4336 - Jump Jets class spell_q13280_13283_jump_jets : public SpellScript { - PrepareSpellScript(spell_q13280_13283_jump_jets); - void HandleCast() { Unit* caster = GetCaster(); @@ -625,8 +598,6 @@ enum FocusOnTheBeach // 50546 - The Focus on the Beach: Ley Line Focus Control Ring Effect class spell_q12066_bunny_kill_credit : public SpellScript { - PrepareSpellScript(spell_q12066_bunny_kill_credit); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -647,8 +618,6 @@ enum DefendingWyrmrestTemple // 49213 - Defending Wyrmrest Temple: Character Script Cast From Gossip class spell_q12372_cast_from_gossip_trigger : public SpellScript { - PrepareSpellScript(spell_q12372_cast_from_gossip_trigger); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); @@ -670,8 +639,6 @@ enum Quest12372Data // 49370 - Wyrmrest Defender: Destabilize Azure Dragonshrine Effect class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScript { - PrepareSpellScript(spell_q12372_destabilize_azure_dragonshrine_dummy); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -702,8 +669,6 @@ enum Quest11010_11102_11023Data // 40113 - Knockdown Fel Cannon: The Aggro Check Aura class spell_q11010_q11102_q11023_aggro_check_aura : public AuraScript { - PrepareAuraScript(spell_q11010_q11102_q11023_aggro_check_aura); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { if (Unit* target = GetTarget()) @@ -720,8 +685,6 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public AuraScript // 40112 - Knockdown Fel Cannon: The Aggro Check class spell_q11010_q11102_q11023_aggro_check : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_aggro_check); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Player* playerTarget = GetHitPlayer()) @@ -739,8 +702,6 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScript // 40119 - Knockdown Fel Cannon: The Aggro Burst class spell_q11010_q11102_q11023_aggro_burst : public AuraScript { - PrepareAuraScript(spell_q11010_q11102_q11023_aggro_burst); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { if (Unit* target = GetTarget()) @@ -757,8 +718,6 @@ class spell_q11010_q11102_q11023_aggro_burst : public AuraScript // 40056 - Knockdown Fel Cannon: Choose Loc class spell_q11010_q11102_q11023_choose_loc : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_choose_loc); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -784,8 +743,6 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScript // 40160 - Throw Bomb class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_q11008_check_fly_mount); - SpellCastResult CheckRequirement() { Unit* caster = GetCaster(); @@ -809,8 +766,6 @@ enum SpellZuldrakRat // 50894 - Zul'Drak Rat class spell_q12527_zuldrak_rat : public SpellScript { - PrepareSpellScript(spell_q12527_zuldrak_rat); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_GORGED_LURKING_BASILISK }); @@ -835,8 +790,6 @@ class spell_q12527_zuldrak_rat : public SpellScript // 55368 - Summon Stefan class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScript { - PrepareSpellScript(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -858,8 +811,6 @@ enum QuenchingMist // 53350 - Quenching Mist class spell_q12730_quenching_mist : public AuraScript { - PrepareAuraScript(spell_q12730_quenching_mist); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLICKERING_FLAMES }); @@ -889,8 +840,6 @@ enum Quest13291_13292_13239_13261Data // 59318 - Grab Fake Soldier class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public SpellScript { - PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE }); @@ -914,8 +863,6 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public // 59303 - Summon Frost Wyrm class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public SpellScript { - PrepareSpellScript(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -932,8 +879,6 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S // 12601 - Second Chances: Summon Landgren's Soul Moveto Target Bunny class spell_q12847_summon_soul_moveto_bunny : public SpellScript { - PrepareSpellScript(spell_q12847_summon_soul_moveto_bunny); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -951,8 +896,6 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScript // 57412 - Reckoning Bomb class spell_q13086_cannons_target : public SpellScript { - PrepareSpellScript(spell_q13086_cannons_target); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) @@ -1010,8 +953,6 @@ enum BurstAtTheSeams // 59576 - Burst at the Seams class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576 : public SpellScript { - PrepareSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1050,8 +991,6 @@ class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576 : public SpellS // 59579 - Burst at the Seams class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579 : public AuraScript { - PrepareAuraScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1094,8 +1033,6 @@ class spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579 : public AuraSc // 52593 - Bloated Abomination Feign Death class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraScript { - PrepareAuraScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1123,8 +1060,6 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc // 76245 - Area Restrict Abom class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript { - PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitCreature()) { @@ -1145,8 +1080,6 @@ class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript // 60041 - Assign Geist Kill Credit to Master class spell_q13264_q13276_q13288_q13289_assign_credit_to_master : public SpellScript { - PrepareSpellScript(spell_q13264_q13276_q13288_q13289_assign_credit_to_master); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -1167,8 +1100,6 @@ class spell_q13264_q13276_q13288_q13289_assign_credit_to_master : public SpellSc // 52510 - Burst at the Seams class spell_q12690_burst_at_the_seams_52510 : public SpellScript { - PrepareSpellScript(spell_q12690_burst_at_the_seams_52510); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1233,8 +1164,6 @@ enum EscapeFromSilverbrook // 48682 - Escape from Silverbrook - Periodic Dummy class spell_q12308_escape_from_silverbrook : public SpellScript { - PrepareSpellScript(spell_q12308_escape_from_silverbrook); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_WORGEN }); @@ -1254,8 +1183,6 @@ class spell_q12308_escape_from_silverbrook : public SpellScript // 48681 - Summon Silverbrook Worgen class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScript { - PrepareSpellScript(spell_q12308_escape_from_silverbrook_summon_worgen); - void ModDest(SpellDestination& dest) { float dist = GetEffectInfo(EFFECT_0).CalcRadius(GetCaster()); @@ -1287,8 +1214,6 @@ enum DeathComesFromOnHigh // 51858 - Siphon of Acherus class spell_q12641_death_comes_from_on_high : public SpellScript { - PrepareSpellScript(spell_q12641_death_comes_from_on_high); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1339,8 +1264,6 @@ enum Recall_Eye_of_Acherus // 52694 - Recall Eye of Acherus class spell_q12641_recall_eye_of_acherus : public SpellScript { - PrepareSpellScript(spell_q12641_recall_eye_of_acherus); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Player* player = GetCaster()->GetCharmerOrOwner()->ToPlayer()) @@ -1360,8 +1283,6 @@ class spell_q12641_recall_eye_of_acherus : public SpellScript // 51769 - Emblazon Runeblade class spell_q12619_emblazon_runeblade : public AuraScript { - PrepareAuraScript(spell_q12619_emblazon_runeblade); - void HandleEffectPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1378,8 +1299,6 @@ class spell_q12619_emblazon_runeblade : public AuraScript // 51770 - Emblazon Runeblade class spell_q12619_emblazon_runeblade_effect : public SpellScript { - PrepareSpellScript(spell_q12619_emblazon_runeblade_effect); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), false); @@ -1400,8 +1319,6 @@ enum Quest_The_Storm_King // 55516 - Gymer's Grab class spell_q12919_gymers_grab : public SpellScript { - PrepareSpellScript(spell_q12919_gymers_grab); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_GYMER }); @@ -1431,8 +1348,6 @@ enum Quest_The_Storm_King_Throw // 55421 - Gymer's Throw class spell_q12919_gymers_throw : public SpellScript { - PrepareSpellScript(spell_q12919_gymers_throw); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1458,8 +1373,6 @@ enum Quest_The_Hunter_And_The_Prince // 61752 - Illidan Kill Credit Master class spell_q13400_illidan_kill_master : public SpellScript { - PrepareSpellScript(spell_q13400_illidan_kill_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ILLIDAN_KILL_CREDIT }); @@ -1487,8 +1400,6 @@ enum RelicOfTheEarthenRing // 66744 - Make Player Destroy Totems class spell_q14100_q14111_make_player_destroy_totems : public SpellScript { - PrepareSpellScript(spell_q14100_q14111_make_player_destroy_totems); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TOTEM_OF_THE_EARTHEN_RING }); @@ -1515,8 +1426,6 @@ enum Fumping // 39238 - Fumping class spell_q10929_fumping : public AuraScript { - PrepareAuraScript(spell_q10929_fumping); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SAND_GNOME, SPELL_SUMMON_BONE_SLICER }); @@ -1551,8 +1460,6 @@ public: class spell_q28813_get_our_boys_back_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q28813_get_our_boys_back_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RENEWED_LIFE }); @@ -1589,8 +1496,6 @@ public: class spell_q28813_set_health_random_SpellScript : public SpellScript { - PrepareSpellScript(spell_q28813_set_health_random_SpellScript); - void HandleDummyEffect() { Unit* caster = GetCaster(); @@ -1612,8 +1517,6 @@ public: // 49285 - Hand Over Reins class spell_q12414_hand_over_reins : public SpellScript { - PrepareSpellScript(spell_q12414_hand_over_reins); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* caster = GetCaster()->ToCreature(); @@ -1633,8 +1536,6 @@ class spell_q12414_hand_over_reins : public SpellScript // 13665 13745 13750 13756 13761 13767 13772 13777 13782 13787 - The Grand Melee class spell_q13665_q13790_bested_trigger : public SpellScript { - PrepareSpellScript(spell_q13665_q13790_bested_trigger); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit()->GetCharmerOrOwnerOrSelf(); @@ -1664,8 +1565,6 @@ enum ApplyHeatAndStir // 43972 - Mixing Blood class spell_q11306_mixing_blood : public SpellScript { - PrepareSpellScript(spell_q11306_mixing_blood); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -1682,8 +1581,6 @@ class spell_q11306_mixing_blood : public SpellScript // 43375 - Mixing Vrykul Blood class spell_q11306_mixing_vrykul_blood : public SpellScript { - PrepareSpellScript(spell_q11306_mixing_vrykul_blood); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -1714,8 +1611,6 @@ class spell_q11306_mixing_vrykul_blood : public SpellScript // 43376 - Failed Mix class spell_q11306_failed_mix_43376 : public SpellScript { - PrepareSpellScript(spell_q11306_failed_mix_43376); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -1732,8 +1627,6 @@ class spell_q11306_failed_mix_43376 : public SpellScript // 43378 - Failed Mix class spell_q11306_failed_mix_43378 : public SpellScript { - PrepareSpellScript(spell_q11306_failed_mix_43378); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -1750,8 +1643,6 @@ class spell_q11306_failed_mix_43378 : public SpellScript // 46444 - Weakness to Lightning: Cast on Master Script Effect class spell_q11896_weakness_to_lightning_46444 : public SpellScript { - PrepareSpellScript(spell_q11896_weakness_to_lightning_46444); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -1811,8 +1702,6 @@ enum TamingTheBeast class spell_quest_taming_the_beast : public AuraScript { - PrepareAuraScript(spell_quest_taming_the_beast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1882,8 +1771,6 @@ class spell_quest_taming_the_beast : public AuraScript // 53099, 57896, 58418, 58420, 59064, 59065, 59439, 60900, 60940 class spell_quest_portal_with_condition : public SpellScript { - PrepareSpellScript(spell_quest_portal_with_condition); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) @@ -1929,8 +1816,6 @@ enum TributeSpells // 24195 - Grom's Tribute class spell_quest_uther_grom_tribute : public SpellScript { - PrepareSpellScript(spell_quest_uther_grom_tribute); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1987,8 +1872,6 @@ enum CallAttackMastiffs // 68682 Call Attack Mastiffs class spell_q14386_call_attack_mastiffs : public SpellScript { - PrepareSpellScript(spell_q14386_call_attack_mastiffs); - void HandleEffect(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 21fbf2b31f9..808dbc89ab0 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -98,8 +98,6 @@ bool IsFinishingMove(Spell const* spell) // 53 - Backstab class spell_rog_backstab : public SpellScript { - PrepareSpellScript(spell_rog_backstab); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_3 } }); @@ -129,8 +127,6 @@ class spell_rog_backstab : public SpellScript // 13877, 33735, (check 51211, 65956) - Blade Flurry class spell_rog_blade_flurry : public AuraScript { - PrepareAuraScript(spell_rog_blade_flurry); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK }); @@ -169,8 +165,6 @@ class spell_rog_blade_flurry : public AuraScript // 2818 - Deadly Poison class spell_rog_deadly_poison : public SpellScript { - PrepareSpellScript(spell_rog_deadly_poison); - bool Load() override { // at this point CastItem must already be initialized @@ -254,8 +248,6 @@ class spell_rog_deadly_poison : public SpellScript // 32645 - Envenom class spell_rog_envenom : public SpellScript { - PrepareSpellScript(spell_rog_envenom); - void CalculateDamage(SpellEffIndex /*effIndex*/) { int32 damagePerCombo = GetHitDamage(); @@ -280,8 +272,6 @@ class spell_rog_envenom : public SpellScript // 196819 - Eviscerate class spell_rog_eviscerate : public SpellScript { - PrepareSpellScript(spell_rog_eviscerate); - void CalculateDamage(SpellEffIndex /*effIndex*/) { int32 damagePerCombo = GetHitDamage(); @@ -306,8 +296,6 @@ class spell_rog_eviscerate : public SpellScript // 193358 - Grand Melee class spell_rog_grand_melee : public AuraScript { - PrepareAuraScript(spell_rog_grand_melee); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_SLICE_AND_DICE }); @@ -349,8 +337,6 @@ class spell_rog_grand_melee : public AuraScript /// 7.1.5 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_ENERGIZE }); @@ -373,8 +359,6 @@ class spell_rog_honor_among_thieves : public AuraScript // 51690 - Killing Spree class spell_rog_killing_spree_aura : public AuraScript { - PrepareAuraScript(spell_rog_killing_spree_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -430,8 +414,6 @@ private: class spell_rog_killing_spree : public SpellScript { - PrepareSpellScript(spell_rog_killing_spree); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty() || GetCaster()->GetVehicleBase()) @@ -455,8 +437,6 @@ class spell_rog_killing_spree : public SpellScript // 385627 - Kingsbane class spell_rog_kingsbane : public AuraScript { - PrepareAuraScript(spell_rog_kingsbane); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& procInfo) { return procInfo.GetActionTarget()->HasAura(GetId(), GetCasterGUID()); @@ -471,8 +451,6 @@ class spell_rog_kingsbane : public AuraScript // 76806 - Mastery: Main Gauche class spell_rog_mastery_main_gauche : public AuraScript { - PrepareAuraScript(spell_rog_mastery_main_gauche); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_MAIN_GAUCHE }); @@ -498,8 +476,6 @@ class spell_rog_mastery_main_gauche : public AuraScript class spell_rog_pickpocket : public SpellScript { - PrepareSpellScript(spell_rog_pickpocket); - SpellCastResult CheckCast() { if (!GetExplTargetUnit() || !GetCaster()->IsValidAttackTarget(GetExplTargetUnit(), GetSpellInfo())) @@ -517,8 +493,6 @@ class spell_rog_pickpocket : public SpellScript // 79096 - Restless Blades class spell_rog_restless_blades : public AuraScript { - PrepareAuraScript(spell_rog_restless_blades); - static uint32 constexpr Spells[] = { SPELL_ROGUE_ADRENALINE_RUSH, SPELL_ROGUE_BETWEEN_THE_EYES, SPELL_ROGUE_SPRINT, SPELL_ROGUE_GRAPPLING_HOOK, SPELL_ROGUE_VANISH, SPELL_ROGUE_KILLING_SPREE, SPELL_ROGUE_MARKED_FOR_DEATH, SPELL_ROGUE_DEATH_FROM_ABOVE }; @@ -548,8 +522,6 @@ class spell_rog_restless_blades : public AuraScript // 315508 - Roll the Bones class spell_rog_roll_the_bones : public SpellScript { - PrepareSpellScript(spell_rog_roll_the_bones); - static uint32 constexpr Spells[] = { SPELL_ROGUE_SKULL_AND_CROSSBONES, SPELL_ROGUE_GRAND_MELEE, SPELL_ROGUE_RUTHLESS_PRECISION, SPELL_ROGUE_TRUE_BEARING, SPELL_ROGUE_BURIED_TREASURE, SPELL_ROGUE_BROADSIDE }; @@ -603,8 +575,6 @@ class spell_rog_roll_the_bones : public SpellScript // 1943 - Rupture class spell_rog_rupture : public AuraScript { - PrepareAuraScript(spell_rog_rupture); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_VENOMOUS_WOUNDS }); @@ -668,8 +638,6 @@ class spell_rog_rupture : public AuraScript // 14161 - Ruthlessness class spell_rog_ruthlessness : public AuraScript { - PrepareAuraScript(spell_rog_ruthlessness); - void HandleProc(AuraEffect* aurEff, ProcEventInfo& procInfo) { Unit* target = GetTarget(); @@ -688,8 +656,6 @@ class spell_rog_ruthlessness : public AuraScript // 185438 - Shadowstrike class spell_rog_shadowstrike : public SpellScript { - PrepareSpellScript(spell_rog_shadowstrike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_PREMEDITATION_AURA, SPELL_ROGUE_SLICE_AND_DICE, SPELL_ROGUE_PREMEDITATION_PASSIVE }) @@ -737,8 +703,6 @@ private: // 193315 - Sinister Strike class spell_rog_sinister_strike : public SpellScript { - PrepareSpellScript(spell_rog_sinister_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_T5_2P_SET_BONUS }); @@ -768,8 +732,6 @@ class spell_rog_sinister_strike : public SpellScript // 1784 - Stealth class spell_rog_stealth : public AuraScript { - PrepareAuraScript(spell_rog_stealth); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -837,8 +799,6 @@ class spell_rog_stealth : public AuraScript // 212283 - Symbols of Death class spell_rog_symbols_of_death : public SpellScript { - PrepareSpellScript(spell_rog_symbols_of_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_SYMBOLS_OF_DEATH_RANK2, SPELL_ROGUE_SYMBOLS_OF_DEATH_CRIT_AURA }); @@ -859,8 +819,6 @@ class spell_rog_symbols_of_death : public SpellScript // 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({ SPELL_ROGUE_TRICKS_OF_THE_TRADE_PROC }); @@ -896,8 +854,6 @@ public: // 57934 - Tricks of the Trade class spell_rog_tricks_of_the_trade : public SpellScript { - PrepareSpellScript(spell_rog_tricks_of_the_trade); - void DoAfterHit() { if (Aura* aura = GetHitAura()) @@ -919,8 +875,6 @@ class spell_rog_tricks_of_the_trade : public SpellScript // 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); @@ -935,8 +889,6 @@ class spell_rog_tricks_of_the_trade_proc : public AuraScript // 198020 - Turn the Tables (PvP Talent) class spell_rog_turn_the_tables : public AuraScript { - PrepareAuraScript(spell_rog_turn_the_tables); - bool CheckForStun(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { return eventInfo.GetProcSpell() && eventInfo.GetProcSpell()->GetSpellInfo()->HasAura(SPELL_AURA_MOD_STUN); @@ -951,8 +903,6 @@ class spell_rog_turn_the_tables : public AuraScript // 198023 - Turn the Tables (periodic) class spell_rog_turn_the_tables_periodic_check : public AuraScript { - PrepareAuraScript(spell_rog_turn_the_tables_periodic_check); - bool Validate(SpellInfo const*) override { return ValidateSpellInfo({ SPELL_ROGUE_TURN_THE_TABLES_BUFF }); @@ -978,8 +928,6 @@ class spell_rog_turn_the_tables_periodic_check : public AuraScript // 1856 - Vanish - SPELL_ROGUE_VANISH class spell_rog_vanish : public SpellScript { - PrepareSpellScript(spell_rog_vanish); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_VANISH_AURA, SPELL_ROGUE_STEALTH_SHAPESHIFT_AURA }); @@ -1011,8 +959,6 @@ class spell_rog_vanish : public SpellScript // 11327 - Vanish class spell_rog_vanish_aura : public AuraScript { - PrepareAuraScript(spell_rog_vanish_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_STEALTH }); @@ -1032,8 +978,6 @@ class spell_rog_vanish_aura : public AuraScript // 79134 - Venomous Wounds - SPELL_ROGUE_VENOMOUS_WOUNDS class spell_rog_venomous_wounds : public AuraScript { - PrepareAuraScript(spell_rog_venomous_wounds); - void HandleProc(AuraEffect* aurEff, ProcEventInfo& /*eventInfo*/) { int32 extraEnergy = aurEff->GetAmount(); diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 1748f75d5d1..1bd95e858ae 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -136,8 +136,6 @@ enum MiscNpcs // 273221 - Aftershock class spell_sha_aftershock : public AuraScript { - PrepareAuraScript(spell_sha_aftershock); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_AFTERSHOCK_ENERGIZE }); @@ -171,8 +169,6 @@ class spell_sha_aftershock : public AuraScript // 108281 - Ancestral Guidance class spell_sha_ancestral_guidance : public AuraScript { - PrepareAuraScript(spell_sha_ancestral_guidance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_GUIDANCE_HEAL }); @@ -211,8 +207,6 @@ class spell_sha_ancestral_guidance : public AuraScript // 114911 - Ancestral Guidance Heal class spell_sha_ancestral_guidance_heal : public SpellScript { - PrepareSpellScript(spell_sha_ancestral_guidance_heal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_GUIDANCE }); @@ -232,8 +226,6 @@ class spell_sha_ancestral_guidance_heal : public SpellScript // 114052 - Ascendance (Restoration) class spell_sha_ascendance_restoration : public AuraScript { - PrepareAuraScript(spell_sha_ascendance_restoration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_RESTORATIVE_MISTS }); @@ -274,8 +266,6 @@ private: // 188443 - Chain Lightning class spell_sha_chain_lightning : public SpellScript { - PrepareSpellScript(spell_sha_chain_lightning); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_CHAIN_LIGHTNING_ENERGIZE, SPELL_SHAMAN_MAELSTROM_CONTROLLER }) @@ -298,8 +288,6 @@ class spell_sha_chain_lightning : public SpellScript // 45297 - Chain Lightning Overload class spell_sha_chain_lightning_overload : public SpellScript { - PrepareSpellScript(spell_sha_chain_lightning_overload); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_CHAIN_LIGHTNING_OVERLOAD_ENERGIZE, SPELL_SHAMAN_MAELSTROM_CONTROLLER }) @@ -322,8 +310,6 @@ class spell_sha_chain_lightning_overload : public SpellScript // 187874 - Crash Lightning class spell_sha_crash_lightning : public SpellScript { - PrepareSpellScript(spell_sha_crash_lightning); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_CRASH_LIGHTNING_CLEAVE, SPELL_SHAMAN_GATHERING_STORMS, SPELL_SHAMAN_GATHERING_STORMS_BUFF }); @@ -359,8 +345,6 @@ class spell_sha_crash_lightning : public SpellScript // 378270 - Deeply Rooted Elements class spell_sha_deeply_rooted_elements : public AuraScript { - PrepareAuraScript(spell_sha_deeply_rooted_elements); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST, SPELL_SHAMAN_STORMSTRIKE, SPELL_SHAMAN_RIPTIDE, @@ -431,8 +415,6 @@ class spell_sha_deeply_rooted_elements : public AuraScript // 335902 - Doom Winds class spell_sha_doom_winds_legendary : public AuraScript { - PrepareAuraScript(spell_sha_doom_winds_legendary); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_DOOM_WINDS_LEGENDARY_COOLDOWN }); @@ -459,8 +441,6 @@ class spell_sha_doom_winds_legendary : public AuraScript // 207778 - Downpour class spell_sha_downpour : public SpellScript { - PrepareSpellScript(spell_sha_downpour); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -497,8 +477,6 @@ class spell_sha_downpour : public SpellScript // 204288 - 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 }); @@ -529,8 +507,6 @@ class spell_sha_earth_shield : public AuraScript // 8042 - Earth Shock class spell_sha_earth_shock : public SpellScript { - PrepareSpellScript(spell_sha_earth_shock); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellEffect({ { SPELL_SHAMAN_T29_2P_ELEMENTAL_DAMAGE_BUFF, EFFECT_0 } }); @@ -554,8 +530,6 @@ class spell_sha_earth_shock : public SpellScript // 170374 - Earthen Rage (Passive) class spell_sha_earthen_rage_passive : public AuraScript { - PrepareAuraScript(spell_sha_earthen_rage_passive); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTHEN_RAGE_PERIODIC, SPELL_SHAMAN_EARTHEN_RAGE_DAMAGE }); @@ -591,8 +565,6 @@ public: // 170377 - Earthen Rage (Proc Aura) class spell_sha_earthen_rage_proc_aura : public AuraScript { - PrepareAuraScript(spell_sha_earthen_rage_proc_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTHEN_RAGE_PASSIVE, SPELL_SHAMAN_EARTHEN_RAGE_DAMAGE }); @@ -660,8 +632,6 @@ private: // 61882 - Earthquake class spell_sha_earthquake : public SpellScript { - PrepareSpellScript(spell_sha_earthquake); - static constexpr std::array<std::pair<uint32, SpellEffIndex>, 3> DamageBuffs = { { { SPELL_SHAMAN_ECHOES_OF_GREAT_SUNDERING_LEGENDARY, EFFECT_1 }, @@ -699,8 +669,6 @@ class spell_sha_earthquake : public SpellScript // 77478 - Earthquake tick class spell_sha_earthquake_tick : public SpellScript { - PrepareSpellScript(spell_sha_earthquake_tick); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTHQUAKE_KNOCKING_DOWN }) @@ -736,8 +704,6 @@ class spell_sha_earthquake_tick : public SpellScript // 120588 - Elemental Blast Overload class spell_sha_elemental_blast : public SpellScript { - PrepareSpellScript(spell_sha_elemental_blast); - static constexpr uint32 BuffSpells[] = { SPELL_SHAMAN_ELEMENTAL_BLAST_CRIT, SPELL_SHAMAN_ELEMENTAL_BLAST_HASTE, SPELL_SHAMAN_ELEMENTAL_BLAST_MASTERY }; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -793,8 +759,6 @@ class spell_sha_elemental_blast : public SpellScript // 318038 - Flametongue Weapon class spell_sha_flametongue_weapon : public SpellScript { - PrepareSpellScript(spell_sha_flametongue_weapon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FLAMETONGUE_WEAPON_ENCHANT }); @@ -828,8 +792,6 @@ class spell_sha_flametongue_weapon : public SpellScript // 319778 - Flametongue - SPELL_SHAMAN_FLAMETONGUE_WEAPON_AURA class spell_sha_flametongue_weapon_aura : public AuraScript { - PrepareAuraScript(spell_sha_flametongue_weapon_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FLAMETONGUE_ATTACK }); @@ -862,8 +824,6 @@ public: } private: - PrepareAuraScript(spell_sha_healing_rain_aura); - void HandleEffectPeriodic(AuraEffect const* aurEff) { GetTarget()->CastSpell(_dest, SPELL_SHAMAN_HEALING_RAIN_HEAL, aurEff); @@ -888,8 +848,6 @@ private: // 73920 - Healing Rain class spell_sha_healing_rain : public SpellScript { - PrepareSpellScript(spell_sha_healing_rain); - void InitializeVisualStalker() { if (Aura* aura = GetHitAura()) @@ -918,8 +876,6 @@ class spell_sha_healing_rain : public SpellScript // 73921 - Healing Rain class spell_sha_healing_rain_target_limit : public SpellScript { - PrepareSpellScript(spell_sha_healing_rain_target_limit); - void SelectTargets(std::list<WorldObject*>& targets) { Trinity::SelectRandomInjuredTargets(targets, 6, true); @@ -934,8 +890,6 @@ class spell_sha_healing_rain_target_limit : public SpellScript // 52042 - Healing Stream Totem class spell_sha_healing_stream_totem_heal : public SpellScript { - PrepareSpellScript(spell_sha_healing_stream_totem_heal); - void SelectTargets(std::list<WorldObject*>& targets) { Trinity::SelectRandomInjuredTargets(targets, 1, true); @@ -950,8 +904,6 @@ class spell_sha_healing_stream_totem_heal : public SpellScript // 210714 - Icefury class spell_sha_icefury : public AuraScript { - PrepareAuraScript(spell_sha_icefury); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FROST_SHOCK_ENERGIZE }); @@ -972,8 +924,6 @@ class spell_sha_icefury : public AuraScript // 23551 - Lightning Shield T2 Bonus class spell_sha_item_lightning_shield : public AuraScript { - PrepareAuraScript(spell_sha_item_lightning_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD }); @@ -994,8 +944,6 @@ class spell_sha_item_lightning_shield : public AuraScript // 23552 - Lightning Shield T2 Bonus class spell_sha_item_lightning_shield_trigger : public AuraScript { - PrepareAuraScript(spell_sha_item_lightning_shield_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE }); @@ -1016,8 +964,6 @@ class spell_sha_item_lightning_shield_trigger : public AuraScript // 23572 - Mana Surge class spell_sha_item_mana_surge : public AuraScript { - PrepareAuraScript(spell_sha_item_mana_surge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_MANA_SURGE }); @@ -1056,8 +1002,6 @@ class spell_sha_item_mana_surge : public AuraScript // 40463 - Shaman Tier 6 Trinket class spell_sha_item_t6_trinket : public AuraScript { - PrepareAuraScript(spell_sha_item_t6_trinket); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1111,8 +1055,6 @@ class spell_sha_item_t6_trinket : public AuraScript // 70811 - Item - Shaman T10 Elemental 2P Bonus class spell_sha_item_t10_elemental_2p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_item_t10_elemental_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY }); @@ -1134,8 +1076,6 @@ class spell_sha_item_t10_elemental_2p_bonus : public AuraScript // 189063 - Lightning Vortex (proc 185881 Item - Shaman T18 Elemental 4P Bonus) class spell_sha_item_t18_elemental_4p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_item_t18_elemental_4p_bonus); - void DiminishHaste(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1152,8 +1092,6 @@ class spell_sha_item_t18_elemental_4p_bonus : public AuraScript // 51505 - Lava burst class spell_sha_lava_burst : public SpellScript { - PrepareSpellScript(spell_sha_lava_burst); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_PATH_OF_FLAMES_TALENT, SPELL_SHAMAN_PATH_OF_FLAMES_SPREAD, SPELL_SHAMAN_LAVA_SURGE }); @@ -1194,8 +1132,6 @@ class spell_sha_lava_burst : public SpellScript // 285466 - Lava Burst Overload damage class spell_sha_lava_crit_chance : public SpellScript { - PrepareSpellScript(spell_sha_lava_crit_chance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FLAME_SHOCK }); @@ -1222,8 +1158,6 @@ class spell_sha_lava_crit_chance : public SpellScript // 77756 - Lava Surge class spell_sha_lava_surge : public AuraScript { - PrepareAuraScript(spell_sha_lava_surge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_SURGE, SPELL_SHAMAN_IGNEOUS_POTENTIAL }); @@ -1254,8 +1188,6 @@ class spell_sha_lava_surge : public AuraScript // 77762 - Lava Surge class spell_sha_lava_surge_proc : public SpellScript { - PrepareSpellScript(spell_sha_lava_surge_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST }); @@ -1280,8 +1212,6 @@ class spell_sha_lava_surge_proc : public SpellScript // 188196 - Lightning Bolt class spell_sha_lightning_bolt : public SpellScript { - PrepareSpellScript(spell_sha_lightning_bolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LIGHTNING_BOLT_ENERGIZE, SPELL_SHAMAN_MAELSTROM_CONTROLLER }) @@ -1304,8 +1234,6 @@ class spell_sha_lightning_bolt : public SpellScript // 45284 - Lightning Bolt Overload class spell_sha_lightning_bolt_overload : public SpellScript { - PrepareSpellScript(spell_sha_lightning_bolt_overload); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LIGHTNING_BOLT_OVERLOAD_ENERGIZE, SPELL_SHAMAN_MAELSTROM_CONTROLLER }) @@ -1328,8 +1256,6 @@ class spell_sha_lightning_bolt_overload : public SpellScript // 192223 - Liquid Magma Totem (erupting hit spell) class spell_sha_liquid_magma_totem : public SpellScript { - PrepareSpellScript(spell_sha_liquid_magma_totem); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LIQUID_MAGMA_HIT }); @@ -1362,8 +1288,6 @@ class spell_sha_liquid_magma_totem : public SpellScript // 168534 - Mastery: Elemental Overload (passive) class spell_sha_mastery_elemental_overload : public AuraScript { - PrepareAuraScript(spell_sha_mastery_elemental_overload); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1458,8 +1382,6 @@ class spell_sha_mastery_elemental_overload : public AuraScript // 285466 - Lava Burst Overload class spell_sha_mastery_elemental_overload_proc : public SpellScript { - PrepareSpellScript(spell_sha_mastery_elemental_overload_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_MASTERY_ELEMENTAL_OVERLOAD }); @@ -1480,8 +1402,6 @@ class spell_sha_mastery_elemental_overload_proc : public SpellScript // 30884 - Nature's Guardian class spell_sha_natures_guardian : public AuraScript { - PrepareAuraScript(spell_sha_natures_guardian); - bool CheckProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { return eventInfo.GetActionTarget()->HealthBelowPct(aurEff->GetAmount()); @@ -1496,8 +1416,6 @@ class spell_sha_natures_guardian : public AuraScript // 210621 - Path of Flames Spread class spell_sha_path_of_flames_spread : public SpellScript { - PrepareSpellScript(spell_sha_path_of_flames_spread); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FLAME_SHOCK }); @@ -1538,8 +1456,6 @@ class spell_sha_path_of_flames_spread : public SpellScript // 294020 - Restorative Mists class spell_sha_restorative_mists : public SpellScript { - PrepareSpellScript(spell_sha_restorative_mists); - void FilterTargets(std::list<WorldObject*>& targets) { _targetCount = uint32(targets.size()); @@ -1565,8 +1481,6 @@ private: // 260878 - Spirit Wolf class spell_sha_spirit_wolf : public AuraScript { - PrepareAuraScript(spell_sha_spirit_wolf); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_GHOST_WOLF, SPELL_SHAMAN_SPIRIT_WOLF_TALENT, SPELL_SHAMAN_SPIRIT_WOLF_PERIODIC, SPELL_SHAMAN_SPIRIT_WOLF_AURA }); @@ -1595,8 +1509,6 @@ class spell_sha_spirit_wolf : public AuraScript // 51564 - Tidal Waves class spell_sha_tidal_waves : public AuraScript { - PrepareAuraScript(spell_sha_tidal_waves); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES }); @@ -1621,8 +1533,6 @@ class spell_sha_tidal_waves : public AuraScript // 28823 - Totemic Power class spell_sha_t3_6p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t3_6p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1677,8 +1587,6 @@ class spell_sha_t3_6p_bonus : public AuraScript // 28820 - Lightning Shield class spell_sha_t3_8p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t3_8p_bonus); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1697,8 +1605,6 @@ class spell_sha_t3_8p_bonus : public AuraScript // 64928 - Item - Shaman T8 Elemental 4P Bonus class spell_sha_t8_elemental_4p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t8_elemental_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ELECTRIFIED }); @@ -1735,8 +1641,6 @@ class spell_sha_t8_elemental_4p_bonus : public AuraScript // 67228 - Item - Shaman T9 Elemental 4P Bonus (Lava Burst) class spell_sha_t9_elemental_4p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t9_elemental_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST_BONUS_DAMAGE }); @@ -1773,8 +1677,6 @@ class spell_sha_t9_elemental_4p_bonus : public AuraScript // 70817 - Item - Shaman T10 Elemental 4P Bonus class spell_sha_t10_elemental_4p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t10_elemental_4p_bonus); - void HandleProc(AuraEffect* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1807,8 +1709,6 @@ class spell_sha_t10_elemental_4p_bonus : public AuraScript // 70808 - Item - Shaman T10 Restoration 4P Bonus class spell_sha_t10_restoration_4p_bonus : public AuraScript { - PrepareAuraScript(spell_sha_t10_restoration_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_CHAINED_HEAL }); @@ -1845,8 +1745,6 @@ class spell_sha_t10_restoration_4p_bonus : public AuraScript // 260895 - Unlimited Power class spell_sha_unlimited_power : public AuraScript { - PrepareAuraScript(spell_sha_unlimited_power); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_UNLIMITED_POWER_BUFF }); @@ -1870,8 +1768,6 @@ class spell_sha_unlimited_power : public AuraScript // 200071 - Undulation class spell_sha_undulation_passive : public AuraScript { - PrepareAuraScript(spell_sha_undulation_passive); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_UNDULATION_PROC }); @@ -1897,8 +1793,6 @@ class spell_sha_undulation_passive : public AuraScript // 33757 - Windfury Weapon class spell_sha_windfury_weapon : public SpellScript { - PrepareSpellScript(spell_sha_windfury_weapon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_WINDFURY_ENCHANTMENT }); @@ -1926,8 +1820,6 @@ class spell_sha_windfury_weapon : public SpellScript // 319773 - Windfury Weapon (proc) class spell_sha_windfury_weapon_proc : public AuraScript { - PrepareAuraScript(spell_sha_windfury_weapon_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_WINDFURY_ATTACK }); @@ -1950,8 +1842,6 @@ class spell_sha_windfury_weapon_proc : public AuraScript // 378269 - Windspeaker's Lava Resurgence class spell_sha_windspeakers_lava_resurgence : public SpellScript { - PrepareSpellScript(spell_sha_windspeakers_lava_resurgence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_VOLCANIC_SURGE }); diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 86891eff198..59df174b3a0 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -81,8 +81,6 @@ enum MiscSpells // 710 - Banish class spell_warl_banish : public SpellScript { - PrepareSpellScript(spell_warl_banish); - public: spell_warl_banish() {} @@ -109,8 +107,6 @@ private: // 111400 - Burning Rush class spell_warl_burning_rush : public SpellScript { - PrepareSpellScript(spell_warl_burning_rush); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -138,8 +134,6 @@ class spell_warl_burning_rush : public SpellScript // 111400 - Burning Rush class spell_warl_burning_rush_aura : public AuraScript { - PrepareAuraScript(spell_warl_burning_rush_aura); - void PeriodicTick(AuraEffect const* aurEff) { if (GetTarget()->GetHealthPct() <= float(aurEff->GetAmount())) @@ -158,8 +152,6 @@ class spell_warl_burning_rush_aura : public AuraScript // 116858 - Chaos Bolt class spell_warl_chaos_bolt : public SpellScript { - PrepareSpellScript(spell_warl_chaos_bolt); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -185,8 +177,6 @@ class spell_warl_chaos_bolt : public SpellScript // 77220 - Mastery: Chaotic Energies class spell_warl_chaotic_energies : public AuraScript { - PrepareAuraScript(spell_warl_chaotic_energies); - void HandleAbsorb(AuraEffect* /*aurEff*/, DamageInfo& dmgInfo, uint32& absorbAmount) { AuraEffect const* effect1 = GetEffect(EFFECT_1); @@ -213,8 +203,6 @@ class spell_warl_chaotic_energies : public AuraScript // 6201 - Create Healthstone class spell_warl_create_healthstone : public SpellScript { - PrepareSpellScript(spell_warl_create_healthstone); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_CREATE_HEALTHSTONE }); @@ -239,8 +227,6 @@ class spell_warl_create_healthstone : public SpellScript // 108416 - Dark Pact class spell_warl_dark_pact : public AuraScript { - PrepareAuraScript(spell_warl_dark_pact); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 }, { spellInfo->Id, EFFECT_2 } }); @@ -267,8 +253,6 @@ class spell_warl_dark_pact : public AuraScript // 48018 - Demonic Circle: Summon class spell_warl_demonic_circle_summon : public AuraScript { - PrepareAuraScript(spell_warl_demonic_circle_summon); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode) { // If effect is removed by expire remove the summoned demonic circle too. @@ -308,8 +292,6 @@ class spell_warl_demonic_circle_summon : public AuraScript // 48020 - Demonic Circle: Teleport class spell_warl_demonic_circle_teleport : public AuraScript { - PrepareAuraScript(spell_warl_demonic_circle_teleport); - void HandleTeleport(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Player* player = GetTarget()->ToPlayer()) @@ -331,8 +313,6 @@ class spell_warl_demonic_circle_teleport : public AuraScript // 67518, 19505 - Devour Magic class spell_warl_devour_magic : public SpellScript { - PrepareSpellScript(spell_warl_devour_magic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_DEMON_TRAINING, SPELL_WARLOCK_DEVOUR_MAGIC_HEAL }) @@ -363,8 +343,6 @@ class spell_warl_devour_magic : public SpellScript // 198590 - Drain Soul class spell_warl_drain_soul : public AuraScript { - PrepareAuraScript(spell_warl_drain_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_WARLOCK_DRAIN_SOUL_ENERGIZE }); @@ -388,8 +366,6 @@ class spell_warl_drain_soul : public AuraScript // 48181 - Haunt class spell_warl_haunt : public SpellScript { - PrepareSpellScript(spell_warl_haunt); - void HandleAfterHit() { if (Aura* aura = GetHitAura()) @@ -406,8 +382,6 @@ class spell_warl_haunt : public SpellScript // 755 - Health Funnel class spell_warl_health_funnel : public AuraScript { - PrepareAuraScript(spell_warl_health_funnel); - void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -457,8 +431,6 @@ class spell_warl_health_funnel : public AuraScript // 6262 - Healthstone class spell_warl_healthstone_heal : public SpellScript { - PrepareSpellScript(spell_warl_healthstone_heal); - void HandleOnHit() { int32 heal = int32(CalculatePct(GetCaster()->GetCreateHealth(), GetHitHeal())); @@ -474,8 +446,6 @@ class spell_warl_healthstone_heal : public SpellScript // 348 - Immolate class spell_warl_immolate : public SpellScript { - PrepareSpellScript(spell_warl_immolate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_IMMOLATE_PERIODIC}); @@ -495,8 +465,6 @@ class spell_warl_immolate : public SpellScript // 366330 - Random Sayaad class spell_warl_random_sayaad : public SpellScript { - PrepareSpellScript(spell_warl_random_sayaad); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -535,8 +503,6 @@ class spell_warl_random_sayaad : public SpellScript // 366222 - Summon Sayaad class spell_warl_sayaad_precast_disorientation : public SpellScript { - PrepareSpellScript(spell_warl_sayaad_precast_disorientation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ PET_SUMMONING_DISORIENTATION }); @@ -563,8 +529,6 @@ class spell_warl_sayaad_precast_disorientation : public SpellScript // 6358 - Seduction (Special Ability) class spell_warl_seduction : public SpellScript { - PrepareSpellScript(spell_warl_seduction); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SUCCUBUS, SPELL_PRIEST_SHADOW_WORD_DEATH }); @@ -593,8 +557,6 @@ class spell_warl_seduction : public SpellScript // 27285 - Seed of Corruption class spell_warl_seed_of_corruption : public SpellScript { - PrepareSpellScript(spell_warl_seed_of_corruption); - void FilterTargets(std::list<WorldObject*>& targets) { if (GetExplTargetUnit()) @@ -610,8 +572,6 @@ class spell_warl_seed_of_corruption : public SpellScript // 27243 - Seed of Corruption class spell_warl_seed_of_corruption_dummy : public AuraScript { - PrepareAuraScript(spell_warl_seed_of_corruption_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SEED_OF_CORRUPTION_DAMAGE }); @@ -666,8 +626,6 @@ class spell_warl_seed_of_corruption_dummy : public AuraScript // Monster spells, triggered only on amount drop (not on death) class spell_warl_seed_of_corruption_generic : public AuraScript { - PrepareAuraScript(spell_warl_seed_of_corruption_generic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SEED_OF_CORRUPTION_GENERIC }); @@ -705,8 +663,6 @@ class spell_warl_seed_of_corruption_generic : public AuraScript // 686 - Shadow Bolt class spell_warl_shadow_bolt : public SpellScript { - PrepareSpellScript(spell_warl_shadow_bolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo ({ SPELL_WARLOCK_SHADOW_BOLT_ENERGIZE }); @@ -726,8 +682,6 @@ class spell_warl_shadow_bolt : public SpellScript // 86121 - Soul Swap class spell_warl_soul_swap : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -753,8 +707,6 @@ class spell_warl_soul_swap : public SpellScript // 86211 - Soul Swap Override - Also acts as a dot container class spell_warl_soul_swap_override : public AuraScript { - PrepareAuraScript(spell_warl_soul_swap_override); - //! Forced to, pure virtual functions must have a body when linking void Register() override { } @@ -772,8 +724,6 @@ private: //! Soul Swap Copy Spells - 92795 - Simply copies spell IDs. class spell_warl_soul_swap_dot_marker : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap_dot_marker); - void HandleHit(SpellEffIndex /*effIndex*/) { Unit* swapVictim = GetCaster(); @@ -811,8 +761,6 @@ class spell_warl_soul_swap_dot_marker : public SpellScript // 86213 - Soul Swap Exhale class spell_warl_soul_swap_exhale : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap_exhale); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_SWAP_MOD_COST, SPELL_WARLOCK_SOUL_SWAP_OVERRIDE }); @@ -876,8 +824,6 @@ class spell_warl_soul_swap_exhale : public SpellScript // 29858 - Soulshatter class spell_warl_soulshatter : public SpellScript { - PrepareSpellScript(spell_warl_soulshatter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SOULSHATTER_EFFECT }); @@ -900,8 +846,6 @@ class spell_warl_soulshatter : public SpellScript // 366323 - Strengthen Pact - Succubus class spell_warl_strengthen_pact_succubus : public SpellScript { - PrepareSpellScript(spell_warl_strengthen_pact_succubus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -928,8 +872,6 @@ class spell_warl_strengthen_pact_succubus : public SpellScript // 366325 - Strengthen Pact - Incubus class spell_warl_strengthen_pact_incubus : public SpellScript { - PrepareSpellScript(spell_warl_strengthen_pact_incubus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -956,8 +898,6 @@ class spell_warl_strengthen_pact_incubus : public SpellScript // 366222 - Summon Sayaad class spell_warl_summon_sayaad : public SpellScript { - PrepareSpellScript(spell_warl_summon_sayaad); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -983,8 +923,6 @@ class spell_warl_summon_sayaad : public SpellScript template <uint32 Trigger> class spell_warl_t4_2p_bonus : public AuraScript { - PrepareAuraScript(spell_warl_t4_2p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ Trigger }); @@ -1006,8 +944,6 @@ class spell_warl_t4_2p_bonus : public AuraScript // 30108, 34438, 34439, 35183 - Unstable Affliction class spell_warl_unstable_affliction : public AuraScript { - PrepareAuraScript(spell_warl_unstable_affliction); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL }); @@ -1044,8 +980,6 @@ class spell_warl_unstable_affliction : public AuraScript /// Updated 7.1.5 class spell_warl_rain_of_fire : public AuraScript { - PrepareAuraScript(spell_warl_rain_of_fire); - void HandleDummyTick(AuraEffect const* /*aurEff*/) { std::vector<AreaTrigger*> rainOfFireAreaTriggers = GetTarget()->GetAreaTriggers(SPELL_WARLOCK_RAIN_OF_FIRE); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index c8036eecd29..90272352e5e 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -82,8 +82,6 @@ enum WarriorMisc // 23881 - Bloodthirst class spell_warr_bloodthirst : public SpellScript { - PrepareSpellScript(spell_warr_bloodthirst); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST_HEAL }); @@ -103,8 +101,6 @@ class spell_warr_bloodthirst : public SpellScript // 384036 - Brutal Vitality class spell_warr_brutal_vitality : public AuraScript { - PrepareAuraScript(spell_warr_brutal_vitality); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_IGNORE_PAIN }); @@ -139,8 +135,6 @@ private: // 100 - Charge class spell_warr_charge : public SpellScript { - PrepareSpellScript(spell_warr_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -168,8 +162,6 @@ class spell_warr_charge : public SpellScript // 126661 - Warrior Charge Drop Fire Periodic class spell_warr_charge_drop_fire_periodic : public AuraScript { - PrepareAuraScript(spell_warr_charge_drop_fire_periodic); - void DropFireVisual(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -194,8 +186,6 @@ class spell_warr_charge_drop_fire_periodic : public AuraScript // 218104 - Charge Effect class spell_warr_charge_effect : public SpellScript { - PrepareSpellScript(spell_warr_charge_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -225,8 +215,6 @@ class spell_warr_charge_effect : public SpellScript // 262161 - Warbreaker class spell_warr_colossus_smash : public SpellScript { - PrepareSpellScript(spell_warr_colossus_smash); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_COLOSSUS_SMASH_AURA, SPELL_WARRIOR_IN_FOR_THE_KILL, SPELL_WARRIOR_IN_FOR_THE_KILL_HASTE }) @@ -277,8 +265,6 @@ private: // 389306 - Critical Thinking class spell_warr_critical_thinking : public AuraScript { - PrepareAuraScript(spell_warr_critical_thinking); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_CRITICAL_THINKING_ENERGIZE }); @@ -300,8 +286,6 @@ class spell_warr_critical_thinking : public AuraScript // 383103 - Fueled by Violence class spell_warr_fueled_by_violence : public AuraScript { - PrepareAuraScript(spell_warr_fueled_by_violence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_FUELED_BY_VIOLENCE_HEAL }); @@ -340,8 +324,6 @@ private: // 6544 - Heroic leap class spell_warr_heroic_leap : public SpellScript { - PrepareSpellScript(spell_warr_heroic_leap); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_HEROIC_LEAP_JUMP }); @@ -392,8 +374,6 @@ class spell_warr_heroic_leap : public SpellScript // Heroic Leap (triggered by Heroic Leap (6544)) - 178368 class spell_warr_heroic_leap_jump : public SpellScript { - PrepareSpellScript(spell_warr_heroic_leap_jump); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -422,8 +402,6 @@ class spell_warr_heroic_leap_jump : public SpellScript // 202168 - Impending Victory class spell_warr_impending_victory : public SpellScript { - PrepareSpellScript(spell_warr_impending_victory); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_IMPENDING_VICTORY_HEAL }); @@ -445,8 +423,6 @@ class spell_warr_impending_victory : public SpellScript // 5246 - Intimidating Shout class spell_warr_intimidating_shout : public SpellScript { - PrepareSpellScript(spell_warr_intimidating_shout); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove(GetExplTargetWorldObject()); @@ -462,8 +438,6 @@ class spell_warr_intimidating_shout : public SpellScript // 70844 - Item - Warrior T10 Protection 4P Bonus class spell_warr_item_t10_prot_4p_bonus : public AuraScript { - PrepareAuraScript(spell_warr_item_t10_prot_4p_bonus); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_WARRIOR_STOICISM }) @@ -490,8 +464,6 @@ class spell_warr_item_t10_prot_4p_bonus : public AuraScript // 12294 - Mortal Strike 7.1.5 class spell_warr_mortal_strike : public SpellScript { - PrepareSpellScript(spell_warr_mortal_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_MORTAL_WOUNDS }); @@ -512,8 +484,6 @@ class spell_warr_mortal_strike : public SpellScript // 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 }); @@ -541,8 +511,6 @@ class spell_warr_rallying_cry : public SpellScript // 2565 - Shield Block class spell_warr_shield_block : public SpellScript { - PrepareSpellScript(spell_warr_shield_block); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_SHIELD_BLOCK_AURA }); @@ -562,8 +530,6 @@ class spell_warr_shield_block : public SpellScript // 385952 - Shield Charge class spell_warr_shield_charge : public SpellScript { - PrepareSpellScript(spell_warr_shield_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_SHIELD_CHARGE_EFFECT }); @@ -583,8 +549,6 @@ class spell_warr_shield_charge : public SpellScript // 46968 - Shockwave class spell_warr_shockwave : public SpellScript { - PrepareSpellScript(spell_warr_shockwave); - bool Validate(SpellInfo const* spellInfo) override { return !ValidateSpellInfo({ SPELL_WARRIOR_SHOCKWAVE, SPELL_WARRIOR_SHOCKWAVE_STUN }) @@ -621,8 +585,6 @@ class spell_warr_shockwave : public SpellScript // 107570 - Storm Bolt class spell_warr_storm_bolt : public SpellScript { - PrepareSpellScript(spell_warr_storm_bolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -645,8 +607,6 @@ class spell_warr_shockwave : public SpellScript // 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 }); @@ -668,8 +628,6 @@ class spell_warr_sudden_death : public AuraScript // 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({ SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_1, SPELL_WARRIOR_SWEEPING_STRIKES_EXTRA_ATTACK_2 }); @@ -713,8 +671,6 @@ class spell_warr_sweeping_strikes : public AuraScript // 215538 - Trauma class spell_warr_trauma : public AuraScript { - PrepareAuraScript(spell_warr_trauma); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_TRAUMA_EFFECT }); @@ -739,8 +695,6 @@ class spell_warr_trauma : public AuraScript // 28845 - Cheat Death class spell_warr_t3_prot_8p_bonus : public AuraScript { - PrepareAuraScript(spell_warr_t3_prot_8p_bonus); - bool CheckProc(ProcEventInfo& eventInfo) { if (eventInfo.GetActionTarget()->HealthBelowPct(20)) @@ -763,8 +717,6 @@ class spell_warr_t3_prot_8p_bonus : public AuraScript // 32215 - Victorious State class spell_warr_victorious_state : public AuraScript { - PrepareAuraScript(spell_warr_victorious_state); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_IMPENDING_VICTORY }); @@ -787,8 +739,6 @@ class spell_warr_victorious_state : public AuraScript // 34428 - Victory Rush class spell_warr_victory_rush : public SpellScript { - PrepareSpellScript(spell_warr_victory_rush); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo |