diff options
Diffstat (limited to 'src/server')
247 files changed, 0 insertions, 3541 deletions
diff --git a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp index a41787b8efc..864b5d2f1e1 100644 --- a/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp +++ b/src/server/scripts/Argus/AntorusTheBurningThrone/boss_garothi_worldbreaker.cpp @@ -509,8 +509,6 @@ private: class spell_garothi_apocalypse_drive : public AuraScript { - PrepareAuraScript(spell_garothi_apocalypse_drive); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_APOCALYPSE_DRIVE_PERIODIC_DAMAGE }); @@ -529,8 +527,6 @@ class spell_garothi_apocalypse_drive : public AuraScript class spell_garothi_fel_bombardment_selector : public SpellScript { - PrepareSpellScript(spell_garothi_fel_bombardment_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -570,8 +566,6 @@ class spell_garothi_fel_bombardment_selector : public SpellScript class spell_garothi_fel_bombardment_warning : public AuraScript { - PrepareAuraScript(spell_garothi_fel_bombardment_warning); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FEL_BOMBARDMENT_PERIODIC }); @@ -592,8 +586,6 @@ class spell_garothi_fel_bombardment_warning : public AuraScript class spell_garothi_fel_bombardment_periodic : public AuraScript { - PrepareAuraScript(spell_garothi_fel_bombardment_periodic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -613,8 +605,6 @@ class spell_garothi_fel_bombardment_periodic : public AuraScript class spell_garothi_searing_barrage_dummy : public SpellScript { - PrepareSpellScript(spell_garothi_searing_barrage_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEARING_BARRAGE_SELECTOR }); @@ -633,8 +623,6 @@ class spell_garothi_searing_barrage_dummy : public SpellScript class spell_garothi_searing_barrage_selector : public SpellScript { - PrepareSpellScript(spell_garothi_searing_barrage_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -667,8 +655,6 @@ class spell_garothi_searing_barrage_selector : public SpellScript class spell_garothi_decimation_selector : public SpellScript { - PrepareSpellScript(spell_garothi_decimation_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DECIMATION_WARNING }); @@ -699,8 +685,6 @@ class spell_garothi_decimation_selector : public SpellScript class spell_garothi_decimation_warning : public AuraScript { - PrepareAuraScript(spell_garothi_decimation_warning); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DECIMATION_MISSILE }); @@ -727,8 +711,6 @@ class spell_garothi_decimation_warning : public AuraScript class spell_garothi_carnage : public AuraScript { - PrepareAuraScript(spell_garothi_carnage); - void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo`*/) { // Usually we could just handle this via spell_proc but since we want @@ -745,8 +727,6 @@ class spell_garothi_carnage : public AuraScript class spell_garothi_annihilation_selector : public SpellScript { - PrepareSpellScript(spell_garothi_annihilation_selector); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -766,8 +746,6 @@ class spell_garothi_annihilation_selector : public SpellScript class spell_garothi_annihilation_triggered : public SpellScript { - PrepareSpellScript(spell_garothi_annihilation_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ANNIHILATION_DAMAGE_UNSPLITTED }); @@ -790,8 +768,6 @@ class spell_garothi_annihilation_triggered : public SpellScript class spell_garothi_eradication : public SpellScript { - PrepareSpellScript(spell_garothi_eradication); - void ChangeDamage() { if (Unit* caster = GetCaster()) @@ -809,8 +785,6 @@ class spell_garothi_eradication : public SpellScript class spell_garothi_surging_fel : public AuraScript { - PrepareAuraScript(spell_garothi_surging_fel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SURGING_FEL_DAMAGE }); @@ -830,8 +804,6 @@ class spell_garothi_surging_fel : public AuraScript class spell_garothi_cannon_chooser : public SpellScript { - PrepareSpellScript(spell_garothi_cannon_chooser); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { Creature* caster = GetHitCreature(); diff --git a/src/server/scripts/DragonIsles/AzureVault/boss_leymor.cpp b/src/server/scripts/DragonIsles/AzureVault/boss_leymor.cpp index 92620beea4c..b872e52d73d 100644 --- a/src/server/scripts/DragonIsles/AzureVault/boss_leymor.cpp +++ b/src/server/scripts/DragonIsles/AzureVault/boss_leymor.cpp @@ -385,8 +385,6 @@ static Position const LeyLineSproutGroupOrigin[] = // 374364 - Ley-Line Sprouts class spell_ley_line_sprouts : public SpellScript { - PrepareSpellScript(spell_ley_line_sprouts); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LEY_LINE_SPROUTS_MISSILE }); @@ -410,8 +408,6 @@ class spell_ley_line_sprouts : public SpellScript // 375732 - Stasis Ritual class spell_stasis_ritual : public AuraScript { - PrepareAuraScript(spell_stasis_ritual); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STASIS_RITUAL_MISSILE }); @@ -432,8 +428,6 @@ class spell_stasis_ritual : public AuraScript // 375652 - Wild Eruption class spell_wild_eruption : public SpellScript { - PrepareSpellScript(spell_wild_eruption); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WILD_ERUPTION_MISSILE }); @@ -475,8 +469,6 @@ struct at_leymor_arcane_eruption : AreaTriggerAI // 374567 - Explosive Brand class spell_explosive_brand : public SpellScript { - PrepareSpellScript(spell_explosive_brand); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXPLOSIVE_BRAND_KNOCKBACK }); @@ -496,8 +488,6 @@ class spell_explosive_brand : public SpellScript // 374567 - Explosive Brand class spell_explosive_brand_AuraScript : public AuraScript { - PrepareAuraScript(spell_explosive_brand_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXPLOSIVE_BRAND_DAMAGE }); @@ -521,8 +511,6 @@ class spell_explosive_brand_AuraScript : public AuraScript // 374720 - Consuming Stomp class spell_consuming_stomp : public AuraScript { - PrepareAuraScript(spell_consuming_stomp); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->KillSelf(); @@ -537,8 +525,6 @@ class spell_consuming_stomp : public AuraScript // 386660 - Erupting Fissure class spell_erupting_fissure : public SpellScript { - PrepareSpellScript(spell_erupting_fissure); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ERUPTING_FISSURE_SPROUT_SELECTOR }); @@ -558,8 +544,6 @@ class spell_erupting_fissure : public SpellScript // 375591 - Sappy Burst class spell_sappy_burst : public SpellScript { - PrepareSpellScript(spell_sappy_burst); - void HandleHitTarget(SpellEffIndex /*effIndex*/) { GetCaster()->KillSelf(); diff --git a/src/server/scripts/DragonIsles/RubyLifePools/ruby_life_pools.cpp b/src/server/scripts/DragonIsles/RubyLifePools/ruby_life_pools.cpp index 03c6731718b..6071c26ac87 100644 --- a/src/server/scripts/DragonIsles/RubyLifePools/ruby_life_pools.cpp +++ b/src/server/scripts/DragonIsles/RubyLifePools/ruby_life_pools.cpp @@ -33,8 +33,6 @@ enum RLPSpells // 371652 - Executed class spell_ruby_life_pools_executed : public AuraScript { - PrepareAuraScript(spell_ruby_life_pools_executed); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -52,8 +50,6 @@ class spell_ruby_life_pools_executed : public AuraScript // 384933 - Ice Shield class spell_ruby_life_pools_ice_shield : public AuraScript { - PrepareAuraScript(spell_ruby_life_pools_ice_shield); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -71,8 +67,6 @@ class spell_ruby_life_pools_ice_shield : public AuraScript // 372793 - Excavate class spell_ruby_life_pools_excavate : public AuraScript { - PrepareAuraScript(spell_ruby_life_pools_excavate); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { if (Unit* caster = GetCaster()) @@ -88,8 +82,6 @@ class spell_ruby_life_pools_excavate : public AuraScript // 395029 - Storm Infusion class spell_ruby_life_pools_storm_infusion : public SpellScript { - PrepareSpellScript(spell_ruby_life_pools_storm_infusion); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 9.0f, 0.0f, 4.0f, 0.0f }); diff --git a/src/server/scripts/DragonIsles/zone_the_forbidden_reach.cpp b/src/server/scripts/DragonIsles/zone_the_forbidden_reach.cpp index e6af907968e..4e9057b6c28 100644 --- a/src/server/scripts/DragonIsles/zone_the_forbidden_reach.cpp +++ b/src/server/scripts/DragonIsles/zone_the_forbidden_reach.cpp @@ -50,8 +50,6 @@ std::array<std::pair<uint32, Position>, 4> LoginRoomData = // 369728 - Dracthyr Login class spell_dracthyr_login : public SpellScript { - PrepareSpellScript(spell_dracthyr_login); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRACTHYR_MOVIE_ROOM_01, SPELL_DRACTHYR_MOVIE_ROOM_02, SPELL_DRACTHYR_MOVIE_ROOM_03, SPELL_DRACTHYR_MOVIE_ROOM_04 }); diff --git a/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp b/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp index f3d6a928d91..4a30195833f 100644 --- a/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp +++ b/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp @@ -52,8 +52,6 @@ struct npc_bg_ab_gryphon_bat_rider_leader : public ScriptedAI // 261985 - Blacksmith Working class spell_bg_ab_blacksmith_working : public AuraScript { - PrepareAuraScript(spell_bg_ab_blacksmith_working); - static constexpr uint32 ITEM_BLACKSMITH_HAMMER = 5956; void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index 59275958892..2e95e41e96f 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -214,8 +214,6 @@ class spell_occuthar_focused_fire : public SpellScriptLoader class spell_occuthar_focused_fire_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_focused_fire_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.size() < 2) @@ -250,8 +248,6 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader class spell_occuthar_eyes_of_occuthar_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_eyes_of_occuthar_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -296,8 +292,6 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader class spell_occuthar_eyes_of_occuthar_vehicle_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript); - bool Load() override { return InstanceHasScript(GetCaster(), BHScriptName); @@ -334,8 +328,6 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader class spell_occuthar_occuthars_destruction_AuraScript : public AuraScript { - PrepareAuraScript(spell_occuthar_occuthars_destruction_AuraScript); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_UNIT; diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index 42bf2b118d4..1c42ea4184f 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -130,8 +130,6 @@ class spell_argaloth_consuming_darkness : public SpellScriptLoader class spell_argaloth_consuming_darkness_SpellScript : public SpellScript { - PrepareSpellScript(spell_argaloth_consuming_darkness_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); @@ -157,8 +155,6 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader class spell_argaloth_meteor_slash_SpellScript : public SpellScript { - PrepareSpellScript(spell_argaloth_meteor_slash_SpellScript); - void CountTargets(std::list<WorldObject*>& targets) { _targetCount = targets.size(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index c78a58d6f78..e9f53d68c92 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -717,8 +717,6 @@ class spell_chains_of_woe_1 : public SpellScriptLoader class spell_chains_of_woe_1_SpellScript : public SpellScript { - PrepareSpellScript(spell_chains_of_woe_1_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAINS_OF_WOE_1 }); @@ -752,8 +750,6 @@ class spell_chains_of_woe_4 : public SpellScriptLoader class spell_chains_of_woe_4_SpellScript : public SpellScript { - PrepareSpellScript(spell_chains_of_woe_4_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAINS_OF_WOE_4 }); @@ -795,8 +791,6 @@ class spell_nether_dragon_essence_1 : public SpellScriptLoader class spell_nether_dragon_essence_1_AuraScript : public AuraScript { - PrepareAuraScript(spell_nether_dragon_essence_1_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -836,8 +830,6 @@ class spell_nether_dragon_essence_2 : public SpellScriptLoader class spell_nether_dragon_essence_2_SpellScript : public SpellScript { - PrepareSpellScript(spell_nether_dragon_essence_2_SpellScript); - void ModDestHeight(SpellDestination& dest) { Position offset = { frand(-35.0f, 35.0f), frand(-25.0f, 25.0f), 0.0f, 0.0f }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index f4fee8fa86a..c2bb6d3c599 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -434,8 +434,6 @@ public: // 47691 - Summon Mole Machine Target Picker class spell_direbrew_summon_mole_machine_target_picker : public SpellScript { - PrepareSpellScript(spell_direbrew_summon_mole_machine_target_picker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MOLE_MACHINE_MINION_SUMMONER }); @@ -455,8 +453,6 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScript // 47370 - Send Mug Target Picker class spell_send_mug_target_picker : public SpellScript { - PrepareSpellScript(spell_send_mug_target_picker); - void FilterTargets(std::list<WorldObject*>& targets) { Unit* caster = GetCaster(); @@ -496,8 +492,6 @@ class spell_send_mug_target_picker : public SpellScript // 47344 - Request Second Mug class spell_request_second_mug : public SpellScript { - PrepareSpellScript(spell_request_second_mug); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_SECOND_MUG }); @@ -517,8 +511,6 @@ class spell_request_second_mug : public SpellScript // 47369 - Send Mug Control Aura class spell_send_mug_control_aura : public AuraScript { - PrepareAuraScript(spell_send_mug_control_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_MUG_TARGET_PICKER }); @@ -538,8 +530,6 @@ class spell_send_mug_control_aura : public AuraScript // 50278 - Barreled Control Aura class spell_barreled_control_aura : public AuraScript { - PrepareAuraScript(spell_barreled_control_aura); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -555,8 +545,6 @@ class spell_barreled_control_aura : public AuraScript // 47407 - Direbrew's Disarm (precast) class spell_direbrew_disarm : public AuraScript { - PrepareAuraScript(spell_direbrew_disarm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DIREBREW_DISARM, SPELL_DIREBREW_DISARM_GROW }); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index a3d07b4ad77..c0c5c49cd8a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -182,8 +182,6 @@ struct go_orb_of_domination : public GameObjectAI // 19873 - Destroy Egg class spell_egg_event : public SpellScript { - PrepareSpellScript(spell_egg_event); - void HandleOnHit() { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index e09f932680a..1822ed1ff56 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -236,8 +236,6 @@ struct boss_vaelastrasz : public BossAI // 18173 - Burning Adrenaline class spell_vael_burning_adrenaline : public AuraScript { - PrepareAuraScript(spell_vael_burning_adrenaline); - void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { //The tooltip says the on death the AoE occurs. According to information: http://qaliaresponse.stage.lithium.com/t5/WoW-Mayhem/Surviving-Burning-Adrenaline-For-tanks/td-p/48609 diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index dfbdbf03349..b57ffcc1072 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -115,8 +115,6 @@ struct boss_baron_geddon : public BossAI // 19695 - Inferno class spell_baron_geddon_inferno : public AuraScript { - PrepareAuraScript(spell_baron_geddon_inferno); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 78946546c00..c87e3661a12 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -112,8 +112,6 @@ struct boss_shazzrah : public BossAI // 23138 - Gate of Shazzrah class spell_shazzrah_gate_dummy : public SpellScript { - PrepareSpellScript(spell_shazzrah_gate_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAZZRAH_GATE }); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index aeebe791a63..1f0044a137c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -392,8 +392,6 @@ class spell_rain_of_bones : public SpellScriptLoader class spell_rain_of_bones_AuraScript : public AuraScript { - PrepareAuraScript(spell_rain_of_bones_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SKELETON }); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9b035976388..e5a48916459 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -487,8 +487,6 @@ private: // 44191 - Flame Strike class spell_felblood_kaelthas_flame_strike : public AuraScript { - PrepareAuraScript(spell_felblood_kaelthas_flame_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_STRIKE_DAMAGE }); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 2047f9ee505..95a4271be0c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -355,8 +355,6 @@ class go_acherus_soul_prison : public GameObjectScript // 51519 - Death Knight Initiate Visual class spell_death_knight_initiate_visual : public SpellScript { - PrepareSpellScript(spell_death_knight_initiate_visual); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { Creature* target = GetHitCreature(); @@ -841,8 +839,6 @@ enum HorseSeats // 52265 - Repo class spell_stable_master_repo : public AuraScript { - PrepareAuraScript(spell_stable_master_repo); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Creature* creature = GetTarget()->ToCreature(); @@ -865,8 +861,6 @@ class spell_stable_master_repo : public AuraScript // 52264 - Deliver Stolen Horse class spell_deliver_stolen_horse : public SpellScript { - PrepareSpellScript(spell_deliver_stolen_horse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DELIVER_STOLEN_HORSE, SPELL_EFFECT_STOLEN_HORSE }); @@ -1079,8 +1073,6 @@ enum GiftOfTheHarvester // 52479 - Gift of the Harvester class spell_gift_of_the_harvester : public SpellScript { - PrepareSpellScript(spell_gift_of_the_harvester); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1125,8 +1117,6 @@ enum Runeforging 327082 - Rune of the Apocalypse */ class spell_chapter1_runeforging_credit : public SpellScript { - PrepareSpellScript(spell_chapter1_runeforging_credit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUNEFORGING_CREDIT }) && diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 11cc168d497..b93c1646e46 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -614,8 +614,6 @@ public: // 53110 - Devour Humanoid class spell_death_knight_devour_humanoid : public SpellScript { - PrepareSpellScript(spell_death_knight_devour_humanoid); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { GetHitUnit()->CastSpell(GetCaster(), GetEffectValue(), true); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 83850147e3f..8a16c962d0a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -793,8 +793,6 @@ private: // 42432 - Headless Horseman Yell Timer class spell_headless_horseman_yell_timer : public AuraScript { - PrepareAuraScript(spell_headless_horseman_yell_timer); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Creature* horseman = GetTarget()->ToCreature(); @@ -813,8 +811,6 @@ class spell_headless_horseman_yell_timer : public AuraScript // 43893 - Headless Horseman - Maniacal Laugh, Maniacal, Delayed 8 class spell_headless_horseman_maniacal_laugh : public AuraScript { - PrepareAuraScript(spell_headless_horseman_maniacal_laugh); - void HandleSound(AuraEffect const* /*aurEff*/) { GetTarget()->PlayDirectSound(SOUNDID_MANIACAL_LAUGH); @@ -829,8 +825,6 @@ class spell_headless_horseman_maniacal_laugh : public AuraScript // 42410 - Headless Horseman Climax - Command, Head Repositions class spell_headless_horseman_head_reposition : public SpellScript { - PrepareSpellScript(spell_headless_horseman_head_reposition); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Position random = GetCaster()->GetRandomNearPosition(30.0f); @@ -846,8 +840,6 @@ class spell_headless_horseman_head_reposition : public SpellScript // 42399 - Headless Horseman Climax - Send Head class spell_headless_horseman_send_head : public SpellScript { - PrepareSpellScript(spell_headless_horseman_send_head); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* head = GetHitUnit(); @@ -864,8 +856,6 @@ class spell_headless_horseman_send_head : public SpellScript // 42603 - Headless Horseman Climax, Head: Periodic class spell_headless_horseman_head_periodic : public AuraScript { - PrepareAuraScript(spell_headless_horseman_head_periodic); - void HandleHPCheck(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -886,8 +876,6 @@ class spell_headless_horseman_head_periodic : public AuraScript // 43101 - Headless Horseman Climax - Command, Head Requests Body class spell_headless_horseman_command_head_request_body : public SpellScript { - PrepareSpellScript(spell_headless_horseman_command_head_request_body); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* horseman = GetHitUnit(); @@ -904,8 +892,6 @@ class spell_headless_horseman_command_head_request_body : public SpellScript // 42401 - Headless Horseman Climax - Return Head class spell_headless_horseman_return_head : public SpellScript { - PrepareSpellScript(spell_headless_horseman_return_head); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* horseman = GetHitUnit(); @@ -922,8 +908,6 @@ class spell_headless_horseman_return_head : public SpellScript // 52236 - Summon Pumpkin Burst Delay class spell_summon_pumpkin_burst_delay : public AuraScript { - PrepareAuraScript(spell_summon_pumpkin_burst_delay); - void HandleText(AuraEffect const* /*aurEff*/) { if (Creature* horseman = GetTarget()->ToCreature()) @@ -939,8 +923,6 @@ class spell_summon_pumpkin_burst_delay : public AuraScript // 42428 - Headless Horseman Climax - Head Is Dead class spell_headless_horseman_head_is_dead : public SpellScript { - PrepareSpellScript(spell_headless_horseman_head_is_dead); - void HandleDummy(SpellEffIndex /*effIndex*/) { Creature* target = GetHitCreature(); @@ -970,8 +952,6 @@ class spell_headless_horseman_head_is_dead : public SpellScript // 42879 - Headless Horseman Climax - Summoning Rhyme Aura class spell_headless_horseman_summoning_rhyme_aura : public AuraScript { - PrepareAuraScript(spell_headless_horseman_summoning_rhyme_aura); - void PeriodicTick(AuraEffect const* aurEff) { if (!GetCaster()) @@ -1013,8 +993,6 @@ class spell_headless_horseman_summoning_rhyme_aura : public AuraScript // 42281 - Sprouting class spell_headless_horseman_sprouting : public SpellScript { - PrepareSpellScript(spell_headless_horseman_sprouting); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* pumpkin = GetHitUnit(); @@ -1032,8 +1010,6 @@ class spell_headless_horseman_sprouting : public SpellScript // 42818 - Headless Horseman - Wisp Flight Port class spell_headless_horseman_wisp_teleport : public SpellScript { - PrepareSpellScript(spell_headless_horseman_wisp_teleport); - void SetDest(SpellDestination& dest) { dest.Relocate(EarthBunnySpawnPosition); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index aed2154129f..f32f4e29111 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -170,8 +170,6 @@ class spell_shadow_portal : public SpellScriptLoader class spell_shadow_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_shadow_portal_SpellScript); - bool Load() override { _instance = GetCaster()->GetInstanceScript(); @@ -289,8 +287,6 @@ class spell_shadow_portal_rooms : public SpellScriptLoader class spell_shadow_portal_rooms_SpellScript : public SpellScript { - PrepareSpellScript(spell_shadow_portal_rooms_SpellScript); - bool Load() override { _instance = GetCaster()->GetInstanceScript(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b5fd8141e25..e58ac8b67c5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -150,8 +150,6 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader class spell_kormok_summon_bone_magesSpellScript : public SpellScript { - PrepareSpellScript(spell_kormok_summon_bone_magesSpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonMageSpells); @@ -184,8 +182,6 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader class spell_kormok_summon_bone_minionsSpellScript : public SpellScript { - PrepareSpellScript(spell_kormok_summon_bone_minionsSpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BONE_MINIONS }); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 88a9d539fba..7d5ff186908 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -365,8 +365,6 @@ private: // 68965 - [DND] Lingering Fumes Targetting (starter) class spell_apothecary_lingering_fumes : public SpellScript { - PrepareSpellScript(spell_apothecary_lingering_fumes); - void HandleAfterCast() { Unit* caster = GetCaster(); @@ -399,8 +397,6 @@ class spell_apothecary_lingering_fumes : public SpellScript // 68644 - [DND] Valentine Boss Validate Area class spell_apothecary_validate_area : public SpellScript { - PrepareSpellScript(spell_apothecary_validate_area); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BUNNY_LOCKDOWN)); @@ -428,8 +424,6 @@ class spell_apothecary_validate_area : public SpellScript // 69038 - Throw Cologne class spell_apothecary_throw_cologne : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_cologne); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_COLOGNE_SPILL, true); @@ -444,8 +438,6 @@ class spell_apothecary_throw_cologne : public SpellScript // 68966 - Throw Perfume class spell_apothecary_throw_perfume : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_perfume); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PERFUME_SPILL, true); @@ -460,8 +452,6 @@ class spell_apothecary_throw_perfume : public SpellScript // 68798 - Concentrated Alluring Perfume Spill class spell_apothecary_perfume_spill : public AuraScript { - PrepareAuraScript(spell_apothecary_perfume_spill); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_PERFUME_SPILL_DAMAGE, true); @@ -476,8 +466,6 @@ class spell_apothecary_perfume_spill : public AuraScript // 68614 - Concentrated Irresistible Cologne Spill class spell_apothecary_cologne_spill : public AuraScript { - PrepareAuraScript(spell_apothecary_cologne_spill); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_COLOGNE_SPILL_DAMAGE, true); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 9ea91aa40e0..c4a21f989a7 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -329,8 +329,6 @@ class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader class spell_shadowfang_keep_haunting_spirits_AuraScript : public AuraScript { - PrepareAuraScript(spell_shadowfang_keep_haunting_spirits_AuraScript); - void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { isPeriodic = true; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index d35ef8f2bb7..ae665d2b2d1 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -325,8 +325,6 @@ public: // 31912 - Ysida Saved Credit Trigger class spell_ysida_saved_credit : public SpellScript { - PrepareSpellScript(spell_ysida_saved_credit); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_YSIDA_SAVED }); @@ -365,8 +363,6 @@ enum HauntingPhantoms // 16336 - Haunting Phantoms class spell_stratholme_haunting_phantoms : public AuraScript { - PrepareAuraScript(spell_stratholme_haunting_phantoms); - void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { isPeriodic = true; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 18e62d1d88f..d27985051b0 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -97,8 +97,6 @@ enum HexOfJammalan // 12479 - Hex of Jammal'an class spell_sunken_temple_hex_of_jammalan : public AuraScript { - PrepareAuraScript(spell_sunken_temple_hex_of_jammalan); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEX_OF_JAMMALAN_TRANSFORM, SPELL_HEX_OF_JAMMALAN_CHARM }); @@ -128,8 +126,6 @@ class spell_sunken_temple_hex_of_jammalan : public AuraScript // 12480 - Hex of Jammal'an class spell_sunken_temple_hex_of_jammalan_transform : public AuraScript { - PrepareAuraScript(spell_sunken_temple_hex_of_jammalan_transform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEX_OF_JAMMALAN_CHARM }); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 33a133b37cf..a2d27715662 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -332,8 +332,6 @@ struct boss_brutallus : public BossAI // 46394 - Burn class spell_brutallus_burn : public AuraScript { - PrepareAuraScript(spell_brutallus_burn); - void HandleEffectPeriodicUpdate(AuraEffect* aurEff) { if (aurEff->GetTickNumber() % 11 == 0) @@ -349,8 +347,6 @@ class spell_brutallus_burn : public AuraScript // 45185 - Stomp class spell_brutallus_stomp : public SpellScript { - PrepareSpellScript(spell_brutallus_stomp); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BURN }); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 18f3500416f..1e7d9b13b84 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -603,8 +603,6 @@ class go_kalecgos_spectral_rift : public GameObjectScript // 46732 - Tap Check class spell_kalecgos_tap_check : public SpellScript { - PrepareSpellScript(spell_kalecgos_tap_check); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -639,8 +637,6 @@ class SpectralBlastSelector : NonTankTargetSelector // 44869 - Spectral Blast class spell_kalecgos_spectral_blast : public SpellScript { - PrepareSpellScript(spell_kalecgos_spectral_blast); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -676,8 +672,6 @@ class spell_kalecgos_spectral_blast : public SpellScript // 44811 - Spectral Realm class spell_kalecgos_spectral_realm_trigger : public SpellScript { - PrepareSpellScript(spell_kalecgos_spectral_realm_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -707,8 +701,6 @@ class spell_kalecgos_spectral_realm_trigger : public SpellScript // 46021 - Spectral Realm class spell_kalecgos_spectral_realm_aura : public AuraScript { - PrepareAuraScript(spell_kalecgos_spectral_realm_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -736,8 +728,6 @@ class spell_kalecgos_spectral_realm_aura : public AuraScript // 45032, 45034 - Curse of Boundless Agony class spell_kalecgos_curse_of_boundless_agony : public AuraScript { - PrepareAuraScript(spell_kalecgos_curse_of_boundless_agony); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 8805c80753c..3b932075070 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -510,8 +510,6 @@ private: // 46050 - Summon Blood Elves Script class spell_summon_blood_elves_script : public SpellScript { - PrepareSpellScript(spell_summon_blood_elves_script); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonBloodElvesSpells); @@ -532,8 +530,6 @@ class spell_summon_blood_elves_script : public SpellScript // 45996 - Darkness class spell_muru_darkness : public SpellScript { - PrepareSpellScript(spell_muru_darkness); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonDarkFiendSpells); @@ -554,8 +550,6 @@ class spell_muru_darkness : public SpellScript // 45934 - Dark Fiend class spell_dark_fiend_skin : public AuraScript { - PrepareAuraScript(spell_dark_fiend_skin); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL) @@ -580,8 +574,6 @@ class spell_dark_fiend_skin : public AuraScript // 46205 - Transform Visual Missile Periodic class spell_transform_visual_missile_periodic : public AuraScript { - PrepareAuraScript(spell_transform_visual_missile_periodic); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true); @@ -596,8 +588,6 @@ class spell_transform_visual_missile_periodic : public AuraScript // 46041 - Summon Blood Elves Periodic class spell_summon_blood_elves_periodic : public AuraScript { - PrepareAuraScript(spell_summon_blood_elves_periodic); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true); @@ -612,8 +602,6 @@ class spell_summon_blood_elves_periodic : public AuraScript // 46284 - Negative Energy Periodic class spell_muru_negative_energy_periodic : public AuraScript { - PrepareAuraScript(spell_muru_negative_energy_periodic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 0c5ed3dbc58..cf321021290 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -112,8 +112,6 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader class spell_hexlord_unstable_affliction_AuraScript : public AuraScript { - PrepareAuraScript(spell_hexlord_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_WL_UNSTABLE_AFFL_DISPEL }); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index f7de0c791ac..d5e0e4f31d5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -410,8 +410,6 @@ private: // 96682 - Decapitate class spell_mandokir_decapitate : public SpellScript { - PrepareSpellScript(spell_mandokir_decapitate); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -439,8 +437,6 @@ class spell_mandokir_decapitate : public SpellScript // 96776 - Bloodletting class spell_mandokir_bloodletting : public AuraScript { - PrepareAuraScript(spell_mandokir_bloodletting); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BLOODLETTING_DAMAGE, SPELL_BLOODLETTING_HEAL }); @@ -470,8 +466,6 @@ class spell_mandokir_bloodletting : public AuraScript // 96821 - Spirit's Vengeance Cancel class spell_mandokir_spirit_vengeance_cancel : public SpellScript { - PrepareSpellScript(spell_mandokir_spirit_vengeance_cancel); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -508,8 +502,6 @@ class DevastatingSlamTargetSelector // 96761 - Devastating Slam class spell_mandokir_devastating_slam : public SpellScript { - PrepareSpellScript(spell_mandokir_devastating_slam); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(DevastatingSlamTargetSelector(GetCaster()->ToCreature(), GetCaster()->GetVictim())); @@ -556,8 +548,6 @@ class spell_mandokir_devastating_slam : public SpellScript // 96721 - Ohgan's Orders class spell_mandokir_ohgan_orders : public SpellScript { - PrepareSpellScript(spell_mandokir_ohgan_orders); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -585,8 +575,6 @@ class spell_mandokir_ohgan_orders : public SpellScript // 96722 - Ohgan's Orders class spell_mandokir_ohgan_orders_trigger : public AuraScript { - PrepareAuraScript(spell_mandokir_ohgan_orders_trigger); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -610,8 +598,6 @@ class spell_mandokir_ohgan_orders_trigger : public AuraScript // 96724 - Reanimate Ohgan class spell_mandokir_reanimate_ohgan : public SpellScript { - PrepareSpellScript(spell_mandokir_reanimate_ohgan); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 508eb441582..77a958a31ed 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -33,8 +33,6 @@ enum TeleportToRazelikh // 27686 - Teleport to Razelikh (GROUP) class spell_razelikh_teleport_group : public SpellScript { - PrepareSpellScript(spell_razelikh_teleport_group); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_SINGLE, SPELL_TELEPORT_SINGLE_IN_GROUP }); diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp index 2f1b2c51517..0020eb30559 100644 --- a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp +++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp @@ -375,8 +375,6 @@ public: class spell_a_trip_to_ironforge_quest_complete_SpellScript : public SpellScript { - PrepareSpellScript(spell_a_trip_to_ironforge_quest_complete_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -407,8 +405,6 @@ public: class spell_follow_that_gyrocopter_quest_start_SpellScript : public SpellScript { - PrepareSpellScript(spell_follow_that_gyrocopter_quest_start_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -439,8 +435,6 @@ public: class spell_low_health_SpellScript : public SpellScript { - PrepareSpellScript(spell_low_health_SpellScript); - void HandleDummyEffect(SpellEffIndex /*eff*/) { if (Creature* target = GetHitCreature()) diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index cbeaf452188..60c69ab9851 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -32,8 +32,6 @@ enum MaraudersOfDarrowshire // 17271 - Test Fetid Skull class spell_eastern_plaguelands_test_fetid_skull : public SpellScript { - PrepareSpellScript(spell_eastern_plaguelands_test_fetid_skull); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CREATE_RESONATING_SKULL, SPELL_CREATE_BONE_DUST }); diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index 66435eb86dc..263c764a098 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -692,8 +692,6 @@ private: // 228928 - Stealth class spell_stealth_vanessa_human_heritage : public AuraScript { - PrepareAuraScript(spell_stealth_vanessa_human_heritage); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetDisplayId(DISPLAY_VANESSA_INVISIBLE); diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index c43de96c55d..4054d4ff6f5 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -221,8 +221,6 @@ enum MagicalChainsHauler // 84238 - Magical Chains (Hauler) class spell_silverpine_magical_chains_hauler : public AuraScript { - PrepareAuraScript(spell_silverpine_magical_chains_hauler); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -938,8 +936,6 @@ enum RaiseForsakenCometh // 83173 - Raise Forsaken class spell_silverpine_raise_forsaken_83173 : public AuraScript { - PrepareAuraScript(spell_silverpine_raise_forsaken_83173); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1083,8 +1079,6 @@ enum SpellForsakenTrooperMasterScriptCometh // 83149 - Forsaken Trooper Master Script (Forsaken High Command) class spell_silverpine_forsaken_trooper_masterscript_high_command : public SpellScript { - PrepareSpellScript(spell_silverpine_forsaken_trooper_masterscript_high_command); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1271,8 +1265,6 @@ private: // 80365 - Flurry of Claws class spell_silverpine_flurry_of_claws : public AuraScript { - PrepareAuraScript(spell_silverpine_flurry_of_claws); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -3196,8 +3188,6 @@ private: // 83840 - Despawn All Summons class spell_silverpine_despawn_all_summons_steel_thunder : public SpellScript { - PrepareSpellScript(spell_silverpine_despawn_all_summons_steel_thunder); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -3402,8 +3392,6 @@ enum PickUpOrcCrate // 83838 - Pick Up Orc Crate class spell_silverpine_pick_up_orc_crate : public SpellScript { - PrepareSpellScript(spell_silverpine_pick_up_orc_crate); - bool Validate(SpellInfo const* /*spellInfi*/) override { return ValidateSpellInfo @@ -3722,8 +3710,6 @@ private: // 83902 - Release Diseased Mutant Bush Chicken class spell_silverpine_release_diseased_mutant_bush_chicken : public SpellScript { - PrepareSpellScript(spell_silverpine_release_diseased_mutant_bush_chicken); - void HandleHit(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -3793,8 +3779,6 @@ enum FreeWebbedVictim // 83919 - Free Webbed Victim class spell_silverpine_free_webbed_victim_random : public SpellScript { - PrepareSpellScript(spell_silverpine_free_webbed_victim_random); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -4085,8 +4069,6 @@ enum BondoftheValkyr // 83979 - Bond of the Val'kyr class spell_silverpine_bond_of_the_valkyr : public AuraScript { - PrepareAuraScript(spell_silverpine_bond_of_the_valkyr); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_AGATHA_FENRIS }); @@ -4383,8 +4365,6 @@ enum NotifyAgatha // 83990 - Notify Agatha class spell_silverpine_notify_agatha : public SpellScript { - PrepareSpellScript(spell_silverpine_notify_agatha); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RISE_FORSAKEN_FENRIS }); @@ -4446,8 +4426,6 @@ enum SpellForsakenTrooperMasterScriptFenrisIsle // 83997 - Forsaken Trooper Master Script (Fenris Isle) class spell_silverpine_forsaken_trooper_masterscript_fenris_isle : public SpellScript { - PrepareSpellScript(spell_silverpine_forsaken_trooper_masterscript_fenris_isle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -4837,8 +4815,6 @@ enum SummonFenrisActors // 84053 - Summon Fenris Actors class spell_silverpine_summon_fenris_keep_actors : public SpellScript { - PrepareSpellScript(spell_silverpine_summon_fenris_keep_actors); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp index e0da4c64877..c6e52086289 100644 --- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp @@ -85,8 +85,6 @@ public: class spell_siege_cannon_SpellScript : public SpellScript { - PrepareSpellScript(spell_siege_cannon_SpellScript); - void SelectRandomTarget(std::list<WorldObject*>& targets) { if (targets.empty()) diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index b7aad7ddd9b..d91500c33d7 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -333,8 +333,6 @@ enum DragonmawShinbones // 8856 - Bending Shinbone class spell_undercity_bending_shinbone : public SpellScript { - PrepareSpellScript(spell_undercity_bending_shinbone); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BENDING_SHINBONE1, SPELL_BENDING_SHINBONE2 }); diff --git a/src/server/scripts/Events/brewfest.cpp b/src/server/scripts/Events/brewfest.cpp index ce07e6c0417..1c00e87ea93 100644 --- a/src/server/scripts/Events/brewfest.cpp +++ b/src/server/scripts/Events/brewfest.cpp @@ -45,8 +45,6 @@ enum RamBlaBla // 42924 - Giddyup! class spell_brewfest_giddyup : public AuraScript { - PrepareAuraScript(spell_brewfest_giddyup); - void OnChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -105,8 +103,6 @@ class spell_brewfest_giddyup : public AuraScript // 42994 - Ram - Gallop class spell_brewfest_ram : public AuraScript { - PrepareAuraScript(spell_brewfest_ram); - void OnPeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); @@ -158,8 +154,6 @@ class spell_brewfest_ram : public AuraScript // 43052 - Ram Fatigue class spell_brewfest_ram_fatigue : public AuraScript { - PrepareAuraScript(spell_brewfest_ram_fatigue); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -185,8 +179,6 @@ class spell_brewfest_ram_fatigue : public AuraScript // 43450 - Brewfest - apple trap - friendly DND class spell_brewfest_apple_trap : public AuraScript { - PrepareAuraScript(spell_brewfest_apple_trap); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAura(SPELL_RAM_FATIGUE); @@ -201,8 +193,6 @@ class spell_brewfest_apple_trap : public AuraScript // 43332 - Exhausted Ram class spell_brewfest_exhausted_ram : public AuraScript { - PrepareAuraScript(spell_brewfest_exhausted_ram); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -218,8 +208,6 @@ class spell_brewfest_exhausted_ram : public AuraScript // 43714 - Brewfest - Relay Race - Intro - Force - Player to throw- DND class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript { - PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -237,8 +225,6 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript // 43755 - Brewfest - Daily - Relay Race - Player - Increase Mount Duration - DND class spell_brewfest_relay_race_turn_in : public SpellScript { - PrepareSpellScript(spell_brewfest_relay_race_turn_in); - void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -259,8 +245,6 @@ class spell_brewfest_relay_race_turn_in : public SpellScript // 43876 - Dismount Ram class spell_brewfest_dismount_ram : public SpellScript { - PrepareSpellScript(spell_brewfest_dismount_ram); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->RemoveAura(SPELL_RENTAL_RACING_RAM); @@ -313,8 +297,6 @@ enum RamBlub // 43262 Brewfest - Barker Bunny 4 class spell_brewfest_barker_bunny : public AuraScript { - PrepareAuraScript(spell_brewfest_barker_bunny); - bool Load() override { return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; @@ -366,8 +348,6 @@ enum BrewfestMountTransformation // 52845 - Brewfest Mount Transformation (Faction Swap) class spell_brewfest_mount_transformation : public SpellScript { - PrepareSpellScript(spell_brewfest_mount_transformation); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -451,8 +431,6 @@ enum WildWinterPilsner // 50098 - The Beast Within class spell_brewfest_botm_the_beast_within : public AuraScript { - PrepareAuraScript(spell_brewfest_botm_the_beast_within); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_UNLEASH_THE_BEAST }); @@ -477,8 +455,6 @@ enum IzzardsEverFlavor // 49864 - Gassy class spell_brewfest_botm_gassy : public AuraScript { - PrepareAuraScript(spell_brewfest_botm_gassy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_BELCH_BREW_BELCH_VISUAL }); @@ -503,8 +479,6 @@ enum MetoksBubbleBock // 49822 - Bloated class spell_brewfest_botm_bloated : public AuraScript { - PrepareAuraScript(spell_brewfest_botm_bloated); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_BUBBLE_BREW_TRIGGER_MISSILE }); @@ -529,8 +503,6 @@ enum BlackrockLager // 49738 - Internal Combustion class spell_brewfest_botm_internal_combustion : public AuraScript { - PrepareAuraScript(spell_brewfest_botm_internal_combustion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_BELCH_FIRE_VISUAL }); @@ -555,8 +527,6 @@ enum StranglethornBrew // 49962 - Jungle Madness! class spell_brewfest_botm_jungle_madness : public SpellScript { - PrepareSpellScript(spell_brewfest_botm_jungle_madness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_JUNGLE_BREW_VISION_EFFECT }); @@ -582,8 +552,6 @@ enum BinaryBrew // 50243 - Teach Language class spell_brewfest_botm_teach_language : public SpellScript { - PrepareSpellScript(spell_brewfest_botm_teach_language); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LEARN_GNOMISH_BINARY, SPELL_LEARN_GOBLIN_BINARY }); @@ -609,8 +577,6 @@ enum CreateEmptyBrewBottle // 42254, 42255, 42256, 42257, 42258, 42259, 42260, 42261, 42263, 42264, 43959, 43961 - Weak Alcohol class spell_brewfest_botm_weak_alcohol : public SpellScript { - PrepareSpellScript(spell_brewfest_botm_weak_alcohol); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BOTM_CREATE_EMPTY_BREW_BOTTLE }); @@ -636,8 +602,6 @@ enum EmptyBottleThrow // 51694 - BOTM - Empty Bottle Throw - Resolve class spell_brewfest_botm_empty_bottle_throw_resolve : public SpellScript { - PrepareSpellScript(spell_brewfest_botm_empty_bottle_throw_resolve); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Events/hallows_end.cpp b/src/server/scripts/Events/hallows_end.cpp index 3744aaca6ed..d868a1eebec 100644 --- a/src/server/scripts/Events/hallows_end.cpp +++ b/src/server/scripts/Events/hallows_end.cpp @@ -44,8 +44,6 @@ std::array<uint32, 4> const CandysSpells = // 24930 - Hallow's End Candy class spell_hallow_end_candy : public SpellScript { - PrepareSpellScript(spell_hallow_end_candy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CandysSpells); @@ -65,8 +63,6 @@ class spell_hallow_end_candy : public SpellScript // 24926 - Hallow's End Candy class spell_hallow_end_candy_pirate : public AuraScript { - PrepareAuraScript(spell_hallow_end_candy_pirate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -112,8 +108,6 @@ enum TrickSpells // 24750 - Trick class spell_hallow_end_trick : public SpellScript { - PrepareSpellScript(spell_hallow_end_trick); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -182,8 +176,6 @@ enum TrickOrTreatSpells // 24751 - Trick or Treat class spell_hallow_end_trick_or_treat : public SpellScript { - PrepareSpellScript(spell_hallow_end_trick_or_treat); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TRICK, SPELL_TREAT, SPELL_TRICKED_OR_TREATED }); @@ -208,8 +200,6 @@ class spell_hallow_end_trick_or_treat : public SpellScript // 44436 - Tricky Treat class spell_hallow_end_tricky_treat : public SpellScript { - PrepareSpellScript(spell_hallow_end_tricky_treat); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -248,8 +238,6 @@ enum HallowendData // 24717, 24718, 24719, 24720, 24724, 24733, 24737, 24741 class spell_hallow_end_wand : public SpellScript { - PrepareSpellScript(spell_hallow_end_wand); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Events/love_is_in_the_air.cpp b/src/server/scripts/Events/love_is_in_the_air.cpp index c79aea25f16..937aefd7fa7 100644 --- a/src/server/scripts/Events/love_is_in_the_air.cpp +++ b/src/server/scripts/Events/love_is_in_the_air.cpp @@ -37,8 +37,6 @@ enum SpellsPicnic // 45102 - Romantic Picnic class spell_love_is_in_the_air_romantic_picnic : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -131,8 +129,6 @@ std::array<uint32, 8> const CreateHeartCandySpells = // 26678 - Create Heart Candy class spell_love_is_in_the_air_create_heart_candy : public SpellScript { - PrepareSpellScript(spell_love_is_in_the_air_create_heart_candy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CreateHeartCandySpells); @@ -161,8 +157,6 @@ enum SomethingStinks // 70192 - Fragrant Air Analysis class spell_love_is_in_the_air_fragrant_air_analysis : public SpellScript { - PrepareSpellScript(spell_love_is_in_the_air_fragrant_air_analysis); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -182,8 +176,6 @@ class spell_love_is_in_the_air_fragrant_air_analysis : public SpellScript // 71507 - Heavily Perfumed class spell_love_is_in_the_air_heavily_perfumed : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_heavily_perfumed); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -203,8 +195,6 @@ class spell_love_is_in_the_air_heavily_perfumed : public AuraScript // 71508 - Recently Analyzed class spell_love_is_in_the_air_recently_analyzed : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_recently_analyzed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEAVILY_PERFUMED }); @@ -229,8 +219,6 @@ class spell_love_is_in_the_air_recently_analyzed : public AuraScript // 69438 - Sample Satisfaction class spell_love_is_in_the_air_sample_satisfaction : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_sample_satisfaction); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (roll_chance_i(30)) @@ -258,8 +246,6 @@ enum PilferingPerfume // 71450 - Crown Parcel Service Uniform class spell_love_is_in_the_air_service_uniform : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_service_uniform); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -293,8 +279,6 @@ class spell_love_is_in_the_air_service_uniform : public AuraScript // 71539 - Crown Chemical Co. Supplies class spell_love_is_in_the_air_cancel_service_uniform : public SpellScript { - PrepareSpellScript(spell_love_is_in_the_air_cancel_service_uniform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SERVICE_UNIFORM }); @@ -319,8 +303,6 @@ class spell_love_is_in_the_air_cancel_service_uniform : public SpellScript // 68530 - Cologne Immune class spell_love_is_in_the_air_perfume_cologne_immune : public SpellScript { - PrepareSpellScript(spell_love_is_in_the_air_perfume_cologne_immune); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Events/lunar_festival.cpp b/src/server/scripts/Events/lunar_festival.cpp index bfdc590655e..be76c67d088 100644 --- a/src/server/scripts/Events/lunar_festival.cpp +++ b/src/server/scripts/Events/lunar_festival.cpp @@ -427,8 +427,6 @@ enum EluneCandle // 26374 - Elune's Candle class spell_lunar_festival_elune_candle : public SpellScript { - PrepareSpellScript(spell_lunar_festival_elune_candle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Events/midsummer.cpp b/src/server/scripts/Events/midsummer.cpp index 2e28d3f18c3..c6e638e0b22 100644 --- a/src/server/scripts/Events/midsummer.cpp +++ b/src/server/scripts/Events/midsummer.cpp @@ -35,8 +35,6 @@ enum TorchSpells // 45724 - Braziers Hit! class spell_midsummer_braziers_hit : public AuraScript { - PrepareAuraScript(spell_midsummer_braziers_hit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -73,8 +71,6 @@ class spell_midsummer_braziers_hit : public AuraScript // 45907 - Torch Target Picker class spell_midsummer_torch_target_picker : public SpellScript { - PrepareSpellScript(spell_midsummer_torch_target_picker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TARGET_INDICATOR_COSMETIC, SPELL_TARGET_INDICATOR }); @@ -96,8 +92,6 @@ class spell_midsummer_torch_target_picker : public SpellScript // 46054 - Torch Toss (land) class spell_midsummer_torch_toss_land : public SpellScript { - PrepareSpellScript(spell_midsummer_torch_toss_land); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BRAZIERS_HIT }); @@ -128,8 +122,6 @@ enum RibbonPoleData // 29705, 29726, 29727 - Test Ribbon Pole Channel class spell_midsummer_test_ribbon_pole_channel : public AuraScript { - PrepareAuraScript(spell_midsummer_test_ribbon_pole_channel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -173,8 +165,6 @@ class spell_midsummer_test_ribbon_pole_channel : public AuraScript // 45406 - Holiday - Midsummer, Ribbon Pole Periodic Visual class spell_midsummer_ribbon_pole_periodic_visual : public AuraScript { - PrepareAuraScript(spell_midsummer_ribbon_pole_periodic_visual); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -220,8 +210,6 @@ enum JugglingTorch // 45819 - Throw Torch class spell_midsummer_juggle_torch : public SpellScript { - PrepareSpellScript(spell_midsummer_juggle_torch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -277,8 +265,6 @@ class spell_midsummer_juggle_torch : public SpellScript // 45644 - Juggle Torch (Catch) class spell_midsummer_torch_catch : public SpellScript { - PrepareSpellScript(spell_midsummer_torch_catch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GIVE_TORCH }); @@ -314,8 +300,6 @@ enum FlingTorch // 46747 - Fling torch class spell_midsummer_fling_torch : public SpellScript { - PrepareSpellScript(spell_midsummer_fling_torch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLING_TORCH_TRIGGERED, SPELL_FLING_TORCH_SHADOW }); @@ -337,8 +321,6 @@ class spell_midsummer_fling_torch : public SpellScript // 45669 - Fling Torch class spell_midsummer_fling_torch_triggered : public SpellScript { - PrepareSpellScript(spell_midsummer_fling_torch_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_JUGGLE_TORCH_MISSED }); @@ -366,8 +348,6 @@ class spell_midsummer_fling_torch_triggered : public SpellScript // 45671 - Juggle Torch (Catch, Quest) class spell_midsummer_fling_torch_catch : public SpellScript { - PrepareSpellScript(spell_midsummer_fling_torch_catch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -427,8 +407,6 @@ class spell_midsummer_fling_torch_catch : public SpellScript // 45676 - Juggle Torch (Quest, Missed) class spell_midsummer_fling_torch_missed : public SpellScript { - PrepareSpellScript(spell_midsummer_fling_torch_missed); - void FilterTargets(std::list<WorldObject*>& targets) { // This spell only hits the caster diff --git a/src/server/scripts/Events/operation_gnomeregan.cpp b/src/server/scripts/Events/operation_gnomeregan.cpp index 9e3be9e2180..127c0359ecd 100644 --- a/src/server/scripts/Events/operation_gnomeregan.cpp +++ b/src/server/scripts/Events/operation_gnomeregan.cpp @@ -35,8 +35,6 @@ enum BasicOrdersEmote 73886 - [DND] Test Stop Dance */ class spell_operation_gnomeregan_basic_orders_emote : public AuraScript { - PrepareAuraScript(spell_operation_gnomeregan_basic_orders_emote); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); diff --git a/src/server/scripts/Events/pilgrims_bounty.cpp b/src/server/scripts/Events/pilgrims_bounty.cpp index 65c4943b045..9d0b8f7ad53 100644 --- a/src/server/scripts/Events/pilgrims_bounty.cpp +++ b/src/server/scripts/Events/pilgrims_bounty.cpp @@ -36,8 +36,6 @@ enum PilgrimsBountyBuffFood class spell_pilgrims_bounty_buff_food : public AuraScript { - PrepareAuraScript(spell_pilgrims_bounty_buff_food); -private: uint32 const _triggeredSpellId; public: @@ -86,8 +84,6 @@ enum FeastOnSpells 61788 - Feast On Stuffing */ class spell_pilgrims_bounty_feast_on : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_feast_on); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) @@ -156,8 +152,6 @@ enum TheTurkinator // 62014 - Turkey Tracker class spell_pilgrims_bounty_turkey_tracker : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_turkey_tracker); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_KILL_COUNTER_VISUAL, SPELL_KILL_COUNTER_VISUAL_MAX }); @@ -212,8 +206,6 @@ enum SpiritOfSharing class spell_pilgrims_bounty_well_fed : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_well_fed); - uint32 _triggeredSpellId; public: @@ -301,8 +293,6 @@ enum BountifulTableMisc 66262 - Pass The Sweet Potatoes */ class spell_pilgrims_bounty_on_plate : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_on_plate); - uint32 _triggeredSpellId1; uint32 _triggeredSpellId2; uint32 _triggeredSpellId3; @@ -407,8 +397,6 @@ private: 61797 - Sweet Potatoes Server */ class spell_pilgrims_bounty_a_serving_of : public AuraScript { - PrepareAuraScript(spell_pilgrims_bounty_a_serving_of); - uint32 _triggeredSpellId; public: diff --git a/src/server/scripts/Events/winter_veil.cpp b/src/server/scripts/Events/winter_veil.cpp index 08ae813d055..a196b109a19 100644 --- a/src/server/scripts/Events/winter_veil.cpp +++ b/src/server/scripts/Events/winter_veil.cpp @@ -32,8 +32,6 @@ enum Mistletoe // 26218 - Mistletoe class spell_winter_veil_mistletoe : public SpellScript { - PrepareSpellScript(spell_winter_veil_mistletoe); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -78,8 +76,6 @@ std::array<uint32, 4> const WonderboltTransformSpells = // 26275 - PX-238 Winter Wondervolt TRAP class spell_winter_veil_px_238_winter_wondervolt : public SpellScript { - PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(WonderboltTransformSpells); @@ -117,8 +113,6 @@ enum ReindeerTransformation // 25860 - Reindeer Transformation class spell_winter_veil_reindeer_transformation : public SpellScript { - PrepareSpellScript(spell_winter_veil_reindeer_transformation); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Events/zalazane_fall.cpp b/src/server/scripts/Events/zalazane_fall.cpp index cdebdca63d8..f655b7db555 100644 --- a/src/server/scripts/Events/zalazane_fall.cpp +++ b/src/server/scripts/Events/zalazane_fall.cpp @@ -338,8 +338,6 @@ typedef npc_troll_volunteer VolunteerAI; // 75420 - Mounting Check class spell_mount_check : public AuraScript { - PrepareAuraScript(spell_mount_check); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MOUNTING_CHECK }); @@ -374,8 +372,6 @@ class spell_mount_check : public AuraScript // 75102 - Vol'jin's War Drums class spell_voljin_war_drums : public SpellScript { - PrepareSpellScript(spell_voljin_war_drums); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MOTIVATE_1, SPELL_MOTIVATE_2 }); diff --git a/src/server/scripts/ExilesReach/zone_exiles_reach.cpp b/src/server/scripts/ExilesReach/zone_exiles_reach.cpp index ddca35f8082..fb9c65ad462 100644 --- a/src/server/scripts/ExilesReach/zone_exiles_reach.cpp +++ b/src/server/scripts/ExilesReach/zone_exiles_reach.cpp @@ -63,8 +63,6 @@ enum AttentionExilesReachData // 290901 - Attention! class spell_attention_exiles_reach_tutorial : public AuraScript { - PrepareAuraScript(spell_attention_exiles_reach_tutorial); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEBUG_LOOK_RIGHT }); @@ -286,8 +284,6 @@ public: // 325108 - Summon Throg - Combat Training (DNT) class spell_summon_sparring_partner : public SpellScript { - PrepareSpellScript(spell_summon_sparring_partner); - void SelectTarget(WorldObject*& target) { Player* caster = GetCaster()->ToPlayer(); @@ -987,8 +983,6 @@ enum KnockedDownExilesReachData // 305445 - Knocked Down! class spell_knocked_down_exiles_reach_beach : public AuraScript { - PrepareAuraScript(spell_knocked_down_exiles_reach_beach); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_KNOCKED_DOWN_STUN2 }); @@ -1057,8 +1051,6 @@ enum SpellCrashLandedData template<uint32 StaticCaptainNPCId> class spell_crash_landed_generic : public SpellScript { - PrepareSpellScript(spell_crash_landed_generic); - void HandleEffect(SpellEffIndex /*effIndex*/) { Player* player = GetCaster()->ToPlayer(); @@ -2032,8 +2024,6 @@ public: // 325076 - Summon Warlord Grimaxe class spell_summon_survivor_beach : public SpellScript { - PrepareSpellScript(spell_summon_survivor_beach); - void SelectTarget(WorldObject*& target) { Player* caster = GetCaster()->ToPlayer(); diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 4161a3a8ce1..c4fcea58e01 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -209,8 +209,6 @@ public: class spell_subjugator_korul_darkness_calls_SpellScript : public SpellScript { - PrepareSpellScript(spell_subjugator_korul_darkness_calls_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* hitUnit = GetHitUnit()) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index d42358717ac..f23b7b017b5 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -259,8 +259,6 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader class spell_anetheron_vampiric_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_anetheron_vampiric_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VAMPIRIC_AURA_HEAL }); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index aa00bf7eb1a..438c6e33a53 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -571,8 +571,6 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader class spell_archimonde_drain_world_tree_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_archimonde_drain_world_tree_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRAIN_WORLD_TREE_TRIGGERED }); @@ -599,8 +597,6 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader // Protection of Elune 38528 class spell_protection_of_elune : public AuraScript { - PrepareAuraScript(spell_protection_of_elune); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 7cdc1f54b48..988de4af818 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -184,8 +184,6 @@ class spell_mark_of_kazrogal : public SpellScriptLoader class spell_mark_of_kazrogal_SpellScript : public SpellScript { - PrepareSpellScript(spell_mark_of_kazrogal_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(MarkTargetFilter()); @@ -199,8 +197,6 @@ class spell_mark_of_kazrogal : public SpellScriptLoader class spell_mark_of_kazrogal_AuraScript : public AuraScript { - PrepareAuraScript(spell_mark_of_kazrogal_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MARK_DAMAGE }); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index 70f97948f7c..553ce106554 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -143,8 +143,6 @@ class boss_salramm : public CreatureScript // 52708 - Steal Flesh class spell_salramm_steal_flesh : public AuraScript { - PrepareAuraScript(spell_salramm_steal_flesh); - void HandlePeriodic(AuraEffect const* /*eff*/) { GetCaster()->CastSpell(GetCaster(), SPELL_STEAL_FLESH_BUFF, true); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 651a6337b4d..6c432a8929a 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1658,8 +1658,6 @@ struct npc_stratholme_rp_dummy : NullCreatureAI // 50773 - Crusader Strike class spell_stratholme_crusader_strike : public SpellScript { - PrepareSpellScript(spell_stratholme_crusader_strike); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index a3aeb643c55..922cc03230a 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -504,8 +504,6 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader class spell_alysrazor_cosmetic_egg_xplosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_alysrazor_cosmetic_egg_xplosion_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(MODEL_INVISIBLE_STALKER)) @@ -540,8 +538,6 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader class spell_alysrazor_turn_monstrosity_SpellScript : public SpellScript { - PrepareSpellScript(spell_alysrazor_turn_monstrosity_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -626,8 +622,6 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader class spell_alysrazor_aggro_closest_SpellScript : public SpellScript { - PrepareSpellScript(spell_alysrazor_aggro_closest_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -666,8 +660,6 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader class spell_alysrazor_fieroblast_SpellScript : public SpellScript { - PrepareSpellScript(spell_alysrazor_fieroblast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIRE_IT_UP }); diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index be6aee37e4d..fc9e400c7a0 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -315,8 +315,6 @@ private: // http://www.wowhead.com/spell=99342/blades-of-baloroc class spell_baleroc_blades_of_baleroc : public SpellScript { - PrepareSpellScript(spell_baleroc_blades_of_baleroc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_INFERNO_BLADE, SPELL_DECIMATION_BLADE }); @@ -354,8 +352,6 @@ class spell_baleroc_blades_of_baleroc : public SpellScript // http://www.wowhead.com/spell=99350/inferno-blade class spell_baleroc_inferno_blade : public AuraScript { - PrepareAuraScript(spell_baleroc_inferno_blade); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -383,8 +379,6 @@ class spell_baleroc_inferno_blade : public AuraScript // http://www.wowhead.com/spell=99352/decimation-blade class spell_baleroc_decimation_blade : public AuraScript { - PrepareAuraScript(spell_baleroc_decimation_blade); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -412,8 +406,6 @@ class spell_baleroc_decimation_blade : public AuraScript // http://www.wowhead.com/spell=99353/decimating-strike class spell_baleroc_decimating_strike : public SpellScript { - PrepareSpellScript(spell_baleroc_decimating_strike); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) @@ -437,8 +429,6 @@ class spell_baleroc_decimating_strike : public SpellScript // http://www.wowhead.com/spell=99515/countdown class spell_baleroc_countdown_aoe_dummy : public SpellScript { - PrepareSpellScript(spell_baleroc_countdown_aoe_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COUNTDOWN_VISUAL_LINK, SPELL_COUNTDOWN_AURA }); @@ -489,8 +479,6 @@ class spell_baleroc_countdown_aoe_dummy : public SpellScript // http://www.wowhead.com/spell=99516/countdown class spell_baleroc_countdown : public AuraScript { - PrepareAuraScript(spell_baleroc_countdown); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COUNTDOWN_VISUAL_LINK, SPELL_COUNTDOWN_AOE_EXPLOSION }); @@ -512,8 +500,6 @@ class spell_baleroc_countdown : public AuraScript // http://www.wowhead.com/spell=99517/countdown class spell_baleroc_countdown_proximity_check : public SpellScript { - PrepareSpellScript(spell_baleroc_countdown_proximity_check); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COUNTDOWN_AURA }); @@ -542,8 +528,6 @@ class spell_baleroc_countdown_proximity_check : public SpellScript // http://www.wowhead.com/spell=99259/shards-of-torment class spell_baleroc_shards_of_torment_target_search : public SpellScript { - PrepareSpellScript(spell_baleroc_shards_of_torment_target_search); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHARDS_OF_TORMENT_SUMMON }); @@ -637,8 +621,6 @@ class spell_baleroc_shards_of_torment_target_search : public SpellScript // http://www.wowhead.com/spell=99253/torment class spell_baleroc_torment_target_search : public SpellScript { - PrepareSpellScript(spell_baleroc_torment_target_search); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TORMENT_PERIODIC }); @@ -676,8 +658,6 @@ class spell_baleroc_torment_target_search : public SpellScript // http://www.wowhead.com/spell=99256/torment class spell_baleroc_torment : public SpellScript { - PrepareSpellScript(spell_baleroc_torment); - void ModifyDamage() { SetHitDamage(GetHitDamage() * GetHitUnit()->GetAuraCount(GetSpellInfo()->Id)); @@ -691,8 +671,6 @@ class spell_baleroc_torment : public SpellScript class spell_baleroc_torment_AuraScript : public AuraScript { - PrepareAuraScript(spell_baleroc_torment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VITAL_FLAME, SPELL_VITAL_SPARK, SPELL_TORMENTED }); @@ -729,8 +707,6 @@ class spell_baleroc_torment_AuraScript : public AuraScript // http://www.wowhead.com/spell=99257/tormented class spell_baleroc_tormented : public AuraScript { - PrepareAuraScript(spell_baleroc_tormented); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetTarget()->GetInstanceScript()) @@ -747,8 +723,6 @@ class spell_baleroc_tormented : public AuraScript // http://www.wowhead.com/spell=99489/tormented class spell_baleroc_tormented_spread : public SpellScript { - PrepareSpellScript(spell_baleroc_tormented_spread); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TORMENTED }); @@ -769,8 +743,6 @@ class spell_baleroc_tormented_spread : public SpellScript // http://www.wowhead.com/spell=99262/vital-spark class spell_baleroc_vital_spark : public AuraScript { - PrepareAuraScript(spell_baleroc_vital_spark); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLAZE_OF_GLORY, SPELL_VITAL_FLAME }); @@ -793,8 +765,6 @@ class spell_baleroc_vital_spark : public AuraScript // http://www.wowhead.com/spell=99263/vital-flame class spell_baleroc_vital_flame : public AuraScript { - PrepareAuraScript(spell_baleroc_vital_flame); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellEffect({ { SPELL_VITAL_SPARK, EFFECT_0 } }); diff --git a/src/server/scripts/Kalimdor/Firelands/firelands.cpp b/src/server/scripts/Kalimdor/Firelands/firelands.cpp index fb24dae1445..243894203b7 100644 --- a/src/server/scripts/Kalimdor/Firelands/firelands.cpp +++ b/src/server/scripts/Kalimdor/Firelands/firelands.cpp @@ -248,8 +248,6 @@ struct npc_firelands_magmakin : public ScriptedAI // http://www.wowhead.com/spell=100799/fiery-torment class spell_firelands_fiery_torment : public SpellScript { - PrepareSpellScript(spell_firelands_fiery_torment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIERY_TORMENT_DAMAGE }); @@ -280,8 +278,6 @@ class spell_firelands_fiery_torment : public SpellScript // http://www.wowhead.com/spell=101092/smouldering class spell_firelands_smouldering : public SpellScript { - PrepareSpellScript(spell_firelands_smouldering); - void CheckQuestStatus(std::list<WorldObject*>& targets) { uint32 questId = 0; @@ -320,8 +316,6 @@ class spell_firelands_smouldering : public SpellScript // http://www.wowhead.com/spell=101093/smouldering class spell_firelands_smouldering_aura : public SpellScript { - PrepareSpellScript(spell_firelands_smouldering_aura); - void SetTarget(WorldObject*& target) { target = GetCaster(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index ebe2ae71072..f5da2934c7d 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -478,8 +478,6 @@ public: class spell_anraphet_alpha_beams_SpellScript : public SpellScript { - PrepareSpellScript(spell_anraphet_alpha_beams_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -510,8 +508,6 @@ public: class spell_anraphet_omega_stance_summon_SpellScript : public SpellScript { - PrepareSpellScript(spell_anraphet_omega_stance_summon_SpellScript); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f }); @@ -537,8 +533,6 @@ public: class spell_anraphet_omega_stance_spider_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_anraphet_omega_stance_spider_effect_SpellScript); - void SetDest(SpellDestination& dest) { // Do our own calculations for the destination position. diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 6f2ecff5f14..1f7c7cfd466 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -262,8 +262,6 @@ class spell_earthrager_ptah_flame_bolt : public SpellScriptLoader class spell_earthrager_ptah_flame_bolt_SpellScript : public SpellScript { - PrepareSpellScript(spell_earthrager_ptah_flame_bolt_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->IsHeroic() ? 3 : 2); @@ -288,8 +286,6 @@ public: class spell_earthrager_ptah_explosion_AuraScript : public AuraScript { - PrepareAuraScript(spell_earthrager_ptah_explosion_AuraScript); - void SetFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* ptah = GetCaster()) diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index 6ce792b6e21..a5985dea99c 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -281,8 +281,6 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader class spell_anhuur_shield_of_light_SpellScript : public SpellScript { - PrepareSpellScript(spell_anhuur_shield_of_light_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { if (InstanceScript* const script = GetCaster()->GetInstanceScript()) @@ -316,8 +314,6 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader class spell_anhuur_disable_beacon_beams_SpellScript : public SpellScript { - PrepareSpellScript(spell_anhuur_disable_beacon_beams_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue()); @@ -355,8 +351,6 @@ public: class spell_anhuur_divine_reckoning_AuraScript : public AuraScript { - PrepareAuraScript(spell_anhuur_divine_reckoning_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { if (Unit* caster = GetCaster()) diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 9a4e8f41ce5..b00858409ac 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -240,8 +240,6 @@ class spell_snufflenose_command : public SpellScriptLoader class spell_snufflenose_commandSpellScript : public SpellScript { - PrepareSpellScript(spell_snufflenose_commandSpellScript); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index f06aa6a134e..153737b1a2f 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -249,8 +249,6 @@ class spell_egg_explosion : public SpellScriptLoader class spell_egg_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_egg_explosion_SpellScript); - void HandleAfterCast() { if (Creature* buru = GetCaster()->FindNearestCreature(NPC_BURU, 5.f)) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index 2b715fba60a..c9285fe98db 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -126,8 +126,6 @@ class boss_rajaxx : public CreatureScript // 25599 - Thundercrash class spell_rajaxx_thundercrash : public SpellScript { - PrepareSpellScript(spell_rajaxx_thundercrash); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { int32 damage = GetHitUnit()->GetHealth() / 2; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index b2e762f57ac..725d8678ea1 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -216,8 +216,6 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader class spell_skeram_arcane_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_skeram_arcane_explosion_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* object) -> bool @@ -252,8 +250,6 @@ public: class spell_skeram_true_fulfillment_SpellScript : public SpellScript { - PrepareSpellScript(spell_skeram_true_fulfillment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TRUE_FULFILLMENT_2, SPELL_GENERIC_DISMOUNT }); diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index c1c627a2453..0193995fcf7 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -385,8 +385,6 @@ class spell_destroy_karangs_banner : public SpellScriptLoader class spell_destroy_karangs_banner_SpellScript : public SpellScript { - PrepareSpellScript(spell_destroy_karangs_banner_SpellScript); - void HandleAfterCast() { if (GameObject* banner = GetCaster()->FindNearestGameObject(GO_BANNER, GetSpellInfo()->GetMaxRange(true))) diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 76aa6af3c7f..e29c47b3709 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -621,8 +621,6 @@ public: // 29528 - Inoculate Nestlewood Owlkin class spell_inoculate_nestlewood : public AuraScript { - PrepareAuraScript(spell_inoculate_nestlewood); - void PeriodicTick(AuraEffect const* /*aurEff*/) { if (GetTarget()->GetTypeId() != TYPEID_UNIT) // prevent error reports in case ignored player target @@ -648,8 +646,6 @@ enum RedSnapperVeryTasty // 29866 - Cast Fishing Net class spell_azuremyst_isle_cast_fishing_net : public SpellScript { - PrepareSpellScript(spell_azuremyst_isle_cast_fishing_net); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FISHED_UP_RED_SNAPPER, SPELL_FISHED_UP_MURLOC }); diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index bf2ea648bc2..79057902202 100644 --- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp @@ -775,8 +775,6 @@ uint32 const CocoonSummonSpells[10] = // 30950 - Free Webbed Creature class spell_free_webbed : public SpellScript { - PrepareSpellScript(spell_free_webbed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells); @@ -796,8 +794,6 @@ class spell_free_webbed : public SpellScript // 31009 - Free Webbed Creature class spell_free_webbed_on_quest : public SpellScript { - PrepareSpellScript(spell_free_webbed_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREE_WEBBED_11 }); diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 38e6a8689fa..09abff2baf3 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -128,8 +128,6 @@ enum VoodooSpells // 17009 - Voodoo class spell_voodoo : public SpellScript { - PrepareSpellScript(spell_voodoo); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BREW, SPELL_GHOSTLY, SPELL_HEX1, SPELL_HEX2, SPELL_HEX3, SPELL_GROW, SPELL_LAUNCH }); diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 995e560f597..41c617f2305 100644 --- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp @@ -30,8 +30,6 @@ enum OozeZap // 42489 - Cast Ooze Zap When Energized class spell_ooze_zap : public SpellScript { - PrepareSpellScript(spell_ooze_zap); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) @@ -66,8 +64,6 @@ class spell_ooze_zap : public SpellScript // 42485 - End of Ooze Channel class spell_ooze_zap_channel_end : public SpellScript { - PrepareSpellScript(spell_ooze_zap_channel_end); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_OOZE_CHANNEL_CREDIT }); @@ -90,8 +86,6 @@ class spell_ooze_zap_channel_end : public SpellScript // 42492 - Cast Energized class spell_energize_aoe : public SpellScript { - PrepareSpellScript(spell_energize_aoe); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ENERGIZED }); @@ -136,8 +130,6 @@ enum RecoverTheCargo // 42287 - Salvage Wreckage class spell_dustwallow_marsh_salvage_wreckage : public SpellScript { - PrepareSpellScript(spell_dustwallow_marsh_salvage_wreckage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_LOCKBOX, SPELL_SUMMON_BURROWER }); diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 097b803488d..64b04472dad 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -127,8 +127,6 @@ public: class spell_swipe_honey_SpellScript : public SpellScript { - PrepareSpellScript(spell_swipe_honey_SpellScript); - SpellCastResult CheckTarget() { if (GetCaster()->FindNearestCreature(NPC_HONEY_BUNNY, 5.0f, true)) @@ -181,8 +179,6 @@ public: spell_beesbees() : SpellScriptLoader("spell_beesbees") { } class spell_beesbees_SpellScript : public SpellScript { - PrepareSpellScript(spell_beesbees_SpellScript); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { if (Creature* honey = GetCaster()->ToCreature()) @@ -228,8 +224,6 @@ public: spell_ruumbos_silly_dance() : SpellScriptLoader("spell_ruumbos_silly_dan class spell_ruumbos_silly_dance_SpellScript : public SpellScript { - PrepareSpellScript(spell_ruumbos_silly_dance_SpellScript); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { if (Player* player = GetHitPlayer()) diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index e17b927f141..e88c3a73bd3 100644 --- a/src/server/scripts/Kalimdor/zone_silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp @@ -1450,8 +1450,6 @@ class go_wind_stone : public GameObjectScript // 46595 - Summon Ice Stone Lieutenant, Trigger class spell_silithus_summon_cultist_periodic : public AuraScript { - PrepareAuraScript(spell_silithus_summon_cultist_periodic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp index 0d37c6fd8bf..05f40e1cc38 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -479,8 +479,6 @@ public: class spell_summon_wave_south_SpellScript : public SpellScript { - PrepareSpellScript(spell_summon_wave_south_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ADD_SOUTH }); @@ -513,8 +511,6 @@ public: class spell_summon_wave_west_SpellScript : public SpellScript { - PrepareSpellScript(spell_summon_wave_west_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ADD_WEST }); @@ -559,8 +555,6 @@ public: class spell_gravity_well_damage_nearby_SpellScript : public SpellScript { - PrepareSpellScript(spell_gravity_well_damage_nearby_SpellScript); - void SetRadiusMod() { GetSpell()->SetSpellValue(SPELLVALUE_RADIUS_MOD, int32(GetCaster()->GetObjectScale() * 10000 * 2 / 3)); @@ -598,8 +592,6 @@ public: class spell_gravity_well_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_gravity_well_damage_SpellScript); - void CalculateDamage(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -634,8 +626,6 @@ public: class spell_gravity_well_pull_SpellScript : public SpellScript { - PrepareSpellScript(spell_gravity_well_pull_SpellScript); - void SetRadiusMod() { GetSpell()->SetSpellValue(SPELLVALUE_RADIUS_MOD, int32(GetCaster()->GetObjectScale() * 10000 * 2 / 3)); @@ -661,8 +651,6 @@ public: class spell_seismic_shard_change_seat_SpellScript : public SpellScript { - PrepareSpellScript(spell_seismic_shard_change_seat_SpellScript); - void ExitVehicle() { GetCaster()->ExitVehicle(); @@ -688,8 +676,6 @@ public: class spell_seismic_shard_SpellScript : public SpellScript { - PrepareSpellScript(spell_seismic_shard_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* target = GetHitUnit()->ToCreature(); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 4e0e280abc0..c028cd99b47 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -193,8 +193,6 @@ public: class spell_rupture_AuraScript : public AuraScript { - PrepareAuraScript(spell_rupture_AuraScript); - void HandleEffectPeriodic(AuraEffect const* aurEff) { Unit* caster = GetCaster(); @@ -241,8 +239,6 @@ public: class spell_elementium_spike_shield_SpellScript : public SpellScript { - PrepareSpellScript(spell_elementium_spike_shield_SpellScript); - void HandleBouncerSpikes() { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index 807d4fc7da8..aee7aa6352b 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -412,8 +412,6 @@ public: class spell_s81035_stalactite_SpellScript : public SpellScript { - PrepareSpellScript(spell_s81035_stalactite_SpellScript); - void SummonStalactiteTrigger() { Unit* caster = GetCaster(); @@ -441,8 +439,6 @@ public: class spell_s81028_s80650_stalactite_SpellScript : public SpellScript { - PrepareSpellScript(spell_s81028_s80650_stalactite_SpellScript); - void ModDestHeight(SpellDestination& dest) { // All stalactite triggers should have Z position 301.3837f, but no way to relocate (not relocateoffset!) height only. @@ -472,8 +468,6 @@ public: class spell_stalactite_mod_dest_height_SpellScript : public SpellScript { - PrepareSpellScript(spell_stalactite_mod_dest_height_SpellScript); - void ModDestHeight(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -502,8 +496,6 @@ public: class spell_s92306_crystal_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_s92306_crystal_storm_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRYSTAL_STORM_TRIGGER }); @@ -554,8 +546,6 @@ public: class spell_s92300_crystal_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_s92300_crystal_storm_SpellScript); - void FilterTargets(std::list<WorldObject*>& unitList) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index faf71a4dc97..db0a43b6f8c 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -278,8 +278,6 @@ class spell_force_of_earth : public SpellScriptLoader class spell_force_of_earth_SpellScript : public SpellScript { - PrepareSpellScript(spell_force_of_earth_SpellScript); - void DummyEffect(SpellEffIndex /*effIndex*/) { GetCaster()->SetDisplayId(26693); // can be moved to SAI part, need sniffs to see what this dummy does (note: npc 43552) @@ -305,8 +303,6 @@ class spell_sc_twilight_documents : public SpellScriptLoader class spell_sc_twilight_documents_SpellScript : public SpellScript { - PrepareSpellScript(spell_sc_twilight_documents_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetGameObjectTemplate(GAMEOBJECT_TWILIGHT_DOCUMENTS)) @@ -350,8 +346,6 @@ class spell_sc_quake : public SpellScriptLoader class spell_sc_quake_SpellScript : public SpellScript { - PrepareSpellScript(spell_sc_quake_SpellScript); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove_if(JumpCheck()); diff --git a/src/server/scripts/Maelstrom/zone_deepholm.cpp b/src/server/scripts/Maelstrom/zone_deepholm.cpp index afe4a95cfe1..7b35b41b257 100644 --- a/src/server/scripts/Maelstrom/zone_deepholm.cpp +++ b/src/server/scripts/Maelstrom/zone_deepholm.cpp @@ -33,8 +33,6 @@ enum AllOurFriendsAreDead // 79614 - Spirit Totem class spell_spirit_totem : public SpellScript { - PrepareSpellScript(spell_spirit_totem); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SPEAK_TO_FALLEN_SPIRIT_FEMALE, SPELL_SPEAK_TO_FALLEN_SPIRIT_MALE }); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp index 53bec1821d0..e6527f59799 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/ahnkahet.cpp @@ -25,8 +25,6 @@ // 56584 - Combined Toxins class spell_ahnkahet_combined_toxins : public AuraScript { - PrepareAuraScript(spell_ahnkahet_combined_toxins); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { // only procs on poisons (damage class check to exclude stuff like Envenom) @@ -43,8 +41,6 @@ class spell_ahnkahet_combined_toxins : public AuraScript // 56698, 59102 - Shadow Blast class spell_ahnkahet_shadow_blast : public SpellScript { - PrepareSpellScript(spell_ahnkahet_shadow_blast); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -69,8 +65,6 @@ enum ShadowSickle // 56702, 59103 - Shadow Sickle class spell_ahnkahet_shadow_sickle : public AuraScript { - PrepareAuraScript(spell_ahnkahet_shadow_sickle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_SICKLE_TRIGGERED }); @@ -108,8 +102,6 @@ class spell_ahnkahet_shadow_sickle : public AuraScript // 58906, 58908, 58909, 58910 - Creature - Yogg-Saron Whisper class spell_ahnkahet_yogg_saron_whisper : public SpellScript { - PrepareSpellScript(spell_ahnkahet_yogg_saron_whisper); - bool Validate(SpellInfo const* spellInfo) override { return sBroadcastTextStore.HasRecord(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue())) && diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp index 278f68b1364..03214e40768 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_amanitar.cpp @@ -266,8 +266,6 @@ private: // 56648 - Potent Fungus class spell_amanitar_potent_fungus : public AuraScript { - PrepareAuraScript(spell_amanitar_potent_fungus); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp index 888edb38a77..5085bfd36cd 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -217,8 +217,6 @@ private: // 56159 - Swarm class spell_ahn_kahet_swarm : public SpellScript { - PrepareSpellScript(spell_ahn_kahet_swarm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWARM_BUFF }); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp index f83f323ab65..4a7b9cd7a80 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp @@ -785,8 +785,6 @@ private: 60297 - Volazj Whisper: Death 02 */ class spell_volazj_whisper : public SpellScript { - PrepareSpellScript(spell_volazj_whisper); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { Player* target = GetHitPlayer(); diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp index 6c899e46faf..386a7622c49 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_jedoga_shadowseeker.cpp @@ -468,8 +468,6 @@ private: // 56328 - Random Lightning Visual Effect class spell_random_lightning_visual_effect : public SpellScript { - PrepareSpellScript(spell_random_lightning_visual_effect); - void ModDestHeight(SpellDestination& dest) { Position const offset = { 0.0f, 0.0f, -19.0f, 0.0f }; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp index 668c2a21d63..296cb50e0e4 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -410,8 +410,6 @@ struct go_prince_taldaram_sphere : public GameObjectAI // 55931 - Conjure Flame Sphere class spell_prince_taldaram_conjure_flame_sphere : public SpellScript { - PrepareSpellScript(spell_prince_taldaram_conjure_flame_sphere); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_SPHERE_SUMMON_1, SPELL_FLAME_SPHERE_SUMMON_2, SPELL_FLAME_SPHERE_SUMMON_3 }); @@ -438,8 +436,6 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScript // 55895, 59511, 59512 - Flame Sphere Summon class spell_prince_taldaram_flame_sphere_summon : public SpellScript { - PrepareSpellScript(spell_prince_taldaram_flame_sphere_summon); - void SetDest(SpellDestination& dest) { Position offset = { 0.0f, 0.0f, 5.5f, 0.0f }; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 858229803b0..7d35ecef46f 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -606,8 +606,6 @@ struct npc_anubarak_impale_target : public NullCreatureAI // 53472, 59433 - Pound class spell_anubarak_pound : public AuraScript { - PrepareAuraScript(spell_anubarak_pound); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POUND_DAMAGE }); @@ -628,8 +626,6 @@ class spell_anubarak_pound : public AuraScript // 53520 - Carrion Beetles class spell_anubarak_carrion_beetles : public AuraScript { - PrepareAuraScript(spell_anubarak_carrion_beetles); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CARRION_BEETLE }); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 30c672d3d6c..d9bd21691f2 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -855,7 +855,6 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript { public: spell_hadronox_periodic_summon_template_AuraScript(uint32 topSpellId, uint32 bottomSpellId) : AuraScript(), _topSpellId(topSpellId), _bottomSpellId(bottomSpellId) { } - PrepareAuraScript(spell_hadronox_periodic_summon_template_AuraScript); private: bool Validate(SpellInfo const* /*spell*/) override @@ -957,8 +956,6 @@ class spell_hadronox_periodic_summon_necromancer : public SpellScriptLoader // 53030, 59417 - Leech Poison class spell_hadronox_leeching_poison : public AuraScript { - PrepareAuraScript(spell_hadronox_leeching_poison); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LEECH_POISON_HEAL }); @@ -986,8 +983,6 @@ class spell_hadronox_leeching_poison : public AuraScript // 53185 - Web Side Door class spell_hadronox_web_doors : public SpellScript { - PrepareSpellScript(spell_hadronox_web_doors); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_CHAMPION_PERIODIC, SPELL_SUMMON_CRYPT_FIEND_PERIODIC, SPELL_SUMMON_NECROMANCER_PERIODIC }); diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp index 7e744bd8cc8..a7358a52b90 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -807,8 +807,6 @@ struct npc_gatewatcher_web_wrap : public NullCreatureAI // 52343 - Krik'Thir Subboss Aggro Trigger class spell_gatewatcher_subboss_trigger : public SpellScript { - PrepareSpellScript(spell_gatewatcher_subboss_trigger); - void HandleTargets(std::list<WorldObject*>& targetList) { // Remove any Watchers that are already in combat @@ -849,8 +847,6 @@ class spell_gatewatcher_subboss_trigger : public SpellScript // 52536 - Fixate Trigger class spell_anub_ar_skirmisher_fixate : public SpellScript { - PrepareSpellScript(spell_anub_ar_skirmisher_fixate); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FIXATE_TRIGGERED }); @@ -871,8 +867,6 @@ class spell_anub_ar_skirmisher_fixate : public SpellScript // 52086 - Web Wrap class spell_gatewatcher_web_wrap : public AuraScript { - PrepareAuraScript(spell_gatewatcher_web_wrap); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_WEB_WRAP_WRAPPED }); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp index 5f795d585ae..9a13a69a664 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_baltharus_the_warborn.cpp @@ -306,8 +306,6 @@ struct npc_baltharus_the_warborn_clone : public BossAI // 74505 - Enervating Brand class spell_baltharus_enervating_brand_trigger : public SpellScript { - PrepareSpellScript(spell_baltharus_enervating_brand_trigger); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SIPHONED_MIGHT }); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 6e063194dd3..9636bc45fae 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1412,8 +1412,6 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader class spell_halion_meteor_strike_marker_AuraScript : public AuraScript { - PrepareAuraScript(spell_halion_meteor_strike_marker_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!GetCaster()) @@ -1443,8 +1441,6 @@ class spell_halion_combustion_consumption : public SpellScriptLoader class spell_halion_combustion_consumption_AuraScript : public AuraScript { - PrepareAuraScript(spell_halion_combustion_consumption_AuraScript); - public: spell_halion_combustion_consumption_AuraScript(uint32 spellID) : AuraScript(), _markSpell(spellID) { } @@ -1501,8 +1497,6 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader class spell_halion_combustion_consumption_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_halion_combustion_consumption_periodic_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -1544,8 +1538,6 @@ class spell_halion_marks : public SpellScriptLoader class spell_halion_marks_AuraScript : public AuraScript { - PrepareAuraScript(spell_halion_marks_AuraScript); - public: spell_halion_marks_AuraScript(uint32 summonSpell, uint32 removeSpell) : AuraScript(), _summonSpellId(summonSpell), _removeSpellId(removeSpell) { } @@ -1608,8 +1600,6 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader class spell_halion_damage_aoe_summon_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_damage_aoe_summon_SpellScript); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1645,8 +1635,6 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader class spell_halion_twilight_realm_handlers_AuraScript : public AuraScript { - PrepareAuraScript(spell_halion_twilight_realm_handlers_AuraScript); - public: spell_halion_twilight_realm_handlers_AuraScript(uint32 beforeHitSpell, bool isApplyHandler) : AuraScript(), _isApply(isApplyHandler), _beforeHitSpellId(beforeHitSpell) @@ -1709,8 +1697,6 @@ class spell_halion_clear_debuffs : public SpellScriptLoader class spell_halion_clear_debuffs_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_clear_debuffs_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CLEAR_DEBUFFS, SPELL_TWILIGHT_REALM }); @@ -1757,8 +1743,6 @@ class spell_halion_twilight_cutter : public SpellScriptLoader class spell_halion_twilight_cutter_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_twilight_cutter_SpellScript); - void RemoveNotBetween(std::list<WorldObject*>& unitList) { if (unitList.empty()) @@ -1796,8 +1780,6 @@ class spell_halion_twilight_phasing : public SpellScriptLoader class spell_halion_twilight_phasing_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_twilight_phasing_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL }); @@ -1830,8 +1812,6 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader class spell_halion_summon_exit_portals_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_summon_exit_portals_SpellScript); - void SetDest0(SpellDestination& dest) { Position const offset = { 0.0f, 20.0f, 0.0f, 0.0f }; @@ -1865,8 +1845,6 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader class spell_halion_spawn_living_embers_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_spawn_living_embers_SpellScript); - void SelectMeteorFlames(std::list<WorldObject*>& unitList) { if (!unitList.empty()) @@ -1899,8 +1877,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader class spell_halion_blazing_aura_SpellScript : public SpellScript { - PrepareSpellScript(spell_halion_blazing_aura_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp index 17ea9738393..fe7be970774 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -210,8 +210,6 @@ class ConflagrationTargetSelector // 74452 - Conflagration class spell_saviana_conflagration_init : public SpellScript { - PrepareSpellScript(spell_saviana_conflagration_init); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FLAME_BEACON, SPELL_CONFLAGRATION_2 }); @@ -242,8 +240,6 @@ class spell_saviana_conflagration_init : public SpellScript // 74455 - Conflagration class spell_saviana_conflagration_throwback : public SpellScript { - PrepareSpellScript(spell_saviana_conflagration_throwback); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index 75761b20a2e..ec81d8719e1 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -166,8 +166,6 @@ class at_baltharus_plateau : public OnlyOnceAreaTriggerScript // 75415 - Rallying Shout class spell_ruby_sanctum_rallying_shout : public SpellScript { - PrepareSpellScript(spell_ruby_sanctum_rallying_shout); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RALLY }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp index c613fd4f5e1..fd83e5064c1 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -133,8 +133,6 @@ class spell_eadric_radiance : public SpellScriptLoader spell_eadric_radiance() : SpellScriptLoader("spell_eadric_radiance") { } class spell_eadric_radiance_SpellScript : public SpellScript { - PrepareSpellScript(spell_eadric_radiance_SpellScript); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove_if(OrientationCheck(GetCaster())); @@ -651,8 +649,6 @@ class spell_paletress_summon_memory : public SpellScriptLoader class spell_paletress_summon_memory_SpellScript : public SpellScript { - PrepareSpellScript(spell_paletress_summon_memory_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(memorySpellId); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp index 0343a09db55..6b308410f64 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_black_knight.cpp @@ -384,8 +384,6 @@ public: // 67751 - Ghoul Explode class spell_black_knight_ghoul_explode : public SpellScript { - PrepareSpellScript(spell_black_knight_ghoul_explode); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -406,8 +404,6 @@ class spell_black_knight_ghoul_explode : public SpellScript // 67889 - Ghoul Explode class spell_black_knight_ghoul_explode_risen_ghoul : public SpellScript { - PrepareSpellScript(spell_black_knight_ghoul_explode_risen_ghoul); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_1).CalcValue()) }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp index 9ffe975f38e..17c36044f66 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -791,8 +791,6 @@ struct npc_anubarak_spike : public ScriptedAI // 65923 - Pursuing Spikes class spell_pursuing_spikes : public AuraScript { - PrepareAuraScript(spell_pursuing_spikes); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PERMAFROST, SPELL_SPIKE_FAIL }); @@ -832,8 +830,6 @@ class spell_pursuing_spikes : public AuraScript // 65919 - Impale class spell_impale : public SpellScript { - PrepareSpellScript(spell_impale); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -853,8 +849,6 @@ class spell_impale : public SpellScript // 66118, 67630, 68646, 68647 - Leeching Swarm class spell_anubarak_leeching_swarm : public AuraScript { - PrepareAuraScript(spell_anubarak_leeching_swarm); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LEECHING_SWARM_DMG, SPELL_LEECHING_SWARM_HEAL }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp index 0cc2f909a6e..eafc61b849a 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -2063,8 +2063,6 @@ struct npc_toc_pet_hunter : public boss_faction_championsAI // 65812, 68154, 68155, 68156 - Unstable Affliction class spell_faction_champion_warl_unstable_affliction : public AuraScript { - PrepareAuraScript(spell_faction_champion_warl_unstable_affliction); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNSTABLE_AFFLICTION_DISPEL }); @@ -2085,8 +2083,6 @@ class spell_faction_champion_warl_unstable_affliction : public AuraScript // 66017, 68753, 68754, 68755 - Death Grip class spell_faction_champion_death_grip : public SpellScript { - PrepareSpellScript(spell_faction_champion_death_grip); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DEATH_GRIP_PULL }); @@ -2110,8 +2106,6 @@ class spell_faction_champion_death_grip : public SpellScript // 65980 - Bloodlust class spell_toc_bloodlust : public SpellScript { - PrepareSpellScript(spell_toc_bloodlust); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ AURA_SATED }); @@ -2139,8 +2133,6 @@ class spell_toc_bloodlust : public SpellScript // 65983 - Heroism class spell_toc_heroism : public SpellScript { - PrepareSpellScript(spell_toc_heroism); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ AURA_EXHAUSTION }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp index bc744e47769..240bf370bd6 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -468,8 +468,6 @@ private: // 66334, 67905, 67906, 67907 - Mistress' Kiss class spell_mistress_kiss : public AuraScript { - PrepareAuraScript(spell_mistress_kiss); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MISTRESS_KISS_DAMAGE_SILENCE }); @@ -495,8 +493,6 @@ class spell_mistress_kiss : public AuraScript // 66336, 67076, 67077, 67078 - Mistress' Kiss class spell_mistress_kiss_area : public SpellScript { - PrepareSpellScript(spell_mistress_kiss_area); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -533,8 +529,6 @@ class spell_mistress_kiss_area : public SpellScript // 66493 - Fel Streak class spell_fel_streak_visual : public SpellScript { - PrepareSpellScript(spell_fel_streak_visual); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp index 895aa70a5d3..837872c398d 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -1068,8 +1068,6 @@ struct boss_icehowl : public boss_northrend_beastsAI // 66342 - Jump to Hand class spell_gormok_jump_to_hand : public AuraScript { - PrepareAuraScript(spell_gormok_jump_to_hand); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_PLAYER }); @@ -1099,8 +1097,6 @@ class spell_gormok_jump_to_hand : public AuraScript // 66245 - Ride Vehicle class spell_gormok_ride_player : public AuraScript { - PrepareAuraScript(spell_gormok_ride_player); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1121,8 +1117,6 @@ class spell_gormok_ride_player : public AuraScript // 66406 - Snobolled! class spell_gormok_snobolled : public AuraScript { - PrepareAuraScript(spell_gormok_snobolled); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_PLAYER }); @@ -1143,8 +1137,6 @@ class spell_gormok_snobolled : public AuraScript // 66823, 67618, 67619, 67620 - Paralytic Toxin class spell_jormungars_paralytic_toxin : public AuraScript { - PrepareAuraScript(spell_jormungars_paralytic_toxin); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PARALYSIS }); @@ -1197,8 +1189,6 @@ class spell_jormungars_paralytic_toxin : public AuraScript // 66870, 67621, 67622, 67623 - Burning Bile class spell_jormungars_burning_bile : public SpellScript { - PrepareSpellScript(spell_jormungars_burning_bile); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1214,8 +1204,6 @@ class spell_jormungars_burning_bile : public SpellScript // 66882 - Slime Pool class spell_jormungars_slime_pool : public AuraScript { - PrepareAuraScript(spell_jormungars_slime_pool); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -1241,8 +1229,6 @@ class spell_jormungars_slime_pool : public AuraScript 66823 - Paralytic Toxin */ class spell_jormungars_snakes_spray : public SpellScript { - PrepareSpellScript(spell_jormungars_snakes_spray); - public: spell_jormungars_snakes_spray(uint32 spellId) : SpellScript(), _spellId(spellId) { } @@ -1268,8 +1254,6 @@ private: // 66830 - Paralysis class spell_jormungars_paralysis : public AuraScript { - PrepareAuraScript(spell_jormungars_paralysis); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1289,8 +1273,6 @@ class spell_jormungars_paralysis : public AuraScript // 66688 - Arctic Breath class spell_icehowl_arctic_breath : public SpellScript { - PrepareSpellScript(spell_icehowl_arctic_breath); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -1311,8 +1293,6 @@ class spell_icehowl_arctic_breath : public SpellScript // 66734 - Trample class spell_icehowl_trample : public SpellScript { - PrepareSpellScript(spell_icehowl_trample); - void CheckTargets(std::list<WorldObject*>& targets) { Creature* caster = GetCaster()->ToCreature(); @@ -1334,8 +1314,6 @@ class spell_icehowl_trample : public SpellScript // 66683 - Massive Crash class spell_icehowl_massive_crash : public AuraScript { - PrepareAuraScript(spell_icehowl_massive_crash); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SURGE_OF_ADRENALINE }); diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp index 06eadcb3e39..dca2b5d81c3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -650,8 +650,6 @@ struct npc_bullet_controller : public ScriptedAI // 66149, 68396 - Bullet Controller Periodic class spell_bullet_controller : public AuraScript { - PrepareAuraScript(spell_bullet_controller); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PERIODIC_LIGHT, SPELL_SUMMON_PERIODIC_DARK }); @@ -679,8 +677,6 @@ class spell_bullet_controller : public AuraScript // 67590, 67602, 67603, 67604 - Powering Up class spell_powering_up : public SpellScript { - PrepareSpellScript(spell_powering_up); - uint32 spellId = 0; uint32 poweringUp = 0; @@ -727,8 +723,6 @@ class spell_powering_up : public SpellScript // 65686, 67222, 67223, 67224 - Light Essence class spell_valkyr_essences : public AuraScript { - PrepareAuraScript(spell_valkyr_essences); - public: spell_valkyr_essences() { @@ -816,8 +810,6 @@ private: // 65916, 67248, 67249, 67250 - Power of the Twins class spell_power_of_the_twins : public AuraScript { - PrepareAuraScript(spell_power_of_the_twins); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index d9190a6ed5a..a24f4be8d3f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -884,8 +884,6 @@ private: // 69016 - Corpse Teleport class spell_lich_king_teleport_corpse : public SpellScript { - PrepareSpellScript(spell_lich_king_teleport_corpse); - void HandleTeleport(SpellEffIndex /*effIndex*/) { GetHitUnit()->NearTeleportTo(CorpseTeleportPosition); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index 93a846c2ca2..d24c8560a6f 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -368,8 +368,6 @@ public: // 59910 - Summon Minions class spell_novos_summon_minions : public SpellScript { - PrepareSpellScript(spell_novos_summon_minions); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_COPY_OF_MINIONS }); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index ff4b55924bd..05fd38c38e5 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -198,8 +198,6 @@ struct boss_tharon_ja : public BossAI // 53242 - Clear Gift of Tharon'ja class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScript { - PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GIFT_OF_THARON_JA }); diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 5beacdc444f..397ae7597a1 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -207,8 +207,6 @@ struct npc_drakkari_invader : public ScriptedAI // 49380, 59803 - Consume class spell_trollgore_consume : public SpellScript { - PrepareSpellScript(spell_trollgore_consume); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CONSUME_BUFF }); @@ -229,8 +227,6 @@ class spell_trollgore_consume : public SpellScript // 49555, 59807 - Corpse Explode class spell_trollgore_corpse_explode : public AuraScript { - PrepareAuraScript(spell_trollgore_corpse_explode); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CORPSE_EXPLODE_DAMAGE }); @@ -259,8 +255,6 @@ class spell_trollgore_corpse_explode : public AuraScript // 49405 - Invader Taunt Trigger class spell_trollgore_invader_taunt : public SpellScript { - PrepareSpellScript(spell_trollgore_invader_taunt); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp index dd578dad0f6..f59488d7189 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.cpp @@ -29,8 +29,6 @@ enum SummonRandomDrakkari // 49960 - Summon Random Drakkari class spell_summon_random_drakkari : public SpellScript { - PrepareSpellScript(spell_summon_random_drakkari); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_DRAKKARI_SHAMAN, SPELL_SUMMON_DRAKKARI_GUARDIAN }); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 75b55d566d5..9bafcb59c1a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -241,8 +241,6 @@ private: // 68793, 69050 - Magic's Bane class spell_bronjahm_magic_bane : public SpellScript { - PrepareSpellScript(spell_bronjahm_magic_bane); - void RecalculateDamage(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->GetPowerType() != POWER_MANA) @@ -262,8 +260,6 @@ class spell_bronjahm_magic_bane : public SpellScript // 68861 - Consume Soul class spell_bronjahm_consume_soul : public SpellScript { - PrepareSpellScript(spell_bronjahm_consume_soul); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -290,8 +286,6 @@ static uint32 const SoulstormVisualSpells[] = class spell_bronjahm_soulstorm_visual : public AuraScript { - PrepareAuraScript(spell_bronjahm_soulstorm_visual); - void HandlePeriodicTick(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -307,8 +301,6 @@ class spell_bronjahm_soulstorm_visual : public AuraScript // 68921, 69049 - Soulstorm class spell_bronjahm_soulstorm_targeting : public SpellScript { - PrepareSpellScript(spell_bronjahm_soulstorm_targeting); - void FilterTargets(std::list<WorldObject*>& targets) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp index f3182d82b3a..6ac0a779725 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_devourer_of_souls.cpp @@ -342,8 +342,6 @@ private: // 69051 - Mirrored Soul class spell_devourer_of_souls_mirrored_soul : public SpellScript { - PrepareSpellScript(spell_devourer_of_souls_mirrored_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_PROC_AURA }); @@ -364,8 +362,6 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScript // 69023 - Mirrored Soul (Proc) class spell_devourer_of_souls_mirrored_soul_proc : public AuraScript { - PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_DAMAGE }); @@ -398,8 +394,6 @@ class spell_devourer_of_souls_mirrored_soul_proc : public AuraScript // 69048 - Mirrored Soul (Target Selector) class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript { - PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_BUFF }); diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp index 486b65cdea6..49987063278 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.cpp @@ -263,8 +263,6 @@ struct npc_jaina_fos: public ScriptedAI // 69131 - Soul Sickness class spell_forge_of_souls_soul_sickness : public AuraScript { - PrepareAuraScript(spell_forge_of_souls_soul_sickness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LETHARGY }); diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index 67097c872dd..fb933ba1a6a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp @@ -140,8 +140,6 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader class spell_marwyn_shared_suffering_AuraScript : public AuraScript { - PrepareAuraScript(spell_marwyn_shared_suffering_AuraScript); - void HandleEffectRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL) diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp index d71381dbf53..b2db3a91b4a 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -2757,8 +2757,6 @@ class spell_hor_start_halls_of_reflection_quest_ae : public SpellScriptLoader class spell_hor_start_halls_of_reflection_quest_ae_SpellScript : public SpellScript { - PrepareSpellScript(spell_hor_start_halls_of_reflection_quest_ae_SpellScript); - void StartQuests(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -2791,8 +2789,6 @@ class spell_hor_evasion : public SpellScriptLoader class spell_hor_evasion_SpellScript : public SpellScript { - PrepareSpellScript(spell_hor_evasion_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2835,8 +2831,6 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader class spell_hor_gunship_cannon_fire_AuraScript : public AuraScript { - PrepareAuraScript(spell_hor_gunship_cannon_fire_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (!urand(0, 2)) @@ -2863,8 +2857,6 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader // 70698 - Quel'Delar's Will class spell_hor_quel_delars_will : public SpellScript { - PrepareSpellScript(spell_hor_quel_delars_will); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp index d34a99d67b6..d07bd4f55fc 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -250,8 +250,6 @@ private: // 68786, 70336 - Permafrost class spell_garfrost_permafrost : public SpellScript { - PrepareSpellScript(spell_garfrost_permafrost); - public: spell_garfrost_permafrost() { diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index fae90261770..e645e2310cc 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -516,8 +516,6 @@ private: // 69012 - Explosive Barrage class spell_krick_explosive_barrage : public AuraScript { - PrepareAuraScript(spell_krick_explosive_barrage); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -543,8 +541,6 @@ class spell_krick_explosive_barrage : public AuraScript // 69263 - Explosive Barrage class spell_ick_explosive_barrage : public AuraScript { - PrepareAuraScript(spell_ick_explosive_barrage); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -575,8 +571,6 @@ class spell_ick_explosive_barrage : public AuraScript // 44851 - Hasty Grow class spell_exploding_orb_hasty_grow : public AuraScript { - PrepareAuraScript(spell_exploding_orb_hasty_grow); - void OnStackChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetStackAmount() == 15) @@ -600,8 +594,6 @@ class spell_exploding_orb_hasty_grow : public AuraScript // 68987 - Pursuit class spell_krick_pursuit : public SpellScript { - PrepareSpellScript(spell_krick_pursuit); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -623,8 +615,6 @@ class spell_krick_pursuit : public SpellScript class spell_krick_pursuit_AuraScript : public AuraScript { - PrepareAuraScript(spell_krick_pursuit_AuraScript); - void HandleExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -643,8 +633,6 @@ class spell_krick_pursuit_AuraScript : public AuraScript // 69029, 70850 - Pursuit Confusion class spell_krick_pursuit_confusion : public AuraScript { - PrepareAuraScript(spell_krick_pursuit_confusion); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp index 86f56279dff..1383bc1a827 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -410,8 +410,6 @@ class player_overlord_brandAI : public PlayerAI // 69172 - Overlord's Brand class spell_tyrannus_overlord_brand : public AuraScript { - PrepareAuraScript(spell_tyrannus_overlord_brand); - bool Load() override { return GetCaster() && GetCaster()->GetEntry() == NPC_TYRANNUS; @@ -444,8 +442,6 @@ class spell_tyrannus_overlord_brand : public AuraScript // 69275 - Mark of Rimefang class spell_tyrannus_mark_of_rimefang : public AuraScript { - PrepareAuraScript(spell_tyrannus_mark_of_rimefang); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -466,8 +462,6 @@ class spell_tyrannus_mark_of_rimefang : public AuraScript // 69232 - Icy Blast class spell_tyrannus_rimefang_icy_blast : public SpellScript { - PrepareSpellScript(spell_tyrannus_rimefang_icy_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICY_BLAST_AURA }); diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp index 61fd509cdf4..2e14fdef1e9 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -233,8 +233,6 @@ private: // 70827 - Ice Shards class spell_pos_ice_shards : public SpellScript { - PrepareSpellScript(spell_pos_ice_shards); - bool Load() override { // This script should execute only in Pit of Saron diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index 56b4ce8b369..fefc0ed8ffe 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -237,8 +237,6 @@ private: // 54956, 59827 - Impaling Charge class spell_gal_darah_impaling_charge : public SpellScript { - PrepareSpellScript(spell_gal_darah_impaling_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_IMPALING_CHARGE_CONTROL_VEHICLE }); @@ -269,8 +267,6 @@ class spell_gal_darah_impaling_charge : public SpellScript // 59823 - Stampede (Rhino Spirit Charge) class spell_gal_darah_stampede_charge : public SpellScript { - PrepareSpellScript(spell_gal_darah_stampede_charge); - void OnHit(SpellEffIndex /*effIndex*/) { if (Creature* caster = GetCaster()->ToCreature()) @@ -286,8 +282,6 @@ class spell_gal_darah_stampede_charge : public SpellScript // 60022 - Clear Puncture class spell_gal_darah_clear_puncture : public SpellScript { - PrepareSpellScript(spell_gal_darah_clear_puncture); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PUNCTURE, SPELL_PUNCTURE_HEROIC }); diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index f8c3fc1a8ee..79a6d240d04 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -205,8 +205,6 @@ class achievement_less_rabi : public AchievementCriteriaScript // 55163 - Mojo Frenzy class spell_moorabi_mojo_frenzy : public AuraScript { - PrepareAuraScript(spell_moorabi_mojo_frenzy); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MOJO_FRENZY_CAST_SPEED }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp index 84b422fdf30..4781352a380 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1091,8 +1091,6 @@ private: // 71806 - Glittering Sparks class spell_taldaram_glittering_sparks : public SpellScript { - PrepareSpellScript(spell_taldaram_glittering_sparks); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1109,8 +1107,6 @@ class spell_taldaram_glittering_sparks : public SpellScript 72040 - Conjure Empowered Flame */ class spell_taldaram_summon_flame_ball : public SpellScript { - PrepareSpellScript(spell_taldaram_summon_flame_ball); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1127,8 +1123,6 @@ class spell_taldaram_summon_flame_ball : public SpellScript 55947 - Flame Sphere Death Effect */ class spell_taldaram_flame_ball_visual : public AuraScript { - PrepareAuraScript(spell_taldaram_flame_ball_visual); - bool Load() override { if (GetCaster()->GetEntry() == NPC_BALL_OF_FLAME || GetCaster()->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) @@ -1169,8 +1163,6 @@ class spell_taldaram_flame_ball_visual : public AuraScript 72784 - Ball of Flames Proc */ class spell_taldaram_ball_of_inferno_flame : public SpellScript { - PrepareSpellScript(spell_taldaram_ball_of_inferno_flame); - void ModAuraStack() { if (Aura* aur = GetHitAura()) @@ -1185,8 +1177,6 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScript class spell_taldaram_ball_of_inferno_flame_aura : public AuraScript { - PrepareAuraScript(spell_taldaram_ball_of_inferno_flame_aura); - void HandleStackDrop(ProcEventInfo& /*eventInfo*/) { ModStackAmount(-1); @@ -1201,8 +1191,6 @@ class spell_taldaram_ball_of_inferno_flame_aura : public AuraScript // 72080 - Kinetic Bomb class spell_valanar_kinetic_bomb : public SpellScript { - PrepareSpellScript(spell_valanar_kinetic_bomb); - void SetDest(SpellDestination& dest) { Position const offset = { 0.0f, 0.0f, 20.0f, 0.0f }; @@ -1217,8 +1205,6 @@ class spell_valanar_kinetic_bomb : public SpellScript class spell_valanar_kinetic_bomb_aura : public AuraScript { - PrepareAuraScript(spell_valanar_kinetic_bomb_aura); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_KINETIC_BOMB_EXPLOSION, SPELL_KINETIC_BOMB_VISUAL }); @@ -1248,8 +1234,6 @@ class spell_valanar_kinetic_bomb_aura : public AuraScript // 72087 - Kinetic Bomb Knockback class spell_valanar_kinetic_bomb_knockback : public SpellScript { - PrepareSpellScript(spell_valanar_kinetic_bomb_knockback); - void KnockIntoAir(SpellMissInfo missInfo) { if (missInfo != SPELL_MISS_NONE) @@ -1268,8 +1252,6 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScript // 72054 - Kinetic Bomb Visual class spell_valanar_kinetic_bomb_absorb : public AuraScript { - PrepareAuraScript(spell_valanar_kinetic_bomb_absorb); - void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) { absorbAmount = CalculatePct(dmgInfo.GetDamage(), aurEff->GetAmount()); @@ -1286,8 +1268,6 @@ class spell_valanar_kinetic_bomb_absorb : public AuraScript // 73001 - Shadow Prison class spell_blood_council_shadow_prison : public AuraScript { - PrepareAuraScript(spell_blood_council_shadow_prison); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADOW_PRISON_DAMAGE }); @@ -1308,8 +1288,6 @@ class spell_blood_council_shadow_prison : public AuraScript // 72999 - Shadow Prison class spell_blood_council_shadow_prison_damage : public SpellScript { - PrepareSpellScript(spell_blood_council_shadow_prison_damage); - void AddExtraDamage(SpellEffIndex /*effIndex*/) { if (Aura* aur = GetHitUnit()->GetAura(GetSpellInfo()->Id)) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp index a98a839653c..6aedfefafae 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_queen_lana_thel.cpp @@ -466,8 +466,6 @@ typedef boss_blood_queen_lana_thel LanaThelAI; // 70946, 71475, 71476, 71477 - Vampiric Bite class spell_blood_queen_vampiric_bite : public SpellScript { - PrepareSpellScript(spell_blood_queen_vampiric_bite); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, SPELL_FRENZIED_BLOODTHIRST, SPELL_PRESENCE_OF_THE_DARKFALLEN }); @@ -526,8 +524,6 @@ class spell_blood_queen_vampiric_bite : public SpellScript // 70877, 71474 - Frenzied Bloodthirst class spell_blood_queen_frenzied_bloodthirst : public AuraScript { - PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetTarget()->GetInstanceScript()) @@ -575,8 +571,6 @@ class BloodboltHitCheck // 71899, 71900, 71901, 71902 - Bloodbolt Whirl class spell_blood_queen_bloodbolt : public SpellScript { - PrepareSpellScript(spell_blood_queen_bloodbolt); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TWILIGHT_BLOODBOLT }); @@ -613,8 +607,6 @@ class spell_blood_queen_bloodbolt : public SpellScript // 70871 - Essence of the Blood Queen class spell_blood_queen_essence_of_the_blood_queen : public AuraScript { - PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL }); @@ -641,8 +633,6 @@ class spell_blood_queen_essence_of_the_blood_queen : public AuraScript // 71390 - Pact of the Darkfallen class spell_blood_queen_pact_of_the_darkfallen : public SpellScript { - PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); @@ -679,8 +669,6 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScript // 71340 - Pact of the Darkfallen class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript { - PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE }); @@ -708,8 +696,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public AuraScript // 71341 - Pact of the Darkfallen class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScript { - PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_target); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); @@ -725,8 +711,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScript // 71446, 71478, 71479, 71480 - Twilight Bloodbolt class spell_blood_queen_twilight_bloodbolt : public SpellScript { - PrepareSpellScript(spell_blood_queen_twilight_bloodbolt); - void HandleResistance(DamageInfo const& damageInfo, uint32& resistAmount, int32& /*absorbAmount*/) { Unit* caster = damageInfo.GetAttacker();; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index ca69c1d8145..3357f25086f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -987,8 +987,6 @@ private: // 72202 - Blood Link class spell_deathbringer_blood_link : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_link); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_POWER, SPELL_BLOOD_POWER }); @@ -1011,8 +1009,6 @@ class spell_deathbringer_blood_link : public SpellScript // 72178 - Blood Link class spell_deathbringer_blood_link_aura : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_link_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_THE_FALLEN_CHAMPION }); @@ -1035,8 +1031,6 @@ class spell_deathbringer_blood_link_aura : public AuraScript // 72371 - Blood Power class spell_deathbringer_blood_power : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_power); - void ModAuraValue() { if (Aura* aura = GetHitAura()) @@ -1051,8 +1045,6 @@ class spell_deathbringer_blood_power : public SpellScript class spell_deathbringer_blood_power_aura : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_power_aura); - void RecalculateHook(AuraEffect const* /*aurEffect*/, int32& amount, bool& canBeRecalculated) { amount = int32(GetUnitOwner()->GetPower(POWER_ENERGY)); @@ -1069,8 +1061,6 @@ class spell_deathbringer_blood_power_aura : public AuraScript // 72409, 72447, 72448, 72449 - Rune of Blood class spell_deathbringer_rune_of_blood : public SpellScript { - PrepareSpellScript(spell_deathbringer_rune_of_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1091,8 +1081,6 @@ class spell_deathbringer_rune_of_blood : public SpellScript // 72176 - Blood Beast's Blood Link class spell_deathbringer_blood_beast_blood_link : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_beast_blood_link); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1113,8 +1101,6 @@ class spell_deathbringer_blood_beast_blood_link : public AuraScript // 72380, 72438, 72439, 72440 - Blood Nova class spell_deathbringer_blood_nova : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_nova); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1135,8 +1121,6 @@ class spell_deathbringer_blood_nova : public SpellScript // 72378, 73058 - Blood Nova class spell_deathbringer_blood_nova_targeting : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_nova_targeting); - public: spell_deathbringer_blood_nova_targeting() { @@ -1198,8 +1182,6 @@ private: // 72385, 72441, 72442, 72443 - Boiling Blood class spell_deathbringer_boiling_blood : public SpellScript { - PrepareSpellScript(spell_deathbringer_boiling_blood); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1225,8 +1207,6 @@ class spell_deathbringer_boiling_blood : public SpellScript // 72257 - Remove Marks of the Fallen Champion class spell_deathbringer_remove_marks : public SpellScript { - PrepareSpellScript(spell_deathbringer_remove_marks); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index e10c1069fcb..e6bdd11aa7f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -350,8 +350,6 @@ private: // 69195, 71219, 73031, 73032 - Pungent Blight class spell_festergut_pungent_blight : public SpellScript { - PrepareSpellScript(spell_festergut_pungent_blight); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -372,8 +370,6 @@ class spell_festergut_pungent_blight : public SpellScript // 72219, 72551, 72552, 72553 - Gastric Bloat class spell_festergut_gastric_bloat : public SpellScript { - PrepareSpellScript(spell_festergut_gastric_bloat); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_GASTRIC_EXPLOSION }); @@ -398,8 +394,6 @@ class spell_festergut_gastric_bloat : public SpellScript // 69290, 71222, 73033, 73034 - Blighted Spores class spell_festergut_blighted_spores : public AuraScript { - PrepareAuraScript(spell_festergut_blighted_spores); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_INOCULATED, SPELL_ORANGE_BLIGHT_RESIDUE }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp index 3a5457e82ba..84a20b7b4a9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1729,8 +1729,6 @@ struct npc_gunship_cannon : public PassiveAI // 68721 - Rocket Pack class spell_igb_rocket_pack : public AuraScript { - PrepareAuraScript(spell_igb_rocket_pack); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROCKET_PACK_DAMAGE, SPELL_ROCKET_BURST }) @@ -1763,8 +1761,6 @@ class spell_igb_rocket_pack : public AuraScript // 70348 - Rocket Pack Useable class spell_igb_rocket_pack_useable : public AuraScript { - PrepareAuraScript(spell_igb_rocket_pack_useable); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -1803,8 +1799,6 @@ class spell_igb_rocket_pack_useable : public AuraScript // 70121 - On Orgrim's Hammer Deck class spell_igb_on_gunship_deck : public AuraScript { - PrepareAuraScript(spell_igb_on_gunship_deck); - public: spell_igb_on_gunship_deck() { @@ -1846,8 +1840,6 @@ private: // 69487 - Overheat class spell_igb_periodic_trigger_with_power_cost : public AuraScript { - PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost); - void HandlePeriodicTick(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1863,8 +1855,6 @@ class spell_igb_periodic_trigger_with_power_cost : public AuraScript // 69399, 70172 - Cannon Blast class spell_igb_cannon_blast : public SpellScript { - PrepareSpellScript(spell_igb_cannon_blast); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1890,8 +1880,6 @@ class spell_igb_cannon_blast : public SpellScript // 69402, 70175 - Incinerating Blast class spell_igb_incinerating_blast : public SpellScript { - PrepareSpellScript(spell_igb_incinerating_blast); - public: spell_igb_incinerating_blast() { @@ -1927,8 +1915,6 @@ private: // 69487 - Overheat class spell_igb_overheat : public AuraScript { - PrepareAuraScript(spell_igb_overheat); - bool Load() override { if (GetAura()->GetType() != UNIT_AURA_TYPE) @@ -1973,8 +1959,6 @@ class spell_igb_overheat : public AuraScript // 69705 - Below Zero class spell_igb_below_zero : public SpellScript { - PrepareSpellScript(spell_igb_below_zero); - void RemovePassengers(SpellMissInfo missInfo) { if (missInfo != SPELL_MISS_NONE) @@ -1992,8 +1976,6 @@ class spell_igb_below_zero : public SpellScript // 70104 - Teleport to Enemy Ship class spell_igb_teleport_to_enemy_ship : public SpellScript { - PrepareSpellScript(spell_igb_teleport_to_enemy_ship); - void RelocateTransportOffset(SpellEffIndex /*effIndex*/) { WorldLocation const* dest = GetHitDest(); @@ -2016,8 +1998,6 @@ class spell_igb_teleport_to_enemy_ship : public SpellScript // 70397, 70403 - Burning Pitch class spell_igb_burning_pitch_selector : public SpellScript { - PrepareSpellScript(spell_igb_burning_pitch_selector); - void FilterTargets(std::list<WorldObject*>& targets) { uint32 team = HORDE; @@ -2055,8 +2035,6 @@ class spell_igb_burning_pitch_selector : public SpellScript // 71335, 71339 - Burning Pitch class spell_igb_burning_pitch : public SpellScript { - PrepareSpellScript(spell_igb_burning_pitch); - void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2075,8 +2053,6 @@ class spell_igb_burning_pitch : public SpellScript // 69678, 70609 - Rocket Artillery class spell_igb_rocket_artillery : public SpellScript { - PrepareSpellScript(spell_igb_rocket_artillery); - void SelectRandomTarget(std::list<WorldObject*>& targets) { if (!targets.empty()) @@ -2103,8 +2079,6 @@ class spell_igb_rocket_artillery : public SpellScript // 69679 - Rocket Artillery class spell_igb_rocket_artillery_explosion : public SpellScript { - PrepareSpellScript(spell_igb_rocket_artillery_explosion); - void DamageGunship(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -2124,8 +2098,6 @@ class spell_igb_rocket_artillery_explosion : public SpellScript // 67335 - Gunship Fall Teleport class spell_igb_gunship_fall_teleport : public SpellScript { - PrepareSpellScript(spell_igb_gunship_fall_teleport); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2155,8 +2127,6 @@ class spell_igb_gunship_fall_teleport : public SpellScript // 70331 - Check for Players class spell_igb_check_for_players : public SpellScript { - PrepareSpellScript(spell_igb_check_for_players); - public: spell_igb_check_for_players() { @@ -2199,8 +2169,6 @@ private: // 72340 - Teleport Players on Victory class spell_igb_teleport_players_on_victory : public SpellScript { - PrepareSpellScript(spell_igb_teleport_players_on_victory); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2224,8 +2192,6 @@ class spell_igb_teleport_players_on_victory : public SpellScript // 71201 - Battle Experience - proc should never happen, handled in script class spell_igb_battle_experience_check : public AuraScript { - PrepareAuraScript(spell_igb_battle_experience_check); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { return false; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index ae91ecb274c..e34aee8b3a9 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -946,8 +946,6 @@ private: // 70842 - Mana Barrier class spell_deathwhisper_mana_barrier : public AuraScript { - PrepareAuraScript(spell_deathwhisper_mana_barrier); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -968,8 +966,6 @@ class spell_deathwhisper_mana_barrier : public AuraScript // 71289 - Dominate Mind class spell_deathwhisper_dominated_mind : public AuraScript { - PrepareAuraScript(spell_deathwhisper_dominated_mind); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DOMINATE_MIND_SCALE }); @@ -990,8 +986,6 @@ class spell_deathwhisper_dominated_mind : public AuraScript // 72478 - Summon Spirits class spell_deathwhisper_summon_spirits : public SpellScript { - PrepareSpellScript(spell_deathwhisper_summon_spirits); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SHADE }); @@ -1011,8 +1005,6 @@ class spell_deathwhisper_summon_spirits : public SpellScript // 70674 - Vampiric Might class spell_deathwhisper_vampiric_might : public AuraScript { - PrepareAuraScript(spell_deathwhisper_vampiric_might); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_VAMPIRIC_MIGHT_PROC }); @@ -1042,8 +1034,6 @@ class spell_deathwhisper_vampiric_might : public AuraScript // 69483 - Dark Reckoning class spell_deathwhisper_dark_reckoning : public AuraScript { - PrepareAuraScript(spell_deathwhisper_dark_reckoning); - bool Validate(SpellInfo const* spell) override { return ValidateSpellEffect({ { spell->Id, EFFECT_0 } }) diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index e87fc08d8a9..08d0fa77a6f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -483,8 +483,6 @@ private: // 69140 - Coldflame class spell_marrowgar_coldflame : public SpellScript { - PrepareSpellScript(spell_marrowgar_coldflame); - void SelectTarget(std::list<WorldObject*>& targets) { targets.clear(); @@ -515,8 +513,6 @@ class spell_marrowgar_coldflame : public SpellScript // 72705 - Coldflame (Bonestorm) class spell_marrowgar_coldflame_bonestorm : public SpellScript { - PrepareSpellScript(spell_marrowgar_coldflame_bonestorm); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -533,8 +529,6 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScript // 69146, 70823, 70824, 70825 - Coldflame (Damage) class spell_marrowgar_coldflame_damage : public AuraScript { - PrepareAuraScript(spell_marrowgar_coldflame_damage); - bool CanBeAppliedOn(Unit* target) { if (target->HasAura(SPELL_IMPALED)) @@ -559,8 +553,6 @@ class spell_marrowgar_coldflame_damage : public AuraScript // 69057, 70826, 72088, 72089 - Bone Spike Graveyard class spell_marrowgar_bone_spike_graveyard : public SpellScript { - PrepareSpellScript(spell_marrowgar_bone_spike_graveyard); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(BoneSpikeSummonId); @@ -619,8 +611,6 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScript // 69075, 70834, 70835, 70836 - Bone Storm class spell_marrowgar_bone_storm : public SpellScript { - PrepareSpellScript(spell_marrowgar_bone_storm); - void RecalculateDamage() { SetHitDamage(int32(GetHitDamage() / std::max(std::sqrt(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); @@ -635,8 +625,6 @@ class spell_marrowgar_bone_storm : public SpellScript // 69055, 70814 - Bone Slice class spell_marrowgar_bone_slice : public SpellScript { - PrepareSpellScript(spell_marrowgar_bone_slice); - public: spell_marrowgar_bone_slice() { diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index f56810783f2..63965a9978c 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -811,8 +811,6 @@ private: // 70672, 72455, 72832, 72833 - Gaseous Bloat class spell_putricide_gaseous_bloat : public AuraScript { - PrepareAuraScript(spell_putricide_gaseous_bloat); - void HandleExtraEffect(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -854,8 +852,6 @@ class spell_putricide_gaseous_bloat : public AuraScript // 70672, 72455, 72832, 72833 - Gaseous Bloat class spell_putricide_ooze_channel : public SpellScript { - PrepareSpellScript(spell_putricide_ooze_channel); - bool Validate(SpellInfo const* spell) override { return ValidateSpellInfo({ spell->ExcludeTargetAuraSpell }); @@ -929,8 +925,6 @@ class ExactDistanceCheck // 70346, 72456, 72868, 72869 - Slime Puddle class spell_putricide_slime_puddle : public SpellScript { - PrepareSpellScript(spell_putricide_slime_puddle); - void ScaleRange(std::list<WorldObject*>& targets) { targets.remove_if(ExactDistanceCheck(GetCaster(), 2.5f * GetCaster()->GetObjectScale())); @@ -947,8 +941,6 @@ class spell_putricide_slime_puddle : public SpellScript // 72868, 72869 - Slime Puddle class spell_putricide_slime_puddle_aura : public SpellScript { - PrepareSpellScript(spell_putricide_slime_puddle_aura); - void ReplaceAura() { if (Unit* target = GetHitUnit()) @@ -964,8 +956,6 @@ class spell_putricide_slime_puddle_aura : public SpellScript // 70351, 71966, 71967, 71968 - Unstable Experiment class spell_putricide_unstable_experiment : public SpellScript { - PrepareSpellScript(spell_putricide_unstable_experiment); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1002,8 +992,6 @@ class spell_putricide_unstable_experiment : public SpellScript // 70459 - Ooze Eruption Search Effect class spell_putricide_ooze_eruption_searcher : public SpellScript { - PrepareSpellScript(spell_putricide_ooze_eruption_searcher); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->HasAura(SPELL_VOLATILE_OOZE_ADHESIVE)) @@ -1022,8 +1010,6 @@ class spell_putricide_ooze_eruption_searcher : public SpellScript // 71770 - Ooze Spell Tank Protection class spell_putricide_ooze_tank_protection : public AuraScript { - PrepareAuraScript(spell_putricide_ooze_tank_protection); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) @@ -1048,8 +1034,6 @@ class spell_putricide_ooze_tank_protection : public AuraScript // 71255 - Choking Gas Bomb class spell_putricide_choking_gas_bomb : public SpellScript { - PrepareSpellScript(spell_putricide_choking_gas_bomb); - void HandleScript(SpellEffIndex /*effIndex*/) { uint32 skipIndex = urand(0, 2); @@ -1073,8 +1057,6 @@ class spell_putricide_choking_gas_bomb : public SpellScript // 70920 - Unbound Plague Search Effect class spell_putricide_unbound_plague : public SpellScript { - PrepareSpellScript(spell_putricide_unbound_plague); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNBOUND_PLAGUE, SPELL_UNBOUND_PLAGUE_SEARCHER }); @@ -1135,8 +1117,6 @@ class spell_putricide_unbound_plague : public SpellScript // 70360, 72527 - Eat Ooze class spell_putricide_eat_ooze : public SpellScript { - PrepareSpellScript(spell_putricide_eat_ooze); - void SelectTarget(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -1177,8 +1157,6 @@ class spell_putricide_eat_ooze : public SpellScript // 72451, 72463, 72671, 72672 - Mutated Plague class spell_putricide_mutated_plague : public AuraScript { - PrepareAuraScript(spell_putricide_mutated_plague); - void HandleTriggerSpell(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1228,8 +1206,6 @@ class spell_putricide_mutated_plague : public AuraScript // 70308 - Mutated Transformation (Init) class spell_putricide_mutation_init : public SpellScript { - PrepareSpellScript(spell_putricide_mutation_init); - SpellCastResult CheckRequirementInternal(SpellCustomErrors& extendedError) { InstanceScript* instance = GetExplTargetUnit()->GetInstanceScript(); @@ -1282,8 +1258,6 @@ class spell_putricide_mutation_init : public SpellScript class spell_putricide_mutation_init_aura : public AuraScript { - PrepareAuraScript(spell_putricide_mutation_init_aura); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { uint32 spellId = 70311; @@ -1302,8 +1276,6 @@ class spell_putricide_mutation_init_aura : public AuraScript // 70405, 72508, 72509, 72510 - Mutated Transformation (Dismiss) class spell_putricide_mutated_transformation_dismiss : public AuraScript { - PrepareAuraScript(spell_putricide_mutated_transformation_dismiss); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Vehicle* veh = GetTarget()->GetVehicleKit()) @@ -1319,8 +1291,6 @@ class spell_putricide_mutated_transformation_dismiss : public AuraScript // 70311, 71503 - Mutated Transformation class spell_putricide_mutated_transformation : public SpellScript { - PrepareSpellScript(spell_putricide_mutated_transformation); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1370,8 +1340,6 @@ class spell_putricide_mutated_transformation : public SpellScript // 70402, 72511, 72512, 72513 - Mutated Transformation (Damage) class spell_putricide_mutated_transformation_dmg : public SpellScript { - PrepareSpellScript(spell_putricide_mutated_transformation_dmg); - void FilterTargetsInitial(std::list<WorldObject*>& targets) { if (Unit* owner = ObjectAccessor::GetUnit(*GetCaster(), GetCaster()->GetCreatorGUID())) @@ -1387,8 +1355,6 @@ class spell_putricide_mutated_transformation_dmg : public SpellScript // 70539, 72457, 72875, 72876 - Regurgitated Ooze class spell_putricide_regurgitated_ooze : public SpellScript { - PrepareSpellScript(spell_putricide_regurgitated_ooze); - // the only purpose of this hook is to fail the achievement void ExtraEffect(SpellEffIndex /*effIndex*/) { @@ -1407,8 +1373,6 @@ class spell_putricide_regurgitated_ooze : public SpellScript // 72618 - Mutated Plague Clear class spell_putricide_clear_aura_effect_value : public SpellScript { - PrepareSpellScript(spell_putricide_clear_aura_effect_value); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1432,8 +1396,6 @@ class spell_putricide_clear_aura_effect_value : public SpellScript // 71123 - Decimate class spell_stinky_precious_decimate : public SpellScript { - PrepareSpellScript(spell_stinky_precious_decimate); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->GetHealthPct() > float(GetEffectValue())) @@ -1452,8 +1414,6 @@ class spell_stinky_precious_decimate : public SpellScript // 70402, 72511, 72512, 72513 - Mutated Transformation class spell_abomination_mutated_transformation : public SpellScript { - PrepareSpellScript(spell_abomination_mutated_transformation); - void HandleResistance(DamageInfo const& damageInfo, uint32& resistAmount, int32& /*absorbAmount*/) { Unit* caster = damageInfo.GetAttacker();; @@ -1474,8 +1434,6 @@ class spell_abomination_mutated_transformation : public SpellScript // 71279, 72459, 72621, 72622 - Choking Gas Explosion class spell_putricide_choking_gas_filter : public SpellScript { - PrepareSpellScript(spell_putricide_choking_gas_filter); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_OOZE_VARIABLE, SPELL_GAS_VARIABLE }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index a693250358f..623b1b929b6 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -416,8 +416,6 @@ private: // 69782, 69796, 69798, 69801 - Ooze Flood class spell_rotface_ooze_flood : public SpellScript { - PrepareSpellScript(spell_rotface_ooze_flood); - void HandleScript(SpellEffIndex /*effIndex*/) { if (!GetHitUnit()) @@ -457,8 +455,6 @@ class spell_rotface_ooze_flood : public SpellScript // 69674, 71224, 73022, 73023 - Mutated Infection class spell_rotface_mutated_infection : public SpellScript { - PrepareSpellScript(spell_rotface_mutated_infection); - void FilterTargets(std::list<WorldObject*>& targets) { // remove targets with this aura already @@ -488,8 +484,6 @@ class spell_rotface_mutated_infection : public SpellScript class spell_rotface_mutated_infection_aura : public AuraScript { - PrepareAuraScript(spell_rotface_mutated_infection_aura); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } }) @@ -513,8 +507,6 @@ class spell_rotface_mutated_infection_aura : public AuraScript // 69538 - Small Ooze Combine class spell_rotface_little_ooze_combine : public SpellScript { - PrepareSpellScript(spell_rotface_little_ooze_combine); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* caster = GetCaster()->ToCreature(); @@ -537,8 +529,6 @@ class spell_rotface_little_ooze_combine : public SpellScript // 69553 - Large Ooze Combine class spell_rotface_large_ooze_combine : public SpellScript { - PrepareSpellScript(spell_rotface_large_ooze_combine); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* caster = GetCaster()->ToCreature(); @@ -583,8 +573,6 @@ class spell_rotface_large_ooze_combine : public SpellScript // 69610 - Large Ooze Buff Combine class spell_rotface_large_ooze_buff_combine : public SpellScript { - PrepareSpellScript(spell_rotface_large_ooze_buff_combine); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -649,8 +637,6 @@ class spell_rotface_large_ooze_buff_combine : public SpellScript // 69839 - Unstable Ooze Explosion class spell_rotface_unstable_ooze_explosion_init : public SpellScript { - PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER }); @@ -677,8 +663,6 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScript // 69832 - Unstable Ooze Explosion class spell_rotface_unstable_ooze_explosion : public SpellScript { - PrepareSpellScript(spell_rotface_unstable_ooze_explosion); - void CheckTarget(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -702,8 +686,6 @@ class spell_rotface_unstable_ooze_explosion : public SpellScript // 71441 - Unstable Ooze Explosion Suicide Trigger class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript { - PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide); - void DespawnSelf(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -725,8 +707,6 @@ class spell_rotface_unstable_ooze_explosion_suicide : public AuraScript // 72285, 72288 - Vile Gas Trigger class spell_rotface_vile_gas_trigger : public SpellScript { - PrepareSpellScript(spell_rotface_vile_gas_trigger); - void FilterTargets(std::list<WorldObject*>& targets) { targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); @@ -780,8 +760,6 @@ class spell_rotface_vile_gas_trigger : public SpellScript // 69507, 71213, 73189, 73190 - Slime Spray class spell_rotface_slime_spray : public SpellScript { - PrepareSpellScript(spell_rotface_slime_spray); - void HandleResidue() { Player* target = GetHitPlayer(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index 2ffe0a3fbdb..ce9f385e625 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1017,8 +1017,6 @@ private: // 70598 - Sindragosa's Fury class spell_sindragosa_s_fury : public SpellScript { - PrepareSpellScript(spell_sindragosa_s_fury); - bool Load() override { // This script should execute only in Icecrown Citadel @@ -1090,8 +1088,6 @@ class spell_sindragosa_s_fury : public SpellScript // 69762 - Unchained Magic class spell_sindragosa_unchained_magic : public SpellScript { - PrepareSpellScript(spell_sindragosa_unchained_magic); - void FilterTargets(std::list<WorldObject*>& targets) { std::vector<WorldObject*> healers; @@ -1147,8 +1143,6 @@ class spell_sindragosa_unchained_magic : public SpellScript // 73061, 73062, 73063, 73064 - Frost Breath class spell_sindragosa_frost_breath : public SpellScript { - PrepareSpellScript(spell_sindragosa_frost_breath); - void HandleInfusion() { Player* target = GetHitPlayer(); @@ -1182,8 +1176,6 @@ class spell_sindragosa_frost_breath : public SpellScript // 69766 - Instability class spell_sindragosa_instability : public AuraScript { - PrepareAuraScript(spell_sindragosa_instability); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BACKLASH }); @@ -1209,8 +1201,6 @@ class spell_sindragosa_instability : public AuraScript // 70126 - Frost Beacon class spell_sindragosa_frost_beacon : public AuraScript { - PrepareAuraScript(spell_sindragosa_frost_beacon); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICE_TOMB_DAMAGE }); @@ -1232,8 +1222,6 @@ class spell_sindragosa_frost_beacon : public AuraScript // 70157 - Ice Tomb (Trap) class spell_sindragosa_ice_tomb_trap : public AuraScript { - PrepareAuraScript(spell_sindragosa_ice_tomb_trap); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB)) @@ -1282,8 +1270,6 @@ class spell_sindragosa_ice_tomb_trap : public AuraScript // 70117 - Icy Grip class spell_sindragosa_icy_grip : public SpellScript { - PrepareSpellScript(spell_sindragosa_icy_grip); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICY_GRIP_JUMP }); @@ -1318,8 +1304,6 @@ class MysticBuffetTargetFilter // 70127, 72528, 72529, 72530 - Mystic Buffet class spell_sindragosa_mystic_buffet : public SpellScript { - PrepareSpellScript(spell_sindragosa_mystic_buffet); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(MysticBuffetTargetFilter(GetCaster())); @@ -1334,8 +1318,6 @@ class spell_sindragosa_mystic_buffet : public SpellScript // 71376 - Icy Blast class spell_rimefang_icy_blast : public SpellScript { - PrepareSpellScript(spell_rimefang_icy_blast); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICY_BLAST_AREA }); @@ -1374,8 +1356,6 @@ class OrderWhelpTargetSelector // 71357 - Order Whelp class spell_frostwarden_handler_order_whelp : public SpellScript { - PrepareSpellScript(spell_frostwarden_handler_order_whelp); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FOCUS_FIRE }); @@ -1417,8 +1397,6 @@ class spell_frostwarden_handler_order_whelp : public SpellScript // 71350 - Focus Fire class spell_frostwarden_handler_focus_fire : public SpellScript { - PrepareSpellScript(spell_frostwarden_handler_focus_fire); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1434,8 +1412,6 @@ class spell_frostwarden_handler_focus_fire : public SpellScript class spell_frostwarden_handler_focus_fire_aura : public AuraScript { - PrepareAuraScript(spell_frostwarden_handler_focus_fire_aura); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -1460,8 +1436,6 @@ class spell_frostwarden_handler_focus_fire_aura : public AuraScript // 69712 - Ice Tomb (Target) class spell_sindragosa_ice_tomb_target : public SpellScript { - PrepareSpellScript(spell_sindragosa_ice_tomb_target); - void FilterTargets(std::list<WorldObject*>& unitList) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp index 56d5c21e9a0..1d2aa997cf2 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp @@ -1424,8 +1424,6 @@ public: // 70053 - Revive Champion class spell_svalna_revive_champion : public SpellScript { - PrepareSpellScript(spell_svalna_revive_champion); - void RemoveAliveTarget(std::list<WorldObject*>& targets) { targets.remove_if(ICCSvalnaAliveCheck()); @@ -1455,8 +1453,6 @@ class spell_svalna_revive_champion : public SpellScript // 71462 - Remove Spear class spell_svalna_remove_spear : public SpellScript { - PrepareSpellScript(spell_svalna_remove_spear); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index 14cd6145543..a2fb6a0ae4b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -1947,8 +1947,6 @@ private: // 70541, 73779, 73780, 73781 - Infest class spell_the_lich_king_infest : public AuraScript { - PrepareAuraScript(spell_the_lich_king_infest); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (GetUnitOwner()->HealthAbovePct(90)) @@ -1977,8 +1975,6 @@ class spell_the_lich_king_infest : public AuraScript // 70337, 73912, 73913, 73914 - Necrotic Plague class spell_the_lich_king_necrotic_plague : public AuraScript { - PrepareAuraScript(spell_the_lich_king_necrotic_plague); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NECROTIC_PLAGUE_JUMP }); @@ -2013,8 +2009,6 @@ class spell_the_lich_king_necrotic_plague : public AuraScript // 70338, 73785, 73786, 73787 - Necrotic Plague (Jump) class spell_the_lich_king_necrotic_plague_jump : public SpellScript { - PrepareSpellScript(spell_the_lich_king_necrotic_plague_jump); - public: spell_the_lich_king_necrotic_plague_jump() { @@ -2051,8 +2045,6 @@ private: class spell_the_lich_king_necrotic_plague_jump_aura : public AuraScript { - PrepareAuraScript(spell_the_lich_king_necrotic_plague_jump_aura); - public: spell_the_lich_king_necrotic_plague_jump_aura() { @@ -2123,8 +2115,6 @@ private: // 73530 - Shadow Trap (Visual) class spell_the_lich_king_shadow_trap_visual : public AuraScript { - PrepareAuraScript(spell_the_lich_king_shadow_trap_visual); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) @@ -2140,8 +2130,6 @@ class spell_the_lich_king_shadow_trap_visual : public AuraScript // 74282 - Shadow Trap (Periodic) class spell_the_lich_king_shadow_trap_periodic : public SpellScript { - PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic); - void CheckTargetCount(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -2159,8 +2147,6 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScript // 72262 - Quake class spell_the_lich_king_quake : public SpellScript { - PrepareSpellScript(spell_the_lich_king_quake); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2188,8 +2174,6 @@ class spell_the_lich_king_quake : public SpellScript // 69110 - Ice Burst Target Search class spell_the_lich_king_ice_burst_target_search : public SpellScript { - PrepareSpellScript(spell_the_lich_king_ice_burst_target_search); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICE_BURST }); @@ -2219,8 +2203,6 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScript // 69200 - Raging Spirit class spell_the_lich_king_raging_spirit : public SpellScript { - PrepareSpellScript(spell_the_lich_king_raging_spirit); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2251,8 +2233,6 @@ class ExactDistanceCheck // 72754, 73708, 73709, 73710 - Defile class spell_the_lich_king_defile : public SpellScript { - PrepareSpellScript(spell_the_lich_king_defile); - void CorrectRange(std::list<WorldObject*>& targets) { targets.remove_if(ExactDistanceCheck(GetCaster(), 10.0f * GetCaster()->GetObjectScale())); @@ -2282,8 +2262,6 @@ class spell_the_lich_king_defile : public SpellScript 74300 - Summon Spirit Bomb */ class spell_the_lich_king_summon_into_air : public SpellScript { - PrepareSpellScript(spell_the_lich_king_summon_into_air); - void ModDestHeight(SpellEffIndex /*effIndex*/) { static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f}; @@ -2308,8 +2286,6 @@ class spell_the_lich_king_summon_into_air : public SpellScript // 69409, 73797, 73798, 73799 - Soul Reaper class spell_the_lich_king_soul_reaper : public AuraScript { - PrepareAuraScript(spell_the_lich_king_soul_reaper); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SOUL_REAPER_BUFF }); @@ -2330,8 +2306,6 @@ class spell_the_lich_king_soul_reaper : public AuraScript // 69030 - Val'kyr Target Search class spell_the_lich_king_valkyr_target_search : public SpellScript { - PrepareSpellScript(spell_the_lich_king_valkyr_target_search); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CHARGE }); @@ -2379,8 +2353,6 @@ class spell_the_lich_king_valkyr_target_search : public SpellScript // 74445 - Val'kyr Carry class spell_the_lich_king_cast_back_to_caster : public SpellScript { - PrepareSpellScript(spell_the_lich_king_cast_back_to_caster); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); @@ -2395,8 +2367,6 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScript // 73488, 73782, 73783, 73784 - Life Siphon class spell_the_lich_king_life_siphon : public SpellScript { - PrepareSpellScript(spell_the_lich_king_life_siphon); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LIFE_SIPHON_HEAL }); @@ -2418,8 +2388,6 @@ class spell_the_lich_king_life_siphon : public SpellScript // 70498 - Vile Spirits class spell_the_lich_king_vile_spirits : public AuraScript { - PrepareAuraScript(spell_the_lich_king_vile_spirits); - public: spell_the_lich_king_vile_spirits() { @@ -2451,8 +2419,6 @@ private: // 70499 - Summon Vile Spirits Effect class spell_the_lich_king_vile_spirits_visual : public SpellScript { - PrepareSpellScript(spell_the_lich_king_vile_spirits_visual); - void ModDestHeight(SpellEffIndex /*effIndex*/) { Position offset = {0.0f, 0.0f, 15.0f, 0.0f}; @@ -2468,8 +2434,6 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScript // 70501 - Vile Spirit Move Target Search class spell_the_lich_king_vile_spirit_move_target_search : public SpellScript { - PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search); - public: spell_the_lich_king_vile_spirit_move_target_search() { @@ -2513,8 +2477,6 @@ private: // 70534 - Vile Spirit Damage Target Search class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScript { - PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2544,8 +2506,6 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScript // 68980, 74296, 74297, 74325 - Harvest Soul class spell_the_lich_king_harvest_soul : public AuraScript { - PrepareAuraScript(spell_the_lich_king_harvest_soul); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -2568,8 +2528,6 @@ class spell_the_lich_king_harvest_soul : public AuraScript // 69382 - Light's Favor class spell_the_lich_king_lights_favor : public AuraScript { - PrepareAuraScript(spell_the_lich_king_lights_favor); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (Unit* caster = GetCaster()) @@ -2595,8 +2553,6 @@ class spell_the_lich_king_lights_favor : public AuraScript // 69397 - Soul Rip class spell_the_lich_king_soul_rip : public AuraScript { - PrepareAuraScript(spell_the_lich_king_soul_rip); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -2619,8 +2575,6 @@ class spell_the_lich_king_soul_rip : public AuraScript // 72595, 73650 - Restore Soul class spell_the_lich_king_restore_soul : public SpellScript { - PrepareSpellScript(spell_the_lich_king_restore_soul); - public: spell_the_lich_king_restore_soul() { @@ -2672,8 +2626,6 @@ private: // 69383 - Dark Hunger class spell_the_lich_king_dark_hunger : public AuraScript { - PrepareAuraScript(spell_the_lich_king_dark_hunger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DARK_HUNGER_HEAL }); @@ -2700,8 +2652,6 @@ class spell_the_lich_king_dark_hunger : public AuraScript // 74276 - In Frostmourne Room class spell_the_lich_king_in_frostmourne_room : public AuraScript { - PrepareAuraScript(spell_the_lich_king_in_frostmourne_room); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -2724,8 +2674,6 @@ class spell_the_lich_king_in_frostmourne_room : public AuraScript // 74302, 74341, 74342, 74343 - Summon Spirit Bomb class spell_the_lich_king_summon_spirit_bomb : public SpellScript { - PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2741,8 +2689,6 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScript // 73582 - Trigger Vile Spirit (Inside, Heroic) class spell_the_lich_king_trigger_vile_spirit : public SpellScript { - PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit); - void ActivateSpirit() { Creature* target = GetHitCreature(); @@ -2761,8 +2707,6 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScript // 71811 - Jump class spell_the_lich_king_jump : public SpellScript { - PrepareSpellScript(spell_the_lich_king_jump); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2781,8 +2725,6 @@ class spell_the_lich_king_jump : public SpellScript // 72431 - Jump (Remove Aura) class spell_the_lich_king_jump_remove_aura : public SpellScript { - PrepareSpellScript(spell_the_lich_king_jump_remove_aura); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2798,8 +2740,6 @@ class spell_the_lich_king_jump_remove_aura : public SpellScript // 73655 - Harvest Soul (Teleport) class spell_the_lich_king_harvest_souls_teleport : public SpellScript { - PrepareSpellScript(spell_the_lich_king_harvest_souls_teleport); - void RelocateTransportOffset(SpellEffIndex /*effIndex*/) { float randCoordX = frand(-18.0f, 18.0f); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index b969f003271..b8c9fca9d61 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -994,8 +994,6 @@ private: // 71085 - Mana Void class spell_dreamwalker_mana_void : public AuraScript { - PrepareAuraScript(spell_dreamwalker_mana_void); - void PeriodicTick(AuraEffect const* aurEff) { // first 3 ticks have amplitude 1 second @@ -1017,8 +1015,6 @@ class spell_dreamwalker_mana_void : public AuraScript // 70916 - Summon Timer: Risen Archmage class spell_dreamwalker_decay_periodic_timer : public AuraScript { - PrepareAuraScript(spell_dreamwalker_decay_periodic_timer); - bool Load() override { _decayRate = GetId() != SPELL_TIMER_BLAZING_SKELETON ? 1000 : 5000; @@ -1048,8 +1044,6 @@ class spell_dreamwalker_decay_periodic_timer : public AuraScript // 71078 - Summon Risen Archmage class spell_dreamwalker_summoner : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summoner); - bool Load() override { if (!GetCaster()->GetInstanceScript()) @@ -1088,8 +1082,6 @@ class spell_dreamwalker_summoner : public SpellScript // 70912 - Summon Timer: Suppresser class spell_dreamwalker_summon_suppresser : public AuraScript { - PrepareAuraScript(spell_dreamwalker_summon_suppresser); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SUPPRESSER }); @@ -1131,8 +1123,6 @@ class spell_dreamwalker_summon_suppresser : public AuraScript // 70936 - Summon Suppresser class spell_dreamwalker_summon_suppresser_effect : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect); - bool Load() override { if (!GetCaster()->GetInstanceScript()) @@ -1159,8 +1149,6 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScript // 72224 - Summon Dream Portal class spell_dreamwalker_summon_dream_portal : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_dream_portal); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1180,8 +1168,6 @@ class spell_dreamwalker_summon_dream_portal : public SpellScript // 72480 - Summon Nightmare Portal class spell_dreamwalker_summon_nightmare_portal : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1201,8 +1187,6 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScript // 71970 - Nightmare Cloud class spell_dreamwalker_nightmare_cloud : public AuraScript { - PrepareAuraScript(spell_dreamwalker_nightmare_cloud); - public: spell_dreamwalker_nightmare_cloud() { @@ -1233,8 +1217,6 @@ private: // 71941 - Twisted Nightmares class spell_dreamwalker_twisted_nightmares : public SpellScript { - PrepareSpellScript(spell_dreamwalker_twisted_nightmares); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1253,8 +1235,6 @@ class spell_dreamwalker_twisted_nightmares : public SpellScript // 47788 - Guardian Spirit class spell_dreamwalker_guardian_spirit_restriction : public SpellScript { - PrepareSpellScript(spell_dreamwalker_guardian_spirit_restriction); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WEAKENED_SOUL }); diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 3be82407246..8546a606d64 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1164,8 +1164,6 @@ private: // 70227 - Empowered Blood class spell_icc_empowered_blood : public AuraScript { - PrepareAuraScript(spell_icc_empowered_blood); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD_2 }); @@ -1191,8 +1189,6 @@ class spell_icc_empowered_blood : public AuraScript // 70304 - Empowered Blood class spell_icc_empowered_blood_3 : public AuraScript { - PrepareAuraScript(spell_icc_empowered_blood_3); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD_4 }); @@ -1218,8 +1214,6 @@ class spell_icc_empowered_blood_3 : public AuraScript // 70299 - Siphon Essence class spell_icc_siphon_essence : public AuraScript { - PrepareAuraScript(spell_icc_siphon_essence); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_CANCEL && GetTarget()->IsAIEnabled()) @@ -1235,8 +1229,6 @@ class spell_icc_siphon_essence : public AuraScript // 70450 - Blood Mirror class spell_darkfallen_blood_mirror : public SpellScript { - PrepareSpellScript(spell_darkfallen_blood_mirror); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BLOOD_MIRROR_2, SPELL_BLOOD_MIRROR_DAMAGE_SHARE }); @@ -1283,8 +1275,6 @@ private: // 70939 - Blood Queen Lana'thel - Clear all Status Ailments class spell_generic_remove_empowered_blood : public SpellScript { - PrepareSpellScript(spell_generic_remove_empowered_blood); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_EMPOWERED_BLOOD }); @@ -1304,8 +1294,6 @@ class spell_generic_remove_empowered_blood : public SpellScript // 70733 - Stoneform class spell_icc_stoneform : public AuraScript { - PrepareAuraScript(spell_icc_stoneform); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -1338,8 +1326,6 @@ class spell_icc_stoneform : public AuraScript // 70536, 70545, 70546, 70547 - Spirit Alarm class spell_icc_spirit_alarm : public SpellScript { - PrepareSpellScript(spell_icc_spirit_alarm); - void HandleEvent(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1390,8 +1376,6 @@ class spell_icc_spirit_alarm : public SpellScript // 72864 - Death Plague class spell_frost_giant_death_plague : public SpellScript { - PrepareSpellScript(spell_frost_giant_death_plague); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RECENTLY_INFECTED, SPELL_DEATH_PLAGUE_KILL, SPELL_DEATH_PLAGUE }); @@ -1455,8 +1439,6 @@ private: // 72155, 72162 - Harvest Blight Specimen class spell_icc_harvest_blight_specimen : public SpellScript { - PrepareSpellScript(spell_icc_harvest_blight_specimen); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1478,8 +1460,6 @@ class spell_icc_harvest_blight_specimen : public SpellScript // 72585 - Soul Missile class spell_icc_soul_missile : public SpellScript { - PrepareSpellScript(spell_icc_soul_missile); - void RelocateDest(SpellDestination& dest) { static Position const offset = { 0.0f, 0.0f, 200.0f, 0.0f }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h index 7b8570fd82c..4fe131bc400 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h @@ -555,8 +555,6 @@ uint32 const MaxHeroicAttempts = 50; class spell_trigger_spell_from_caster : public SpellScript { - PrepareSpellScript(spell_trigger_spell_from_caster); - public: spell_trigger_spell_from_caster(uint32 triggerId, TriggerCastFlags triggerFlags = TRIGGERED_FULL_MASK); diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp index c3263533db1..86942296681 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp @@ -121,8 +121,6 @@ private: // 66637 - Horde Gunship Portal class spell_ioc_gunship_portal : public SpellScript { - PrepareSpellScript(spell_ioc_gunship_portal); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -151,8 +149,6 @@ class spell_ioc_gunship_portal : public SpellScript // 66656 - Parachute class spell_ioc_parachute_ic : public AuraScript { - PrepareAuraScript(spell_ioc_parachute_ic); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -197,8 +193,6 @@ class StartLaunchEvent : public BasicEvent // 66218 - Launch class spell_ioc_launch : public SpellScript { - PrepareSpellScript(spell_ioc_launch); - void Launch() { if (!GetCaster()->ToCreature() || !GetExplTargetDest()) @@ -225,8 +219,6 @@ enum SeaforiumBombSpells // 66676 - Seaforium Blast class spell_ioc_seaforium_blast_credit : public SpellScript { - PrepareSpellScript(spell_ioc_seaforium_blast_credit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_A_BOMB_INABLE_CREDIT, SPELL_A_BOMB_INATION_CREDIT }); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index c29fb0ec62d..0f57dfbfae6 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -653,8 +653,6 @@ struct boss_four_horsemen_sir : public boss_four_horsemen_baseAI // 28835 - Mark of Zeliek class spell_four_horsemen_mark : public AuraScript { - PrepareAuraScript(spell_four_horsemen_mark); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 1f1d20df53f..f4653cb2972 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -290,8 +290,6 @@ private: // 28374, 54426 - Decimate class spell_gluth_decimate : public SpellScript { - PrepareSpellScript(spell_gluth_decimate); - // handles the damaging effect of the decimate spell. void HandleScriptEffect(SpellEffIndex /* index */) { @@ -333,8 +331,6 @@ class spell_gluth_decimate : public SpellScript // 28239, 28404 - Zombie Chow Search (single target and aoe zombie-kill spell) to heal Gluth on each target hit class spell_gluth_zombiechow_search : public SpellScript { - PrepareSpellScript(spell_gluth_zombiechow_search); - void HealForEachTargetHit() { GetCaster()->ModifyHealth(int32(GetCaster()->CountPctFromMaxHealth(5))); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 0d2cd019ef4..454d6ba4674 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -890,8 +890,6 @@ struct npc_gothik_trigger : public ScriptedAI // 27831, 55638 - Shadow Bolt Volley class spell_gothik_shadow_bolt_volley : public SpellScript { - PrepareSpellScript(spell_gothik_shadow_bolt_volley); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK)); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index 7c4f0321ce5..ad815472a61 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -188,8 +188,6 @@ private: // 28169 - Mutating Injection class spell_grobbulus_mutating_injection : public AuraScript { - PrepareAuraScript(spell_grobbulus_mutating_injection); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MUTATING_EXPLOSION, SPELL_POISON_CLOUD }); @@ -219,8 +217,6 @@ class spell_grobbulus_mutating_injection : public AuraScript // 28158, 54362 - Poison class spell_grobbulus_poison_cloud : public AuraScript { - PrepareAuraScript(spell_grobbulus_poison_cloud); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 554e39ff1e6..645acf28775 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -213,8 +213,6 @@ struct boss_heigan : public BossAI // 29371 - Eruption class spell_heigan_eruption : public SpellScript { - PrepareSpellScript(spell_heigan_eruption); - void HandleScript(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index c5bb7db14ad..72e07397e3e 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -856,8 +856,6 @@ private: // 28410 - Chains of Kel'Thuzad class spell_kelthuzad_chains : public AuraScript { - PrepareAuraScript(spell_kelthuzad_chains); - void HandleApply(AuraEffect const* aurEff, AuraEffectHandleModes mode) { aurEff->HandleAuraModScale(GetTargetApplication(), mode, true); @@ -878,8 +876,6 @@ class spell_kelthuzad_chains : public AuraScript // 27819 - Detonate Mana class spell_kelthuzad_detonate_mana : public AuraScript { - PrepareAuraScript(spell_kelthuzad_detonate_mana); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MANA_DETONATION_DAMAGE }); @@ -908,8 +904,6 @@ class spell_kelthuzad_detonate_mana : public AuraScript // 27808 - Frost Blast class spell_kelthuzad_frost_blast : public AuraScript { - PrepareAuraScript(spell_kelthuzad_frost_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FROST_BLAST_DMG }); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 0995313f448..7a83239a2c1 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -154,8 +154,6 @@ class achievement_spore_loser : public AchievementCriteriaScript // 29865, 55053 - Deathbloom class spell_loatheb_deathbloom : public AuraScript { - PrepareAuraScript(spell_loatheb_deathbloom); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DEATHBLOOM_FINAL_DAMAGE }); diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index aa5bb49af45..214b8a94918 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -489,8 +489,6 @@ struct go_sapphiron_birth : public GameObjectAI // 24780 - Dream Fog class spell_sapphiron_change_blizzard_target : public AuraScript { - PrepareAuraScript(spell_sapphiron_change_blizzard_target); - void HandlePeriodic(AuraEffect const* /*eff*/) { TempSummon* me = GetTarget()->ToTempSummon(); @@ -519,8 +517,6 @@ class spell_sapphiron_change_blizzard_target : public AuraScript // 28522 - Icebolt class spell_sapphiron_icebolt : public AuraScript { - PrepareAuraScript(spell_sapphiron_icebolt); - void HandleApply(AuraEffect const* /*eff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->ApplySpellImmune(SPELL_ICEBOLT, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FROST, true); @@ -559,8 +555,6 @@ class spell_sapphiron_icebolt : public AuraScript // 28560 - Summon Blizzard class spell_sapphiron_summon_blizzard : public SpellScript { - PrepareSpellScript(spell_sapphiron_summon_blizzard); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BLIZZARD }); @@ -595,8 +589,6 @@ class spell_sapphiron_summon_blizzard : public SpellScript // 29330 - Sapphiron's Wing Buffet Despawn class spell_sapphiron_wing_buffet_despawn_periodic : public AuraScript { - PrepareAuraScript(spell_sapphiron_wing_buffet_despawn_periodic); - void PeriodicTick(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -613,8 +605,6 @@ class spell_sapphiron_wing_buffet_despawn_periodic : public AuraScript // 29336 - Despawn Buffet class spell_sapphiron_despawn_buffet : public SpellScript { - PrepareSpellScript(spell_sapphiron_despawn_buffet); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { if (Creature* target = GetHitCreature()) diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index 5e45d415970..a4a20fb900c 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -944,8 +944,6 @@ struct npc_tesla : public ScriptedAI // 28085 - Negative Charge class spell_thaddius_polarity_charge : public SpellScript { - PrepareSpellScript(spell_thaddius_polarity_charge); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1034,8 +1032,6 @@ class spell_thaddius_polarity_charge : public SpellScript // 28089 - Polarity Shift class spell_thaddius_polarity_shift : public SpellScript { - PrepareSpellScript(spell_thaddius_polarity_shift); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1077,8 +1073,6 @@ class spell_thaddius_polarity_shift : public SpellScript // 54517 - Magnetic Pull class spell_thaddius_magnetic_pull : public SpellScript { - PrepareSpellScript(spell_thaddius_magnetic_pull); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MAGNETIC_PULL }); diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index a9600ba6e48..4e0985c330b 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1476,8 +1476,6 @@ struct npc_static_field : public ScriptedAI // 56046 - Portal Beam class spell_malygos_portal_beam : public AuraScript { - PrepareAuraScript(spell_malygos_portal_beam); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1510,8 +1508,6 @@ class spell_malygos_portal_beam : public AuraScript // 56047 - Random Portal class spell_malygos_random_portal : public SpellScript { - PrepareSpellScript(spell_malygos_random_portal); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1556,8 +1552,6 @@ class IsCreatureVehicleCheck // 57459, 61693, 61694 - Arcane Storm class spell_malygos_arcane_storm : public SpellScript { - PrepareSpellScript(spell_malygos_arcane_storm); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1603,8 +1597,6 @@ class spell_malygos_arcane_storm : public SpellScript // 56105 - Vortex class spell_malygos_vortex_dummy : public SpellScript { - PrepareSpellScript(spell_malygos_vortex_dummy); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1630,8 +1622,6 @@ class spell_malygos_vortex_dummy : public SpellScript // 55873 - Vortex class spell_malygos_vortex_visual : public AuraScript { - PrepareAuraScript(spell_malygos_vortex_visual); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1694,8 +1684,6 @@ class ExactDistanceCheck // 56438 - Arcane Overload class spell_arcane_overload : public SpellScript { - PrepareSpellScript(spell_arcane_overload); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1717,8 +1705,6 @@ class spell_arcane_overload : public SpellScript // 61210 - Align Disk Aggro class spell_nexus_lord_align_disk_aggro : public SpellScript { - PrepareSpellScript(spell_nexus_lord_align_disk_aggro); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1758,8 +1744,6 @@ class IsPlayerOnHoverDisk // 56397 - Arcane Barrage class spell_scion_of_eternity_arcane_barrage : public SpellScript { - PrepareSpellScript(spell_scion_of_eternity_arcane_barrage); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT && GetCaster()->GetInstanceScript() != nullptr; @@ -1829,8 +1813,6 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScript // 58842 - Destroy Platform Channel class spell_malygos_destroy_platform_channel : public AuraScript { - PrepareAuraScript(spell_malygos_destroy_platform_channel); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1858,8 +1840,6 @@ class spell_malygos_destroy_platform_channel : public AuraScript // 59084 - Destroy Platform Boom Visual class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScript { - PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1885,8 +1865,6 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScript // 59099 - Destroy Platform Event class spell_alexstrasza_bunny_destroy_platform_event : public SpellScript { - PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1915,8 +1893,6 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScript // 56070 - Summon Red Dragon Buddy class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScript { - PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1938,8 +1914,6 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScript // 56072 - Ride Red Dragon Buddy class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript { - PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1960,8 +1934,6 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript // 60939 - Surge of Power class spell_malygos_surge_of_power_warning_selector_25 : public SpellScript { - PrepareSpellScript(spell_malygos_surge_of_power_warning_selector_25); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2013,8 +1985,6 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScript // 60936 - Surge of Power class spell_malygos_surge_of_power_25 : public SpellScript { - PrepareSpellScript(spell_malygos_surge_of_power_25); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2054,8 +2024,6 @@ class spell_malygos_surge_of_power_25 : public SpellScript // 61028 - Alexstrasza's Gift Beam class spell_alexstrasza_gift_beam : public AuraScript { - PrepareAuraScript(spell_alexstrasza_gift_beam); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2088,8 +2056,6 @@ class spell_alexstrasza_gift_beam : public AuraScript // 61023 - Alexstrasza's Gift Visual class spell_alexstrasza_gift_beam_visual : public AuraScript { - PrepareAuraScript(spell_alexstrasza_gift_beam_visual); - public: spell_alexstrasza_gift_beam_visual() { diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index b0075cbef0c..e86c687b159 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -231,8 +231,6 @@ struct containment_sphere : public GameObjectAI // 48095 - Intense Cold class spell_intense_cold : public AuraScript { - PrepareAuraScript(spell_intense_cold); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { if (GetStackAmount() < 2) diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp index 5c7b7702f53..9715348d5b3 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_magus_telestra.cpp @@ -326,8 +326,6 @@ private: // 47710 - Summon Telestra Clones class spell_magus_telestra_summon_clones : public SpellScript { - PrepareSpellScript(spell_magus_telestra_summon_clones); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -357,8 +355,6 @@ class spell_magus_telestra_summon_clones : public SpellScript // 47713 - Telestra Clone Dies (Arcane) class spell_magus_telestra_clone_dies : public AuraScript { - PrepareAuraScript(spell_magus_telestra_clone_dies); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TRIGGER_000 }); diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index fb3a8007270..9cb218167d8 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -268,8 +268,6 @@ std::array<uint32, 4> const SummonSpellsHeroic = // 47958, 57082 - Crystal Spikes class spell_ormorok_summon_crystal_spikes : public SpellScript { - PrepareSpellScript(spell_ormorok_summon_crystal_spikes); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(SummonSpells) && ValidateSpellInfo(SummonSpellsHeroic); @@ -291,8 +289,6 @@ class spell_ormorok_summon_crystal_spikes : public SpellScript // 47941 - Crystal Spike class spell_ormorok_crystal_spike : public AuraScript { - PrepareAuraScript(spell_ormorok_crystal_spike); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp index 3d64e9e5350..4e766d77811 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp @@ -139,8 +139,6 @@ struct boss_drakos : public BossAI // 51336 - Magic Pull class spell_drakos_magic_pull : public SpellScript { - PrepareSpellScript(spell_drakos_magic_pull); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGIC_PULL_EFFECT, SPELL_SUMMON_UNSTABLE_SPHERE }); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index e8f85b0d0e6..95eaa59cf8f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -254,8 +254,6 @@ private: // 51162 - Planar Shift class spell_eregos_planar_shift : public AuraScript { - PrepareAuraScript(spell_eregos_planar_shift); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* creature = GetTarget()->ToCreature()) diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp index 1f4c23b67bf..13b869a4d5e 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp @@ -338,8 +338,6 @@ private: // 51103 - Frostbomb class spell_urom_frostbomb : public AuraScript { - PrepareAuraScript(spell_urom_frostbomb); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FROST_BUFFET }); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 256394560d1..2e6357a0794 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -243,8 +243,6 @@ private: // 50053 - Centrifuge Shield class spell_varos_centrifuge_shield : public AuraScript { - PrepareAuraScript(spell_varos_centrifuge_shield); - bool Load() override { Unit* caster = GetCaster(); @@ -273,8 +271,6 @@ class spell_varos_centrifuge_shield : public AuraScript // 50785, 59372 - Energize Cores class spell_varos_energize_core_area_enemy : public SpellScript { - PrepareSpellScript(spell_varos_energize_core_area_enemy); - void FilterTargets(std::list<WorldObject*>& targets) { Creature* varos = GetCaster()->ToCreature(); @@ -308,8 +304,6 @@ class spell_varos_energize_core_area_enemy : public SpellScript // 61407, 62136 - Energize Cores class spell_varos_energize_core_area_entry : public SpellScript { - PrepareSpellScript(spell_varos_energize_core_area_entry); - void FilterTargets(std::list<WorldObject*>& targets) { Creature* varos = GetCaster()->ToCreature(); diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 44d18148dbb..4dfca6ae6d7 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -376,8 +376,6 @@ private: // 49462 - Call Ruby Drake class spell_oculus_call_ruby_emerald_amber_drake : public SpellScript { - PrepareSpellScript(spell_oculus_call_ruby_emerald_amber_drake); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -396,8 +394,6 @@ class spell_oculus_call_ruby_emerald_amber_drake : public SpellScript // 49463 - Ride Ruby Drake Que class spell_oculus_ride_ruby_emerald_amber_drake_que : public AuraScript { - PrepareAuraScript(spell_oculus_ride_ruby_emerald_amber_drake_que); - void HandlePeriodic(AuraEffect const* aurEff) { // caster of the triggered spell is wrong for an unknown reason, handle it here correctly @@ -415,8 +411,6 @@ class spell_oculus_ride_ruby_emerald_amber_drake_que : public AuraScript // 50240 - Evasive Maneuvers class spell_oculus_evasive_maneuvers : public AuraScript { - PrepareAuraScript(spell_oculus_evasive_maneuvers); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUBY_EVASIVE_CHARGES }); @@ -439,8 +433,6 @@ class spell_oculus_evasive_maneuvers : public AuraScript // 49840 - Shock Lance class spell_oculus_shock_lance : public SpellScript { - PrepareSpellScript(spell_oculus_shock_lance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -470,8 +462,6 @@ class spell_oculus_shock_lance : public SpellScript // 49838 - Stop Time class spell_oculus_stop_time : public AuraScript { - PrepareAuraScript(spell_oculus_stop_time); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -497,8 +487,6 @@ class spell_oculus_stop_time : public AuraScript // 49592 - Temporal Rift class spell_oculus_temporal_rift : public AuraScript { - PrepareAuraScript(spell_oculus_temporal_rift); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -531,8 +519,6 @@ class spell_oculus_temporal_rift : public AuraScript // 50341 - Touch the Nightmare class spell_oculus_touch_the_nightmare : public SpellScript { - PrepareSpellScript(spell_oculus_touch_the_nightmare); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { SetHitDamage(int32(GetCaster()->CountPctFromMaxHealth(30))); @@ -547,8 +533,6 @@ class spell_oculus_touch_the_nightmare : public SpellScript // 50344 - Dream Funnel class spell_oculus_dream_funnel : public AuraScript { - PrepareAuraScript(spell_oculus_dream_funnel); - void HandleEffectCalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { if (Unit* caster = GetCaster()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp index caefccde989..2a54638e94d 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_general_bjarngrim.cpp @@ -380,8 +380,6 @@ private: // 53792 - Battle Stance class spell_bjarngrim_stance_dummy : public AuraScript { - PrepareAuraScript(spell_bjarngrim_stance_dummy); - public: spell_bjarngrim_stance_dummy(uint8 stanceId) : AuraScript(), _stanceId(stanceId) { } @@ -456,8 +454,6 @@ private: // 52098 - Charge Up class spell_bjarngrim_charge_up : public AuraScript { - PrepareAuraScript(spell_bjarngrim_charge_up); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TEMPOARY_ELECTRICAL_CHARGE }); @@ -478,8 +474,6 @@ class spell_bjarngrim_charge_up : public AuraScript // 59085 - Arc Weld class spell_bjarngrim_arc_weld : public AuraScript { - PrepareAuraScript(spell_bjarngrim_arc_weld); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ARC_WELD_DAMAGE }); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 0b4eeef3f4f..099bd3a86a3 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -201,8 +201,6 @@ struct boss_loken : public BossAI // 52942, 59837 - Pulsing Shockwave class spell_loken_pulsing_shockwave : public SpellScript { - PrepareSpellScript(spell_loken_pulsing_shockwave); - void CalculateDamage(SpellEffIndex /*effIndex*/) { if (!GetHitUnit()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp index 7fe66b85571..53fcdb94f43 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_volkhan.cpp @@ -377,8 +377,6 @@ private: // 52654, 52238 - Temper class spell_volkhan_temper_dummy : public SpellScript { - PrepareSpellScript(spell_volkhan_temper_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TEMPER_DUMMY_COMBAT }); @@ -412,8 +410,6 @@ class spell_volkhan_temper_dummy : public SpellScript // 52441 - Cool Down class spell_volkhan_cool_down : public AuraScript { - PrepareAuraScript(spell_volkhan_cool_down); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COOL_DOWN_SLOW, SPELL_COSMETIC_STUN_IMMUNE_FREEZE_AMNIM }); @@ -446,8 +442,6 @@ class spell_volkhan_cool_down : public AuraScript // 59123 Cosmetic - Stun + Immune Permanent (Freeze Anim) class spell_volkhan_cosmetic_stun_immune_permanent : public AuraScript { - PrepareAuraScript(spell_volkhan_cosmetic_stun_immune_permanent); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -463,8 +457,6 @@ class spell_volkhan_cosmetic_stun_immune_permanent : public AuraScript // 52237, 59529 - Shattering Stomp class spell_volkhan_shattering_stomp : public SpellScript { - PrepareSpellScript(spell_volkhan_shattering_stomp); - void HandleShattering() { if (Creature* caster = GetCaster()->ToCreature()) diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index 8080cfa4c55..25b0dd77579 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -134,8 +134,6 @@ struct boss_krystallus : public BossAI // 50810, 61546 - Shatter class spell_krystallus_shatter : public SpellScript { - PrepareSpellScript(spell_krystallus_shatter); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -154,8 +152,6 @@ class spell_krystallus_shatter : public SpellScript // 50811, 61547 - Shatter class spell_krystallus_shatter_effect : public SpellScript { - PrepareSpellScript(spell_krystallus_shatter_effect); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }); diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp index 265827cbd1d..7d575f0d16a 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_sjonnir.cpp @@ -404,8 +404,6 @@ private: 50824 - Summon Earthen Dwarf */ class spell_sjonnir_periodic_summon : public AuraScript { - PrepareAuraScript(spell_sjonnir_periodic_summon); - public: spell_sjonnir_periodic_summon(uint32 leftPipeSpell, uint32 rightPipeSpell) : AuraScript(), _leftPipeSpell(leftPipeSpell), _rightPipeSpell(rightPipeSpell) { } @@ -439,8 +437,6 @@ private: // 50777 - Iron Sludge Spawn Visual class spell_sjonnir_iron_sludge_spawn_visual : public AuraScript { - PrepareAuraScript(spell_sjonnir_iron_sludge_spawn_visual); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // They're indeed passive but I'm not sure enough if it's handled by this aura or directly in script diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 4b5aec6dad1..84262234a81 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -1017,8 +1017,6 @@ private: // 64412 - Phase Punch class spell_algalon_phase_punch : public AuraScript { - PrepareAuraScript(spell_algalon_phase_punch); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1045,8 +1043,6 @@ class spell_algalon_phase_punch : public AuraScript // 65508 - Constellation Phase Trigger class spell_algalon_phase_constellation : public AuraScript { - PrepareAuraScript(spell_algalon_phase_constellation); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -1070,8 +1066,6 @@ class spell_algalon_phase_constellation : public AuraScript // 62266 - Trigger 3 Adds class spell_algalon_trigger_3_adds : public SpellScript { - PrepareSpellScript(spell_algalon_trigger_3_adds); - void SelectTarget(std::list<WorldObject*>& targets) { // Remove Living Constellation already actived @@ -1098,8 +1092,6 @@ class spell_algalon_trigger_3_adds : public SpellScript // 62018 - Collapse class spell_algalon_collapse : public AuraScript { - PrepareAuraScript(spell_algalon_collapse); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1115,8 +1107,6 @@ class spell_algalon_collapse : public AuraScript // 64443, 64584 - Big Bang class spell_algalon_big_bang : public SpellScript { - PrepareSpellScript(spell_algalon_big_bang); - bool Load() override { _targetCount = 0; @@ -1146,8 +1136,6 @@ private: // 64445 - Remove Player from Phase class spell_algalon_remove_phase : public AuraScript { - PrepareAuraScript(spell_algalon_remove_phase); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1163,8 +1151,6 @@ class spell_algalon_remove_phase : public AuraScript // 62295 - Cosmic Smash class spell_algalon_cosmic_smash : public SpellScript { - PrepareSpellScript(spell_algalon_cosmic_smash); - void ModDestHeight(SpellDestination& dest) { // Meteor should spawn below the platform @@ -1181,8 +1167,6 @@ class spell_algalon_cosmic_smash : public SpellScript // 62311, 64596 - Cosmic Smash class spell_algalon_cosmic_smash_damage : public SpellScript { - PrepareSpellScript(spell_algalon_cosmic_smash_damage); - void RecalculateDamage() { if (!GetExplTargetDest() || !GetHitUnit()) @@ -1202,8 +1186,6 @@ class spell_algalon_cosmic_smash_damage : public SpellScript // 65311 - Supermassive Fail class spell_algalon_supermassive_fail : public SpellScript { - PrepareSpellScript(spell_algalon_supermassive_fail); - void RecalculateDamage() { if (Player* player = GetHitPlayer()) @@ -1221,8 +1203,6 @@ class spell_algalon_supermassive_fail : public SpellScript // 64417 - Phase Punch (Phase Shifts) class spell_algalon_black_hole_phase_shifts : public AuraScript { - PrepareAuraScript(spell_algalon_black_hole_phase_shifts); - bool Load() override { return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp index 3e4451164c3..0db4f8b942f 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp @@ -673,8 +673,6 @@ class spell_shield_of_runes : public SpellScriptLoader class spell_shield_of_runes_AuraScript : public AuraScript { - PrepareAuraScript(spell_shield_of_runes_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -701,8 +699,6 @@ class spell_assembly_meltdown : public SpellScriptLoader class spell_assembly_meltdown_SpellScript : public SpellScript { - PrepareSpellScript(spell_assembly_meltdown_SpellScript); - void HandleInstaKill(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -729,8 +725,6 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader class spell_assembly_rune_of_summoning_AuraScript : public AuraScript { - PrepareAuraScript(spell_assembly_rune_of_summoning_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RUNE_OF_SUMMONING_SUMMON }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index dde0a93c49b..e0e64ffbdbb 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -524,8 +524,6 @@ private: // 64381 - Strength of the Pack class spell_auriaya_strenght_of_the_pack : public SpellScript { - PrepareSpellScript(spell_auriaya_strenght_of_the_pack); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove_if([](WorldObject* obj) { return obj->GetEntry() != NPC_SANCTUM_SENTRY; }); @@ -540,8 +538,6 @@ class spell_auriaya_strenght_of_the_pack : public SpellScript // 64392, 64679 - Sentinel Blast class spell_auriaya_sentinel_blast : public SpellScript { - PrepareSpellScript(spell_auriaya_sentinel_blast); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* object) -> bool @@ -566,8 +562,6 @@ class spell_auriaya_sentinel_blast : public SpellScript // 63709 - Aggro Creator class spell_auriaya_agro_creator : public SpellScript { - PrepareSpellScript(spell_auriaya_agro_creator); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_POUNCE }); @@ -596,8 +590,6 @@ class spell_auriaya_agro_creator : public SpellScript // 64456 - Feral Essence Application Removal class spell_auriaya_feral_essence_removal : public SpellScript { - PrepareSpellScript(spell_auriaya_feral_essence_removal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FERAL_ESSENCE }); @@ -618,8 +610,6 @@ class spell_auriaya_feral_essence_removal : public SpellScript // 64496, 64674 - Feral Rush class spell_auriaya_feral_rush : public SpellScript { - PrepareSpellScript(spell_auriaya_feral_rush); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FERAL_RUSH_2 }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp index 2151d24530d..61e0854c319 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1434,8 +1434,6 @@ class achievement_unbroken : public AchievementCriteriaScript // 62399 - Overload Circuit class spell_overload_circuit : public AuraScript { - PrepareAuraScript(spell_overload_circuit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SYSTEMS_SHUTDOWN }); @@ -1460,8 +1458,6 @@ class spell_overload_circuit : public AuraScript // 62292 - Blaze class spell_tar_blaze : public AuraScript { - PrepareAuraScript(spell_tar_blaze); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -1492,8 +1488,6 @@ class spell_load_into_catapult : public SpellScriptLoader class spell_load_into_catapult_AuraScript : public AuraScript { - PrepareAuraScript(spell_load_into_catapult_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* owner = GetOwner()->ToUnit(); @@ -1538,8 +1532,6 @@ class spell_auto_repair : public SpellScriptLoader class spell_auto_repair_SpellScript : public SpellScript { - PrepareSpellScript(spell_auto_repair_SpellScript); - void CheckCooldownForTarget(SpellMissInfo missInfo) { if (missInfo != SPELL_MISS_NONE) @@ -1603,8 +1595,6 @@ class spell_systems_shutdown : public SpellScriptLoader class spell_systems_shutdown_AuraScript : public AuraScript { - PrepareAuraScript(spell_systems_shutdown_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Creature* owner = GetOwner()->ToCreature(); @@ -1686,8 +1676,6 @@ class spell_pursue : public SpellScriptLoader class spell_pursue_SpellScript : public SpellScript { - PrepareSpellScript(spell_pursue_SpellScript); - private: // EFFECT #0 - select target void FilterTargets(std::list<WorldObject*>& targets) @@ -1734,7 +1722,6 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader class spell_vehicle_throw_passenger_SpellScript : public SpellScript { - PrepareSpellScript(spell_vehicle_throw_passenger_SpellScript); void HandleScript(SpellEffIndex /*effIndex*/) { Spell* baseSpell = GetSpell(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 7ccc20206da..cb5becbdd08 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -1541,8 +1541,6 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader class spell_freya_attuned_to_nature_dose_reduction_SpellScript : public SpellScript { - PrepareSpellScript(spell_freya_attuned_to_nature_dose_reduction_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -1590,8 +1588,6 @@ class spell_freya_iron_roots : public SpellScriptLoader class spell_freya_iron_roots_SpellScript : public SpellScript { - PrepareSpellScript(spell_freya_iron_roots_SpellScript); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp index a7036a1fbbb..9b9d91c7574 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -458,8 +458,6 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader class spell_general_vezax_mark_of_the_faceless_AuraScript : public AuraScript { - PrepareAuraScript(spell_general_vezax_mark_of_the_faceless_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_THE_FACELESS_DAMAGE }); @@ -495,8 +493,6 @@ class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader class spell_general_vezax_mark_of_the_faceless_leech_SpellScript : public SpellScript { - PrepareSpellScript(spell_general_vezax_mark_of_the_faceless_leech_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove(GetExplTargetWorldObject()); @@ -525,8 +521,6 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader class spell_general_vezax_saronite_vapors_AuraScript : public AuraScript { - PrepareAuraScript(spell_general_vezax_saronite_vapors_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SARONITE_VAPORS_ENERGIZE, SPELL_SARONITE_VAPORS_DAMAGE }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 77c1d767971..4d2b9895876 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -991,8 +991,6 @@ class spell_biting_cold : public SpellScriptLoader class spell_biting_cold_AuraScript : public AuraScript { - PrepareAuraScript(spell_biting_cold_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -1048,8 +1046,6 @@ public: class spell_biting_cold_dot_AuraScript : public AuraScript { - PrepareAuraScript(spell_biting_cold_dot_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* caster = GetCaster(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index 98412e00e9e..b005d402bb6 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -455,8 +455,6 @@ class spell_ignis_slag_pot : public SpellScriptLoader class spell_ignis_slag_pot_AuraScript : public AuraScript { - PrepareAuraScript(spell_ignis_slag_pot_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SLAG_POT_DAMAGE, SPELL_SLAG_IMBUED }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index 49f598b35a7..933bf45563c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -334,8 +334,6 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader class spell_ulduar_rubble_summonSpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_rubble_summonSpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -390,8 +388,6 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader class spell_ulduar_stone_grip_cast_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_stone_grip_cast_target_SpellScript); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_UNIT) @@ -451,8 +447,6 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader class spell_ulduar_cancel_stone_gripSpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_cancel_stone_gripSpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }); @@ -491,8 +485,6 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader class spell_ulduar_squeezed_lifeless_SpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_squeezed_lifeless_SpellScript); - void HandleInstaKill(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->GetTypeId() != TYPEID_PLAYER || !GetHitUnit()->GetVehicle()) @@ -530,8 +522,6 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader class spell_ulduar_stone_grip_absorb_AuraScript : public AuraScript { - PrepareAuraScript(spell_ulduar_stone_grip_absorb_AuraScript); - //! This will be called when Right Arm (vehicle) has sustained a specific amount of damage depending on instance mode //! What we do here is remove all harmful aura's related and teleport to safe spot. void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) @@ -568,8 +558,6 @@ class spell_ulduar_stone_grip : public SpellScriptLoader class spell_ulduar_stone_grip_AuraScript : public AuraScript { - PrepareAuraScript(spell_ulduar_stone_grip_AuraScript); - void OnRemoveStun(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { GetUnitOwner()->RemoveAurasDueToSpell(aurEff->GetAmount()); @@ -621,8 +609,6 @@ class spell_kologarn_stone_shout : public SpellScriptLoader class spell_kologarn_stone_shout_SpellScript : public SpellScript { - PrepareSpellScript(spell_kologarn_stone_shout_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* object) -> bool @@ -657,8 +643,6 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader class spell_kologarn_summon_focused_eyebeam_SpellScript : public SpellScript { - PrepareSpellScript(spell_kologarn_summon_focused_eyebeam_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index b95d606c719..06b0f21465d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1721,8 +1721,6 @@ class spell_mimiron_bomb_bot : public SpellScriptLoader class spell_mimiron_bomb_bot_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_bomb_bot_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitPlayer()) @@ -1762,8 +1760,6 @@ class spell_mimiron_clear_fires : public SpellScriptLoader class spell_mimiron_clear_fires_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_clear_fires_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -1790,8 +1786,6 @@ class spell_mimiron_despawn_assault_bots : public SpellScriptLoader class spell_mimiron_despawn_assault_bots_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_despawn_assault_bots_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -1818,8 +1812,6 @@ class spell_mimiron_fire_search : public SpellScriptLoader class spell_mimiron_fire_search_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_fire_search_SpellScript); - public: spell_mimiron_fire_search_SpellScript() { @@ -1889,8 +1881,6 @@ class spell_mimiron_fire_search : public SpellScriptLoader // 64444 - Magnetic Core Summon class spell_mimiron_magnetic_core_summon : public SpellScript { - PrepareSpellScript(spell_mimiron_magnetic_core_summon); - void ModDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -1914,8 +1904,6 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader class spell_mimiron_magnetic_core_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_magnetic_core_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* obj) { return obj->IsUnit() && (obj->ToUnit()->GetVehicleBase() || obj->ToUnit()->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE)); }); @@ -1934,8 +1922,6 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader class spell_mimiron_magnetic_core_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_magnetic_core_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MAGNETIC_CORE_VISUAL }); @@ -1987,8 +1973,6 @@ class spell_mimiron_napalm_shell : public SpellScriptLoader class spell_mimiron_napalm_shell_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_napalm_shell_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NAPALM_SHELL, SPELL_NAPALM_SHELL_25 }); @@ -2036,8 +2020,6 @@ class spell_mimiron_plasma_blast : public SpellScriptLoader class spell_mimiron_plasma_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_plasma_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PLASMA_BLAST }); @@ -2074,8 +2056,6 @@ class spell_mimiron_proximity_explosion : public SpellScriptLoader class spell_mimiron_proximity_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_proximity_explosion_SpellScript); - void OnHit(SpellEffIndex /*effIndex*/) { if (GetHitPlayer()) @@ -2110,8 +2090,6 @@ class spell_mimiron_proximity_mines : public SpellScriptLoader class spell_mimiron_proximity_mines_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_proximity_mines_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PROXIMITY_MINE }); @@ -2143,8 +2121,6 @@ class spell_mimiron_proximity_trigger : public SpellScriptLoader class spell_mimiron_proximity_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_proximity_trigger_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PROXIMITY_MINE_EXPLOSION }); @@ -2184,8 +2160,6 @@ class spell_mimiron_rapid_burst : public SpellScriptLoader class spell_mimiron_rapid_burst_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_rapid_burst_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RAPID_BURST_LEFT, SPELL_RAPID_BURST_RIGHT }); @@ -2224,8 +2198,6 @@ class spell_mimiron_rocket_strike : public SpellScriptLoader class spell_mimiron_rocket_strike_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_rocket_strike_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SCRIPT_EFFECT_ROCKET_STRIKE }); @@ -2273,8 +2245,6 @@ class spell_mimiron_rocket_strike_damage : public SpellScriptLoader class spell_mimiron_rocket_strike_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_rocket_strike_damage_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NOT_SO_FRIENDLY_FIRE }); @@ -2321,8 +2291,6 @@ class spell_mimiron_rocket_strike_target_select : public SpellScriptLoader class spell_mimiron_rocket_strike_target_select_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_rocket_strike_target_select_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ROCKET_STRIKE }); @@ -2373,8 +2341,6 @@ class spell_mimiron_self_repair : public SpellScriptLoader class spell_mimiron_self_repair_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_self_repair_SpellScript); - void HandleScript() { if (GetCaster()->GetAI()) @@ -2401,8 +2367,6 @@ class spell_mimiron_summon_assault_bot : public SpellScriptLoader class spell_mimiron_summon_assault_bot_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_summon_assault_bot_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ASSAULT_BOT }); @@ -2438,8 +2402,6 @@ class spell_mimiron_summon_assault_bot_target : public SpellScriptLoader class spell_mimiron_summon_assault_bot_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_summon_assault_bot_target_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ASSAULT_BOT_DUMMY }); @@ -2470,8 +2432,6 @@ class spell_mimiron_summon_fire_bot : public SpellScriptLoader class spell_mimiron_summon_fire_bot_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_summon_fire_bot_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_FIRE_BOT }); @@ -2507,8 +2467,6 @@ class spell_mimiron_summon_fire_bot_target : public SpellScriptLoader class spell_mimiron_summon_fire_bot_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_summon_fire_bot_target_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_FIRE_BOT_DUMMY }); @@ -2539,8 +2497,6 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader class spell_mimiron_summon_flames_spread_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_summon_flames_spread_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -2576,8 +2532,6 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader class spell_mimiron_summon_flames_spread_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_summon_flames_spread_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_FLAMES_SPREAD }); @@ -2611,8 +2565,6 @@ class spell_mimiron_summon_frost_bomb_target : public SpellScriptLoader class spell_mimiron_summon_frost_bomb_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_summon_frost_bomb_target_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_FROST_BOMB }); @@ -2660,8 +2612,6 @@ class spell_mimiron_summon_junk_bot : public SpellScriptLoader class spell_mimiron_summon_junk_bot_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_summon_junk_bot_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_JUNK_BOT }); @@ -2697,8 +2647,6 @@ class spell_mimiron_summon_junk_bot_target : public SpellScriptLoader class spell_mimiron_summon_junk_bot_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_summon_junk_bot_target_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_JUNK_BOT_DUMMY }); @@ -2729,8 +2677,6 @@ class spell_mimiron_weld : public SpellScriptLoader class spell_mimiron_weld_AuraScript : public AuraScript { - PrepareAuraScript(spell_mimiron_weld_AuraScript); - void HandleTick(AuraEffect const* aurEff) { Unit* caster = GetTarget(); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index 1df2ee350d6..619eddadea5 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -1584,8 +1584,6 @@ public: 64021 - Flame Breath */ class spell_razorscale_flame_breath : public SpellScript { - PrepareSpellScript(spell_razorscale_flame_breath); - void CheckDamage() { Creature* target = GetHitCreature(); @@ -1620,8 +1618,6 @@ class spell_razorscale_flame_breath : public SpellScript 63969 - Summon Iron Dwarves */ class spell_razorscale_summon_iron_dwarves : public SpellScript { - PrepareSpellScript(spell_razorscale_summon_iron_dwarves); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1661,8 +1657,6 @@ class spell_razorscale_summon_iron_dwarves : public SpellScript // 64821 - Fuse Armor class spell_razorscale_fuse_armor : public AuraScript { - PrepareAuraScript(spell_razorscale_fuse_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FUSED_ARMOR }); @@ -1686,8 +1680,6 @@ class spell_razorscale_fuse_armor : public AuraScript // 62669 - Firebolt class spell_razorscale_firebolt : public SpellScript { - PrepareSpellScript(spell_razorscale_firebolt); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* obj) { return obj->GetEntry() != NPC_RAZORSCALE_HARPOON_FIRE_STATE; }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index f4d3db39bf7..38145e95a6a 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1676,8 +1676,6 @@ class spell_thorim_blizzard_effect : public SpellScriptLoader class spell_thorim_blizzard_effect_AuraScript : public AuraScript { - PrepareAuraScript(spell_thorim_blizzard_effect_AuraScript); - bool CheckAreaTarget(Unit* target) { /// @todo: fix this for all dynobj auras @@ -1717,8 +1715,6 @@ class spell_thorim_frostbolt_volley : public SpellScriptLoader class spell_thorim_frostbolt_volley_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_frostbolt_volley_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* object) -> bool @@ -1753,8 +1749,6 @@ class spell_thorim_charge_orb : public SpellScriptLoader class spell_thorim_charge_orb_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_charge_orb_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LIGHTNING_PILLAR_1 }); @@ -1799,8 +1793,6 @@ class spell_thorim_lightning_charge : public SpellScriptLoader class spell_thorim_lightning_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_lightning_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LIGHTNING_CHARGE }); @@ -1839,8 +1831,6 @@ class spell_thorim_arena_leap : public SpellScriptLoader class spell_thorim_arena_leap_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_arena_leap_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1880,8 +1870,6 @@ class spell_thorim_stormhammer : public SpellScriptLoader class spell_thorim_stormhammer_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_stormhammer_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_DEAFENING_THUNDER }); @@ -1938,8 +1926,6 @@ class spell_thorim_stormhammer_sif : public SpellScriptLoader class spell_thorim_stormhammer_sif_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_stormhammer_sif_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STORMHAMMER_BOOMERANG, SPELL_SIF_TRANSFORM }); @@ -1980,8 +1966,6 @@ class spell_thorim_stormhammer_boomerang : public SpellScriptLoader class spell_thorim_stormhammer_boomerang_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_stormhammer_boomerang_SpellScript); - void RecoverHammer(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2008,8 +1992,6 @@ class spell_thorim_runic_smash : public SpellScriptLoader class spell_thorim_runic_smash_SpellScript : public SpellScript { - PrepareSpellScript(spell_thorim_runic_smash_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUNIC_SMASH }); @@ -2062,8 +2044,6 @@ class spell_thorim_activate_lightning_orb_periodic : public SpellScriptLoader class spell_thorim_activate_lightning_orb_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_thorim_activate_lightning_orb_periodic_AuraScript); - InstanceScript* instance = nullptr; void PeriodicTick(AuraEffect const* /*aurEff*/) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 01f68586df3..422e4283693 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -669,8 +669,6 @@ private: // 63018, 65121 - Searing Light class spell_xt002_searing_light_spawn_life_spark : public AuraScript { - PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_LIFE_SPARK }); @@ -692,8 +690,6 @@ class spell_xt002_searing_light_spawn_life_spark : public AuraScript // 63024, 64234 - Gravity Bomb class spell_xt002_gravity_bomb_aura : public AuraScript { - PrepareAuraScript(spell_xt002_gravity_bomb_aura); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_VOID_ZONE }); @@ -727,8 +723,6 @@ class spell_xt002_gravity_bomb_aura : public AuraScript // 63025, 64233 - Gravity Bomb (Damage) class spell_xt002_gravity_bomb_damage : public SpellScript { - PrepareSpellScript(spell_xt002_gravity_bomb_damage); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitDamage() >= int32(GetHitUnit()->GetHealth())) @@ -746,8 +740,6 @@ class spell_xt002_gravity_bomb_damage : public SpellScript // 62791 - XT-002 Heart Overload Trigger Spell (SERVERSIDE) class spell_xt002_heart_overload_periodic : public SpellScript { - PrepareSpellScript(spell_xt002_heart_overload_periodic); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo @@ -792,8 +784,6 @@ class spell_xt002_heart_overload_periodic : public SpellScript // 62826 - Energy Orb class spell_xt002_energy_orb : public SpellScript { - PrepareSpellScript(spell_xt002_energy_orb); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo @@ -831,8 +821,6 @@ class spell_xt002_energy_orb : public SpellScript // 62775 - Tympanic Tantrum class spell_xt002_tympanic_tantrum : public SpellScript { - PrepareSpellScript(spell_xt002_tympanic_tantrum); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if([](WorldObject* object) -> bool @@ -863,8 +851,6 @@ class spell_xt002_tympanic_tantrum : public SpellScript // 65032 - 321-Boombot Aura class spell_xt002_321_boombot_aura : public AuraScript { - PrepareAuraScript(spell_xt002_321_boombot_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ACHIEVEMENT_CREDIT_NERF_SCRAPBOTS }); @@ -893,8 +879,6 @@ class spell_xt002_321_boombot_aura : public AuraScript // 63849 - Exposed Heart class spell_xt002_exposed_heart : public AuraScript { - PrepareAuraScript(spell_xt002_exposed_heart); - bool Load() override { _damageAmount = 0; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp index c4f1f0f037c..c73d7132a92 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1970,8 +1970,6 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader // 63744, class spell_yogg_saron_target_selectors_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_target_selectors_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2029,8 +2027,6 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 class spell_yogg_saron_psychosis_SpellScript : public SanityReduction { - PrepareSpellScript(spell_yogg_saron_psychosis_SpellScript); - bool Load() override { _stacks = GetSpellInfo()->Id == SPELL_PSYCHOSIS ? 9 : 12; @@ -2068,8 +2064,6 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 public: spell_yogg_saron_malady_of_the_mind_SpellScript() : SanityReduction(3) { } - PrepareSpellScript(spell_yogg_saron_malady_of_the_mind_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(HighSanityTargetSelector()); @@ -2091,8 +2085,6 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 class spell_yogg_saron_malady_of_the_mind_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_malady_of_the_mind_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MALADY_OF_THE_MIND_JUMP }); @@ -2138,8 +2130,6 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 class spell_yogg_saron_brain_link_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_brain_link_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); @@ -2162,8 +2152,6 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 class spell_yogg_saron_brain_link_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_brain_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BRAIN_LINK_DAMAGE, SPELL_BRAIN_LINK_NO_DAMAGE }); @@ -2236,8 +2224,6 @@ class spell_yogg_saron_brain_link_damage : public SpellScriptLoader // 6380 public: spell_yogg_saron_brain_link_damage_SpellScript() : SanityReduction(2) { } - PrepareSpellScript(spell_yogg_saron_brain_link_damage_SpellScript); - void Register() override { OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_brain_link_damage_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); @@ -2258,8 +2244,6 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 class spell_yogg_saron_boil_ominously_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_boil_ominously_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_GUARDIAN_1 }); @@ -2297,8 +2281,6 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader // 64465 class spell_yogg_saron_shadow_beacon_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_shadow_beacon_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -2332,8 +2314,6 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader class spell_yogg_saron_empowering_shadows_range_check_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_empowering_shadows_range_check_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2360,8 +2340,6 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader class spell_yogg_saron_empowering_shadows_missile_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_empowering_shadows_missile_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EMPOWERING_SHADOWS }); @@ -2394,8 +2372,6 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 class spell_yogg_saron_constrictor_tentacle_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_constrictor_tentacle_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CONSTRICTOR_TENTACLE_SUMMON }); @@ -2426,8 +2402,6 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 class spell_yogg_saron_lunge_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_lunge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SQUEEZE_10, SPELL_SQUEEZE_25 }); @@ -2466,8 +2440,6 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125, 64126 class spell_yogg_saron_squeeze_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_squeeze_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* vehicle = GetTarget()->GetVehicleBase()) @@ -2495,8 +2467,6 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 class spell_yogg_saron_diminsh_power_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_diminsh_power_AuraScript); - void HandleProc(AuraEffect* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -2526,8 +2496,6 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 class spell_yogg_saron_empowered_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_empowered_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EMPOWERED_BUFF, SPELL_WEAKENED }); @@ -2578,8 +2546,6 @@ class spell_yogg_saron_match_health : public SpellScriptLoader // 64069 class spell_yogg_saron_match_health_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_match_health_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2606,8 +2572,6 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader // 65238 class spell_yogg_saron_shattered_illusion_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_shattered_illusion_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2634,8 +2598,6 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / class spell_yogg_saron_death_ray_warning_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_death_ray_warning_visual_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEATH_RAY_PERIODIC, SPELL_DEATH_RAY_DAMAGE_VISUAL }); @@ -2672,8 +2634,6 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / class spell_yogg_saron_cancel_illusion_room_aura_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_cancel_illusion_room_aura_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_BACK_TO_MAIN_ROOM }); @@ -2708,8 +2668,6 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader // 64010, 6401 class spell_yogg_saron_nondescript_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_nondescript_AuraScript); - void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { GetTarget()->CastSpell(GetTarget(), uint32(aurEff->GetAmount()), true); @@ -2735,8 +2693,6 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 class spell_yogg_saron_revealed_tentacle_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_revealed_tentacle_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TENTACLE_VOID_ZONE, SPELL_GRIM_REPRISAL }); @@ -2772,8 +2728,6 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 class spell_yogg_saron_grim_reprisal_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_grim_reprisal_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GRIM_REPRISAL_DAMAGE }); @@ -2811,8 +2765,6 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 class spell_yogg_saron_induce_madness_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_induce_madness_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_BACK_TO_MAIN_ROOM, SPELL_SHATTERED_ILLUSION_REMOVE }); @@ -2858,8 +2810,6 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 class spell_yogg_saron_sanity_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_sanity_SpellScript); - // don't target players outside of room or handle it in SPELL_INSANE_PERIODIC? void ModSanityStacks() @@ -2875,8 +2825,6 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 class spell_yogg_saron_sanity_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_sanity_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LOW_SANITY_SCREEN_EFFECT, SPELL_INSANE, SPELL_SANITY_WELL, SPELL_BRAIN_LINK }); @@ -2931,8 +2879,6 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 class spell_yogg_saron_insane_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_insane_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_INSANE_VISUAL }); @@ -2974,8 +2920,6 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader // 64555 class spell_yogg_saron_insane_periodic_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_insane_periodic_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -3016,8 +2960,6 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 class spell_yogg_saron_lunatic_gaze_SpellScript : public SanityReduction { - PrepareSpellScript(spell_yogg_saron_lunatic_gaze_SpellScript); - bool Load() override { _stacks = GetSpellInfo()->Id == SPELL_LUNATIC_GAZE_DAMAGE ? 4 : 2; @@ -3054,8 +2996,6 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader // 62650, 6267 class spell_yogg_saron_keeper_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_keeper_aura_AuraScript); - bool CanApply(Unit* target) { if (target->GetTypeId() != TYPEID_PLAYER && target != GetCaster()) @@ -3083,8 +3023,6 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader class spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript); - SpellCastResult CheckRequirement() { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -3124,8 +3062,6 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader // 64172 class spell_yogg_saron_titanic_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_titanic_storm_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -3152,8 +3088,6 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // class spell_yogg_saron_hodirs_protective_gaze_AuraScript : public AuraScript { - PrepareAuraScript(spell_yogg_saron_hodirs_protective_gaze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLASH_FREEZE }); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp index 6a01f6e86ab..ea28a6ee936 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.cpp @@ -24,8 +24,6 @@ // 61906 - Random Aggro Periodic (5 sec) class spell_ulduar_random_aggro_periodic : public AuraScript { - PrepareAuraScript(spell_ulduar_random_aggro_periodic); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -55,8 +53,6 @@ class spell_ulduar_random_aggro_periodic : public AuraScript // 65042 - Prison of Yogg-Saron Teleport class spell_ulduar_teleporter : public SpellScript { - PrepareSpellScript(spell_ulduar_teleporter); - SpellCastResult CheckRequirement() { if (GetExplTargetUnit()->GetTypeId() != TYPEID_PLAYER) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp index 72db7a72bea..df36779cace 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp @@ -379,8 +379,6 @@ struct npc_ingvar_throw_dummy : public ScriptedAI // 42912 - Summon Banshee class spell_ingvar_summon_banshee : public SpellScript { - PrepareSpellScript(spell_ingvar_summon_banshee); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f }); @@ -395,8 +393,6 @@ class spell_ingvar_summon_banshee : public SpellScript // 42730, 59735 - Woe Strike class spell_ingvar_woe_strike : public AuraScript { - PrepareAuraScript(spell_ingvar_woe_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WOE_STRIKE_EFFECT }); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index a3589c74d7f..871499ca53e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -308,8 +308,6 @@ private: // 48400 - Frost Tomb class spell_frost_tomb : public AuraScript { - PrepareAuraScript(spell_frost_tomb); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_DEATH) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index fdf9757ec09..3e6103542a4 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -114,8 +114,6 @@ enum Fixate // 40414 - Fixate class spell_fixate : public SpellScript { - PrepareSpellScript(spell_fixate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIXATE_TRIGGER }); @@ -140,8 +138,6 @@ enum SecondWind // 42770 - Second Wind class spell_uk_second_wind : public AuraScript { - PrepareAuraScript(spell_uk_second_wind); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SECOND_WIND_TRIGGER }); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 2d044443a80..9d0b962d40a 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -524,8 +524,6 @@ struct go_palehoof_sphere : public GameObjectAI // 48139 - Crazed class spell_palehoof_crazed : public AuraScript { - PrepareAuraScript(spell_palehoof_crazed); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAurasDueToSpell(SPELL_CRAZED_TAUNT); @@ -540,8 +538,6 @@ class spell_palehoof_crazed : public AuraScript // 48146 - Crazed class spell_palehoof_crazed_effect : public SpellScript { - PrepareSpellScript(spell_palehoof_crazed_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRAZED_TAUNT }); @@ -561,8 +557,6 @@ class spell_palehoof_crazed_effect : public SpellScript // 47669 - Awaken Subboss class spell_palehoof_awaken_subboss : public SpellScript { - PrepareSpellScript(spell_palehoof_awaken_subboss); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ORB_CHANNEL }); @@ -585,8 +579,6 @@ class spell_palehoof_awaken_subboss : public SpellScript // 47670 - Awaken Gortok class spell_palehoof_awaken_gortok : public SpellScript { - PrepareSpellScript(spell_palehoof_awaken_gortok); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 295e6216169..93562e43267 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -580,8 +580,6 @@ struct npc_ymirjar_harpooner : public npc_skadi_trashAI // 47594 - Freezing Cloud class spell_freezing_cloud_area_right : public SpellScript { - PrepareSpellScript(spell_freezing_cloud_area_right); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FREEZING_CLOUD }); @@ -607,8 +605,6 @@ class spell_freezing_cloud_area_right : public SpellScript // 47574 - Freezing Cloud class spell_freezing_cloud_area_left : public SpellScript { - PrepareSpellScript(spell_freezing_cloud_area_left); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FREEZING_CLOUD }); @@ -634,8 +630,6 @@ class spell_freezing_cloud_area_left : public SpellScript // 47579, 60020 - Freezing Cloud class spell_freezing_cloud_damage : public AuraScript { - PrepareAuraScript(spell_freezing_cloud_damage); - bool CanBeAppliedOn(Unit* target) { if (Aura* aur = target->GetAura(GetId())) @@ -654,8 +648,6 @@ class spell_freezing_cloud_damage : public AuraScript // 49308 - Utgarde Pinnacle Guantlet Reset Check class spell_skadi_reset_check : public SpellScript { - PrepareSpellScript(spell_skadi_reset_check); - void CountTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_UTGARDE_PINNACLE_GAUNTLET_EFFECT)); @@ -689,8 +681,6 @@ private: // 48642 - Launch Harpoon class spell_skadi_launch_harpoon : public SpellScript { - PrepareSpellScript(spell_skadi_launch_harpoon); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.size() >= 2) @@ -713,8 +703,6 @@ class spell_skadi_launch_harpoon : public SpellScript // 50255, 59331 - Poisoned Spear class spell_skadi_poisoned_spear : public SpellScript { - PrepareSpellScript(spell_skadi_poisoned_spear); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POISONED_SPEAR_PERIODIC }); @@ -734,8 +722,6 @@ class spell_skadi_poisoned_spear : public SpellScript // 61791 - Ride Vehicle class spell_skadi_ride_vehicle : public AuraScript { - PrepareAuraScript(spell_skadi_ride_vehicle); - void OnRemoveVehicle(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { PreventDefaultAction(); @@ -756,8 +742,6 @@ class spell_skadi_ride_vehicle : public AuraScript // 59275 - Summon Gauntlet Mobs Periodic class spell_summon_gauntlet_mobs_periodic : public AuraScript { - PrepareAuraScript(spell_summon_gauntlet_mobs_periodic); - void CastTheNextTwoSpells() { for (uint8 i = 0; i < 2; ++i) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 4f3fa489b43..00b32535e3e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -468,8 +468,6 @@ class RitualTargetCheck // 48278 - Paralyze class spell_paralyze_pinnacle : public SpellScript { - PrepareSpellScript(spell_paralyze_pinnacle); - void FilterTargets(std::list<WorldObject*>& unitList) { unitList.remove_if(RitualTargetCheck()); diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp index ed4e27691e0..4e52371e2bc 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_ymiron.cpp @@ -305,8 +305,6 @@ private: // 48292 - Dark Slash class spell_dark_slash : public SpellScript { - PrepareSpellScript(spell_dark_slash); - void CalculateDamage() { // Slashes the target with darkness, dealing damage equal to half the target's current health. diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp index 9047eca63f6..18cb2f092ae 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.cpp @@ -32,8 +32,6 @@ enum UtgardeSpells // 59237 - Beast's Mark class spell_utgarde_pinnacle_beast_mark : public AuraScript { - PrepareAuraScript(spell_utgarde_pinnacle_beast_mark); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BEAST_MARK_DAMAGE_N, SPELL_BEAST_MARK_DAMAGE_H }); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index c23a1f49435..8373f5faefa 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -117,8 +117,6 @@ struct boss_archavon : public BossAI // 58941 - Rock Shards class spell_archavon_rock_shards : public SpellScript { - PrepareSpellScript(spell_archavon_rock_shards); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 7ba269e920a..851700b1b39 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -102,8 +102,6 @@ struct boss_koralon : public BossAI // 66725, 68161 - Meteor Fists class spell_koralon_meteor_fists : public AuraScript { - PrepareAuraScript(spell_koralon_meteor_fists); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_METEOR_FISTS_DAMAGE }); @@ -125,8 +123,6 @@ class spell_koralon_meteor_fists : public AuraScript // 66809, 67331 - Meteor Fists class spell_koralon_meteor_fists_damage : public SpellScript { - PrepareSpellScript(spell_koralon_meteor_fists_damage); - public: spell_koralon_meteor_fists_damage() { @@ -158,8 +154,6 @@ private: // 66808, 68160 - Meteor Fists class spell_flame_warder_meteor_fists : public AuraScript { - PrepareAuraScript(spell_flame_warder_meteor_fists); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FW_METEOR_FISTS_DAMAGE }); diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp index 6ed3c203e5e..4c14f24e3e1 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_toravon.cpp @@ -137,8 +137,6 @@ struct npc_frozen_orb : public ScriptedAI // 46523 - Random Aggro class spell_toravon_random_aggro : public SpellScript { - PrepareSpellScript(spell_toravon_random_aggro); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 04eaa2fe6a8..3fa94370f6a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -136,8 +136,6 @@ class achievement_defenseless : public AchievementCriteriaScript // 58694 - Arcane Vacuum class spell_cyanigosa_arcane_vacuum : public SpellScript { - PrepareSpellScript(spell_cyanigosa_arcane_vacuum); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PLAYER }); diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index ce81b58899a..c162e65c498 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -282,8 +282,6 @@ private: // 59820 - Drained class spell_ichoron_drained : public AuraScript { - PrepareAuraScript(spell_ichoron_drained); - bool Load() override { return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON; @@ -315,8 +313,6 @@ class spell_ichoron_drained : public AuraScript // 54269 - Merge class spell_ichoron_merge : public SpellScript { - PrepareSpellScript(spell_ichoron_merge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHRINK }); @@ -342,8 +338,6 @@ class spell_ichoron_merge : public SpellScript // 54306 - Protective Bubble class spell_ichoron_protective_bubble : public AuraScript { - PrepareAuraScript(spell_ichoron_protective_bubble); - bool Load() override { return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON; @@ -366,8 +360,6 @@ class spell_ichoron_protective_bubble : public AuraScript // 54259 - Splatter class spell_ichoron_splatter : public AuraScript { - PrepareAuraScript(spell_ichoron_splatter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index 0401dd9de2b..b8afac4505a 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -92,8 +92,6 @@ struct boss_moragg : public BossAI // 54442, 59524 - Ray of Suffering class spell_moragg_ray : public AuraScript { - PrepareAuraScript(spell_moragg_ray); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -115,8 +113,6 @@ class spell_moragg_ray : public AuraScript // 54396 - Optic Link class spell_moragg_optic_link : public AuraScript { - PrepareAuraScript(spell_moragg_optic_link); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index 96764dce6a2..65499d61b49 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -234,8 +234,6 @@ private: // 54164 - Summon Players class spell_xevozz_summon_players : public SpellScript { - PrepareSpellScript(spell_xevozz_summon_players); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGIC_PULL }); diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index a5d59677f25..626042068f5 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1205,8 +1205,6 @@ struct go_activation_crystal : public GameObjectAI // 58040 - Destroy Door Seal class spell_violet_hold_destroy_door_seal : public AuraScript { - PrepareAuraScript(spell_violet_hold_destroy_door_seal); - bool Load() override { _instance = GetUnitOwner()->GetInstanceScript(); @@ -1232,8 +1230,6 @@ private: // 58008 - Portal Periodic class spell_violet_hold_portal_periodic : public AuraScript { - PrepareAuraScript(spell_violet_hold_portal_periodic); - void PeriodicTick(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1250,8 +1246,6 @@ class spell_violet_hold_portal_periodic : public AuraScript // 62138 - Teleport to Inside Violet Hold class spell_violet_hold_teleport_player : public SpellScript { - PrepareSpellScript(spell_violet_hold_teleport_player); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_PLAYER_EFFECT }); diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index c36f84ee111..ef6846d7882 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -157,8 +157,6 @@ struct npc_captured_beryl_sorcerer : public FollowerAI // Spell 45625: - Arcane Chains: Character Force Cast class spell_arcane_chains_character_force_cast : public SpellScript { - PrepareSpellScript(spell_arcane_chains_character_force_cast); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { GetHitUnit()->CastSpell(GetCaster(), SPELL_ARCANE_CHAINS_SUMMON_CHAINED_MAGE_HUNTER); // Player cast back 45626 on npc @@ -425,8 +423,6 @@ enum red_dragonblood // 46620 - Red Dragonblood class spell_red_dragonblood : public AuraScript { - PrepareAuraScript(spell_red_dragonblood); - void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE || !GetCaster()) @@ -1253,8 +1249,6 @@ enum WindsoulTotemAura // 46374 - Windsoul Totem Aura class spell_windsoul_totem_aura : public AuraScript { - PrepareAuraScript(spell_windsoul_totem_aura); - void OnRemove(AuraEffect const*, AuraEffectHandleModes) { if (GetTarget()->isDead()) @@ -1279,8 +1273,6 @@ enum BloodsporeRuination // 45997 - Bloodspore Ruination class spell_q11719_bloodspore_ruination_45997 : public SpellScript { - PrepareSpellScript(spell_q11719_bloodspore_ruination_45997); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -1367,8 +1359,6 @@ enum ShorteningBlaster // 45668 - Crafty's Ultra-Advanced Proto-Typical Shortening Blaster class spell_q11653_shortening_blaster : public SpellScript { - PrepareSpellScript(spell_q11653_shortening_blaster); - void HandleScript(SpellEffIndex /* effIndex */) { Unit* caster = GetCaster(); @@ -1410,8 +1400,6 @@ std::array<uint32, 3> const CocoonSummonSpells = // 45516 - Nerub'ar Web Random Unit (Not On Quest, Script Effect) class spell_borean_tundra_nerubar_web_random_unit_not_on_quest : public SpellScript { - PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -1431,8 +1419,6 @@ class spell_borean_tundra_nerubar_web_random_unit_not_on_quest : public SpellScr // 45515 - Nerub'ar Web Random Unit (Not On Quest, Dummy) class spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy : public SpellScript { - PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREED_SOLDIER_DEBUFF }); @@ -1457,8 +1443,6 @@ class spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy : public Sp // 45535 - Nerub'ar Web Random Unit (On Quest, Dummy) class spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy : public SpellScript { - PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREED_SOLDIER_DEBUFF, SPELL_FREED_WARSONG_PEON }); @@ -1485,8 +1469,6 @@ class spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy : public SpellS // 45522 - Dispel Freed Soldier Debuff class spell_borean_tundra_dispel_freed_soldier_debuff : public SpellScript { - PrepareSpellScript(spell_borean_tundra_dispel_freed_soldier_debuff); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -1522,8 +1504,6 @@ enum BringEmBackAlive // 45877 - Deliver Kodo class spell_borean_tundra_deliver_kodo : public SpellScript { - PrepareSpellScript(spell_borean_tundra_deliver_kodo); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_KODO_DELIVERED }); @@ -1544,8 +1524,6 @@ class spell_borean_tundra_deliver_kodo : public SpellScript // 48204 - Kodo Delivered class spell_borean_tundra_kodo_delivered : public SpellScript { - PrepareSpellScript(spell_borean_tundra_kodo_delivered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sBroadcastTextStore.HasRecord(TEXT_DELIVERED_1) && @@ -1600,8 +1578,6 @@ enum TheArtOfPersuasion // 45634 - Neural Needle class spell_borean_tundra_neural_needle : public SpellScript { - PrepareSpellScript(spell_borean_tundra_neural_needle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NEURAL_NEEDLE_IMPACT }); @@ -1654,8 +1630,6 @@ class spell_borean_tundra_neural_needle : public SpellScript // 48252 - Prototype Neural Needle class spell_borean_tundra_prototype_neural_needle : public SpellScript { - PrepareSpellScript(spell_borean_tundra_prototype_neural_needle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PROTOTYPE_NEURAL_NEEDLE_IMPACT }); @@ -1712,8 +1686,6 @@ enum PrisonBreak // 45449 - Arcane Prisoner Rescue class spell_borean_tundra_arcane_prisoner_rescue : public SpellScript { - PrepareSpellScript(spell_borean_tundra_arcane_prisoner_rescue); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ARCANE_PRISONER_1, SPELL_SUMMON_ARCANE_PRISONER_2 }); diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 6c6b1408bc3..d66b74dfb1e 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -379,8 +379,6 @@ enum StrengthenAncientsMisc // 47575 - Strengthen the Ancients: On Interact Dummy to Woodlands Walker class spell_q12096_q12092_dummy : public SpellScript { - PrepareSpellScript(spell_q12096_q12092_dummy); - void HandleDummy(SpellEffIndex /*effIndex*/) { uint32 roll = rand32() % 2; @@ -416,8 +414,6 @@ class spell_q12096_q12092_dummy : public SpellScript // 47530 - Bark of the Walkers class spell_q12096_q12092_bark : public SpellScript { - PrepareSpellScript(spell_q12096_q12092_bark); - void HandleDummy(SpellEffIndex /*effIndex*/) { Creature* lothalor = GetHitCreature(); @@ -564,8 +560,6 @@ enum WarsongBattleStandard // 47304 - Warsong Battle Standard class spell_dragonblight_warsong_battle_standard : public SpellScript { - PrepareSpellScript(spell_dragonblight_warsong_battle_standard); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sBroadcastTextStore.HasRecord(TEXT_TAUNT_1) && @@ -601,8 +595,6 @@ enum MysteryOfTheInfinite // 49686 - Mystery of the Infinite: Script Effect Player Cast Mirror Image class spell_dragonblight_moti_mirror_image_script_effect : public SpellScript { - PrepareSpellScript(spell_dragonblight_moti_mirror_image_script_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_AURA }); @@ -622,8 +614,6 @@ class spell_dragonblight_moti_mirror_image_script_effect : public SpellScript // 50020 - Mystery of the Infinite: Hourglass cast See Invis on Master class spell_dragonblight_moti_hourglass_cast_see_invis_on_master : public SpellScript { - PrepareSpellScript(spell_dragonblight_moti_hourglass_cast_see_invis_on_master); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -656,8 +646,6 @@ enum TheChainGunAndYou // 49550 - Call Out Injured Soldier class spell_dragonblight_call_out_injured_soldier : public SpellScript { - PrepareSpellScript(spell_dragonblight_call_out_injured_soldier); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sBroadcastTextStore.HasRecord(TEXT_CALL_OUT_1) && sBroadcastTextStore.HasRecord(TEXT_CALL_OUT_2); @@ -696,8 +684,6 @@ enum TortureTheTorturer // 48603 - High Executor's Branding Iron class spell_dragonblight_high_executor_branding_iron : public SpellScript { - PrepareSpellScript(spell_dragonblight_high_executor_branding_iron); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TORTURER_KILL_CREDIT, SPELL_BRANDING_IRON_IMPACT }); @@ -759,8 +745,6 @@ enum ThePerfectDissemblance // 48692 - The Perfect Dissemblance: Quest Completion Script class spell_dragonblight_cancel_banshees_magic_mirror : public SpellScript { - PrepareSpellScript(spell_dragonblight_cancel_banshees_magic_mirror); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BANSHEES_MAGIC_MIRROR }); @@ -790,8 +774,6 @@ enum AFallFromGrace // 48762 - A Fall from Grace: Scarlet Raven Priest Image - Master class spell_dragonblight_scarlet_raven_priest_image_master : public SpellScript { - PrepareSpellScript(spell_dragonblight_scarlet_raven_priest_image_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_IMAGE_FEMALE, SPELL_PRIEST_IMAGE_MALE }); @@ -812,8 +794,6 @@ class spell_dragonblight_scarlet_raven_priest_image_master : public SpellScript // 48769 - A Fall from Grace: Quest Completion Script class spell_dragonblight_cancel_scarlet_raven_priest_image : public SpellScript { - PrepareSpellScript(spell_dragonblight_cancel_scarlet_raven_priest_image); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_IMAGE_FEMALE, SPELL_PRIEST_IMAGE_MALE }); @@ -847,8 +827,6 @@ enum BombardTheBallistae // 48347 - Bombard the Ballistae: FX Master class spell_dragonblight_bombard_the_ballistae_fx_master : public SpellScript { - PrepareSpellScript(spell_dragonblight_bombard_the_ballistae_fx_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -896,8 +874,6 @@ enum ProjectionsAndPlans // 47097 - Surge Needle Teleporter class spell_dragonblight_surge_needle_teleporter : public SpellScript { - PrepareSpellScript(spell_dragonblight_surge_needle_teleporter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TELE_MOONREST_GARDENS, SPELL_TELE_SURGE_NEEDLE }); @@ -934,8 +910,6 @@ class spell_dragonblight_surge_needle_teleporter : public SpellScript // 50252 - Blood Draw class spell_dragonblight_fill_blood_unholy_frost_gem : public SpellScript { - PrepareSpellScript(spell_dragonblight_fill_blood_unholy_frost_gem); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -955,8 +929,6 @@ class spell_dragonblight_fill_blood_unholy_frost_gem : public SpellScript // 47447 - Corrosive Spit class spell_dragonblight_corrosive_spit : public AuraScript { - PrepareAuraScript(spell_dragonblight_corrosive_spit); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 8885426c44a..2b22cf699c3 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -712,8 +712,6 @@ enum ShredderDelivery class spell_shredder_delivery : public SpellScript { - PrepareSpellScript(spell_shredder_delivery); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -740,8 +738,6 @@ enum InfectedWorgenBite // 53094 - Infected Worgen Bite class spell_infected_worgen_bite : public AuraScript { - PrepareAuraScript(spell_infected_worgen_bite); - void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -838,8 +834,6 @@ enum WarheadSpells // 49107 - Vehicle: Warhead Fuse class spell_vehicle_warhead_fuse : public SpellScript { - PrepareSpellScript(spell_vehicle_warhead_fuse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARHEAD_Z_CHECK, SPELL_WARHEAD_SEEKING_LUMBERSHIP, SPELL_WARHEAD_FUSE }); @@ -869,8 +863,6 @@ enum WarheadDenonate // 49250 - Detonate class spell_warhead_detonate : public SpellScript { - PrepareSpellScript(spell_warhead_detonate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARACHUTE, SPELL_TORPEDO_EXPLOSION }); @@ -904,8 +896,6 @@ class spell_warhead_detonate : public SpellScript // 61678 - Z Check class spell_z_check : public AuraScript { - PrepareAuraScript(spell_z_check); - public: spell_z_check() { @@ -939,8 +929,6 @@ private: // 49181 - Warhead Fuse class spell_warhead_fuse : public AuraScript { - PrepareAuraScript(spell_warhead_fuse); - void HandleOnEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* rocketUnit = GetTarget()->GetVehicleBase()) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 8c9ada59842..89ebec5526c 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -219,8 +219,6 @@ enum SomeAssemblyRequired // 43393 - Ping Master class spell_fjord_mindless_abomination_ping_master : public SpellScript { - PrepareSpellScript(spell_fjord_mindless_abomination_ping_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MINDLESS_ABOMINATION_CONTROL }); @@ -240,8 +238,6 @@ class spell_fjord_mindless_abomination_ping_master : public SpellScript // 42268 - Quest - Mindless Abomination Explosion FX Master class spell_fjord_mindless_abomination_explosion_fx_master : public SpellScript { - PrepareSpellScript(spell_fjord_mindless_abomination_explosion_fx_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -310,8 +306,6 @@ std::array<uint32, 11> const CocoonSummonSpells = // 43288 - Rivenwood Captives: Player Not On Quest class spell_fjord_rivenwood_captives_not_on_quest : public SpellScript { - PrepareSpellScript(spell_fjord_rivenwood_captives_not_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells); @@ -331,8 +325,6 @@ class spell_fjord_rivenwood_captives_not_on_quest : public SpellScript // 43287 - Rivenwood Captives: Player On Quest class spell_fjord_rivenwood_captives_on_quest : public SpellScript { - PrepareSpellScript(spell_fjord_rivenwood_captives_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT }); @@ -373,8 +365,6 @@ enum TheCleansing // 43365 - The Cleansing: Shrine Cast class spell_fjord_the_cleansing_shrine_cast : public SpellScript { - PrepareSpellScript(spell_fjord_the_cleansing_shrine_cast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RECENT_MEDITATION, SPELL_CLEANSING_SOUL }) && @@ -412,8 +402,6 @@ class spell_fjord_the_cleansing_shrine_cast : public SpellScript // 43351 - Cleansing Soul class spell_fjord_the_cleansing_cleansing_soul : public AuraScript { - PrepareAuraScript(spell_fjord_the_cleansing_cleansing_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_INNER_TURMOIL, SPELL_RECENT_MEDITATION }); @@ -442,8 +430,6 @@ class spell_fjord_the_cleansing_cleansing_soul : public AuraScript // 50217 - The Cleansing: Script Effect Player Cast Mirror Image class spell_fjord_the_cleansing_mirror_image_script_effect : public SpellScript { - PrepareSpellScript(spell_fjord_the_cleansing_mirror_image_script_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_AURA }); @@ -463,8 +449,6 @@ class spell_fjord_the_cleansing_mirror_image_script_effect : public SpellScript // 50238 - The Cleansing: Your Inner Turmoil's On Death Cast on Master class spell_fjord_the_cleansing_on_death_cast_on_master : public SpellScript { - PrepareSpellScript(spell_fjord_the_cleansing_on_death_cast_on_master); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -496,8 +480,6 @@ enum TheWayToHisHeart // 21014 - Anuniaq's Net class spell_fjord_the_way_to_his_heart_anuniaq_net : public SpellScript { - PrepareSpellScript(spell_fjord_the_way_to_his_heart_anuniaq_net); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CREATE_TASTY_REEF_FISH, SPELL_FISHED_UP_REEF_SHARK }); @@ -518,8 +500,6 @@ class spell_fjord_the_way_to_his_heart_anuniaq_net : public SpellScript // 44455 - The Way to His Heart...: Character Script Effect Reverse Cast class spell_fjord_the_way_to_his_heart_reverse_cast : public SpellScript { - PrepareSpellScript(spell_fjord_the_way_to_his_heart_reverse_cast); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -539,8 +519,6 @@ class spell_fjord_the_way_to_his_heart_reverse_cast : public SpellScript // 44462 - The Way to His Heart...: Cast Quest Complete on Master class spell_fjord_the_way_to_his_heart_quest_complete : public SpellScript { - PrepareSpellScript(spell_fjord_the_way_to_his_heart_quest_complete); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 57b13922988..e59c7dd5ed8 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -733,8 +733,6 @@ struct npc_frostbrood_skytalon : public VehicleAI // 55288 - It's All Fun and Games: The Ocular On Death class spell_icecrown_the_ocular_on_death : public SpellScript { - PrepareSpellScript(spell_icecrown_the_ocular_on_death); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -759,8 +757,6 @@ class spell_icecrown_the_ocular_on_death : public SpellScript // 66411 - Summon Tualiq Proxy class spell_icecrown_summon_tualiq_proxy : public SpellScript { - PrepareSpellScript(spell_icecrown_summon_tualiq_proxy); - void SetDest(SpellDestination& dest) { Position const offset = { 0.0f, 0.0f, 30.0f, 0.0f }; @@ -786,8 +782,6 @@ enum BreakfastOfChampions // 66512 - Pound Drum class spell_icecrown_pound_drum : public SpellScript { - PrepareSpellScript(spell_icecrown_pound_drum); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_DEEP_JORMUNGAR, SPELL_STORMFORGED_MOLE_MACHINE }); @@ -827,8 +821,6 @@ std::array<uint32, 4> const ChumTheWaterSummonSpells = // 66741 - Chum the Water class spell_icecrown_chum_the_water : public SpellScript { - PrepareSpellScript(spell_icecrown_chum_the_water); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(ChumTheWaterSummonSpells); @@ -861,8 +853,6 @@ enum ThroughTheEye // 25732 - Through the Eye: Eye of the Lich King class spell_icecrown_through_the_eye_the_eye_of_the_lk : public AuraScript { - PrepareAuraScript(spell_icecrown_through_the_eye_the_eye_of_the_lk); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_IMAGE_OF_VARDMADRA, SPELL_SUMMON_IMAGE_OF_SHADOW_CULTIST }) && @@ -892,8 +882,6 @@ class spell_icecrown_through_the_eye_the_eye_of_the_lk : public AuraScript // 57884 - Through the Eye: Kill Credit to Master class spell_icecrown_through_the_eye_kill_credit_to_master : public SpellScript { - PrepareSpellScript(spell_icecrown_through_the_eye_kill_credit_to_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_USING_THE_EYE_OF_THE_LK }); @@ -917,8 +905,6 @@ class spell_icecrown_through_the_eye_kill_credit_to_master : public SpellScript // 56515 - Summon Freed Crusader class spell_icecrown_summon_freed_crusader : public SpellScript { - PrepareSpellScript(spell_icecrown_summon_freed_crusader); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 000d8ce01c2..3cddb45f981 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -115,8 +115,6 @@ struct npc_engineer_helice : public EscortAI class spell_q12688_detonate_1 : public SpellScript { - PrepareSpellScript(spell_q12688_detonate_1); - static constexpr uint32 SPAWN_GROUP_FLAMES = 67; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -156,8 +154,6 @@ class spell_q12688_detonate_1 : public SpellScript class spell_q12688_detonate_2 : public SpellScript { - PrepareSpellScript(spell_q12688_detonate_2); - static constexpr uint32 SPAWN_GROUP_FLAMES = 68; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -390,8 +386,6 @@ enum MiscLifewarden // 51957 - Call of the Lifewarden class spell_q12620_the_lifewarden_wrath : public SpellScript { - PrepareSpellScript(spell_q12620_the_lifewarden_wrath); - void HandleSendEvent(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -468,8 +462,6 @@ enum KickWhatKick // 51330 - Shoot RJR class spell_q12589_shoot_rjr : public SpellScript { - PrepareSpellScript(spell_q12589_shoot_rjr); - SpellCastResult CheckCast() { if (Unit* target = GetExplTargetUnit()) @@ -593,8 +585,6 @@ enum ReturnedSevenfold // 51854 - Deathbolt class spell_q12611_deathbolt : public SpellScript { - PrepareSpellScript(spell_q12611_deathbolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -634,8 +624,6 @@ enum BurningToHelp // 52308 - Take Sputum Sample class spell_sholazar_take_sputum_sample : public SpellScript { - PrepareSpellScript(spell_sholazar_take_sputum_sample); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) && ValidateSpellInfo( @@ -668,8 +656,6 @@ class spell_sholazar_take_sputum_sample : public SpellScript // 52306 - Sputum Collected class spell_sholazar_sputum_collected : public SpellScript { - PrepareSpellScript(spell_sholazar_sputum_collected); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HYDRA_SPUTUM }); @@ -704,8 +690,6 @@ enum ACleansingSong // 52941 - Song of Cleansing class spell_sholazar_song_of_cleansing : public SpellScript { - PrepareSpellScript(spell_sholazar_song_of_cleansing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -753,8 +737,6 @@ enum StrengthOfTheTempest // 53062 - Lightning Strike class spell_sholazar_lightning_strike : public SpellScript { - PrepareSpellScript(spell_sholazar_lightning_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CREATE_POWER_OF_THE_TEMPEST }); @@ -778,8 +760,6 @@ class spell_sholazar_lightning_strike : public SpellScript // 51071 - Flight to Sholazar (Missile Warning) class spell_sholazar_flight_to_sholazar : public SpellScript { - PrepareSpellScript(spell_sholazar_flight_to_sholazar); - bool Validate(SpellInfo const* spellInfo) override { return sBroadcastTextStore.LookupEntry(uint32(spellInfo->GetEffect(EFFECT_0).CalcValue())); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 7d2a256e64f..f271d5161cf 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -843,8 +843,6 @@ private: // 61319 - Jokkum Scriptcast class spell_jokkum_scriptcast : public AuraScript { - PrepareAuraScript(spell_jokkum_scriptcast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_JOKKUM_SUMMON }); @@ -865,8 +863,6 @@ class spell_jokkum_scriptcast : public AuraScript // 56650 - Player Cast Veranus Summon class spell_veranus_summon : public AuraScript { - PrepareAuraScript(spell_veranus_summon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_VERANUS_AND_THORIM }); @@ -892,8 +888,6 @@ enum CloseRift // 56763 - Close Rift class spell_close_rift : public AuraScript { - PrepareAuraScript(spell_close_rift); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DESPAWN_RIFT }); @@ -917,8 +911,6 @@ private: // 56689 - Grip class spell_grip : public AuraScript { - PrepareAuraScript(spell_grip); - void DummyTick(AuraEffect const* /*aurEff*/) { ++_tickNumber; @@ -975,8 +967,6 @@ class spell_grip : public AuraScript // 60533 - Grab On class spell_grab_on : public SpellScript { - PrepareSpellScript(spell_grab_on); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP, GetCaster()->GetGUID())) @@ -994,8 +984,6 @@ class spell_grab_on : public SpellScript template <int8 StacksToLose> class spell_loosen_grip : public SpellScript { - PrepareSpellScript(spell_loosen_grip); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP)) @@ -1011,8 +999,6 @@ class spell_loosen_grip : public SpellScript // 60596 - Low Health Trigger class spell_low_health_trigger : public SpellScript { - PrepareSpellScript(spell_low_health_trigger); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ static_cast<uint32>(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -1033,8 +1019,6 @@ class spell_low_health_trigger : public SpellScript // 60864 - Jaws of Death class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScript { - PrepareSpellScript(spell_jaws_of_death_claw_swipe_pct_damage); - void HandleDamage(SpellEffIndex /*effIndex*/) { SetEffectValue(static_cast<int32>(GetHitUnit()->CountPctFromMaxHealth(GetEffectValue()))); @@ -1049,8 +1033,6 @@ class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScript // 56705 - Claw Swipe class spell_claw_swipe_check : public AuraScript { - PrepareAuraScript(spell_claw_swipe_check); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetAI()->DoAction(ACTION_CLAW_SWIPE_WARN); @@ -1083,8 +1065,6 @@ class spell_claw_swipe_check : public AuraScript // 60587 - Fatal Strike class spell_fatal_strike : public SpellScript { - PrepareSpellScript(spell_fatal_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FATAL_STRIKE_DAMAGE }); @@ -1114,8 +1094,6 @@ class spell_fatal_strike : public SpellScript // 56672 - Player Mount Wyrm class spell_player_mount_wyrm : public AuraScript { - PrepareAuraScript(spell_player_mount_wyrm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIGHT_WYRM }); @@ -1139,8 +1117,6 @@ class spell_player_mount_wyrm : public AuraScript // 55693 - Remove Collapsing Cave Aura class spell_storm_peaks_remove_collapsing_cave_aura : public SpellScript { - PrepareSpellScript(spell_storm_peaks_remove_collapsing_cave_aura); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -1171,8 +1147,6 @@ enum MountingHodirsHelm // 56278 - Read Pronouncement class spell_storm_peaks_read_pronouncement : public AuraScript { - PrepareAuraScript(spell_storm_peaks_read_pronouncement); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sBroadcastTextStore.HasRecord(TEXT_PRONOUNCEMENT_1) && @@ -1210,8 +1184,6 @@ enum JormuttarIsSooFat // 56565 - Bear Flank Master class spell_storm_peaks_bear_flank_master : public SpellScript { - PrepareSpellScript(spell_storm_peaks_bear_flank_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CREATE_BEAR_FLANK, SPELL_BEAR_FLANK_FAIL }); @@ -1231,8 +1203,6 @@ class spell_storm_peaks_bear_flank_master : public SpellScript // 56569 - Bear Flank Fail class spell_storm_peaks_bear_flank_fail : public AuraScript { - PrepareAuraScript(spell_storm_peaks_bear_flank_fail); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sBroadcastTextStore.HasRecord(TEXT_CARVE_FAIL); @@ -1268,8 +1238,6 @@ enum AmpleInspiration // 54581 - Mammoth Explosion Spell Spawner class spell_storm_peaks_mammoth_explosion_master : public SpellScript { - PrepareSpellScript(spell_storm_peaks_mammoth_explosion_master); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1306,8 +1274,6 @@ class spell_storm_peaks_mammoth_explosion_master : public SpellScript // 54892 - Unstable Explosive Detonation class spell_storm_peaks_unstable_explosive_detonation : public SpellScript { - PrepareSpellScript(spell_storm_peaks_unstable_explosive_detonation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return sObjectMgr->GetItemTemplate(ITEM_EXPLOSIVE_DEVICE); @@ -1337,8 +1303,6 @@ enum MendingFences // 55512 - Call of Earth class spell_storm_peaks_call_of_earth : public SpellScript { - PrepareSpellScript(spell_storm_peaks_call_of_earth); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_EARTHEN }); diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 7c23c47d9fe..5bcdcd4c8c1 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -354,8 +354,6 @@ private: 61409 - Build Siege Vehicle (Force) */ class spell_wintergrasp_force_building : public SpellScript { - PrepareSpellScript(spell_wintergrasp_force_building); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -382,8 +380,6 @@ class spell_wintergrasp_force_building : public SpellScript // 61178 - Grab Passenger class spell_wintergrasp_grab_passenger : public SpellScript { - PrepareSpellScript(spell_wintergrasp_grab_passenger); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -428,8 +424,6 @@ enum WgTeleport // 54640 - Teleport class spell_wintergrasp_defender_teleport : public SpellScript { - PrepareSpellScript(spell_wintergrasp_defender_teleport); - SpellCastResult CheckCast() { if (Player* target = GetExplTargetUnit()->ToPlayer()) @@ -449,8 +443,6 @@ class spell_wintergrasp_defender_teleport : public SpellScript // 54643 - Teleport class spell_wintergrasp_defender_teleport_trigger : public SpellScript { - PrepareSpellScript(spell_wintergrasp_defender_teleport_trigger); - void HandleDummy(SpellEffIndex /*effindex*/) { if (Unit* target = GetHitUnit()) @@ -471,8 +463,6 @@ class spell_wintergrasp_defender_teleport_trigger : public SpellScript // 59911 - Tenacity class spell_wintergrasp_tenacity_refresh : public AuraScript { - PrepareAuraScript(spell_wintergrasp_tenacity_refresh); - bool Validate(SpellInfo const* spellInfo) override { if (!ValidateSpellEffect({ { spellInfo->Id, EFFECT_2 } })) diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 389ebc14da4..fd750e96b89 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -415,8 +415,6 @@ uint32 const FetchIngredients[21][4] = // 51157 - Random Ingredient Hard Aura class spell_random_ingredient_aura : public AuraScript { - PrepareAuraScript(spell_random_ingredient_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -454,8 +452,6 @@ class spell_random_ingredient_aura : public AuraScript // 51134 - Random Ingredient Easy class spell_random_ingredient : public SpellScript { - PrepareSpellScript(spell_random_ingredient); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -524,8 +520,6 @@ class spell_random_ingredient : public SpellScript // 51046 - Pot Check class spell_pot_check : public SpellScript { - PrepareSpellScript(spell_pot_check); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -615,8 +609,6 @@ class spell_pot_check : public SpellScript class spell_fetch_ingredient_aura : public AuraScript { - PrepareAuraScript(spell_fetch_ingredient_aura); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -690,8 +682,6 @@ enum ScourgeDisguise // 51966 - Scourge Disguise class spell_zuldrak_scourge_disguise : public AuraScript { - PrepareAuraScript(spell_zuldrak_scourge_disguise); - void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -714,8 +704,6 @@ class spell_zuldrak_scourge_disguise : public AuraScript // 51971 - Scourge Disguise Instability class spell_zuldrak_scourge_disguise_instability : public AuraScript { - PrepareAuraScript(spell_zuldrak_scourge_disguise_instability); - void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { isPeriodic = true; @@ -743,8 +731,6 @@ class spell_zuldrak_scourge_disguise_instability : public AuraScript // 52010 - Scourge Disguise Expiring class spell_zuldrak_scourge_disguise_expiring : public AuraScript { - PrepareAuraScript(spell_zuldrak_scourge_disguise_expiring); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Player* player = GetTarget()->ToPlayer()) @@ -768,8 +754,6 @@ class spell_zuldrak_scourge_disguise_expiring : public AuraScript // 54089 - Drop Disguise class spell_zuldrak_drop_disguise : public SpellScript { - PrepareSpellScript(spell_zuldrak_drop_disguise); - void HandleHit() { if (Unit* target = GetHitUnit()) @@ -796,8 +780,6 @@ enum Cocooned // 51596 - Cocooned: Player Not On Quest class spell_zuldrak_cocooned_not_on_quest : public SpellScript { - PrepareSpellScript(spell_zuldrak_cocooned_not_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SCOURGED_CAPTIVE }); @@ -817,8 +799,6 @@ class spell_zuldrak_cocooned_not_on_quest : public SpellScript // 51598 - Cocooned: Player On Quest class spell_zuldrak_cocooned_on_quest : public SpellScript { - PrepareSpellScript(spell_zuldrak_cocooned_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SCOURGED_CAPTIVE, SPELL_SUMMON_CAPTIVE_FOOTMAN }); @@ -850,8 +830,6 @@ enum Sabotage // 52324 - Scourgewagon Explosion class spell_zuldrak_scourgewagon_explosion : public SpellScript { - PrepareSpellScript(spell_zuldrak_scourgewagon_explosion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -888,8 +866,6 @@ class spell_zuldrak_scourgewagon_explosion : public SpellScript // 54990 - Chains of the Scourge class spell_zuldrak_chains_of_the_scourge : public SpellScript { - PrepareSpellScript(spell_zuldrak_chains_of_the_scourge); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_1).CalcValue()) }); diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp index 5fecee52b14..456ceb98b0a 100644 --- a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp +++ b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_exarch_maladaar.cpp @@ -352,8 +352,6 @@ private: // 33326 - Stolen Soul Dispel class spell_exarch_maladaar_stolen_soul_dispel : public AuraScript { - PrepareAuraScript(spell_exarch_maladaar_stolen_soul_dispel); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_STOLEN_SOUL }); diff --git a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp index e594ee7a6e6..24912ea91ee 100644 --- a/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp +++ b/src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_talon_king_ikiss.cpp @@ -154,8 +154,6 @@ struct boss_talon_king_ikiss : public BossAI // 38194 - Blink class spell_talon_king_ikiss_blink : public SpellScript { - PrepareSpellScript(spell_talon_king_ikiss_blink); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLINK_TELEPORT }); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp index 50e8cc2d488..38a7fd78d66 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_blackheart_the_inciter.cpp @@ -206,8 +206,6 @@ struct boss_blackheart_the_inciter_mc_dummy : public NullCreatureAI // 33676 - Incite Chaos class spell_blackheart_incite_chaos : public SpellScript { - PrepareSpellScript(spell_blackheart_incite_chaos); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_INCITE_CHAOS_B }); diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index c091efd21c9..47655500d92 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -156,8 +156,6 @@ struct boss_murmur : public BossAI // 33923, 38796 - Sonic Boom class spell_murmur_sonic_boom : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SONIC_BOOM_EFFECT }); @@ -177,8 +175,6 @@ class spell_murmur_sonic_boom : public SpellScript // 33666, 38795 - Sonic Boom Effect class spell_murmur_sonic_boom_effect : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom_effect); - void CalcDamage() { if (Unit* target = GetHitUnit()) @@ -209,8 +205,6 @@ class ThunderingStormCheck // 39365 - Thundering Storm class spell_murmur_thundering_storm : public SpellScript { - PrepareSpellScript(spell_murmur_thundering_storm); - void FilterTarget(std::list<WorldObject*>& targets) { targets.remove_if(ThunderingStormCheck(GetCaster())); @@ -225,8 +219,6 @@ class spell_murmur_thundering_storm : public SpellScript // 33711, 38794 - Murmur's Touch class spell_murmur_murmurs_touch : public AuraScript { - PrepareAuraScript(spell_murmur_murmurs_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp index 433c3ee1ba1..ce4eb611ed9 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp @@ -27,8 +27,6 @@ enum Spells // 33493 - Mark of Malice class spell_mark_of_malice : public AuraScript { - PrepareAuraScript(spell_mark_of_malice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_MALICE_TRIGGERED }); diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index 6b93face40a..c7af1be4c76 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -236,8 +236,6 @@ private: // 41986 - Anger class spell_soul_fragment_anger : public SpellScript { - PrepareSpellScript(spell_soul_fragment_anger); - void HandleKill() { if (Creature* caster = GetCaster()->ToCreature()) @@ -253,8 +251,6 @@ class spell_soul_fragment_anger : public SpellScript // 39645 - Shadow Inferno class spell_illidari_nightlord_shadow_inferno : public AuraScript { - PrepareAuraScript(spell_illidari_nightlord_shadow_inferno); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_INFERNO_DAMAGE }); diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 52b66895bfe..a8da948a5aa 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -317,8 +317,6 @@ struct npc_fel_geyser : public PassiveAI // 42005 - Bloodboil class spell_gurtogg_bloodboil_bloodboil : public SpellScript { - PrepareSpellScript(spell_gurtogg_bloodboil_bloodboil); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.size() <= 5) @@ -339,8 +337,6 @@ class spell_gurtogg_bloodboil_bloodboil : public SpellScript // 40618 - Insignificance class spell_gurtogg_bloodboil_insignificance : public SpellScript { - PrepareSpellScript(spell_gurtogg_bloodboil_insignificance); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FEL_RAGE_TARGET }); diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index eb4b585514a..ed26aa1867b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1848,8 +1848,6 @@ private: // 41077 - Akama Teleport class spell_illidan_akama_teleport : public SpellScript { - PrepareSpellScript(spell_illidan_akama_teleport); - void SetDest(SpellDestination& dest) { if (Creature* caster = GetCaster()->ToCreature()) @@ -1868,8 +1866,6 @@ class spell_illidan_akama_teleport : public SpellScript // 41268 - Quest - Black Temple - Akama - Door Open class spell_illidan_akama_door_channel : public AuraScript { - PrepareAuraScript(spell_illidan_akama_door_channel); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ARCANE_EXPLOSION }); @@ -1894,8 +1890,6 @@ class spell_illidan_akama_door_channel : public AuraScript // 40904 - Draw Soul class spell_illidan_draw_soul : public SpellScript { - PrepareSpellScript(spell_illidan_draw_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRAW_SOUL_HEAL }); @@ -1917,8 +1911,6 @@ class spell_illidan_draw_soul : public SpellScript 41914 - Parasitic Shadowfiend */ class spell_illidan_parasitic_shadowfiend : public AuraScript { - PrepareAuraScript(spell_illidan_parasitic_shadowfiend); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PARASITIC_SHADOWFIENDS }); @@ -1943,8 +1935,6 @@ class spell_illidan_parasitic_shadowfiend : public AuraScript // 41913 - Parasitic Shadowfiend Passive class spell_illidan_parasitic_shadowfiend_proc : public AuraScript { - PrepareAuraScript(spell_illidan_parasitic_shadowfiend_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARASITIC_SHADOWFIEND, SPELL_PARASITIC_SHADOWFIEND_2 }); @@ -1965,8 +1955,6 @@ class spell_illidan_parasitic_shadowfiend_proc : public AuraScript // 41923 - Remove Parasitic Shadowfiends (SERVERSIDE) class spell_illidan_remove_parasitic_shadowfiend : public AuraScript { - PrepareAuraScript(spell_illidan_remove_parasitic_shadowfiend); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARASITIC_SHADOWFIEND, SPELL_PARASITIC_SHADOWFIEND_2 }); @@ -1988,8 +1976,6 @@ class spell_illidan_remove_parasitic_shadowfiend : public AuraScript 39849 - Throw Glaive */ class spell_illidan_throw_warglaive : public SpellScript { - PrepareSpellScript(spell_illidan_throw_warglaive); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -2005,8 +1991,6 @@ class spell_illidan_throw_warglaive : public SpellScript // 39857 - Tear of Azzinoth Summon Channel class spell_illidan_tear_of_azzinoth_channel : public AuraScript { - PrepareAuraScript(spell_illidan_tear_of_azzinoth_channel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_UNCAGED_WRATH }); @@ -2035,8 +2019,6 @@ class spell_illidan_tear_of_azzinoth_channel : public AuraScript // 40631 - Flame Blast class spell_illidan_flame_blast : public SpellScript { - PrepareSpellScript(spell_illidan_flame_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLAZE_SUMMON }); @@ -2058,8 +2040,6 @@ class spell_illidan_flame_blast : public SpellScript // 39873 - Glaive Returns class spell_illidan_return_glaives : public SpellScript { - PrepareSpellScript(spell_illidan_return_glaives); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->SendPlaySpellVisualKit(SPELL_GLAIVE_VISUAL_KIT, 0, 0); @@ -2076,8 +2056,6 @@ class spell_illidan_return_glaives : public SpellScript // 40834 - Agonizing Flames class spell_illidan_agonizing_flames : public SpellScript { - PrepareSpellScript(spell_illidan_agonizing_flames); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AGONIZING_FLAMES }); @@ -2108,8 +2086,6 @@ class spell_illidan_agonizing_flames : public SpellScript // 40511 - Demon Transform 1 class spell_illidan_demon_transform1 : public AuraScript { - PrepareAuraScript(spell_illidan_demon_transform1); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEMON_TRANSFORM_2 }); @@ -2131,8 +2107,6 @@ class spell_illidan_demon_transform1 : public AuraScript // 40398 - Demon Transform 2 class spell_illidan_demon_transform2 : public AuraScript { - PrepareAuraScript(spell_illidan_demon_transform2); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3 }); @@ -2168,8 +2142,6 @@ class spell_illidan_demon_transform2 : public AuraScript // 41126 - Flame Burst class spell_illidan_flame_burst : public SpellScript { - PrepareSpellScript(spell_illidan_flame_burst); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_BURST_EFFECT }); @@ -2189,8 +2161,6 @@ class spell_illidan_flame_burst : public SpellScript // 41081 - Find Target class spell_illidan_find_target : public SpellScript { - PrepareSpellScript(spell_illidan_find_target); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYZE }); @@ -2228,8 +2198,6 @@ class spell_illidan_find_target : public SpellScript // 39908 - Eye Blast class spell_illidan_eye_blast : public AuraScript { - PrepareAuraScript(spell_illidan_eye_blast); - void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -2245,8 +2213,6 @@ class spell_illidan_eye_blast : public AuraScript // 40761 - Cage Trap class spell_illidan_cage_trap : public SpellScript { - PrepareSpellScript(spell_illidan_cage_trap); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Creature* target = GetHitCreature(); @@ -2273,8 +2239,6 @@ class spell_illidan_cage_trap : public SpellScript // 40760 - Cage Trap class spell_illidan_caged : public AuraScript { - PrepareAuraScript(spell_illidan_caged); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CAGED_DEBUFF }); @@ -2297,8 +2261,6 @@ class spell_illidan_caged : public AuraScript // 40409 - Maiev Down class spell_maiev_down : public AuraScript { - PrepareAuraScript(spell_maiev_down); - bool Load() override { return GetUnitOwner()->GetTypeId() == TYPEID_UNIT; @@ -2325,8 +2287,6 @@ class spell_maiev_down : public AuraScript // 40693 - Cage Trap class spell_illidan_cage_teleport : public SpellScript { - PrepareSpellScript(spell_illidan_cage_teleport); - void SetDest(SpellDestination& dest) { Position offset = { 0.0f, 0.0f, GetCaster()->GetPositionZ(), 0.0f }; @@ -2342,8 +2302,6 @@ class spell_illidan_cage_teleport : public SpellScript // 41242 - Akama Despawn class spell_illidan_despawn_akama : public SpellScript { - PrepareSpellScript(spell_illidan_despawn_akama); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index d64b240104d..ae4fa8522c9 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -563,8 +563,6 @@ private: // 41499 - Empyreal Balance class spell_illidari_council_empyreal_balance : public SpellScript { - PrepareSpellScript(spell_illidari_council_empyreal_balance); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -582,8 +580,6 @@ class spell_illidari_council_empyreal_balance : public SpellScript // 41333 - Empyreal Equivalency class spell_illidari_council_empyreal_equivalency : public SpellScript { - PrepareSpellScript(spell_illidari_council_empyreal_equivalency); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->SetHealth(GetCaster()->CountPctFromCurHealth(25)); @@ -598,8 +594,6 @@ class spell_illidari_council_empyreal_equivalency : public SpellScript // 41341 - Balance of Power class spell_illidari_council_balance_of_power : public AuraScript { - PrepareAuraScript(spell_illidari_council_balance_of_power); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHARED_RULE }); @@ -620,8 +614,6 @@ class spell_illidari_council_balance_of_power : public AuraScript // 41480 - Deadly Strike class spell_illidari_council_deadly_strike : public AuraScript { - PrepareAuraScript(spell_illidari_council_deadly_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEADLY_POISON }); @@ -644,8 +636,6 @@ class spell_illidari_council_deadly_strike : public AuraScript // 41485 - Deadly Poison class spell_illidari_council_deadly_poison : public AuraScript { - PrepareAuraScript(spell_illidari_council_deadly_poison); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ENVENOM, SPELL_ENVENOM_VISUAL }); @@ -670,8 +660,6 @@ class spell_illidari_council_deadly_poison : public AuraScript // 41476 - Vanish class spell_illidari_council_vanish : public AuraScript { - PrepareAuraScript(spell_illidari_council_vanish); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VANISH_TELEPORT }); @@ -691,8 +679,6 @@ class spell_illidari_council_vanish : public AuraScript // 41475 - Reflective Shield class spell_illidari_council_reflective_shield : public AuraScript { - PrepareAuraScript(spell_illidari_council_reflective_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_REFLECTIVE_SHIELD_DAMAGE }); @@ -716,8 +702,6 @@ class spell_illidari_council_reflective_shield : public AuraScript // 41467 - Judgement class spell_illidari_council_judgement : public SpellScript { - PrepareSpellScript(spell_illidari_council_judgement); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -754,8 +738,6 @@ class spell_illidari_council_judgement : public SpellScript 41459 - Seal of Blood */ class spell_illidari_council_seal : public AuraScript { - PrepareAuraScript(spell_illidari_council_seal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -784,8 +766,6 @@ class spell_illidari_council_seal : public AuraScript // 41478 - Dampen Magic class spell_illidari_dampen_magic : public AuraScript { - PrepareAuraScript(spell_illidari_dampen_magic); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index ab130530025..634aed72741 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -186,8 +186,6 @@ private: // 40869 - Fatal Attraction class spell_mother_shahraz_fatal_attraction : public SpellScript { - PrepareSpellScript(spell_mother_shahraz_fatal_attraction); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -223,8 +221,6 @@ class spell_mother_shahraz_fatal_attraction : public SpellScript // 40870 - Fatal Attraction Dummy Visual class spell_mother_shahraz_fatal_attraction_link : public SpellScript { - PrepareSpellScript(spell_mother_shahraz_fatal_attraction_link); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FATAL_ATTRACTION_DAMAGE }); @@ -244,8 +240,6 @@ class spell_mother_shahraz_fatal_attraction_link : public SpellScript // 40816 - Saber Lash class spell_mother_shahraz_saber_lash : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_saber_lash); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_1 } }) @@ -273,8 +267,6 @@ class spell_mother_shahraz_saber_lash : public AuraScript 40862 - Sinful Periodic */ class spell_mother_shahraz_generic_periodic : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_generic_periodic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) @@ -299,8 +291,6 @@ class spell_mother_shahraz_generic_periodic : public AuraScript // 40867 - Random Periodic class spell_mother_shahraz_random_periodic : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_random_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(RandomBeam); diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp index d20264a015e..2deea39af21 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -715,8 +715,6 @@ private: // 41350 - Aura of Desire class spell_reliquary_of_souls_aura_of_desire : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_aura_of_desire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AURA_OF_DESIRE_DAMAGE }); @@ -749,8 +747,6 @@ class spell_reliquary_of_souls_aura_of_desire : public AuraScript // 41337 - Aura of Anger class spell_reliquary_of_souls_aura_of_anger : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_aura_of_anger); - void HandleEffectPeriodicUpdate(AuraEffect* aurEff) { if (AuraEffect* aurEff1 = aurEff->GetBase()->GetEffect(EFFECT_1)) @@ -767,8 +763,6 @@ class spell_reliquary_of_souls_aura_of_anger : public AuraScript // 28819 - Submerge Visual class spell_reliquary_of_souls_submerge : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_submerge); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetStandState(UNIT_STAND_STATE_SUBMERGED); @@ -789,8 +783,6 @@ class spell_reliquary_of_souls_submerge : public AuraScript // 41376 - Spite class spell_reliquary_of_souls_spite : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_spite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SPITE_DAMAGE }); @@ -811,8 +803,6 @@ class spell_reliquary_of_souls_spite : public AuraScript // 41305 - Frenzy class spell_reliquary_of_souls_frenzy : public SpellScript { - PrepareSpellScript(spell_reliquary_of_souls_frenzy); - void HandleAfterCast() { if (Creature* caster = GetCaster()->ToCreature()) diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 399d32a19d9..e1c9b76bc48 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -1082,8 +1082,6 @@ private: // 40401 - Shade Soul Channel (serverside spell) class spell_shade_soul_channel_serverside : public AuraScript { - PrepareAuraScript(spell_shade_soul_channel_serverside); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADE_SOUL_CHANNEL_2 }); @@ -1103,8 +1101,6 @@ class spell_shade_soul_channel_serverside : public AuraScript // 40520 - Shade Soul Channel class spell_shade_soul_channel : public AuraScript { - PrepareAuraScript(spell_shade_soul_channel); - void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { int32 const maxSlowEff = -99; diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index 8d6017741ca..366848cb07c 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -306,8 +306,6 @@ private: // 40251 - Shadow of Death class spell_teron_gorefiend_shadow_of_death : public AuraScript { - PrepareAuraScript(spell_teron_gorefiend_shadow_of_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -352,8 +350,6 @@ class spell_teron_gorefiend_shadow_of_death : public AuraScript // 40268 - Spiritual Vengeance class spell_teron_gorefiend_spiritual_vengeance : public AuraScript { - PrepareAuraScript(spell_teron_gorefiend_spiritual_vengeance); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->KillSelf(); @@ -368,8 +364,6 @@ class spell_teron_gorefiend_spiritual_vengeance : public AuraScript // 41999 - Shadow of Death Remove class spell_teron_gorefiend_shadow_of_death_remove : public SpellScript { - PrepareSpellScript(spell_teron_gorefiend_shadow_of_death_remove); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index 483fb69ffcc..cd3021848d4 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -203,8 +203,6 @@ private: // 39992 - Needle Spine Targeting class spell_najentus_needle_spine : public SpellScript { - PrepareSpellScript(spell_najentus_needle_spine); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NEEDLE_SPINE }); diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp index 72623c68ace..3eb49532f94 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp @@ -659,8 +659,6 @@ struct boss_fathomguard_caribdis : public ScriptedAI // 38358 - Tidal Surge class spell_fathomlord_karathress_tidal_surge : public SpellScript { - PrepareSpellScript(spell_fathomlord_karathress_tidal_surge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TIDAL_SURGE_EFFECT }); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index 4ed1fa4af22..e384bb3a078 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -667,8 +667,6 @@ private: // 46430 - Synch Health class spell_ahune_synch_health : public SpellScript { - PrepareSpellScript(spell_ahune_synch_health); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->SetHealth(GetCaster()->GetHealth()); @@ -683,8 +681,6 @@ class spell_ahune_synch_health : public SpellScript // 45926 - Summoning Rhyme Aura class spell_summoning_rhyme_aura : public AuraScript { - PrepareAuraScript(spell_summoning_rhyme_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FORCE_WHISP_FLIGHT, SPELL_SUMMONING_RHYME_BONFIRE }); @@ -727,8 +723,6 @@ class spell_summoning_rhyme_aura : public AuraScript // 46878 - Summon Ice Spear Delayer class spell_summon_ice_spear_delayer : public AuraScript { - PrepareAuraScript(spell_summon_ice_spear_delayer); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICE_SPEAR_KNOCKBACK }); @@ -750,8 +744,6 @@ class spell_summon_ice_spear_delayer : public AuraScript // 46371 - Ice Spear Control Aura class spell_ice_spear_control_aura : public AuraScript { - PrepareAuraScript(spell_ice_spear_control_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICE_SPEAR_TARGET_PICKER }); @@ -772,8 +764,6 @@ class spell_ice_spear_control_aura : public AuraScript // 46372 - Ice Spear Target Picker class spell_ice_spear_target_picker : public SpellScript { - PrepareSpellScript(spell_ice_spear_target_picker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ICE_SPEAR_BUNNY }); @@ -804,8 +794,6 @@ class spell_ice_spear_target_picker : public SpellScript // 46320 - Spell Slippery Floor Periodic class spell_slippery_floor_periodic : public SpellScript { - PrepareSpellScript(spell_slippery_floor_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SLIPPERY_FLOOR_SLIP }); @@ -830,8 +818,6 @@ class spell_slippery_floor_periodic : public SpellScript // 46146 - Ahune Spanky Hands class spell_ahune_spanky_hands : public AuraScript { - PrepareAuraScript(spell_ahune_spanky_hands); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COLD_SLAP }); @@ -852,8 +838,6 @@ class spell_ahune_spanky_hands : public AuraScript // 46843 - Minion Despawner class spell_ahune_minion_despawner : public SpellScript { - PrepareSpellScript(spell_ahune_minion_despawner); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -869,8 +853,6 @@ class spell_ahune_minion_despawner : public SpellScript // 46398 - Spell Ice Bombardment Dest Picker class spell_ice_bombardment_dest_picker : public SpellScript { - PrepareSpellScript(spell_ice_bombardment_dest_picker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICE_BOMBARDMENT }); diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp index 6a04a457345..2330a2f75ba 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp @@ -138,8 +138,6 @@ private: // 31704 - Levitate class spell_the_black_stalker_levitate : public SpellScript { - PrepareSpellScript(spell_the_black_stalker_levitate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LEVITATION_PULSE }); @@ -159,8 +157,6 @@ class spell_the_black_stalker_levitate : public SpellScript // 31701 - Levitation Pulse class spell_the_black_stalker_levitation_pulse : public SpellScript { - PrepareSpellScript(spell_the_black_stalker_levitation_pulse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SOMEONE_GRAB_ME }); @@ -180,8 +176,6 @@ class spell_the_black_stalker_levitation_pulse : public SpellScript // 31702 - Someone Grab Me class spell_the_black_stalker_someone_grab_me : public SpellScript { - PrepareSpellScript(spell_the_black_stalker_someone_grab_me); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGNETIC_PULL, SPELL_SUSPENSION }); @@ -202,8 +196,6 @@ class spell_the_black_stalker_someone_grab_me : public SpellScript // 31703 - Magnetic Pull class spell_the_black_stalker_magnetic_pull : public SpellScript { - PrepareSpellScript(spell_the_black_stalker_magnetic_pull); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUSPENSION_PRIMER }); @@ -223,8 +215,6 @@ class spell_the_black_stalker_magnetic_pull : public SpellScript // 38756 - Summon Spore Strider class spell_the_black_stalker_summon_spore_strider : public SpellScript { - PrepareSpellScript(spell_the_black_stalker_summon_spore_strider); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SPORE_STRIDER }); diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index c88f98b937a..d2a3aaa3ed6 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -276,8 +276,6 @@ class spell_gruul_shatter : public SpellScriptLoader class spell_gruul_shatter_SpellScript : public SpellScript { - PrepareSpellScript(spell_gruul_shatter_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_STONED, SPELL_SHATTER_EFFECT }); @@ -311,8 +309,6 @@ class spell_gruul_shatter_effect : public SpellScriptLoader class spell_gruul_shatter_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_gruul_shatter_effect_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }); diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index d564283af30..2c281a65d43 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -282,8 +282,6 @@ class spell_broggok_poison_cloud : public SpellScriptLoader class spell_broggok_poison_cloud_AuraScript : public AuraScript { - PrepareAuraScript(spell_broggok_poison_cloud_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 90d24c23b51..b6f9ffbc92d 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -452,8 +452,6 @@ struct go_manticron_cube : public GameObjectAI // 30541 - Blaze class spell_magtheridon_blaze_target : public SpellScript { - PrepareSpellScript(spell_magtheridon_blaze_target); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BLAZE }); @@ -473,8 +471,6 @@ class spell_magtheridon_blaze_target : public SpellScript // 30410 - Shadow Grasp class spell_magtheridon_shadow_grasp : public AuraScript { - PrepareAuraScript(spell_magtheridon_shadow_grasp); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MIND_EXHAUSTION }); @@ -496,8 +492,6 @@ class spell_magtheridon_shadow_grasp : public AuraScript // 30166 - Shadow Grasp (Visual Effect) class spell_magtheridon_shadow_grasp_visual : public AuraScript { - PrepareAuraScript(spell_magtheridon_shadow_grasp_visual); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index e1da5cc09bd..3fca93a1a44 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -191,8 +191,6 @@ class spell_kargath_executioner : public SpellScriptLoader class spell_kargath_executioner_AuraScript : public AuraScript { - PrepareAuraScript(spell_kargath_executioner_AuraScript); - bool AreaCheck(Unit* target) { if (target->GetMap()->GetId() != 540) @@ -226,8 +224,6 @@ class spell_remove_kargath_executioner : public SpellScriptLoader class spell_remove_kargath_executioner_SpellScript : public SpellScript { - PrepareSpellScript(spell_remove_kargath_executioner_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetCaster(); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 12ae2319eb6..aa42fe49dfa 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -552,8 +552,6 @@ struct npc_flame_patch_alar : public ScriptedAI // 34229 - Flame Quills class spell_alar_flame_quills : public AuraScript { - PrepareAuraScript(spell_alar_flame_quills); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(flameQuillsSpells); diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index dee825dd272..806d379c0fc 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -478,8 +478,6 @@ struct npc_solarium_priest : public ScriptedAI // 42783 - Wrath of the Astromancer class spell_astromancer_wrath_of_the_astromancer : public AuraScript { - PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_WRATH_OF_THE_ASTROMANCER_DOT }) diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index f0264e3599c..4a9c11101c7 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1327,8 +1327,6 @@ struct npc_phoenix_egg_tk : public ScriptedAI // 35941 - Gravity Lapse class spell_kael_gravity_lapse : public SpellScript { - PrepareSpellScript(spell_kael_gravity_lapse); - public: spell_kael_gravity_lapse() { @@ -1360,8 +1358,6 @@ private: // 36730 - Flame Strike class spell_kaelthas_flame_strike : public AuraScript { - PrepareAuraScript(spell_kaelthas_flame_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_STRIKE_DAMAGE }); @@ -1382,8 +1378,6 @@ class spell_kaelthas_flame_strike : public AuraScript // 36976 - Summon Weapons class spell_kaelthas_summon_weapons : public SpellScript { - PrepareSpellScript(spell_kaelthas_summon_weapons); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(SummonWeaponsSpells); @@ -1405,8 +1399,6 @@ class spell_kaelthas_summon_weapons : public SpellScript // 39497 - Remove Enchanted Weapons class spell_kaelthas_remove_weapons : public SpellScript { - PrepareSpellScript(spell_kaelthas_remove_weapons); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(RemoveWeaponsSpells); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp index 9a83dd61c3b..cc13773a290 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp @@ -161,8 +161,6 @@ struct boss_mechano_lord_capacitus : public BossAI // 39093 - Negative Charge class spell_capacitus_polarity_charge : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_charge); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -217,8 +215,6 @@ class spell_capacitus_polarity_charge : public SpellScript // 39096 - Polarity Shift class spell_capacitus_polarity_shift : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_shift); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POSITIVE_POLARITY, SPELL_NEGATIVE_POLARITY }); diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp index 6f8c5b06e50..3ca064382e3 100644 --- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp +++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -204,8 +204,6 @@ private: // 35268, 39346 - Inferno class spell_nethermancer_sepethrea_inferno : public AuraScript { - PrepareAuraScript(spell_nethermancer_sepethrea_inferno); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_INFERNO_DAMAGE }); diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp index a637298c64e..896df533363 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -154,8 +154,6 @@ private: // 34799 - Arcane Devastation class spell_commander_sarannis_arcane_devastation : public AuraScript { - PrepareAuraScript(spell_commander_sarannis_arcane_devastation); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ARCANE_RESONANCE }); @@ -175,8 +173,6 @@ class spell_commander_sarannis_arcane_devastation : public AuraScript // 34803 - Summon Reinforcements class spell_commander_sarannis_summon_reinforcements : public SpellScript { - PrepareSpellScript(spell_commander_sarannis_summon_reinforcements); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(SummonReinforcementsSpells); diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 939c035a122..9d1a56f7dec 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -166,8 +166,6 @@ private: // 32960 - Mark of Kazzak class spell_mark_of_kazzak : public AuraScript { - PrepareAuraScript(spell_mark_of_kazzak); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_KAZZAK_DAMAGE }); @@ -201,8 +199,6 @@ class spell_mark_of_kazzak : public AuraScript // 21063 - Twisted Reflection class spell_twisted_reflection : public AuraScript { - PrepareAuraScript(spell_twisted_reflection); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TWISTED_REFLECTION_HEAL }); diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index fe34876d400..5b66e7e43cc 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -990,8 +990,6 @@ class spell_oscillating_field : public SpellScriptLoader class spell_oscillating_field_SpellScript : public SpellScript { - PrepareSpellScript(spell_oscillating_field_SpellScript); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) diff --git a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 9ede3ffc95d..3766425e621 100644 --- a/src/server/scripts/Outland/zone_hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp @@ -809,8 +809,6 @@ enum FelSpirits // 39190 - Send Vengeance class spell_hellfire_peninsula_send_vengeance : public SpellScript { - PrepareSpellScript(spell_hellfire_peninsula_send_vengeance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_VENGEANCE_TO_PLAYER }); @@ -832,8 +830,6 @@ class spell_hellfire_peninsula_send_vengeance : public SpellScript // 39202 - Send Vengeance to Player class spell_hellfire_peninsula_send_vengeance_to_player : public SpellScript { - PrepareSpellScript(spell_hellfire_peninsula_send_vengeance_to_player); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_FEL_SPIRIT }); diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index a4395a2fb04..1bbf80b84e9 100644 --- a/src/server/scripts/Outland/zone_nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp @@ -716,8 +716,6 @@ enum FireBomb // 31959 - Fire Bomb Target Summon Trigger class spell_nagrand_fire_bomb_target_summon_trigger : public SpellScript { - PrepareSpellScript(spell_nagrand_fire_bomb_target_summon_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIRE_BOMB_TARGET_SUMMON_EFFECT }); @@ -739,8 +737,6 @@ class spell_nagrand_fire_bomb_target_summon_trigger : public SpellScript // 31960 - Fire Bomb Target Summon Effect class spell_nagrand_fire_bomb_target_summon_effect : public SpellScript { - PrepareSpellScript(spell_nagrand_fire_bomb_target_summon_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIRE_BOMB_DAMAGE_MISSILE }); @@ -760,8 +756,6 @@ class spell_nagrand_fire_bomb_target_summon_effect : public SpellScript // 31961 - Fire Bomb class spell_nagrand_fire_bomb_damage_missile : public SpellScript { - PrepareSpellScript(spell_nagrand_fire_bomb_damage_missile); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIRE_BOMB_SUMMON_CATAPULT_BLAZE, SPELL_FIRE_BOMB_FLAMES }); diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index a42eb0e2f77..631be8101ac 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -477,8 +477,6 @@ enum DetonateTeleporter // 38920 - Detonate Teleporter class spell_detonate_teleporter : public SpellScript { - PrepareSpellScript(spell_detonate_teleporter); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 4e75ab30f24..3d849c5ce95 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1517,8 +1517,6 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader class spell_unlocking_zuluheds_chains_SpellScript : public SpellScript { - PrepareSpellScript(spell_unlocking_zuluheds_chains_SpellScript); - void HandleAfterHit() { if (Player* caster = GetCaster()->ToPlayer()) @@ -1609,8 +1607,6 @@ enum DissensionAmongstTheRanks // 38224 - Illidari Agent Illusion class spell_shadowmoon_illidari_agent_illusion : public AuraScript { - PrepareAuraScript(spell_shadowmoon_illidari_agent_illusion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ILLIDARI_DISGUISE_MALE, SPELL_ILLIDARI_DISGUISE_FEMALE }); @@ -1640,8 +1636,6 @@ class spell_shadowmoon_illidari_agent_illusion : public AuraScript // 38223 - Quest Credit: Crazed Colossus class spell_shadowmoon_quest_credit_crazed_colossus : public SpellScript { - PrepareSpellScript(spell_shadowmoon_quest_credit_crazed_colossus); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 2d09310aa8d..41e4b00661a 100644 --- a/src/server/scripts/Outland/zone_terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp @@ -151,8 +151,6 @@ public: // 40655 - Skyguard Flare class spell_skyguard_flare : public SpellScript { - PrepareSpellScript(spell_skyguard_flare); - void ModDestHeight(SpellDestination& dest) { dest._position.m_positionZ = GetCaster()->GetMap()->GetHeight(GetCaster()->GetPhaseShift(), dest._position.GetPositionX(), dest._position.GetPositionY(), MAX_HEIGHT); @@ -186,8 +184,6 @@ std::array<uint32, 5> const CocoonSummonSpells = // 38949 - Terrokar Free Webbed Creature class spell_terokkar_free_webbed : public SpellScript { - PrepareSpellScript(spell_terokkar_free_webbed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells); @@ -207,8 +203,6 @@ class spell_terokkar_free_webbed : public SpellScript // 38950 - Terokkar Free Webbed Creature ON QUEST class spell_terokkar_free_webbed_on_quest : public SpellScript { - PrepareSpellScript(spell_terokkar_free_webbed_on_quest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(CocoonSummonSpells) && ValidateSpellInfo({ SPELL_FREE_WEBBED_6 }); @@ -245,8 +239,6 @@ enum WhoAreThey // 48917 - Who Are They: Cast from Questgiver class spell_terokkar_shadowy_disguise_cast_from_questgiver : public SpellScript { - PrepareSpellScript(spell_terokkar_shadowy_disguise_cast_from_questgiver); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOWY_DISGUISE }); @@ -266,8 +258,6 @@ class spell_terokkar_shadowy_disguise_cast_from_questgiver : public SpellScript // 32756 - Shadowy Disguise class spell_terokkar_shadowy_disguise : public AuraScript { - PrepareAuraScript(spell_terokkar_shadowy_disguise); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MALE_SHADOWY_DISGUISE, SPELL_FEMALE_SHADOWY_DISGUISE }); @@ -296,8 +286,6 @@ class spell_terokkar_shadowy_disguise : public AuraScript // 32780 - Cancel Shadowy Disguise class spell_terokkar_cancel_shadowy_disguise : public SpellScript { - PrepareSpellScript(spell_terokkar_cancel_shadowy_disguise); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOWY_DISGUISE }); diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index f63db95a1a2..b35dfeade3a 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -151,8 +151,6 @@ enum LichPet // 69735 - Lich Pet OnSummon class spell_pet_gen_lich_pet_onsummon : public SpellScript { - PrepareSpellScript(spell_pet_gen_lich_pet_onsummon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LICH_PET_AURA }); @@ -173,8 +171,6 @@ class spell_pet_gen_lich_pet_onsummon : public SpellScript // 69736 - Lich Pet Aura Remove class spell_pet_gen_lich_pet_aura_remove : public SpellScript { - PrepareSpellScript(spell_pet_gen_lich_pet_aura_remove); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LICH_PET_AURA }); @@ -194,8 +190,6 @@ class spell_pet_gen_lich_pet_aura_remove : public SpellScript // 69732 - Lich Pet Aura class spell_pet_gen_lich_pet_aura : public AuraScript { - PrepareAuraScript(spell_pet_gen_lich_pet_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LICH_PET_AURA_ONKILL }); @@ -228,8 +222,6 @@ class spell_pet_gen_lich_pet_aura : public AuraScript // 70050 - [DND] Lich Pet class spell_pet_gen_lich_pet_periodic_emote : public AuraScript { - PrepareAuraScript(spell_pet_gen_lich_pet_periodic_emote); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LICH_PET_EMOTE }); @@ -257,8 +249,6 @@ class spell_pet_gen_lich_pet_periodic_emote : public AuraScript // 70049 - [DND] Lich Pet class spell_pet_gen_lich_pet_emote : public AuraScript { - PrepareAuraScript(spell_pet_gen_lich_pet_emote); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->HandleEmoteCommand(EMOTE_ONESHOT_CUSTOM_SPELL_01); @@ -273,8 +263,6 @@ class spell_pet_gen_lich_pet_emote : public AuraScript // 69682 - Lil' K.T. Focus class spell_pet_gen_lich_pet_focus : public SpellScript { - PrepareSpellScript(spell_pet_gen_lich_pet_focus); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); diff --git a/src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp b/src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp index eef3eb0b075..f1911ac9c53 100644 --- a/src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp +++ b/src/server/scripts/Shadowlands/Torghast/spell_torghast.cpp @@ -26,8 +26,6 @@ // 297721 - Subjugator's Manacles class spell_torghast_subjugators_manacles : public AuraScript { - PrepareAuraScript(spell_torghast_subjugators_manacles); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& procInfo) { if (_triggeredTargets.contains(procInfo.GetProcTarget()->GetGUID())) @@ -55,8 +53,6 @@ class spell_torghast_subjugators_manacles : public AuraScript // 300771 - Blade of the Lifetaker class spell_torghast_blade_of_the_lifetaker : public AuraScript { - PrepareAuraScript(spell_torghast_blade_of_the_lifetaker); - void HandleProc(AuraEffect* aurEff, ProcEventInfo& procInfo) { PreventDefaultAction(); @@ -75,8 +71,6 @@ class spell_torghast_blade_of_the_lifetaker : public AuraScript // 300796 - Touch of the Unseen class spell_torghast_touch_of_the_unseen : public AuraScript { - PrepareAuraScript(spell_torghast_touch_of_the_unseen); - static constexpr uint32 SPELL_DOOR_OF_SHADOWS = 300728; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -108,8 +102,6 @@ class spell_torghast_touch_of_the_unseen : public AuraScript // 305060 - Yel'Shir's Powerglove class spell_torghast_yelshirs_powerglove : public SpellScript { - PrepareSpellScript(spell_torghast_yelshirs_powerglove); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (SpellInfo const* triggeringSpell = GetTriggeringSpell()) @@ -126,8 +118,6 @@ class spell_torghast_yelshirs_powerglove : public SpellScript // 321706 - Dimensional Blade class spell_torghast_dimensional_blade : public SpellScript { - PrepareSpellScript(spell_torghast_dimensional_blade); - static constexpr uint32 SPELL_MAGE_BLINK = 1953; static constexpr uint32 SPELL_MAGE_SHIMMER = 212653; @@ -170,8 +160,6 @@ class spell_torghast_dimensional_blade : public SpellScript // 341324 - Uncontrolled Darkness class spell_torghast_uncontrolled_darkness : public AuraScript { - PrepareAuraScript(spell_torghast_uncontrolled_darkness); - void Register() override { // just a value holder, no hooks @@ -184,8 +172,6 @@ public: // 343174 - Uncontrolled Darkness class spell_torghast_uncontrolled_darkness_proc : public AuraScript { - PrepareAuraScript(spell_torghast_uncontrolled_darkness_proc); - static constexpr uint32 SPELL_UNCONTROLLED_DARKNESS = 341324; static constexpr uint32 SPELL_UNCONTROLLED_DARKNESS_BUFF = 341375; @@ -236,8 +222,6 @@ class spell_torghast_uncontrolled_darkness_proc : public AuraScript // 342632 - Malevolent Stitching class spell_torghast_fleshcraft_shield_proc : public AuraScript { - PrepareAuraScript(spell_torghast_fleshcraft_shield_proc); - static constexpr uint32 SPELL_LABEL_FLESHCRAFT_BUFF = 1103; bool CheckProc(ProcEventInfo& procInfo) @@ -254,8 +238,6 @@ class spell_torghast_fleshcraft_shield_proc : public AuraScript // 342779 - Crystallized Dreams class spell_torghast_soulshape_proc : public AuraScript { - PrepareAuraScript(spell_torghast_soulshape_proc); - static constexpr uint32 SPELL_LABEL_SOULSHAPE = 1100; bool CheckProc(ProcEventInfo& procInfo) @@ -273,8 +255,6 @@ class spell_torghast_soulshape_proc : public AuraScript // 342799 - Gnarled Key class spell_torghast_door_of_shadows_proc : public AuraScript { - PrepareAuraScript(spell_torghast_door_of_shadows_proc); - static constexpr uint32 SPELL_LABEL_DOOR_OF_SHADOWS = 726; bool CheckProc(ProcEventInfo& procInfo) @@ -291,8 +271,6 @@ class spell_torghast_door_of_shadows_proc : public AuraScript // 348908 - Ethereal Wildseed class spell_torghast_flicker_proc : public AuraScript { - PrepareAuraScript(spell_torghast_flicker_proc); - static constexpr uint32 SPELL_LABEL_FLICKER = 1105; bool CheckProc(ProcEventInfo& procInfo) @@ -309,8 +287,6 @@ class spell_torghast_flicker_proc : public AuraScript // 354569 - Potent Potion class spell_torghast_potent_potion_proc : public AuraScript { - PrepareAuraScript(spell_torghast_potent_potion_proc); - static constexpr uint32 SPELL_LABEL_REJUVENATING_SIPHONED_ESSENCE = 1290; bool CheckProc(ProcEventInfo& procInfo) @@ -327,8 +303,6 @@ class spell_torghast_potent_potion_proc : public AuraScript // 354706 - Spiritual Rejuvenation Potion class spell_torghast_potent_potion_calc : public SpellScript { - PrepareSpellScript(spell_torghast_potent_potion_calc); - static constexpr uint32 SPELL_LABEL_SPIRITUAL_REJUVENATION_POTION = 354568; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -352,8 +326,6 @@ class spell_torghast_potent_potion_calc : public SpellScript // 373761 - Poisonous Spores class spell_torghast_poisonous_spores : public AuraScript { - PrepareAuraScript(spell_torghast_poisonous_spores); - void HandleProc(AuraEffect* aurEff, ProcEventInfo& procInfo) { PreventDefaultAction(); diff --git a/src/server/scripts/Shadowlands/spell_covenant.cpp b/src/server/scripts/Shadowlands/spell_covenant.cpp index b4fe51752b6..79cc92cac93 100644 --- a/src/server/scripts/Shadowlands/spell_covenant.cpp +++ b/src/server/scripts/Shadowlands/spell_covenant.cpp @@ -24,8 +24,6 @@ // 323916 - Sulfuric Emission class spell_soulbind_sulfuric_emission : public AuraScript { - PrepareAuraScript(spell_soulbind_sulfuric_emission); - static constexpr uint32 SPELL_SULFURIC_EMISSION_COOLDOWN_AURA = 347684; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -53,8 +51,6 @@ class spell_soulbind_sulfuric_emission : public AuraScript // 332753 - Superior Tactics class spell_soulbind_superior_tactics : public AuraScript { - PrepareAuraScript(spell_soulbind_superior_tactics); - static constexpr uint32 SPELL_SUPERIOR_TACTICS_COOLDOWN_AURA = 332926; bool Validate(SpellInfo const* /*spellInfo*/) override 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 diff --git a/src/server/scripts/World/boss_emerald_dragons.cpp b/src/server/scripts/World/boss_emerald_dragons.cpp index cdb4ee81eaa..4e7bee33cb8 100644 --- a/src/server/scripts/World/boss_emerald_dragons.cpp +++ b/src/server/scripts/World/boss_emerald_dragons.cpp @@ -728,8 +728,6 @@ class spell_dream_fog_sleep : public SpellScriptLoader class spell_dream_fog_sleep_SpellScript : public SpellScript { - PrepareSpellScript(spell_dream_fog_sleep_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(DreamFogTargetSelector()); @@ -773,8 +771,6 @@ class spell_mark_of_nature : public SpellScriptLoader class spell_mark_of_nature_SpellScript : public SpellScript { - PrepareSpellScript(spell_mark_of_nature_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp b/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp index e506d3ec260..9368195d55e 100644 --- a/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp +++ b/src/server/scripts/Zandalar/Underrot/boss_cragmaw_the_infested.cpp @@ -254,8 +254,6 @@ private: // 271775 - Tantrum Energy Bar (periodic) class spell_cragmaw_power_energize_tantrum : public AuraScript { - PrepareAuraScript(spell_cragmaw_power_energize_tantrum); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -271,8 +269,6 @@ class spell_cragmaw_power_energize_tantrum : public AuraScript // 260411 - Summon Larva class spell_cragmaw_summon_larva : public AuraScript { - PrepareAuraScript(spell_cragmaw_summon_larva); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* creature = GetTarget()->ToCreature()) @@ -302,8 +298,6 @@ struct at_cragmaw_destroy_larva : AreaTriggerAI // 260416 - Metamorphosis class spell_cragmaw_larva_metamorphosis : public AuraScript { - PrepareAuraScript(spell_cragmaw_larva_metamorphosis); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -340,8 +334,6 @@ class spell_cragmaw_larva_metamorphosis : public AuraScript // 278641 - Blood Burst class spell_cragmaw_blood_burst : public AuraScript { - PrepareAuraScript(spell_cragmaw_blood_burst); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); diff --git a/src/server/scripts/Zandalar/Underrot/boss_elder_leaxa.cpp b/src/server/scripts/Zandalar/Underrot/boss_elder_leaxa.cpp index 2dbceab860e..25dfd5be650 100644 --- a/src/server/scripts/Zandalar/Underrot/boss_elder_leaxa.cpp +++ b/src/server/scripts/Zandalar/Underrot/boss_elder_leaxa.cpp @@ -214,8 +214,6 @@ struct npc_blood_wave_stalker : public ScriptedAI // 264747 - Sanguine Feast class spell_sanguine_feast_selector : public SpellScript { - PrepareSpellScript(spell_sanguine_feast_selector); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -236,8 +234,6 @@ class spell_sanguine_feast_selector : public SpellScript // 260889 - Creeping Rot class spell_creeping_rot_selector : public SpellScript { - PrepareSpellScript(spell_creeping_rot_selector); - static constexpr float SPAWN_DISTANCE = 5.0f; void HandleHit(SpellEffIndex /*effIndex*/) @@ -268,8 +264,6 @@ class spell_creeping_rot_selector : public SpellScript // 261496 - Creeping Rot (Aura) class spell_creeping_rot_aura : public AuraScript { - PrepareAuraScript(spell_creeping_rot_aura); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE) @@ -302,8 +296,6 @@ static Position const MirrorSpawnPositions[] = // 264603 - Blood Mirror class spell_blood_mirror_selector : public SpellScript { - PrepareSpellScript(spell_blood_mirror_selector); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_MIRROR_MISSILE }); @@ -326,8 +318,6 @@ class spell_blood_mirror_selector : public SpellScript // 261498 - Creeping Rot class spell_taint_of_ghuun : public SpellScript { - PrepareSpellScript(spell_taint_of_ghuun); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TAINT_OF_GHUUN }); |