From 2b2fc5fb8a5faf6351b419c1d5a5ec2cd44285f1 Mon Sep 17 00:00:00 2001 From: Warpten Date: Fri, 28 Aug 2020 15:40:26 +0200 Subject: [PATCH] Core/Spells: remove PrepareSpellScript and PrepareAuraScript macros and make Hooklist use emplace behaivior (#174) --- src/common/Utilities/Util.h | 8 +- src/server/game/Spells/Auras/SpellAuras.cpp | 82 +- src/server/game/Spells/Spell.cpp | 44 +- src/server/game/Spells/SpellScript.cpp | 411 -------- src/server/game/Spells/SpellScript.h | 955 ++++++++++-------- .../BaradinHold/boss_alizabal.cpp | 6 +- .../BaradinHold/boss_occuthar.cpp | 18 +- .../BaradinHold/boss_pit_lord_argaloth.cpp | 19 +- .../boss_ascendant_council.cpp | 158 +-- .../BastionOfTwilight/boss_chogall.cpp | 98 +- .../boss_halfus_wyrmbreaker.cpp | 22 +- .../boss_theralion_and_valiona.cpp | 134 +-- .../boss_ascendant_lord_obsidius.cpp | 26 +- .../BlackrockCaverns/boss_beauty.cpp | 4 +- .../boss_corla_herald_of_twilight.cpp | 22 +- .../boss_karsh_steelbender.cpp | 20 +- .../boss_romogg_bonecrusher.cpp | 24 +- .../BlackrockDepths/boss_coren_direbrew.cpp | 28 +- .../BlackwingDescent/blackwing_descent.cpp | 24 +- .../BlackwingDescent/boss_atramedes.cpp | 70 +- .../BlackwingDescent/boss_chimaeron.cpp | 38 +- .../BlackwingDescent/boss_magmaw.cpp | 68 +- .../BlackwingDescent/boss_maloriak.cpp | 60 +- .../BlackwingDescent/boss_nefarians_end.cpp | 96 +- .../boss_omnotron_defense_system.cpp | 70 +- .../BlackwingLair/boss_razorgore.cpp | 4 +- .../BlackwingLair/boss_vaelastrasz.cpp | 4 +- .../MoltenCore/boss_baron_geddon.cpp | 4 +- .../MoltenCore/boss_shazzrah.cpp | 6 +- .../Deadmines/boss_admiral_ripsnarl.cpp | 12 +- .../Deadmines/boss_captain_cookie.cpp | 10 +- .../Deadmines/boss_foe_reaper_5000.cpp | 16 +- .../Deadmines/boss_glubtok.cpp | 6 +- .../Deadmines/boss_helix_gearbreaker.cpp | 50 +- .../Deadmines/boss_vanessa_van_cleef.cpp | 6 +- .../EasternKingdoms/Deadmines/deadmines.cpp | 16 +- .../Gilneas/gilneas_chapter_2.cpp | 26 +- .../EasternKingdoms/Gnomeregan/gnomeregan.cpp | 6 +- .../GrimBatol/boss_drahga_shadowburner.cpp | 8 +- .../EasternKingdoms/GrimBatol/boss_erudax.cpp | 24 +- .../GrimBatol/boss_forgemaster_throngus.cpp | 62 +- .../GrimBatol/boss_general_umbriss.cpp | 16 +- .../EasternKingdoms/GrimBatol/grim_batol.cpp | 4 +- .../Karazhan/boss_nightbane.cpp | 4 +- .../boss_felblood_kaelthas.cpp | 4 +- .../the_scarlet_enclave_chapter_1.cpp | 4 +- .../Scholomance/boss_darkmaster_gandling.cpp | 8 +- .../Scholomance/boss_kormok.cpp | 10 +- .../ShadowfangKeep/boss_apothecary_hummel.cpp | 28 +- .../ShadowfangKeep/boss_baron_ashbury.cpp | 12 +- .../ShadowfangKeep/boss_baron_silverlaine.cpp | 6 +- .../boss_commander_springvale.cpp | 14 +- .../ShadowfangKeep/boss_lord_godfrey.cpp | 20 +- .../ShadowfangKeep/boss_lord_walden.cpp | 20 +- .../ShadowfangKeep/shadowfang_keep.cpp | 4 +- .../EasternKingdoms/Stratholme/stratholme.cpp | 6 +- .../SunwellPlateau/boss_kalecgos.cpp | 28 +- .../SunwellPlateau/boss_muru.cpp | 20 +- .../boss_commander_ulthok.cpp | 4 +- .../ThroneOfTheTides/boss_lady_nazjar.cpp | 10 +- .../ThroneOfTheTides/boss_ozumat.cpp | 34 +- .../ThroneOfTheTides/throne_of_the_tides.cpp | 20 +- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 28 +- .../ZulGurub/boss_bloodlord_mandokir.cpp | 40 +- .../ZulGurub/boss_high_priest_venoxis.cpp | 36 +- .../ZulGurub/boss_high_priestess_kilnara.cpp | 22 +- .../ZulGurub/boss_jindo_the_godbreaker.cpp | 16 +- .../EasternKingdoms/ZulGurub/boss_zanzil.cpp | 28 +- .../EasternKingdoms/ZulGurub/zulgurub.cpp | 22 +- .../EasternKingdoms/zone_blasted_lands.cpp | 4 +- .../zone_dun_morogh_area_coldridge_valley.cpp | 12 +- .../zone_hillsbrad_foothills.cpp | 20 +- .../EasternKingdoms/zone_tol_barad.cpp | 4 +- .../scripts/EasternKingdoms/zone_westfall.cpp | 27 +- .../BattleForMountHyjal/boss_anetheron.cpp | 4 +- .../BattleForMountHyjal/boss_archimonde.cpp | 4 +- .../BattleForMountHyjal/boss_kazrogal.cpp | 8 +- .../boss_salramm_the_fleshcrafter.cpp | 4 +- .../CullingOfStratholme/npc_arthas.cpp | 4 +- .../DragonSoul/boss_madness_of_deathwing.cpp | 144 +-- .../CavernsOfTime/EndTime/boss_murozond.cpp | 12 +- .../Kalimdor/Firelands/boss_alysrazor.cpp | 20 +- .../Kalimdor/Firelands/boss_baleroc.cpp | 46 +- .../HallsOfOrigination/boss_ammunae.cpp | 20 +- .../HallsOfOrigination/boss_anraphet.cpp | 26 +- .../boss_earthrager_ptah.cpp | 19 +- .../HallsOfOrigination/boss_isiset.cpp | 36 +- .../Kalimdor/HallsOfOrigination/boss_rajh.cpp | 12 +- .../HallsOfOrigination/boss_setesh.cpp | 4 +- .../boss_temple_guardian_anhuur.cpp | 22 +- .../halls_of_origination.cpp | 6 +- .../boss_general_husam.cpp | 32 +- .../boss_high_prophet_barim.cpp | 16 +- .../boss_lockmaw_and_augh.cpp | 14 +- .../LostCityOfTheTolvir/boss_siamat.cpp | 40 +- .../Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp | 6 +- .../Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp | 8 +- .../ThroneOfTheFourWinds/boss_alakir.cpp | 70 +- .../boss_conclave_of_wind.cpp | 45 +- .../throne_of_the_four_winds.cpp | 8 +- .../Kalimdor/VortexPinnacle/boss_altairus.cpp | 22 +- .../Kalimdor/VortexPinnacle/boss_asaad.cpp | 40 +- .../boss_grand_vizier_ertan.cpp | 8 +- .../VortexPinnacle/vortex_pinnacle.cpp | 56 +- .../scripts/Kalimdor/zone_ashenvale.cpp | 4 +- src/server/scripts/Kalimdor/zone_durotar.cpp | 8 +- src/server/scripts/Kalimdor/zone_felwood.cpp | 20 +- .../scripts/Kalimdor/zone_mount_hyjal.cpp | 24 +- src/server/scripts/Kalimdor/zone_uldum.cpp | 28 +- .../Maelstrom/Stonecore/boss_corborus.cpp | 10 +- .../Stonecore/boss_high_priestess_azil.cpp | 48 +- .../Maelstrom/Stonecore/boss_ozruk.cpp | 20 +- .../Maelstrom/Stonecore/boss_slabhide.cpp | 16 +- .../scripts/Maelstrom/Stonecore/stonecore.cpp | 22 +- .../AzjolNerub/Ahnkahet/boss_elder_nadox.cpp | 6 +- .../Ahnkahet/boss_prince_taldaram.cpp | 8 +- .../AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 4 +- .../AzjolNerub/AzjolNerub/boss_anubarak.cpp | 8 +- .../AzjolNerub/AzjolNerub/boss_hadronox.cpp | 13 +- .../boss_krikthir_the_gatewatcher.cpp | 12 +- .../boss_baltharus_the_warborn.cpp | 4 +- .../RubySanctum/boss_halion.cpp | 66 +- .../RubySanctum/boss_saviana_ragefire.cpp | 10 +- .../RubySanctum/ruby_sanctum.cpp | 6 +- .../boss_argent_challenge.cpp | 12 +- .../boss_anubarak_trial.cpp | 8 +- .../boss_faction_champions.cpp | 24 +- .../TrialOfTheCrusader/boss_lord_jaraxxus.cpp | 16 +- .../boss_northrend_beasts.cpp | 38 +- .../TrialOfTheCrusader/boss_twin_valkyr.cpp | 14 +- .../Northrend/DraktharonKeep/boss_novos.cpp | 4 +- .../DraktharonKeep/boss_tharon_ja.cpp | 4 +- .../DraktharonKeep/boss_trollgore.cpp | 14 +- .../ForgeOfSouls/boss_bronjahm.cpp | 16 +- .../ForgeOfSouls/boss_devourer_of_souls.cpp | 20 +- .../HallsOfReflection/boss_marwyn.cpp | 4 +- .../HallsOfReflection/halls_of_reflection.cpp | 16 +- .../PitOfSaron/boss_forgemaster_garfrost.cpp | 6 +- .../PitOfSaron/boss_krickandick.cpp | 28 +- .../PitOfSaron/boss_scourgelord_tyrannus.cpp | 14 +- .../FrozenHalls/PitOfSaron/pit_of_saron.cpp | 8 +- .../Northrend/Gundrak/boss_gal_darah.cpp | 8 +- .../Northrend/Gundrak/boss_moorabi.cpp | 4 +- .../boss_blood_prince_council.cpp | 44 +- .../boss_blood_queen_lana_thel.cpp | 36 +- .../boss_deathbringer_saurfang.cpp | 46 +- .../IcecrownCitadel/boss_festergut.cpp | 12 +- .../boss_icecrown_gunship_battle.cpp | 92 +- .../boss_lady_deathwhisper.cpp | 12 +- .../IcecrownCitadel/boss_lord_marrowgar.cpp | 36 +- .../boss_professor_putricide.cpp | 97 +- .../IcecrownCitadel/boss_rotface.cpp | 46 +- .../IcecrownCitadel/boss_sindragosa.cpp | 64 +- .../IcecrownCitadel/boss_the_lich_king.cpp | 160 +-- .../boss_valithria_dreamwalker.cpp | 40 +- .../IcecrownCitadel/icecrown_citadel.cpp | 28 +- .../IsleOfConquest/isle_of_conquest.cpp | 16 +- .../Naxxramas/boss_four_horsemen.cpp | 4 +- .../Northrend/Naxxramas/boss_gluth.cpp | 10 +- .../Northrend/Naxxramas/boss_gothik.cpp | 4 +- .../Northrend/Naxxramas/boss_grobbulus.cpp | 8 +- .../Northrend/Naxxramas/boss_heigan.cpp | 4 +- .../Northrend/Naxxramas/boss_kelthuzad.cpp | 10 +- .../Northrend/Naxxramas/boss_loatheb.cpp | 4 +- .../Northrend/Naxxramas/boss_sapphiron.cpp | 16 +- .../Northrend/Naxxramas/boss_thaddius.cpp | 12 +- .../Nexus/EyeOfEternity/boss_malygos.cpp | 84 +- .../Nexus/Nexus/boss_keristrasza.cpp | 4 +- .../Northrend/Nexus/Nexus/boss_ormorok.cpp | 4 +- .../Northrend/Nexus/Oculus/boss_eregos.cpp | 4 +- .../Northrend/Nexus/Oculus/boss_varos.cpp | 14 +- .../scripts/Northrend/Nexus/Oculus/oculus.cpp | 34 +- .../Ulduar/HallsOfLightning/boss_loken.cpp | 4 +- .../Ulduar/HallsOfStone/boss_krystallus.cpp | 8 +- .../Ulduar/boss_algalon_the_observer.cpp | 42 +- .../Ulduar/Ulduar/boss_assembly_of_iron.cpp | 14 +- .../Northrend/Ulduar/Ulduar/boss_auriaya.cpp | 10 +- .../Ulduar/Ulduar/boss_flame_leviathan.cpp | 31 +- .../Northrend/Ulduar/Ulduar/boss_freya.cpp | 8 +- .../Ulduar/Ulduar/boss_general_vezax.cpp | 12 +- .../Northrend/Ulduar/Ulduar/boss_hodir.cpp | 8 +- .../Northrend/Ulduar/Ulduar/boss_ignis.cpp | 6 +- .../Northrend/Ulduar/Ulduar/boss_kologarn.cpp | 40 +- .../Northrend/Ulduar/Ulduar/boss_mimiron.cpp | 146 +-- .../Ulduar/Ulduar/boss_razorscale.cpp | 8 +- .../Northrend/Ulduar/Ulduar/boss_thorim.cpp | 54 +- .../Northrend/Ulduar/Ulduar/boss_xt002.cpp | 36 +- .../Ulduar/Ulduar/boss_yogg_saron.cpp | 191 ++-- .../Ulduar/Ulduar/instance_ulduar.cpp | 4 +- .../UtgardeKeep/boss_ingvar_the_plunderer.cpp | 10 +- .../UtgardeKeep/UtgardeKeep/boss_keleseth.cpp | 4 +- .../UtgardeKeep/UtgardeKeep/utgarde_keep.cpp | 14 +- .../UtgardePinnacle/boss_palehoof.cpp | 16 +- .../UtgardePinnacle/boss_skadi.cpp | 36 +- .../UtgardePinnacle/boss_svala.cpp | 4 +- .../VaultOfArchavon/boss_archavon.cpp | 4 +- .../VaultOfArchavon/boss_koralon.cpp | 14 +- .../Northrend/VioletHold/boss_cyanigosa.cpp | 4 +- .../Northrend/VioletHold/boss_ichoron.cpp | 20 +- .../Northrend/VioletHold/boss_moragg.cpp | 10 +- .../Northrend/VioletHold/boss_xevozz.cpp | 4 +- .../Northrend/VioletHold/violet_hold.cpp | 12 +- .../scripts/Northrend/zone_borean_tundra.cpp | 12 +- .../scripts/Northrend/zone_dragonblight.cpp | 8 +- .../scripts/Northrend/zone_grizzly_hills.cpp | 30 +- .../scripts/Northrend/zone_howling_fjord.cpp | 4 +- .../scripts/Northrend/zone_sholazar_basin.cpp | 16 +- .../scripts/Northrend/zone_storm_peaks.cpp | 58 +- .../scripts/Northrend/zone_wintergrasp.cpp | 16 +- src/server/scripts/Northrend/zone_zuldrak.cpp | 16 +- .../SethekkHalls/boss_talon_king_ikiss.cpp | 6 +- .../boss_blackheart_the_inciter.cpp | 3 +- .../ShadowLabyrinth/boss_murmur.cpp | 12 +- .../ShadowLabyrinth/shadow_labyrinth.cpp | 4 +- .../Outland/BlackTemple/black_temple.cpp | 8 +- .../BlackTemple/boss_gurtogg_bloodboil.cpp | 8 +- .../Outland/BlackTemple/boss_illidan.cpp | 82 +- .../BlackTemple/boss_illidari_council.cpp | 38 +- .../BlackTemple/boss_mother_shahraz.cpp | 24 +- .../BlackTemple/boss_reliquary_of_souls.cpp | 20 +- .../BlackTemple/boss_shade_of_akama.cpp | 8 +- .../BlackTemple/boss_teron_gorefiend.cpp | 16 +- .../BlackTemple/boss_warlord_najentus.cpp | 6 +- .../TheSlavePens/boss_ahune.cpp | 40 +- .../scripts/Outland/GruulsLair/boss_gruul.cpp | 8 +- .../BloodFurnace/boss_broggok.cpp | 4 +- .../MagtheridonsLair/boss_magtheridon.cpp | 14 +- .../ShatteredHalls/shattered_halls.cpp | 8 +- .../TempestKeep/Eye/boss_astromancer.cpp | 4 +- .../Outland/TempestKeep/Eye/boss_kaelthas.cpp | 4 +- .../Mechanar/boss_mechano_lord_capacitus.cpp | 10 +- .../botanica/boss_commander_sarannis.cpp | 4 +- .../scripts/Outland/boss_doomlord_kazzak.cpp | 10 +- .../Outland/zone_blades_edge_mountains.cpp | 4 +- .../Outland/zone_shadowmoon_valley.cpp | 4 +- src/server/scripts/Pet/pet_dk.cpp | 4 +- src/server/scripts/Pet/pet_hunter.cpp | 16 +- src/server/scripts/Spells/spell_dk.cpp | 214 ++-- src/server/scripts/Spells/spell_druid.cpp | 256 ++--- src/server/scripts/Spells/spell_generic.cpp | 531 +++------- src/server/scripts/Spells/spell_holiday.cpp | 158 +-- src/server/scripts/Spells/spell_hunter.cpp | 214 ++-- src/server/scripts/Spells/spell_item.cpp | 460 +++------ src/server/scripts/Spells/spell_mage.cpp | 250 ++--- src/server/scripts/Spells/spell_paladin.cpp | 242 ++--- src/server/scripts/Spells/spell_pet.cpp | 138 +-- src/server/scripts/Spells/spell_priest.cpp | 240 ++--- src/server/scripts/Spells/spell_quest.cpp | 289 ++---- src/server/scripts/Spells/spell_rogue.cpp | 169 +--- src/server/scripts/Spells/spell_shaman.cpp | 236 ++--- src/server/scripts/Spells/spell_warlock.cpp | 208 ++-- src/server/scripts/Spells/spell_warrior.cpp | 165 +-- 252 files changed, 3275 insertions(+), 7394 deletions(-) diff --git a/src/common/Utilities/Util.h b/src/common/Utilities/Util.h index 7530a623d5..6b28e1dd4d 100644 --- a/src/common/Utilities/Util.h +++ b/src/common/Utilities/Util.h @@ -331,7 +331,7 @@ std::string StringJoin(Container const& c, std::string delimiter) // simple class for not-modifyable list template -class HookList final +class HookList { private: typedef std::vector ContainerType; @@ -347,6 +347,12 @@ class HookList final return *this; } + template + void Register(Args&&... args) + { + _container.emplace_back(std::forward(args)...); + } + size_t size() { return _container.size(); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 09b8cd782d..cd249f4f3f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1890,7 +1890,7 @@ bool Aura::CallScriptCheckAreaTargetHandlers(Unit* target) (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_CHECK_AREA_TARGET); auto hookItrEnd = (*scritr)->DoCheckAreaTarget.end(), hookItr = (*scritr)->DoCheckAreaTarget.begin(); for (; hookItr != hookItrEnd; ++hookItr) - result &= hookItr->Call(*scritr, target); + result &= hookItr->Call(target); (*scritr)->_FinishScriptCall(); } @@ -1904,7 +1904,7 @@ void Aura::CallScriptDispel(DispelInfo* dispelInfo) (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_DISPEL); auto hookItrEnd = (*scritr)->OnDispel.end(), hookItr = (*scritr)->OnDispel.begin(); for (; hookItr != hookItrEnd; ++hookItr) - hookItr->Call(*scritr, dispelInfo); + hookItr->Call(dispelInfo); (*scritr)->_FinishScriptCall(); } @@ -1917,7 +1917,7 @@ void Aura::CallScriptAfterDispel(DispelInfo* dispelInfo) (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_AFTER_DISPEL); auto hookItrEnd = (*scritr)->AfterDispel.end(), hookItr = (*scritr)->AfterDispel.begin(); for (; hookItr != hookItrEnd; ++hookItr) - hookItr->Call(*scritr, dispelInfo); + hookItr->Call(dispelInfo); (*scritr)->_FinishScriptCall(); } @@ -1931,8 +1931,8 @@ bool Aura::CallScriptEffectApplyHandlers(AuraEffect const* aurEff, AuraApplicati (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_APPLY, aurApp); auto effEndItr = (*scritr)->OnEffectApply.end(), effItr = (*scritr)->OnEffectApply.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, mode); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()), mode)) + effItr->Call(aurEff, mode); if (!preventDefault) preventDefault = (*scritr)->_IsDefaultActionPrevented(); @@ -1951,8 +1951,8 @@ bool Aura::CallScriptEffectRemoveHandlers(AuraEffect const* aurEff, AuraApplicat (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_REMOVE, aurApp); auto effEndItr = (*scritr)->OnEffectRemove.end(), effItr = (*scritr)->OnEffectRemove.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, mode); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()), mode)) + effItr->Call(aurEff, mode); if (!preventDefault) preventDefault = (*scritr)->_IsDefaultActionPrevented(); @@ -1969,8 +1969,8 @@ void Aura::CallScriptAfterEffectApplyHandlers(AuraEffect const* aurEff, AuraAppl (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_APPLY, aurApp); auto effEndItr = (*scritr)->AfterEffectApply.end(), effItr = (*scritr)->AfterEffectApply.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, mode); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()), mode)) + effItr->Call(aurEff, mode); (*scritr)->_FinishScriptCall(); } @@ -1983,8 +1983,8 @@ void Aura::CallScriptAfterEffectRemoveHandlers(AuraEffect const* aurEff, AuraApp (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_REMOVE, aurApp); auto effEndItr = (*scritr)->AfterEffectRemove.end(), effItr = (*scritr)->AfterEffectRemove.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, mode); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()), mode)) + effItr->Call(aurEff, mode); (*scritr)->_FinishScriptCall(); } @@ -1998,8 +1998,8 @@ bool Aura::CallScriptEffectPeriodicHandlers(AuraEffect const* aurEff, AuraApplic (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_PERIODIC, aurApp); auto effEndItr = (*scritr)->OnEffectPeriodic.end(), effItr = (*scritr)->OnEffectPeriodic.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff); if (!preventDefault) preventDefault = (*scritr)->_IsDefaultActionPrevented(); @@ -2017,8 +2017,8 @@ void Aura::CallScriptEffectUpdatePeriodicHandlers(AuraEffect* aurEff) (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_UPDATE_PERIODIC); auto effEndItr = (*scritr)->OnEffectUpdatePeriodic.end(), effItr = (*scritr)->OnEffectUpdatePeriodic.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff); (*scritr)->_FinishScriptCall(); } @@ -2031,8 +2031,8 @@ void Aura::CallScriptEffectCalcAmountHandlers(AuraEffect const* aurEff, int32 & (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_AMOUNT); auto effEndItr = (*scritr)->DoEffectCalcAmount.end(), effItr = (*scritr)->DoEffectCalcAmount.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, amount, canBeRecalculated); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, amount, canBeRecalculated); (*scritr)->_FinishScriptCall(); } @@ -2045,8 +2045,8 @@ void Aura::CallScriptEffectCalcPeriodicHandlers(AuraEffect const* aurEff, bool & (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_PERIODIC); auto effEndItr = (*scritr)->DoEffectCalcPeriodic.end(), effItr = (*scritr)->DoEffectCalcPeriodic.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, isPeriodic, amplitude); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, isPeriodic, amplitude); (*scritr)->_FinishScriptCall(); } @@ -2059,8 +2059,8 @@ void Aura::CallScriptEffectCalcSpellModHandlers(AuraEffect const* aurEff, SpellM (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_CALC_SPELLMOD); auto effEndItr = (*scritr)->DoEffectCalcSpellMod.end(), effItr = (*scritr)->DoEffectCalcSpellMod.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, spellMod); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, spellMod); (*scritr)->_FinishScriptCall(); } @@ -2074,8 +2074,8 @@ void Aura::CallScriptEffectAbsorbHandlers(AuraEffect* aurEff, AuraApplication co auto effEndItr = (*scritr)->OnEffectAbsorb.end(), effItr = (*scritr)->OnEffectAbsorb.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, dmgInfo, absorbAmount); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, dmgInfo, absorbAmount); if (!defaultPrevented) defaultPrevented = (*scritr)->_IsDefaultActionPrevented(); @@ -2091,8 +2091,8 @@ void Aura::CallScriptEffectAfterAbsorbHandlers(AuraEffect* aurEff, AuraApplicati (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_ABSORB, aurApp); auto effEndItr = (*scritr)->AfterEffectAbsorb.end(), effItr = (*scritr)->AfterEffectAbsorb.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, dmgInfo, absorbAmount); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, dmgInfo, absorbAmount); (*scritr)->_FinishScriptCall(); } @@ -2105,8 +2105,8 @@ void Aura::CallScriptEffectManaShieldHandlers(AuraEffect* aurEff, AuraApplicatio (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_MANASHIELD, aurApp); auto effEndItr = (*scritr)->OnEffectManaShield.end(), effItr = (*scritr)->OnEffectManaShield.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, dmgInfo, absorbAmount); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, dmgInfo, absorbAmount); (*scritr)->_FinishScriptCall(); } @@ -2119,8 +2119,8 @@ void Aura::CallScriptEffectAfterManaShieldHandlers(AuraEffect* aurEff, AuraAppli (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_MANASHIELD, aurApp); auto effEndItr = (*scritr)->AfterEffectManaShield.end(), effItr = (*scritr)->AfterEffectManaShield.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, dmgInfo, absorbAmount); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, dmgInfo, absorbAmount); (*scritr)->_FinishScriptCall(); } @@ -2133,8 +2133,8 @@ void Aura::CallScriptEffectSplitHandlers(AuraEffect* aurEff, AuraApplication con (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_SPLIT, aurApp); auto effEndItr = (*scritr)->OnEffectSplit.end(), effItr = (*scritr)->OnEffectSplit.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, dmgInfo, splitAmount); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, dmgInfo, splitAmount); (*scritr)->_FinishScriptCall(); } @@ -2148,7 +2148,7 @@ bool Aura::CallScriptCheckProcHandlers(AuraApplication const* aurApp, ProcEventI (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_CHECK_PROC, aurApp); auto hookItrEnd = (*scritr)->DoCheckProc.end(), hookItr = (*scritr)->DoCheckProc.begin(); for (; hookItr != hookItrEnd; ++hookItr) - result &= hookItr->Call(*scritr, eventInfo); + result &= hookItr->Call(eventInfo); (*scritr)->_FinishScriptCall(); } @@ -2164,7 +2164,7 @@ bool Aura::CallScriptPrepareProcHandlers(AuraApplication const* aurApp, ProcEven (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_PREPARE_PROC, aurApp); auto effEndItr = (*scritr)->DoPrepareProc.end(), effItr = (*scritr)->DoPrepareProc.begin(); for (; effItr != effEndItr; ++effItr) - effItr->Call(*scritr, eventInfo); + effItr->Call(eventInfo); if (prepare) prepare = !(*scritr)->_IsDefaultActionPrevented(); @@ -2183,7 +2183,7 @@ bool Aura::CallScriptProcHandlers(AuraApplication const* aurApp, ProcEventInfo& (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_PROC, aurApp); auto hookItrEnd = (*scritr)->OnProc.end(), hookItr = (*scritr)->OnProc.begin(); for (; hookItr != hookItrEnd; ++hookItr) - hookItr->Call(*scritr, eventInfo); + hookItr->Call(eventInfo); handled |= (*scritr)->_IsDefaultActionPrevented(); (*scritr)->_FinishScriptCall(); @@ -2199,7 +2199,7 @@ void Aura::CallScriptAfterProcHandlers(AuraApplication const* aurApp, ProcEventI (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_AFTER_PROC, aurApp); auto hookItrEnd = (*scritr)->AfterProc.end(), hookItr = (*scritr)->AfterProc.begin(); for (; hookItr != hookItrEnd; ++hookItr) - hookItr->Call(*scritr, eventInfo); + hookItr->Call(eventInfo); (*scritr)->_FinishScriptCall(); } @@ -2213,8 +2213,8 @@ bool Aura::CallScriptCheckEffectProcHandlers(AuraEffect const* aurEff, AuraAppli (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_CHECK_EFFECT_PROC, aurApp); auto hookItrEnd = (*scritr)->DoCheckEffectProc.end(), hookItr = (*scritr)->DoCheckEffectProc.begin(); for (; hookItr != hookItrEnd; ++hookItr) - if (hookItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - result &= hookItr->Call(*scritr, aurEff, eventInfo); + if (hookItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + result &= hookItr->Call(aurEff, eventInfo); (*scritr)->_FinishScriptCall(); } @@ -2230,8 +2230,8 @@ bool Aura::CallScriptEffectProcHandlers(AuraEffect const* aurEff, AuraApplicatio (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_PROC, aurApp); auto effEndItr = (*scritr)->OnEffectProc.end(), effItr = (*scritr)->OnEffectProc.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, eventInfo); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, eventInfo); if (!preventDefault) preventDefault = (*scritr)->_IsDefaultActionPrevented(); @@ -2248,8 +2248,8 @@ void Aura::CallScriptAfterEffectProcHandlers(AuraEffect const* aurEff, AuraAppli (*scritr)->_PrepareScriptCall(AURA_SCRIPT_HOOK_EFFECT_AFTER_PROC, aurApp); auto effEndItr = (*scritr)->AfterEffectProc.end(), effItr = (*scritr)->AfterEffectProc.begin(); for (; effItr != effEndItr; ++effItr) - if (effItr->IsEffectAffected(m_spellInfo, aurEff->GetEffIndex())) - effItr->Call(*scritr, aurEff, eventInfo); + if (effItr->Filter(m_spellInfo, SpellEffIndex(aurEff->GetEffIndex()))) + effItr->Call(aurEff, eventInfo); (*scritr)->_FinishScriptCall(); } diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 3f7b13991a..6b0b431518 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7914,7 +7914,7 @@ void Spell::CallScriptBeforeCastHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_BEFORE_CAST); auto hookItrEnd = (*scritr)->BeforeCast.end(), hookItr = (*scritr)->BeforeCast.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -7927,7 +7927,7 @@ void Spell::CallScriptOnCastHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_ON_CAST); auto hookItrEnd = (*scritr)->OnCast.end(), hookItr = (*scritr)->OnCast.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -7940,7 +7940,7 @@ void Spell::CallScriptAfterCastHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_AFTER_CAST); auto hookItrEnd = (*scritr)->AfterCast.end(), hookItr = (*scritr)->AfterCast.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -7955,7 +7955,7 @@ SpellCastResult Spell::CallScriptCheckCastHandlers() auto hookItrEnd = (*scritr)->OnCheckCast.end(), hookItr = (*scritr)->OnCheckCast.begin(); for (; hookItr != hookItrEnd; ++hookItr) { - SpellCastResult tempResult = (*hookItr).Call(*scritr); + SpellCastResult tempResult = (*hookItr).Call(); if (retVal == SPELL_CAST_OK) retVal = tempResult; } @@ -7972,7 +7972,7 @@ void Spell::CallScriptOnSpellStartHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_ON_SPELL_START); auto hookItrEnd = (*scritr)->OnSpellStart.end(), hookItr = (*scritr)->OnSpellStart.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -7991,7 +7991,7 @@ bool Spell::CallScriptEffectHandlers(SpellEffIndex effIndex, SpellEffectHandleMo bool preventDefault = false; for (auto scritr = m_loadedScripts.begin(); scritr != m_loadedScripts.end(); ++scritr) { - HookList::iterator effItr, effEndItr; + HookList::iterator effItr, effEndItr; SpellScriptHookType hookType; switch (mode) { @@ -8022,8 +8022,8 @@ bool Spell::CallScriptEffectHandlers(SpellEffIndex effIndex, SpellEffectHandleMo (*scritr)->_PrepareScriptCall(hookType); for (; effItr != effEndItr; ++effItr) // effect execution can be prevented - if (!(*scritr)->_IsEffectPrevented(effIndex) && (*effItr).IsEffectAffected(m_spellInfo, effIndex)) - (*effItr).Call(*scritr, effIndex); + if (!(*scritr)->_IsEffectPrevented(effIndex) && (*effItr).Filter(m_spellInfo, effIndex)) + (*effItr).Call(effIndex); if (!preventDefault) preventDefault = (*scritr)->_IsDefaultEffectPrevented(effIndex); @@ -8040,7 +8040,7 @@ void Spell::CallScriptSuccessfulDispel(SpellEffIndex effIndex) (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_EFFECT_SUCCESSFUL_DISPEL); auto hookItrEnd = (*scritr)->OnEffectSuccessfulDispel.end(), hookItr = (*scritr)->OnEffectSuccessfulDispel.begin(); for (; hookItr != hookItrEnd; ++hookItr) - hookItr->Call(*scritr, effIndex); + hookItr->Call(effIndex); (*scritr)->_FinishScriptCall(); } @@ -8053,7 +8053,7 @@ void Spell::CallScriptBeforeHitHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_BEFORE_HIT); auto hookItrEnd = (*scritr)->BeforeHit.end(), hookItr = (*scritr)->BeforeHit.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -8066,7 +8066,7 @@ void Spell::CallScriptOnHitHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_HIT); auto hookItrEnd = (*scritr)->OnHit.end(), hookItr = (*scritr)->OnHit.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -8079,7 +8079,7 @@ void Spell::CallScriptAfterHitHandlers() (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_AFTER_HIT); auto hookItrEnd = (*scritr)->AfterHit.end(), hookItr = (*scritr)->AfterHit.begin(); for (; hookItr != hookItrEnd; ++hookItr) - (*hookItr).Call(*scritr); + (*hookItr).Call(); (*scritr)->_FinishScriptCall(); } @@ -8092,8 +8092,8 @@ void Spell::CallScriptObjectAreaTargetSelectHandlers(std::list& ta (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_OBJECT_AREA_TARGET_SELECT); auto hookItrEnd = (*scritr)->OnObjectAreaTargetSelect.end(), hookItr = (*scritr)->OnObjectAreaTargetSelect.begin(); for (; hookItr != hookItrEnd; ++hookItr) - if (hookItr->IsEffectAffected(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) - hookItr->Call(*scritr, targets); + if (hookItr->Filter(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) + hookItr->Call(targets); (*scritr)->_FinishScriptCall(); } @@ -8106,8 +8106,8 @@ void Spell::CallScriptObjectTargetSelectHandlers(WorldObject*& target, SpellEffI (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_OBJECT_TARGET_SELECT); auto hookItrEnd = (*scritr)->OnObjectTargetSelect.end(), hookItr = (*scritr)->OnObjectTargetSelect.begin(); for (; hookItr != hookItrEnd; ++hookItr) - if (hookItr->IsEffectAffected(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) - hookItr->Call(*scritr, target); + if (hookItr->Filter(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) + hookItr->Call(target); (*scritr)->_FinishScriptCall(); } @@ -8120,8 +8120,8 @@ void Spell::CallScriptDestinationTargetSelectHandlers(SpellDestination& target, (*scritr)->_PrepareScriptCall(SPELL_SCRIPT_HOOK_DESTINATION_TARGET_SELECT); auto hookItrEnd = (*scritr)->OnDestinationTargetSelect.end(), hookItr = (*scritr)->OnDestinationTargetSelect.begin(); for (; hookItr != hookItrEnd; ++hookItr) - if (hookItr->IsEffectAffected(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) - hookItr->Call(*scritr, target); + if (hookItr->Filter(m_spellInfo, effIndex) && targetType.GetTarget() == hookItr->GetTarget()) + hookItr->Call(target); (*scritr)->_FinishScriptCall(); } @@ -8137,14 +8137,14 @@ bool Spell::CheckScriptEffectImplicitTargets(uint32 effIndex, uint32 effIndexToC { auto targetSelectHookEnd = (*itr)->OnObjectTargetSelect.end(), targetSelectHookItr = (*itr)->OnObjectTargetSelect.begin(); for (; targetSelectHookItr != targetSelectHookEnd; ++targetSelectHookItr) - if (((*targetSelectHookItr).IsEffectAffected(m_spellInfo, effIndex) && !(*targetSelectHookItr).IsEffectAffected(m_spellInfo, effIndexToCheck)) || - (!(*targetSelectHookItr).IsEffectAffected(m_spellInfo, effIndex) && (*targetSelectHookItr).IsEffectAffected(m_spellInfo, effIndexToCheck))) + if (((*targetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndex)) && !(*targetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndexToCheck))) || + (!(*targetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndex)) && (*targetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndexToCheck)))) return false; auto areaTargetSelectHookEnd = (*itr)->OnObjectAreaTargetSelect.end(), areaTargetSelectHookItr = (*itr)->OnObjectAreaTargetSelect.begin(); for (; areaTargetSelectHookItr != areaTargetSelectHookEnd; ++areaTargetSelectHookItr) - if (((*areaTargetSelectHookItr).IsEffectAffected(m_spellInfo, effIndex) && !(*areaTargetSelectHookItr).IsEffectAffected(m_spellInfo, effIndexToCheck)) || - (!(*areaTargetSelectHookItr).IsEffectAffected(m_spellInfo, effIndex) && (*areaTargetSelectHookItr).IsEffectAffected(m_spellInfo, effIndexToCheck))) + if (((*areaTargetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndex)) && !(*areaTargetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndexToCheck))) || + (!(*areaTargetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndex)) && (*areaTargetSelectHookItr).Filter(m_spellInfo, SpellEffIndex(effIndexToCheck)))) return false; } return true; diff --git a/src/server/game/Spells/SpellScript.cpp b/src/server/game/Spells/SpellScript.cpp index a5237ef7c9..7eb59a6344 100644 --- a/src/server/game/Spells/SpellScript.cpp +++ b/src/server/game/Spells/SpellScript.cpp @@ -82,241 +82,6 @@ std::string const* _SpellScript::_GetScriptName() const return m_scriptName; } -_SpellScript::EffectHook::EffectHook(uint8 _effIndex) -{ - // effect index must be in range <0;2>, allow use of special effindexes - ASSERT(_effIndex == EFFECT_ALL || _effIndex == EFFECT_FIRST_FOUND || _effIndex < MAX_SPELL_EFFECTS); - effIndex = _effIndex; -} - -uint8 _SpellScript::EffectHook::GetAffectedEffectsMask(SpellInfo const* spellEntry) -{ - uint8 mask = 0; - if ((effIndex == EFFECT_ALL) || (effIndex == EFFECT_FIRST_FOUND)) - { - for (uint8 i = 0; i < MAX_SPELL_EFFECTS; ++i) - { - if ((effIndex == EFFECT_FIRST_FOUND) && mask) - return mask; - if (CheckEffect(spellEntry, i)) - mask |= (uint8)1<Effects[effIndex].Effect && !effName) - return true; - if (!spellEntry->Effects[effIndex].Effect) - return false; - return (effName == SPELL_EFFECT_ANY) || (spellEntry->Effects[effIndex].Effect == effName); -} - -std::string _SpellScript::EffectNameCheck::ToString() -{ - switch (effName) - { - case SPELL_EFFECT_ANY: - return "SPELL_EFFECT_ANY"; - default: - char num[10]; - sprintf (num, "%u", effName); - return num; - } -} - -bool _SpellScript::EffectAuraNameCheck::Check(SpellInfo const* spellEntry, uint8 effIndex) -{ - if (!spellEntry->Effects[effIndex].ApplyAuraName && !effAurName) - return true; - if (!spellEntry->Effects[effIndex].ApplyAuraName) - return false; - return (effAurName == SPELL_AURA_ANY) || (spellEntry->Effects[effIndex].ApplyAuraName == effAurName); -} - -std::string _SpellScript::EffectAuraNameCheck::ToString() -{ - switch (effAurName) - { - case SPELL_AURA_ANY: - return "SPELL_AURA_ANY"; - default: - char num[10]; - sprintf (num, "%u", effAurName); - return num; - } -} - -SpellScript::CastHandler::CastHandler(SpellCastFnType _pCastHandlerScript) -{ - pCastHandlerScript = _pCastHandlerScript; -} - -void SpellScript::CastHandler::Call(SpellScript* spellScript) -{ - (spellScript->*pCastHandlerScript)(); -} - -SpellScript::CheckCastHandler::CheckCastHandler(SpellCheckCastFnType checkCastHandlerScript) -{ - _checkCastHandlerScript = checkCastHandlerScript; -} - -SpellCastResult SpellScript::CheckCastHandler::Call(SpellScript* spellScript) -{ - return (spellScript->*_checkCastHandlerScript)(); -} - -SpellScript::EffectHandler::EffectHandler(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : _SpellScript::EffectNameCheck(_effName), _SpellScript::EffectHook(_effIndex) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -std::string SpellScript::EffectHandler::ToString() -{ - return "Index: " + EffIndexToString() + " Name: " +_SpellScript::EffectNameCheck::ToString(); -} - -bool SpellScript::EffectHandler::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) -{ - return _SpellScript::EffectNameCheck::Check(spellEntry, effIndexToCheck); -} - -void SpellScript::EffectHandler::Call(SpellScript* spellScript, SpellEffIndex effIndexToHandle) -{ - (spellScript->*pEffectHandlerScript)(effIndexToHandle); -} - -SpellScript::HitHandler::HitHandler(SpellHitFnType _pHitHandlerScript) -{ - pHitHandlerScript = _pHitHandlerScript; -} - -void SpellScript::HitHandler::Call(SpellScript* spellScript) -{ - (spellScript->*pHitHandlerScript)(); -} - -SpellScript::TargetHook::TargetHook(uint8 _effectIndex, uint16 _targetType, bool _area, bool _dest) - : _SpellScript::EffectHook(_effectIndex), targetType(_targetType), area(_area), dest(_dest) { } - -std::string SpellScript::TargetHook::ToString() -{ - std::ostringstream oss; - oss << "Index: " << EffIndexToString() << " Target: " << targetType; - return oss.str(); -} - -bool SpellScript::TargetHook::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) -{ - if (!targetType) - return false; - - if (spellEntry->Effects[effIndexToCheck].TargetA.GetTarget() != targetType && - spellEntry->Effects[effIndexToCheck].TargetB.GetTarget() != targetType) - return false; - - SpellImplicitTargetInfo targetInfo(targetType); - switch (targetInfo.GetSelectionCategory()) - { - case TARGET_SELECT_CATEGORY_CHANNEL: // SINGLE - return !area; - case TARGET_SELECT_CATEGORY_NEARBY: // BOTH - return true; - case TARGET_SELECT_CATEGORY_CONE: // AREA - case TARGET_SELECT_CATEGORY_AREA: // AREA - return area; - case TARGET_SELECT_CATEGORY_DEFAULT: - switch (targetInfo.GetObjectType()) - { - case TARGET_OBJECT_TYPE_SRC: // EMPTY - return false; - case TARGET_OBJECT_TYPE_DEST: // DEST - return dest; - default: - switch (targetInfo.GetReferenceType()) - { - case TARGET_REFERENCE_TYPE_CASTER: // SINGLE - return !area; - case TARGET_REFERENCE_TYPE_TARGET: // BOTH - return true; - default: - break; - } - break; - } - break; - default: - break; - } - - return false; -} - -SpellScript::ObjectAreaTargetSelectHandler::ObjectAreaTargetSelectHandler(SpellObjectAreaTargetSelectFnType _pObjectAreaTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) - : TargetHook(_effIndex, _targetType, true, false) -{ - pObjectAreaTargetSelectHandlerScript = _pObjectAreaTargetSelectHandlerScript; -} - -void SpellScript::ObjectAreaTargetSelectHandler::Call(SpellScript* spellScript, std::list& targets) -{ - (spellScript->*pObjectAreaTargetSelectHandlerScript)(targets); -} - -SpellScript::ObjectTargetSelectHandler::ObjectTargetSelectHandler(SpellObjectTargetSelectFnType _pObjectTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) - : TargetHook(_effIndex, _targetType, false, false) -{ - pObjectTargetSelectHandlerScript = _pObjectTargetSelectHandlerScript; -} - -void SpellScript::ObjectTargetSelectHandler::Call(SpellScript* spellScript, WorldObject*& target) -{ - (spellScript->*pObjectTargetSelectHandlerScript)(target); -} - -SpellScript::DestinationTargetSelectHandler::DestinationTargetSelectHandler(SpellDestinationTargetSelectFnType _DestinationTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) - : TargetHook(_effIndex, _targetType, false, true) -{ - DestinationTargetSelectHandlerScript = _DestinationTargetSelectHandlerScript; -} - -void SpellScript::DestinationTargetSelectHandler::Call(SpellScript* spellScript, SpellDestination& target) -{ - (spellScript->*DestinationTargetSelectHandlerScript)(target); -} - bool SpellScript::_Validate(SpellInfo const* entry) { for (auto itr = OnEffectLaunch.begin(); itr != OnEffectLaunch.end(); ++itr) @@ -791,182 +556,6 @@ bool AuraScript::_Validate(SpellInfo const* entry) return _SpellScript::_Validate(entry); } -AuraScript::CheckAreaTargetHandler::CheckAreaTargetHandler(AuraCheckAreaTargetFnType _pHandlerScript) -{ - pHandlerScript = _pHandlerScript; -} - -bool AuraScript::CheckAreaTargetHandler::Call(AuraScript* auraScript, Unit* _target) -{ - return (auraScript->*pHandlerScript)(_target); -} - -AuraScript::AuraDispelHandler::AuraDispelHandler(AuraDispelFnType _pHandlerScript) -{ - pHandlerScript = _pHandlerScript; -} - -void AuraScript::AuraDispelHandler::Call(AuraScript* auraScript, DispelInfo* _dispelInfo) -{ - (auraScript->*pHandlerScript)(_dispelInfo); -} - -AuraScript::EffectBase::EffectBase(uint8 _effIndex, uint16 _effName) - : _SpellScript::EffectAuraNameCheck(_effName), _SpellScript::EffectHook(_effIndex) { } - -bool AuraScript::EffectBase::CheckEffect(SpellInfo const* spellEntry, uint8 effIndexToCheck) -{ - return _SpellScript::EffectAuraNameCheck::Check(spellEntry, effIndexToCheck); -} - -std::string AuraScript::EffectBase::ToString() -{ - return "Index: " + EffIndexToString() + " AuraName: " +_SpellScript::EffectAuraNameCheck::ToString(); -} - -AuraScript::EffectPeriodicHandler::EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectPeriodicHandler::Call(AuraScript* auraScript, AuraEffect const* _aurEff) -{ - (auraScript->*pEffectHandlerScript)(_aurEff); -} - -AuraScript::EffectUpdatePeriodicHandler::EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectUpdatePeriodicHandler::Call(AuraScript* auraScript, AuraEffect* aurEff) -{ - (auraScript->*pEffectHandlerScript)(aurEff); -} - -AuraScript::EffectCalcAmountHandler::EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectCalcAmountHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) -{ - (auraScript->*pEffectHandlerScript)(aurEff, amount, canBeRecalculated); -} - -AuraScript::EffectCalcPeriodicHandler::EffectCalcPeriodicHandler(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectCalcPeriodicHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, bool& isPeriodic, int32& periodicTimer) -{ - (auraScript->*pEffectHandlerScript)(aurEff, isPeriodic, periodicTimer); -} - -AuraScript::EffectCalcSpellModHandler::EffectCalcSpellModHandler(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectCalcSpellModHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, SpellModifier*& spellMod) -{ - (auraScript->*pEffectHandlerScript)(aurEff, spellMod); -} - -AuraScript::EffectApplyHandler::EffectApplyHandler(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) - : AuraScript::EffectBase(_effIndex, _effName) -{ - pEffectHandlerScript = _pEffectHandlerScript; - mode = _mode; -} - -void AuraScript::EffectApplyHandler::Call(AuraScript* auraScript, AuraEffect const* _aurEff, AuraEffectHandleModes _mode) -{ - if (_mode & mode) - (auraScript->*pEffectHandlerScript)(_aurEff, _mode); -} - -AuraScript::EffectAbsorbHandler::EffectAbsorbHandler(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) - : AuraScript::EffectBase(_effIndex, SPELL_AURA_SCHOOL_ABSORB) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectAbsorbHandler::Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) -{ - (auraScript->*pEffectHandlerScript)(aurEff, dmgInfo, absorbAmount); -} - -AuraScript::EffectManaShieldHandler::EffectManaShieldHandler(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) - : AuraScript::EffectBase(_effIndex, SPELL_AURA_MANA_SHIELD) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectManaShieldHandler::Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) -{ - (auraScript->*pEffectHandlerScript)(aurEff, dmgInfo, absorbAmount); -} - -AuraScript::EffectSplitHandler::EffectSplitHandler(AuraEffectSplitFnType _pEffectHandlerScript, uint8 _effIndex) - : AuraScript::EffectBase(_effIndex, SPELL_AURA_SPLIT_DAMAGE_PCT) -{ - pEffectHandlerScript = _pEffectHandlerScript; -} - -void AuraScript::EffectSplitHandler::Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& splitAmount) -{ - (auraScript->*pEffectHandlerScript)(aurEff, dmgInfo, splitAmount); -} - -AuraScript::CheckProcHandler::CheckProcHandler(AuraCheckProcFnType handlerScript) -{ - _HandlerScript = handlerScript; -} - -bool AuraScript::CheckProcHandler::Call(AuraScript* auraScript, ProcEventInfo& eventInfo) -{ - return (auraScript->*_HandlerScript)(eventInfo); -} - -AuraScript::CheckEffectProcHandler::CheckEffectProcHandler(AuraCheckEffectProcFnType handlerScript, uint8 effIndex, uint16 effName) - : AuraScript::EffectBase(effIndex, effName) -{ - _HandlerScript = handlerScript; -} - -bool AuraScript::CheckEffectProcHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo) -{ - return (auraScript->*_HandlerScript)(aurEff, eventInfo); -} - -AuraScript::AuraProcHandler::AuraProcHandler(AuraProcFnType handlerScript) -{ - _HandlerScript = handlerScript; -} - -void AuraScript::AuraProcHandler::Call(AuraScript* auraScript, ProcEventInfo& eventInfo) -{ - (auraScript->*_HandlerScript)(eventInfo); -} - -AuraScript::EffectProcHandler::EffectProcHandler(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName) - : AuraScript::EffectBase(effIndex, effName) -{ - _EffectHandlerScript = effectHandlerScript; -} - -void AuraScript::EffectProcHandler::Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo) -{ - (auraScript->*_EffectHandlerScript)(aurEff, eventInfo); -} - bool AuraScript::_Load(Aura* aura) { m_aura = aura; diff --git a/src/server/game/Spells/SpellScript.h b/src/server/game/Spells/SpellScript.h index 94efed9bf9..4925b50546 100644 --- a/src/server/game/Spells/SpellScript.h +++ b/src/server/game/Spells/SpellScript.h @@ -19,10 +19,16 @@ #define __SPELL_SCRIPT_H #include "ObjectGuid.h" +#include "Optional.h" #include "SharedDefines.h" #include "SpellAuraDefines.h" +#include "SpellInfo.h" +#include "Utilities/StringFormat.h" #include "Util.h" +#include "advstd.h" + #include +#include #include class Aura; @@ -39,7 +45,6 @@ class ModuleReference; class Player; class ProcEventInfo; class Spell; -class SpellInfo; class SpellScript; class Unit; class WorldLocation; @@ -60,7 +65,7 @@ enum SpellScriptState }; #define SPELL_SCRIPT_STATE_END SPELL_SCRIPT_STATE_UNLOADING + 1 -// helper class from which SpellScript and SpellAura derive, use these classes instead +// helper class from which SpellScript and AuraScript derive, use these classes instead class TC_GAME_API _SpellScript { // internal use classes & functions @@ -77,38 +82,323 @@ class TC_GAME_API _SpellScript std::string const* _GetScriptName() const; protected: - class TC_GAME_API EffectHook - { - public: - EffectHook(uint8 _effIndex); - virtual ~EffectHook() { } - uint8 GetAffectedEffectsMask(SpellInfo const* spellInfo); - bool IsEffectAffected(SpellInfo const* spellInfo, uint8 effIndex); - virtual bool CheckEffect(SpellInfo const* spellInfo, uint8 effIndex) = 0; - std::string EffIndexToString(); - protected: - uint8 effIndex; + /** + * Pseudo specialization (actually a new type) of HookList that is able to give proper parameters to Register(...) to an IDE's autocomplete. + * + * Don't directly implement this type. Expose it as a typedef in your type instead. + */ + template + struct _HookList : HookList + { + explicit _HookList(_SpellScript* owner) : _owner(owner) { } + + template + void Register(typename T::template HookType hookFunction, CtorArgs... args) + { + if (Derived* derivedOwner = dynamic_cast(_owner)) + return HookList::Register(derivedOwner, hookFunction, std::forward(args)...); + } + + private: + _SpellScript* _owner; }; - class TC_GAME_API EffectNameCheck + /** + * Base type in charge of encapsulating a spellscript hook. + * Takes an instance of the spellscript and a member function pointer. + */ + template + struct TC_GAME_API HookHandler { - public: - EffectNameCheck(uint16 _effName) { effName = _effName; } - bool Check(SpellInfo const* spellInfo, uint8 effIndex); - std::string ToString(); - private: - uint16 effName; + //> Type of the function pointer + template + using HookType = R(T::*)(Args...); + + using HookList = _SpellScript::_HookList>; + + template + HookHandler(Derived* owner, HookType hookFunction) + { + _handler = [=](Args&&... args) -> R { + // Value capture to avoid taking addresses of temporaries + + return (owner->*hookFunction)(std::forward(args)...); + }; + } + + R Call(Args... args) + { + return _handler(std::forward(args)...); + } + + private: + std::function _handler; }; - class TC_GAME_API EffectAuraNameCheck + /** + * Base type for hooks that filter on effect index. + * This type can't be directly used because it doesn't expose a HookList typedef. + */ + template + struct TC_GAME_API EffectIndexHookHandler : HookHandler { - public: - EffectAuraNameCheck(uint16 _effAurName) { effAurName = _effAurName; } - bool Check(SpellInfo const* spellInfo, uint8 effIndex); - std::string ToString(); - private: - uint16 effAurName; + //> Type of the required function pointer. + template + using HookType = typename HookHandler::template HookType; + + //> Base type shorthand. + using BaseHookHandler = HookHandler; + + template + EffectIndexHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex, std::function effectInfoFilter) + : BaseHookHandler(owner, hookFunction), _effIndex(effIndex), _effectInfoFilter(effectInfoFilter) + { + // effect index must be in range <0;2>, allow use of special effindexes + ASSERT(_effIndex == EFFECT_ALL || _effIndex == EFFECT_FIRST_FOUND || _effIndex < MAX_SPELL_EFFECTS); + } + + std::string ToString() const + { + return Trinity::StringFormat("Index: %s", EffectIndexToString()); + } + + uint32 GetAffectedEffectsMask(SpellInfo const* spellInfo) + { + uint32 effectMask = 0; + if (_effIndex == EFFECT_FIRST_FOUND || _effIndex == EFFECT_ALL) + { + for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i) + { + if (_effectInfoFilter(spellInfo->Effects[i])) + effectMask |= 1 << i; + + if (_effIndex == EFFECT_FIRST_FOUND && effectMask != 0) + return effectMask; + } + } + else if (_effIndex >= EFFECT_0 && _effIndex < MAX_SPELL_EFFECTS) + { + if (_effectInfoFilter(spellInfo->Effects[_effIndex])) + return 1 << _effIndex; + } + + return effectMask; + } + + bool Filter(SpellInfo const* spellInfo, SpellEffIndex effIndex) + { + return GetAffectedEffectsMask(spellInfo) & (1 << effIndex); + } + + private: + uint8 _effIndex; + std::function _effectInfoFilter; + + const char* EffectIndexToString() const + { + switch (_effIndex) + { + case EFFECT_ALL: return "EFFECT_ALL"; + case EFFECT_FIRST_FOUND: return "EFFECT_FIRST_FOUND"; + case EFFECT_0: return "EFFECT_0"; + case EFFECT_1: return "EFFECT_1"; + case EFFECT_2: return "EFFECT_2"; + } + + return "Invalid value"; + } + + }; + + /** + * Base type for hooks that filter on effect index AND effect name. + * + * If you were to declare a hook using this type, the signature of Register would be + * Register(this, &class::function, EffectIndexSpecifier, EffectNameSpecifier) + */ + template + struct TC_GAME_API EffectNameHookHandler : EffectIndexHookHandler + { + //> Type of the required function pointer. + template + using HookType = typename EffectIndexHookHandler::template HookType; + + //> Base type shorthand. + using BaseHookHandler = EffectIndexHookHandler; + + //> Type of the hook container list. + using HookList = _HookList, uint8, uint16>; + + template + EffectNameHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex, uint16 effName) + : BaseHookHandler(owner, hookFunction, effIndex, + [_effectName = effName](SpellEffectInfo const& effectInfo) { + return _effectName == SPELL_EFFECT_ANY || effectInfo.Effect == _effectName; + }), _effName(effName) + { + + } + + std::string ToString() const + { + return Trinity::StringFormat("%s Name: %s", BaseHookHandler::ToString(), EffectNameToString()); + } + + private: + std::string EffectNameToString() const + { + if (_effName == SPELL_EFFECT_ANY) + return "SPELL_EFFECT_ANY"; + + return Trinity::StringFormat("%u", _effName); + } + + uint16 _effName; + }; + + /** + * Base type for hooks that filter on effect index AND target type. + * + * If you were to declare a hook using this type, the signature of Register would be + * Register(this, &class::function, EffectIndexSpecifier, TargetNameSpecifier) + */ + template + struct TC_GAME_API EffectTargetHookHandler : EffectIndexHookHandler + { + //> Type of the required function pointer. + template + using HookType = typename EffectIndexHookHandler::template HookType; + + //> Base type shorthand. + using BaseHookHandler = EffectIndexHookHandler; + + //> Type of the hook container list. + using HookList = _HookList, uint8, uint16>; + + template + EffectTargetHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex, uint16 targetType) + : BaseHookHandler(owner, hookFunction, effIndex, + [_targetType = targetType](SpellEffectInfo const& effectInfo) { + if (!_targetType) + return false; + + if (effectInfo.TargetA.GetTarget() != _targetType && effectInfo.TargetB.GetTarget() != _targetType) + return false; + + SpellImplicitTargetInfo targetInfo(_targetType); + switch (targetInfo.GetSelectionCategory()) + { + case TARGET_SELECT_CATEGORY_CHANNEL: // SINGLE + return !Area; + case TARGET_SELECT_CATEGORY_NEARBY: // BOTH + return true; + case TARGET_SELECT_CATEGORY_CONE: // AREA + case TARGET_SELECT_CATEGORY_AREA: // AREA + return Area; + case TARGET_SELECT_CATEGORY_DEFAULT: + switch (targetInfo.GetObjectType()) + { + case TARGET_OBJECT_TYPE_SRC: // EMPTY + return false; + case TARGET_OBJECT_TYPE_DEST: // DEST + return Dest; + default: + switch (targetInfo.GetReferenceType()) + { + case TARGET_REFERENCE_TYPE_CASTER: // SINGLE + return !Area; + case TARGET_REFERENCE_TYPE_TARGET: // BOTH + return true; + default: + break; + } + break; + } + break; + default: + break; + } + + return false; + }), _targetType(targetType) + { + + } + + std::string ToString() const + { + return Trinity::StringFormat("%s Target: %u", BaseHookHandler::ToString(), _targetType); + } + + uint16 GetTarget() + { + return _targetType; + } + + private: + uint16 _targetType; + }; + + /** + * Base type for hooks that filter on effect index AND area target types. + */ + using ObjectAreaTargetSelectHookHandler = EffectTargetHookHandler&>; + + /** + * Base type for hooks that filter on effect index AND single target types. + */ + using ObjectTargetSelectHookHandler = EffectTargetHookHandler; + + /** + * Base type for hooks that filter on effect index AND destination target types. + */ + using DestinationTargetSelectHookHandler = EffectTargetHookHandler; + + /** + * Base type for hooks that filter on effect index AND aura name. + * + * If you were to declare a hook using this type, the signature of Register would be + * Register(this, &class::function, EffectIndexSpecifier, AuraNameSpecifier) + */ + template + struct TC_GAME_API AuraNameHookHandler : EffectIndexHookHandler + { + //> Type of the required function pointer. + template + using HookType = typename EffectIndexHookHandler::template HookType; + + //> Base type shorthand. + using BaseHookHandler = EffectIndexHookHandler; + + //> Type of the hook container list. + using HookList = _HookList, uint8, uint16>; + + template + AuraNameHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex, uint16 auraName) + : BaseHookHandler(owner, hookFunction, effIndex, + [_auraName = auraName](SpellEffectInfo const& effectInfo) { + return _auraName == SPELL_AURA_ANY || effectInfo.ApplyAuraName == _auraName; + }), _auraName(auraName) + { + + } + + std::string ToString() const + { + return Trinity::StringFormat("%s Name: %s", BaseHookHandler::ToString(), AuraNameToString()); + } + + private: + std::string AuraNameToString() const + { + if (_auraName == SPELL_AURA_ANY) + return "SPELL_AURA_ANY"; + + return Trinity::StringFormat("%u", _auraName); + } + + uint16 _auraName; }; uint8 m_currentScriptState; @@ -188,106 +478,26 @@ class TC_GAME_API SpellScript : public _SpellScript // internal use classes & functions // DO NOT OVERRIDE THESE IN SCRIPTS public: - #define SPELLSCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ - typedef SpellCastResult(CLASSNAME::*SpellCheckCastFnType)(); \ - typedef void(CLASSNAME::*SpellEffectFnType)(SpellEffIndex); \ - typedef void(CLASSNAME::*SpellHitFnType)(); \ - typedef void(CLASSNAME::*SpellCastFnType)(); \ - typedef void(CLASSNAME::*SpellObjectAreaTargetSelectFnType)(std::list&); \ - typedef void(CLASSNAME::*SpellObjectTargetSelectFnType)(WorldObject*&); \ - typedef void(CLASSNAME::*SpellDestinationTargetSelectFnType)(SpellDestination&); + + using CheckCastHook = HookHandler; + using EffectNameHook = EffectNameHookHandler; + using HitHook = HookHandler; + using CastHook = HookHandler; - SPELLSCRIPT_FUNCTION_TYPE_DEFINES(SpellScript) - - class TC_GAME_API CastHandler - { - public: - CastHandler(SpellCastFnType _pCastHandlerScript); - void Call(SpellScript* spellScript); - private: - SpellCastFnType pCastHandlerScript; - }; - - class TC_GAME_API CheckCastHandler - { - public: - CheckCastHandler(SpellCheckCastFnType checkCastHandlerScript); - SpellCastResult Call(SpellScript* spellScript); - private: - SpellCheckCastFnType _checkCastHandlerScript; - }; - - class TC_GAME_API EffectHandler : public _SpellScript::EffectNameCheck, public _SpellScript::EffectHook - { - public: - EffectHandler(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - std::string ToString(); - bool CheckEffect(SpellInfo const* spellInfo, uint8 effIndex) override; - void Call(SpellScript* spellScript, SpellEffIndex effIndex); - private: - SpellEffectFnType pEffectHandlerScript; - }; - - class TC_GAME_API HitHandler - { - public: - HitHandler(SpellHitFnType _pHitHandlerScript); - void Call(SpellScript* spellScript); - private: - SpellHitFnType pHitHandlerScript; - }; - - class TC_GAME_API TargetHook : public _SpellScript::EffectHook - { - public: - TargetHook(uint8 _effectIndex, uint16 _targetType, bool _area, bool _dest); - bool CheckEffect(SpellInfo const* spellInfo, uint8 effIndex) override; - std::string ToString(); - uint16 GetTarget() const { return targetType; } - protected: - uint16 targetType; - bool area; - bool dest; - }; - - class TC_GAME_API ObjectAreaTargetSelectHandler : public TargetHook - { - public: - ObjectAreaTargetSelectHandler(SpellObjectAreaTargetSelectFnType _pObjectAreaTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType); - void Call(SpellScript* spellScript, std::list& targets); - private: - SpellObjectAreaTargetSelectFnType pObjectAreaTargetSelectHandlerScript; - }; - - class TC_GAME_API ObjectTargetSelectHandler : public TargetHook - { - public: - ObjectTargetSelectHandler(SpellObjectTargetSelectFnType _pObjectTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType); - void Call(SpellScript* spellScript, WorldObject*& target); - private: - SpellObjectTargetSelectFnType pObjectTargetSelectHandlerScript; - }; - - class TC_GAME_API DestinationTargetSelectHandler : public TargetHook - { - public: - DestinationTargetSelectHandler(SpellDestinationTargetSelectFnType _DestinationTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType); - void Call(SpellScript* spellScript, SpellDestination& target); - private: - SpellDestinationTargetSelectFnType DestinationTargetSelectHandlerScript; - }; - - #define SPELLSCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ - class CastHandlerFunction : public SpellScript::CastHandler { public: CastHandlerFunction(SpellCastFnType _pCastHandlerScript) : SpellScript::CastHandler((SpellScript::SpellCastFnType)_pCastHandlerScript) { } }; \ - class CheckCastHandlerFunction : public SpellScript::CheckCastHandler { public: CheckCastHandlerFunction(SpellCheckCastFnType _checkCastHandlerScript) : SpellScript::CheckCastHandler((SpellScript::SpellCheckCastFnType)_checkCastHandlerScript) { } }; \ - class EffectHandlerFunction : public SpellScript::EffectHandler { public: EffectHandlerFunction(SpellEffectFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : SpellScript::EffectHandler((SpellScript::SpellEffectFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class HitHandlerFunction : public SpellScript::HitHandler { public: HitHandlerFunction(SpellHitFnType _pHitHandlerScript) : SpellScript::HitHandler((SpellScript::SpellHitFnType)_pHitHandlerScript) { } }; \ - class ObjectAreaTargetSelectHandlerFunction : public SpellScript::ObjectAreaTargetSelectHandler { public: ObjectAreaTargetSelectHandlerFunction(SpellObjectAreaTargetSelectFnType _pObjectAreaTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectAreaTargetSelectHandler((SpellScript::SpellObjectAreaTargetSelectFnType)_pObjectAreaTargetSelectHandlerScript, _effIndex, _targetType) { } }; \ - class ObjectTargetSelectHandlerFunction : public SpellScript::ObjectTargetSelectHandler { public: ObjectTargetSelectHandlerFunction(SpellObjectTargetSelectFnType _pObjectTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::ObjectTargetSelectHandler((SpellScript::SpellObjectTargetSelectFnType)_pObjectTargetSelectHandlerScript, _effIndex, _targetType) { } }; \ - class DestinationTargetSelectHandlerFunction : public SpellScript::DestinationTargetSelectHandler { public: DestinationTargetSelectHandlerFunction(SpellDestinationTargetSelectFnType _DestinationTargetSelectHandlerScript, uint8 _effIndex, uint16 _targetType) : SpellScript::DestinationTargetSelectHandler((SpellScript::SpellDestinationTargetSelectFnType)_DestinationTargetSelectHandlerScript, _effIndex, _targetType) { } } - - #define PrepareSpellScript(CLASSNAME) SPELLSCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) SPELLSCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) public: + SpellScript() + : _SpellScript(), m_spell(nullptr), m_hitPreventEffectMask(0), m_hitPreventDefaultEffectMask(0), + OnSpellStart(this), + BeforeCast(this), + OnCast(this), + AfterCast(this), + OnCheckCast(this), + OnEffectLaunch(this), OnEffectLaunchTarget(this), OnEffectHit(this), OnEffectHitTarget(this), OnEffectSuccessfulDispel(this), + BeforeHit(this), OnHit(this), AfterHit(this), + OnObjectAreaTargetSelect(this), OnObjectTargetSelect(this), OnDestinationTargetSelect(this) + { + } + bool _Validate(SpellInfo const* entry) override; bool _Load(Spell* spell); void _InitHit(); @@ -304,58 +514,66 @@ class TC_GAME_API SpellScript : public _SpellScript Spell* m_spell; uint8 m_hitPreventEffectMask; uint8 m_hitPreventDefaultEffectMask; - public: - // - // SpellScript interface - // hooks to which you can attach your functions - // - // example: OnSpellStart += SpellCastFn(class::function); - HookList OnSpellStart; - // example: BeforeCast += SpellCastFn(class::function); - HookList BeforeCast; - // example: OnCast += SpellCastFn(class::function); - HookList OnCast; - // example: AfterCast += SpellCastFn(class::function); - HookList AfterCast; - #define SpellCastFn(F) CastHandlerFunction(&F) - // example: OnCheckCast += SpellCheckCastFn(); - // where function is SpellCastResult function() - HookList OnCheckCast; - #define SpellCheckCastFn(F) CheckCastHandlerFunction(&F) + public: // SpellScript interface - Cast hooks - // example: OnEffect**** += SpellEffectFn(class::function, EffectIndexSpecifier, EffectNameSpecifier); - // where function is void function(SpellEffIndex effIndex) - HookList OnEffectLaunch; - HookList OnEffectLaunchTarget; - HookList OnEffectHit; - HookList OnEffectHitTarget; - HookList OnEffectSuccessfulDispel; - #define SpellEffectFn(F, I, N) EffectHandlerFunction(&F, I, N) + // OnSpellStart.Register(this, &class::function); + // Function is: void function(); + CastHook::HookList OnSpellStart; - // example: BeforeHit += SpellHitFn(class::function); - HookList BeforeHit; - // example: OnHit += SpellHitFn(class::function); - HookList OnHit; - // example: AfterHit += SpellHitFn(class::function); - HookList AfterHit; - // where function is: void function() - #define SpellHitFn(F) HitHandlerFunction(&F) + // BeforeCast.Register(this, &class::function); + // Function is: void function(); + CastHook::HookList BeforeCast; - // example: OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(class::function, EffectIndexSpecifier, TargetsNameSpecifier); - // where function is void function(std::list& targets) - HookList OnObjectAreaTargetSelect; - #define SpellObjectAreaTargetSelectFn(F, I, N) ObjectAreaTargetSelectHandlerFunction(&F, I, N) + // OnCast.Register(this, &class::function); + // Function is: void function(); + CastHook::HookList OnCast; - // example: OnObjectTargetSelect += SpellObjectTargetSelectFn(class::function, EffectIndexSpecifier, TargetsNameSpecifier); - // where function is void function(WorldObject*& target) - HookList OnObjectTargetSelect; - #define SpellObjectTargetSelectFn(F, I, N) ObjectTargetSelectHandlerFunction(&F, I, N) + // AfterCast.Register(this, &class::function); + // Function is: void function(); + CastHook::HookList AfterCast; - // example: OnDestinationTargetSelect += SpellDestinationTargetSelectFn(class::function, EffectIndexSpecifier, TargetsNameSpecifier); - // where function is void function(SpellDestination& target) - HookList OnDestinationTargetSelect; - #define SpellDestinationTargetSelectFn(F, I, N) DestinationTargetSelectHandlerFunction(&F, I, N) + // OnCheckCast.Register(this, &class::function); + // Function is: SpellCastResult function() + CheckCastHook::HookList OnCheckCast; + + public: // SpellScript interface - Effect hooks + + // OnEffect****.Register(this, &class::function, EffectIndexSpecifier, EffectNameSpecifier); + // Function is: void function(SpellEffIndex effIndex); + EffectNameHook::HookList OnEffectLaunch; + EffectNameHook::HookList OnEffectLaunchTarget; + EffectNameHook::HookList OnEffectHit; + EffectNameHook::HookList OnEffectHitTarget; + EffectNameHook::HookList OnEffectSuccessfulDispel; + + public: // SpellScript interface - Hit hooks + + // BeforeHit.Register(this, class::function); + // Function is: void function() + HitHook::HookList BeforeHit; + + // OnHit.Register(this, &class::function); + // Function is: void function() + HitHook::HookList OnHit; + + // AfterHit.Register(this, &class::function); + // Function is: void function() + HitHook::HookList AfterHit; + + public: // SpellScript interface - Target selection hooks + + // OnObjectAreaTargetSelect.Register(this, &class::function, EffectIndexSpecifier, TargetsNameSpecifier); + // Function is: void function(std::list& targets) + ObjectAreaTargetSelectHookHandler::HookList OnObjectAreaTargetSelect; + + // OnObjectTargetSelect.Register(this, &class::function, EffectIndexSpecifier, TargetsNameSpecifier); + // Function is: void function(WorldObject*& target) + ObjectTargetSelectHookHandler::HookList OnObjectTargetSelect; + + // OnDestinationTargetSelect.Register(this, &class::function, EffectIndexSpecifier, TargetsNameSpecifier); + // Function is: void function(SpellDestination& target) + DestinationTargetSelectHookHandler::HookList OnDestinationTargetSelect; // hooks are executed in following order, at specified event of spell: // 1. BeforeCast - executed when spell preparation is finished (when cast bar becomes full) before cast is handled @@ -505,6 +723,7 @@ enum AuraScriptHookType /*AURA_SCRIPT_HOOK_APPLY, AURA_SCRIPT_HOOK_REMOVE, */ }; + /* #define HOOK_AURA_EFFECT_START HOOK_AURA_EFFECT_APPLY #define HOOK_AURA_EFFECT_END HOOK_AURA_EFFECT_CALC_SPELLMOD + 1 @@ -516,175 +735,131 @@ class TC_GAME_API AuraScript : public _SpellScript // DO NOT OVERRIDE THESE IN SCRIPTS public: - #define AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) \ - typedef bool(CLASSNAME::*AuraCheckAreaTargetFnType)(Unit* target); \ - typedef void(CLASSNAME::*AuraDispelFnType)(DispelInfo* dispelInfo); \ - typedef void(CLASSNAME::*AuraEffectApplicationModeFnType)(AuraEffect const*, AuraEffectHandleModes); \ - typedef void(CLASSNAME::*AuraEffectPeriodicFnType)(AuraEffect const*); \ - typedef void(CLASSNAME::*AuraEffectUpdatePeriodicFnType)(AuraEffect*); \ - typedef void(CLASSNAME::*AuraEffectCalcAmountFnType)(AuraEffect const*, int32 &, bool &); \ - typedef void(CLASSNAME::*AuraEffectCalcPeriodicFnType)(AuraEffect const*, bool &, int32 &); \ - typedef void(CLASSNAME::*AuraEffectCalcSpellModFnType)(AuraEffect const*, SpellModifier* &); \ - typedef void(CLASSNAME::*AuraEffectAbsorbFnType)(AuraEffect*, DamageInfo &, uint32 &); \ - typedef void(CLASSNAME::*AuraEffectSplitFnType)(AuraEffect*, DamageInfo &, uint32 &); \ - typedef bool(CLASSNAME::*AuraCheckProcFnType)(ProcEventInfo&); \ - typedef bool(CLASSNAME::*AuraCheckEffectProcFnType)(AuraEffect const*, ProcEventInfo&); \ - typedef void(CLASSNAME::*AuraProcFnType)(ProcEventInfo&); \ - typedef void(CLASSNAME::*AuraEffectProcFnType)(AuraEffect const*, ProcEventInfo&); \ + using AuraCheckAreaTargetHookHandler = HookHandler; + using AuraDispelHookHandler = HookHandler; + using AuraEffectPeriodicHookHandler = AuraNameHookHandler; + using AuraEffectUpdatePeriodicHookHandler = AuraNameHookHandler; + using AuraEffectCalcAmountHookHandler = AuraNameHookHandler; + using AuraEffectCalcPeriodicHookHandler = AuraNameHookHandler; + using AuraEffectCalcSpellModHookHandler = AuraNameHookHandler; - AURASCRIPT_FUNCTION_TYPE_DEFINES(AuraScript) + template + struct TC_GAME_API AuraEffectHandleModeHookHandler : AuraNameHookHandler + { + //> Base type shorthand. + using BaseHookHandler = AuraNameHookHandler; - class TC_GAME_API CheckAreaTargetHandler - { - public: - CheckAreaTargetHandler(AuraCheckAreaTargetFnType pHandlerScript); - bool Call(AuraScript* auraScript, Unit* target); - private: - AuraCheckAreaTargetFnType pHandlerScript; - }; - class TC_GAME_API AuraDispelHandler - { - public: - AuraDispelHandler(AuraDispelFnType pHandlerScript); - void Call(AuraScript* auraScript, DispelInfo* dispelInfo); - private: - AuraDispelFnType pHandlerScript; - }; - class TC_GAME_API EffectBase : public _SpellScript::EffectAuraNameCheck, public _SpellScript::EffectHook - { - public: - EffectBase(uint8 _effIndex, uint16 _effName); - std::string ToString(); - bool CheckEffect(SpellInfo const* spellInfo, uint8 effIndex) override; - }; - class TC_GAME_API EffectPeriodicHandler : public EffectBase - { - public: - EffectPeriodicHandler(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript* auraScript, AuraEffect const* _aurEff); - private: - AuraEffectPeriodicFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectUpdatePeriodicHandler : public EffectBase - { - public: - EffectUpdatePeriodicHandler(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript* auraScript, AuraEffect* aurEff); - private: - AuraEffectUpdatePeriodicFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectCalcAmountHandler : public EffectBase - { - public: - EffectCalcAmountHandler(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript* auraScript, AuraEffect const* aurEff, int32 & amount, bool & canBeRecalculated); - private: - AuraEffectCalcAmountFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectCalcPeriodicHandler : public EffectBase - { - public: - EffectCalcPeriodicHandler(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript* auraScript, AuraEffect const* aurEff, bool & isPeriodic, int32 & periodicTimer); - private: - AuraEffectCalcPeriodicFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectCalcSpellModHandler : public EffectBase - { - public: - EffectCalcSpellModHandler(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName); - void Call(AuraScript* auraScript, AuraEffect const* aurEff, SpellModifier* & spellMod); - private: - AuraEffectCalcSpellModFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectApplyHandler : public EffectBase - { - public: - EffectApplyHandler(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode); - void Call(AuraScript* auraScript, AuraEffect const* _aurEff, AuraEffectHandleModes _mode); - private: - AuraEffectApplicationModeFnType pEffectHandlerScript; - AuraEffectHandleModes mode; - }; - class TC_GAME_API EffectAbsorbHandler : public EffectBase - { - public: - EffectAbsorbHandler(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex); - void Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount); - private: - AuraEffectAbsorbFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectManaShieldHandler : public EffectBase - { - public: - EffectManaShieldHandler(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex); - void Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount); - private: - AuraEffectAbsorbFnType pEffectHandlerScript; - }; - class TC_GAME_API EffectSplitHandler : public EffectBase - { - public: - EffectSplitHandler(AuraEffectSplitFnType _pEffectHandlerScript, uint8 _effIndex); - void Call(AuraScript* auraScript, AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & splitAmount); - private: - AuraEffectSplitFnType pEffectHandlerScript; - }; - class TC_GAME_API CheckProcHandler - { - public: - CheckProcHandler(AuraCheckProcFnType handlerScript); - bool Call(AuraScript* auraScript, ProcEventInfo& eventInfo); - private: - AuraCheckProcFnType _HandlerScript; - }; - class TC_GAME_API CheckEffectProcHandler : public EffectBase - { - public: - CheckEffectProcHandler(AuraCheckEffectProcFnType handlerScript, uint8 effIndex, uint16 effName); - bool Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo); - private: - AuraCheckEffectProcFnType _HandlerScript; - }; - class TC_GAME_API AuraProcHandler - { - public: - AuraProcHandler(AuraProcFnType handlerScript); - void Call(AuraScript* auraScript, ProcEventInfo& eventInfo); - private: - AuraProcFnType _HandlerScript; - }; - class TC_GAME_API EffectProcHandler : public EffectBase - { - public: - EffectProcHandler(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName); - void Call(AuraScript* auraScript, AuraEffect const* aurEff, ProcEventInfo& eventInfo); - private: - AuraEffectProcFnType _EffectHandlerScript; + //> Type of the required function pointer. + template + using HookType = typename BaseHookHandler::template HookType; + + //> Type of the hook container list. + using HookList = _HookList, SpellEffIndex, uint16, AuraEffectHandleModes>; + + template + AuraEffectHandleModeHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex, uint16 auraName, AuraEffectHandleModes mode) + : BaseHookHandler(owner, hookFunction, effIndex, auraName), _mode(mode) + { + + } + + //> Disable the other implementation. + bool Filter(SpellInfo const* /*spellInfo*/, SpellEffIndex /*effIndex*/) = delete; + + //> Contractual implementation, see HookHandler::Filtered + bool Filter(SpellInfo const* spellInfo, SpellEffIndex effIndex, AuraEffectHandleModes mode) + { + if (!(mode & _mode)) + return false; + + return BaseHookHandler::Filter(spellInfo, effIndex); + } + + private: + AuraEffectHandleModes _mode; }; - #define AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) \ - class CheckAreaTargetFunction : public AuraScript::CheckAreaTargetHandler { public: CheckAreaTargetFunction(AuraCheckAreaTargetFnType _pHandlerScript) : AuraScript::CheckAreaTargetHandler((AuraScript::AuraCheckAreaTargetFnType)_pHandlerScript) { } }; \ - class AuraDispelFunction : public AuraScript::AuraDispelHandler { public: AuraDispelFunction(AuraDispelFnType _pHandlerScript) : AuraScript::AuraDispelHandler((AuraScript::AuraDispelFnType)_pHandlerScript) { } }; \ - class EffectPeriodicHandlerFunction : public AuraScript::EffectPeriodicHandler { public: EffectPeriodicHandlerFunction(AuraEffectPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectPeriodicHandler((AuraScript::AuraEffectPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class EffectUpdatePeriodicHandlerFunction : public AuraScript::EffectUpdatePeriodicHandler { public: EffectUpdatePeriodicHandlerFunction(AuraEffectUpdatePeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectUpdatePeriodicHandler((AuraScript::AuraEffectUpdatePeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class EffectCalcAmountHandlerFunction : public AuraScript::EffectCalcAmountHandler { public: EffectCalcAmountHandlerFunction(AuraEffectCalcAmountFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcAmountHandler((AuraScript::AuraEffectCalcAmountFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class EffectCalcPeriodicHandlerFunction : public AuraScript::EffectCalcPeriodicHandler { public: EffectCalcPeriodicHandlerFunction(AuraEffectCalcPeriodicFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcPeriodicHandler((AuraScript::AuraEffectCalcPeriodicFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class EffectCalcSpellModHandlerFunction : public AuraScript::EffectCalcSpellModHandler { public: EffectCalcSpellModHandlerFunction(AuraEffectCalcSpellModFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName) : AuraScript::EffectCalcSpellModHandler((AuraScript::AuraEffectCalcSpellModFnType)_pEffectHandlerScript, _effIndex, _effName) { } }; \ - class EffectApplyHandlerFunction : public AuraScript::EffectApplyHandler { public: EffectApplyHandlerFunction(AuraEffectApplicationModeFnType _pEffectHandlerScript, uint8 _effIndex, uint16 _effName, AuraEffectHandleModes _mode) : AuraScript::EffectApplyHandler((AuraScript::AuraEffectApplicationModeFnType)_pEffectHandlerScript, _effIndex, _effName, _mode) { } }; \ - class EffectAbsorbFunction : public AuraScript::EffectAbsorbHandler { public: EffectAbsorbFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectAbsorbHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) { } }; \ - class EffectManaShieldFunction : public AuraScript::EffectManaShieldHandler { public: EffectManaShieldFunction(AuraEffectAbsorbFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectManaShieldHandler((AuraScript::AuraEffectAbsorbFnType)_pEffectHandlerScript, _effIndex) { } }; \ - class EffectSplitFunction : public AuraScript::EffectSplitHandler { public: EffectSplitFunction(AuraEffectSplitFnType _pEffectHandlerScript, uint8 _effIndex) : AuraScript::EffectSplitHandler((AuraScript::AuraEffectSplitFnType)_pEffectHandlerScript, _effIndex) { } }; \ - class CheckProcHandlerFunction : public AuraScript::CheckProcHandler { public: CheckProcHandlerFunction(AuraCheckProcFnType handlerScript) : AuraScript::CheckProcHandler((AuraScript::AuraCheckProcFnType)handlerScript) { } }; \ - class CheckEffectProcHandlerFunction : public AuraScript::CheckEffectProcHandler { public: CheckEffectProcHandlerFunction(AuraCheckEffectProcFnType handlerScript, uint8 effIndex, uint16 effName) : AuraScript::CheckEffectProcHandler((AuraScript::AuraCheckEffectProcFnType)handlerScript, effIndex, effName) { } }; \ - class AuraProcHandlerFunction : public AuraScript::AuraProcHandler { public: AuraProcHandlerFunction(AuraProcFnType handlerScript) : AuraScript::AuraProcHandler((AuraScript::AuraProcFnType)handlerScript) { } }; \ - class EffectProcHandlerFunction : public AuraScript::EffectProcHandler { public: EffectProcHandlerFunction(AuraEffectProcFnType effectHandlerScript, uint8 effIndex, uint16 effName) : AuraScript::EffectProcHandler((AuraScript::AuraEffectProcFnType)effectHandlerScript, effIndex, effName) { } } + using AuraEffectApplyHookHandler = AuraEffectHandleModeHookHandler; + + struct TC_GAME_API AuraEffectAbsorbHookHandler : AuraNameHookHandler + { + //> Base type shorthand. + using BaseHookHandler = AuraNameHookHandler; - #define PrepareAuraScript(CLASSNAME) AURASCRIPT_FUNCTION_TYPE_DEFINES(CLASSNAME) AURASCRIPT_FUNCTION_CAST_DEFINES(CLASSNAME) + //> Type of the required function pointer. + template + using HookType = typename BaseHookHandler::template HookType; + + //> Type of the hook container list. + using HookList = _HookList; + + template + AuraEffectAbsorbHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex) + : BaseHookHandler(owner, hookFunction, effIndex, SPELL_AURA_SCHOOL_ABSORB) + { + } + }; + + struct TC_GAME_API AuraEffectManaShieldHookHandler : AuraNameHookHandler + { + //> Base type shorthand. + using BaseHookHandler = AuraNameHookHandler; + + //> Type of the required function pointer. + template + using HookType = typename BaseHookHandler::template HookType; + + //> Type of the hook container list. + using HookList = _HookList; + + template + AuraEffectManaShieldHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex) + : BaseHookHandler(owner, hookFunction, effIndex, SPELL_AURA_MANA_SHIELD) + { + } + }; + + struct TC_GAME_API AuraEffectSplitHookHandler : AuraNameHookHandler + { + //> Base type shorthand. + using BaseHookHandler = AuraNameHookHandler; + + //> Type of the required function pointer. + template + using HookType = typename BaseHookHandler::template HookType; + + //> Type of the hook container list + using HookList = _HookList; + + template + AuraEffectSplitHookHandler(Derived* owner, HookType hookFunction, uint8 effIndex) + : BaseHookHandler(owner, hookFunction, effIndex, SPELL_AURA_SPLIT_DAMAGE_PCT) + { + } + }; + + using AuraCheckProcHookHandler = HookHandler; + using AuraEffectCheckProcHookHandler = AuraNameHookHandler; + using AuraProcHookHandler = HookHandler; + using AuraEffectProcHookHandler = AuraNameHookHandler; public: - AuraScript() : _SpellScript(), m_aura(nullptr), m_auraApplication(nullptr), m_defaultActionPrevented(false) - { } + AuraScript() + : _SpellScript(), m_aura(nullptr), m_auraApplication(nullptr), m_defaultActionPrevented(false), + DoCheckAreaTarget(this), + OnDispel(this), AfterDispel(this), + OnEffectApply(this), AfterEffectApply(this), + OnEffectRemove(this), AfterEffectRemove(this), + OnEffectPeriodic(this), OnEffectUpdatePeriodic(this), + DoEffectCalcAmount(this), DoEffectCalcPeriodic(this), DoEffectCalcSpellMod(this), + OnEffectAbsorb(this), AfterEffectAbsorb(this), + OnEffectManaShield(this), AfterEffectManaShield(this), + OnEffectSplit(this), + DoCheckProc(this), DoCheckEffectProc(this), + DoPrepareProc(this), OnProc(this), AfterProc(this), + OnEffectProc(this), AfterEffectProc(this) + { + } bool _Validate(SpellInfo const* entry) override; bool _Load(Aura* aura); void _PrepareScriptCall(AuraScriptHookType hookType, AuraApplication const* aurApp = nullptr); @@ -713,137 +888,123 @@ class TC_GAME_API AuraScript : public _SpellScript // AuraScript interface // hooks to which you can attach your functions // + // executed when area aura checks if it can be applied on target - // example: OnEffectApply += AuraEffectApplyFn(class::function); + // example: OnEffectApply.Register(this, &class::function); // where function is: bool function (Unit* target); - HookList DoCheckAreaTarget; - #define AuraCheckAreaTargetFn(F) CheckAreaTargetFunction(&F) + AuraCheckAreaTargetHookHandler::HookList DoCheckAreaTarget; // executed when aura is dispelled by a unit - // example: OnDispel += AuraDispelFn(class::function); + // example: OnDispel.Register(this, &class::function); // where function is: void function (DispelInfo* dispelInfo); - HookList OnDispel; + AuraDispelHookHandler::HookList OnDispel; // executed after aura is dispelled by a unit - // example: AfterDispel += AuraDispelFn(class::function); + // example: AfterDispel.Register(this, &class::function); // where function is: void function (DispelInfo* dispelInfo); - HookList AfterDispel; - #define AuraDispelFn(F) AuraDispelFunction(&F) + AuraDispelHookHandler::HookList AfterDispel; // executed when aura effect is applied with specified mode to target // should be used when when effect handler preventing/replacing is needed, do not use this hook for triggering spellcasts/removing auras etc - may be unsafe - // example: OnEffectApply += AuraEffectApplyFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier, AuraEffectHandleModes); + // example: OnEffectApply.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, AuraEffectHandleModes mode); - HookList OnEffectApply; + AuraEffectApplyHookHandler::HookList OnEffectApply; // executed after aura effect is applied with specified mode to target - // example: AfterEffectApply += AuraEffectApplyFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier, AuraEffectHandleModes); + // example: AfterEffectApply.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, AuraEffectHandleModes mode); - HookList AfterEffectApply; - #define AuraEffectApplyFn(F, I, N, M) EffectApplyHandlerFunction(&F, I, N, M) + AuraEffectApplyHookHandler::HookList AfterEffectApply; // executed after aura effect is removed with specified mode from target // should be used when when effect handler preventing/replacing is needed, do not use this hook for triggering spellcasts/removing auras etc - may be unsafe - // example: OnEffectRemove += AuraEffectRemoveFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier, AuraEffectHandleModes); + // example: OnEffectRemove.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: OnEffectRemove.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier, AuraEffectHandleModes); // where function is: void function (AuraEffect const* aurEff, AuraEffectHandleModes mode); - HookList OnEffectRemove; + AuraEffectApplyHookHandler::HookList OnEffectRemove; // executed when aura effect is removed with specified mode from target - // example: AfterEffectRemove += AuraEffectRemoveFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier, AuraEffectHandleModes); + // example: AfterEffectRemove.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, AuraEffectHandleModes mode); - HookList AfterEffectRemove; - #define AuraEffectRemoveFn(F, I, N, M) EffectApplyHandlerFunction(&F, I, N, M) + AuraEffectApplyHookHandler::HookList AfterEffectRemove; // executed when periodic aura effect ticks on target - // example: OnEffectPeriodic += AuraEffectPeriodicFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: OnEffectPeriodic.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff); - HookList OnEffectPeriodic; - #define AuraEffectPeriodicFn(F, I, N) EffectPeriodicHandlerFunction(&F, I, N) + AuraEffectPeriodicHookHandler::HookList OnEffectPeriodic; // executed when periodic aura effect is updated - // example: OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: OnEffectUpdatePeriodic.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect* aurEff); - HookList OnEffectUpdatePeriodic; - #define AuraEffectUpdatePeriodicFn(F, I, N) EffectUpdatePeriodicHandlerFunction(&F, I, N) + AuraEffectUpdatePeriodicHookHandler::HookList OnEffectUpdatePeriodic; // executed when aura effect calculates amount - // example: DoEffectCalcAmount += AuraEffectCalcAmounFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: DoEffectCalcAmount.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect* aurEff, int32& amount, bool& canBeRecalculated); - HookList DoEffectCalcAmount; - #define AuraEffectCalcAmountFn(F, I, N) EffectCalcAmountHandlerFunction(&F, I, N) + AuraEffectCalcAmountHookHandler::HookList DoEffectCalcAmount; // executed when aura effect calculates periodic data - // example: DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: DoEffectCalcPeriodic.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, bool& isPeriodic, int32& amplitude); - HookList DoEffectCalcPeriodic; - #define AuraEffectCalcPeriodicFn(F, I, N) EffectCalcPeriodicHandlerFunction(&F, I, N) + AuraEffectCalcPeriodicHookHandler::HookList DoEffectCalcPeriodic; // executed when aura effect calculates spellmod - // example: DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: DoEffectCalcSpellMod.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, SpellModifier*& spellMod); - HookList DoEffectCalcSpellMod; - #define AuraEffectCalcSpellModFn(F, I, N) EffectCalcSpellModHandlerFunction(&F, I, N) + AuraEffectCalcSpellModHookHandler::HookList DoEffectCalcSpellMod; // executed when absorb aura effect is going to reduce damage - // example: OnEffectAbsorb += AuraEffectAbsorbFn(class::function, EffectIndexSpecifier); + // example: OnEffectAbsorb.Register(this, &class::function, EffectIndexSpecifier); // where function is: void function (AuraEffect const* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount); - HookList OnEffectAbsorb; - #define AuraEffectAbsorbFn(F, I) EffectAbsorbFunction(&F, I) + AuraEffectAbsorbHookHandler::HookList OnEffectAbsorb; // executed after absorb aura effect reduced damage to target - absorbAmount is real amount absorbed by aura - // example: AfterEffectAbsorb += AuraEffectAbsorbFn(class::function, EffectIndexSpecifier); + // example: AfterEffectAbsorb.Register(this, &class::function, EffectIndexSpecifier); // where function is: void function (AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount); - HookList AfterEffectAbsorb; + AuraEffectAbsorbHookHandler::HookList AfterEffectAbsorb; // executed when mana shield aura effect is going to reduce damage - // example: OnEffectManaShield += AuraEffectManaShieldFn(class::function, EffectIndexSpecifier); + // example: OnEffectManaShield.Register(this, &class::function, EffectIndexSpecifier); // where function is: void function (AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount); - HookList OnEffectManaShield; - #define AuraEffectManaShieldFn(F, I) EffectManaShieldFunction(&F, I) + AuraEffectManaShieldHookHandler::HookList OnEffectManaShield; // executed after mana shield aura effect reduced damage to target - absorbAmount is real amount absorbed by aura - // example: AfterEffectManaShield += AuraEffectManaShieldFn(class::function, EffectIndexSpecifier); + // example: AfterEffectManaShield.Register(this, &class::function, EffectIndexSpecifier); // where function is: void function (AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount); - HookList AfterEffectManaShield; + AuraEffectManaShieldHookHandler::HookList AfterEffectManaShield; // executed when the caster of some spell with split dmg aura gets damaged through it - // example: OnEffectSplit += AuraEffectSplitFn(class::function, EffectIndexSpecifier); + // example: OnEffectSplit.Register(this, &class::function, EffectIndexSpecifier); // where function is: void function (AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& splitAmount); - HookList OnEffectSplit; - #define AuraEffectSplitFn(F, I) EffectSplitFunction(&F, I) + AuraEffectSplitHookHandler::HookList OnEffectSplit; // executed when aura checks if it can proc - // example: DoCheckProc += AuraCheckProcFn(class::function); + // example: DoCheckProc.Register(this, &class::function); // where function is: bool function (ProcEventInfo& eventInfo); - HookList DoCheckProc; - #define AuraCheckProcFn(F) CheckProcHandlerFunction(&F) + AuraCheckProcHookHandler::HookList DoCheckProc; // executed when aura effect checks if it can proc the aura - // example: DoCheckEffectProc += AuraCheckEffectProcFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: DoCheckEffectProc.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is bool function (AuraEffect const* aurEff, ProcEventInfo& eventInfo); - HookList DoCheckEffectProc; - #define AuraCheckEffectProcFn(F, I, N) CheckEffectProcHandlerFunction(&F, I, N) + AuraEffectCheckProcHookHandler::HookList DoCheckEffectProc; // executed before aura procs (possibility to prevent charge drop/cooldown) - // example: DoPrepareProc += AuraProcFn(class::function); + // example: DoPrepareProc.Register(this, &class::function); // where function is: void function (ProcEventInfo& eventInfo); - HookList DoPrepareProc; + AuraProcHookHandler::HookList DoPrepareProc; // executed when aura procs - // example: OnProc += AuraProcFn(class::function); + // example: OnProc.Register(this, &class::function); // where function is: void function (ProcEventInfo& eventInfo); - HookList OnProc; + AuraProcHookHandler::HookList OnProc; // executed after aura proced - // example: AfterProc += AuraProcFn(class::function); + // example: AfterProc.Register(this, &class::function); // where function is: void function (ProcEventInfo& eventInfo); - HookList AfterProc; - #define AuraProcFn(F) AuraProcHandlerFunction(&F) + AuraProcHookHandler::HookList AfterProc; // executed when aura effect procs - // example: OnEffectProc += AuraEffectProcFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: OnEffectProc.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, ProcEventInfo& procInfo); - HookList OnEffectProc; + AuraEffectProcHookHandler::HookList OnEffectProc; // executed after aura effect proced - // example: AfterEffectProc += AuraEffectProcFn(class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); + // example: AfterEffectProc.Register(this, &class::function, EffectIndexSpecifier, EffectAuraNameSpecifier); // where function is: void function (AuraEffect const* aurEff, ProcEventInfo& procInfo); - HookList AfterEffectProc; - #define AuraEffectProcFn(F, I, N) EffectProcHandlerFunction(&F, I, N) + AuraEffectProcHookHandler::HookList AfterEffectProc; // AuraScript interface - hook/effect execution manipulators diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp index f52902a9c3..c573591f29 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp @@ -204,8 +204,6 @@ private: class spell_alizabal_seething_hate : public SpellScript { - PrepareSpellScript(spell_alizabal_seething_hate); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -233,8 +231,8 @@ class spell_alizabal_seething_hate : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alizabal_seething_hate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_alizabal_seething_hate::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_alizabal_seething_hate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_alizabal_seething_hate::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index 040cca6c76..3476a48121 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -233,8 +233,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& targets) { if (targets.empty()) @@ -248,7 +246,7 @@ class spell_occuthar_focused_fire : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_focused_fire_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_occuthar_focused_fire_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -266,8 +264,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 ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -295,8 +291,8 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_occuthar_eyes_of_occuthar_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_occuthar_eyes_of_occuthar_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_occuthar_eyes_of_occuthar_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_occuthar_eyes_of_occuthar_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -314,8 +310,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 GetCaster()->GetInstanceScript() != nullptr; @@ -334,7 +328,7 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript::HandleScript); + AfterHit.Register(&spell_occuthar_eyes_of_occuthar_vehicle_SpellScript::HandleScript); } }; @@ -352,8 +346,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; @@ -372,7 +364,7 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_occuthar_occuthars_destruction_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_occuthar_occuthars_destruction_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; 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 365589c7f0..eb57357719 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -219,8 +219,6 @@ private: // 88954 / 95173 - Consuming Darkness class spell_argaloth_consuming_darkness : public SpellScript { - PrepareSpellScript(spell_argaloth_consuming_darkness); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); @@ -228,15 +226,12 @@ class spell_argaloth_consuming_darkness : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_consuming_darkness::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_argaloth_consuming_darkness::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_argaloth_consuming_darkness_AuraScript : public AuraScript { - PrepareAuraScript(spell_argaloth_consuming_darkness_AuraScript); - - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (AuraEffect* aurEff = GetEffect(EFFECT_0)) @@ -248,15 +243,13 @@ class spell_argaloth_consuming_darkness_AuraScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_argaloth_consuming_darkness_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_argaloth_consuming_darkness_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; // 88942 / 95172 - Meteor Slash class spell_argaloth_meteor_slash : public SpellScript { - PrepareSpellScript(spell_argaloth_meteor_slash); - bool Load() override { _targetCount = 0; @@ -278,8 +271,8 @@ class spell_argaloth_meteor_slash : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_meteor_slash::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104); - BeforeHit += SpellHitFn(spell_argaloth_meteor_slash::SplitDamage); + OnObjectAreaTargetSelect.Register(&spell_argaloth_meteor_slash::CountTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104); + BeforeHit.Register(&spell_argaloth_meteor_slash::SplitDamage); } private: @@ -289,8 +282,6 @@ private: // 88987 / 95176 - Fel Firestorm class spell_argaloth_fel_firestorm : public SpellScript { - PrepareSpellScript(spell_argaloth_fel_firestorm); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); @@ -298,7 +289,7 @@ class spell_argaloth_fel_firestorm : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_argaloth_fel_firestorm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_argaloth_fel_firestorm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index c1cc46e859..80da816bfc 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -1891,8 +1891,6 @@ class npc_ascendant_council_flame_strike : public CreatureScript class spell_feludius_water_bomb_targeting : public SpellScript { - PrepareSpellScript(spell_feludius_water_bomb_targeting); - void HandleHit(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -1902,14 +1900,12 @@ class spell_feludius_water_bomb_targeting : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_feludius_water_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_feludius_water_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_feludius_water_bomb : public SpellScript { - PrepareSpellScript(spell_feludius_water_bomb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WATER_BOMB_TRIGGERED }); @@ -1926,14 +1922,12 @@ class spell_feludius_water_bomb : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_feludius_water_bomb::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_feludius_water_bomb::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_feludius_glaciate : public SpellScript { - PrepareSpellScript(spell_feludius_glaciate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1971,15 +1965,13 @@ class spell_feludius_glaciate : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_feludius_glaciate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_feludius_glaciate::FreezeTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_feludius_glaciate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_feludius_glaciate::FreezeTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_feludius_heart_of_ice : public AuraScript { - PrepareAuraScript(spell_feludius_heart_of_ice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2008,15 +2000,13 @@ class spell_feludius_heart_of_ice : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_feludius_heart_of_ice::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_feludius_heart_of_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE); + AfterEffectApply.Register(&spell_feludius_heart_of_ice::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_feludius_heart_of_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE); } }; class spell_feludius_frost_imbued : public SpellScript { - PrepareSpellScript(spell_feludius_frost_imbued); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2027,14 +2017,12 @@ class spell_feludius_frost_imbued : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_feludius_frost_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_feludius_frost_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_feludius_frost_imbued_AuraScript : public AuraScript { - PrepareAuraScript(spell_feludius_frost_imbued_AuraScript); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { if (Unit* caster = GetCaster()) @@ -2051,15 +2039,13 @@ class spell_feludius_frost_imbued_AuraScript : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_feludius_frost_imbued_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_feludius_frost_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_feludius_frost_imbued_AuraScript::CheckProc); + OnEffectProc.Register(&spell_feludius_frost_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_feludius_frozen_orb_targeting : public SpellScript { - PrepareSpellScript(spell_feludius_frozen_orb_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2070,14 +2056,12 @@ class spell_feludius_frozen_orb_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_feludius_frozen_orb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_feludius_frozen_orb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_ignacious_rising_flames : public AuraScript { - PrepareAuraScript(spell_ignacious_rising_flames); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RISING_FLAMES_BUFF }); @@ -2100,15 +2084,13 @@ class spell_ignacious_rising_flames : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignacious_rising_flames::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - AfterEffectRemove += AuraEffectRemoveFn(spell_ignacious_rising_flames::HandleAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_ignacious_rising_flames::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectRemove.Register(&spell_ignacious_rising_flames::HandleAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_ignacious_burning_blood : public AuraScript { - PrepareAuraScript(spell_ignacious_burning_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2137,15 +2119,13 @@ class spell_ignacious_burning_blood : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_ignacious_burning_blood::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignacious_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE); + AfterEffectApply.Register(&spell_ignacious_burning_blood::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_ignacious_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL_WITH_VALUE); } }; class spell_ignacious_flame_imbued : public SpellScript { - PrepareSpellScript(spell_ignacious_flame_imbued); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2156,14 +2136,12 @@ class spell_ignacious_flame_imbued : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ignacious_flame_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_ignacious_flame_imbued::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_ignacious_flame_imbued_AuraScript : public AuraScript { - PrepareAuraScript(spell_ignacious_flame_imbued_AuraScript); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { if (Unit* caster = GetCaster()) @@ -2180,15 +2158,13 @@ class spell_ignacious_flame_imbued_AuraScript : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_ignacious_flame_imbued_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_ignacious_flame_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_ignacious_flame_imbued_AuraScript::CheckProc); + OnEffectProc.Register(&spell_ignacious_flame_imbued_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_ignacious_inferno_leap : public SpellScript { - PrepareSpellScript(spell_ignacious_inferno_leap); - void HandleInfernoRush() { if (Unit* caster = GetCaster()) @@ -2199,14 +2175,12 @@ class spell_ignacious_inferno_leap : public SpellScript void Register() { - AfterCast += SpellCastFn(spell_ignacious_inferno_leap::HandleInfernoRush); + AfterCast.Register(&spell_ignacious_inferno_leap::HandleInfernoRush); } }; class spell_ignacious_inferno_rush : public SpellScript { - PrepareSpellScript(spell_ignacious_inferno_rush); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2225,14 +2199,12 @@ class spell_ignacious_inferno_rush : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ignacious_inferno_rush::HandleAuraRemoval, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_ignacious_inferno_rush::HandleAuraRemoval, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_ignacious_flame_strike : public SpellScript { - PrepareSpellScript(spell_ignacious_flame_strike); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2249,15 +2221,13 @@ class spell_ignacious_flame_strike : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ignacious_flame_strike::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_ignacious_flame_strike::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ignacious_flame_strike::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_ignacious_flame_strike::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_arion_lashing_winds : public SpellScript { - PrepareSpellScript(spell_arion_lashing_winds); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2281,14 +2251,12 @@ class spell_arion_lashing_winds : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_arion_lashing_winds::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_arion_lashing_winds::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_arion_thundershock : public SpellScript { - PrepareSpellScript(spell_arion_thundershock); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GROUNDED }); @@ -2302,14 +2270,12 @@ class spell_arion_thundershock : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_arion_thundershock::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_arion_thundershock::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_arion_lightning_rod : public SpellScript { - PrepareSpellScript(spell_arion_lightning_rod); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2321,14 +2287,12 @@ class spell_arion_lightning_rod : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_rod::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arion_lightning_rod::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_arion_chain_lightning_targeting : public SpellScript { - PrepareSpellScript(spell_arion_chain_lightning_targeting); - void HandleHit(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -2346,7 +2310,7 @@ class spell_arion_chain_lightning_targeting : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_arion_chain_lightning_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_arion_chain_lightning_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2366,8 +2330,6 @@ class ArionDisperseDistanceCheck class spell_arion_disperse : public SpellScript { - PrepareSpellScript(spell_arion_disperse); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2395,15 +2357,13 @@ class spell_arion_disperse : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_arion_disperse::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_disperse::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_arion_disperse::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_arion_disperse::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_arion_lightning_blast : public SpellScript { - PrepareSpellScript(spell_arion_lightning_blast); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2414,15 +2374,13 @@ class spell_arion_lightning_blast : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_arion_lightning_blast_dummy : public SpellScript { - PrepareSpellScript(spell_arion_lightning_blast_dummy); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2433,14 +2391,12 @@ class spell_arion_lightning_blast_dummy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_lightning_blast_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arion_lightning_blast_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_arion_static_overload : public SpellScript { - PrepareSpellScript(spell_arion_static_overload); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GRAVITY_CORE }); @@ -2461,14 +2417,12 @@ class spell_arion_static_overload : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arion_static_overload::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arion_static_overload::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_arion_static_overload_triggered : public SpellScript { - PrepareSpellScript(spell_arion_static_overload_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2488,14 +2442,12 @@ class spell_arion_static_overload_triggered : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_arion_static_overload_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_arion_static_overload_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_terrastra_gravity_well : public SpellScript { - PrepareSpellScript(spell_terrastra_gravity_well); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -2512,14 +2464,12 @@ class spell_terrastra_gravity_well : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_terrastra_gravity_well::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_terrastra_gravity_well::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_terrastra_harden_skin : public AuraScript { - PrepareAuraScript(spell_terrastra_harden_skin); - bool Load() override { _absorbedDamage = 0; @@ -2548,15 +2498,13 @@ private: void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_terrastra_harden_skin::OnAbsorb, EFFECT_1); - AfterEffectRemove += AuraEffectRemoveFn(spell_terrastra_harden_skin::OnAuraRemoveHandler, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + OnEffectAbsorb.Register(&spell_terrastra_harden_skin::OnAbsorb, EFFECT_1); + AfterEffectRemove.Register(&spell_terrastra_harden_skin::OnAuraRemoveHandler, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; class spell_terrastra_quake : public SpellScript { - PrepareSpellScript(spell_terrastra_quake); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWIRLING_WINDS }); @@ -2572,14 +2520,12 @@ class spell_terrastra_quake : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_terrastra_quake::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_terrastra_quake::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_terrastra_eruption : public SpellScript { - PrepareSpellScript(spell_terrastra_eruption); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ERUPTION_SUMMON }); @@ -2605,14 +2551,12 @@ class spell_terrastra_eruption : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_terrastra_eruption::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_terrastra_eruption::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_terrastra_gravity_core : public SpellScript { - PrepareSpellScript(spell_terrastra_gravity_core); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STATIC_OVERLOAD }); @@ -2633,14 +2577,12 @@ class spell_terrastra_gravity_core : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_terrastra_gravity_core::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_terrastra_gravity_core::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_terrastra_gravity_core_triggered : public SpellScript { - PrepareSpellScript(spell_terrastra_gravity_core_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2660,14 +2602,12 @@ class spell_terrastra_gravity_core_triggered : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_terrastra_gravity_core_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_terrastra_gravity_core_triggered::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_elementium_monstrosity_lava_seed : public SpellScript { - PrepareSpellScript(spell_elementium_monstrosity_lava_seed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LAVA_SEED_DUMMY }); @@ -2681,14 +2621,12 @@ class spell_elementium_monstrosity_lava_seed : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_elementium_monstrosity_lava_seed::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_elementium_monstrosity_lava_seed::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_elementium_monstrosity_cryogenic_aura : public AuraScript { - PrepareAuraScript(spell_elementium_monstrosity_cryogenic_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2715,14 +2653,12 @@ class spell_elementium_monstrosity_cryogenic_aura : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_elementium_monstrosity_cryogenic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_elementium_monstrosity_cryogenic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_elementium_monstrosity_liquid_ice : public AuraScript { - PrepareAuraScript(spell_elementium_monstrosity_liquid_ice); - void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -2736,14 +2672,12 @@ class spell_elementium_monstrosity_liquid_ice : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_elementium_monstrosity_liquid_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_elementium_monstrosity_liquid_ice::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_elementium_monstrosity_electric_instability : public SpellScript { - PrepareSpellScript(spell_elementium_monstrosity_electric_instability); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2776,15 +2710,13 @@ class spell_elementium_monstrosity_electric_instability : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elementium_monstrosity_electric_instability::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_elementium_monstrosity_electric_instability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_elementium_monstrosity_electric_instability::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_elementium_monstrosity_electric_instability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_elementium_monstrosity_gravity_crush : public SpellScript { - PrepareSpellScript(spell_elementium_monstrosity_gravity_crush); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2800,7 +2732,7 @@ class spell_elementium_monstrosity_gravity_crush : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_elementium_monstrosity_gravity_crush::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_elementium_monstrosity_gravity_crush::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp index e2da65de31..8540461fc2 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp @@ -961,8 +961,6 @@ private: class spell_chogall_absorb_elemental_reverse_cast : public SpellScript { - PrepareSpellScript(spell_chogall_absorb_elemental_reverse_cast); - void HandleScriptEffect(SpellEffIndex effIndex) { GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints); @@ -970,14 +968,12 @@ class spell_chogall_absorb_elemental_reverse_cast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_absorb_elemental_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_absorb_elemental : public SpellScript { - PrepareSpellScript(spell_chogall_absorb_elemental); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -986,14 +982,12 @@ class spell_chogall_absorb_elemental : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_absorb_elemental::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_absorb_elemental_heroic : public SpellScript { - PrepareSpellScript(spell_chogall_absorb_elemental_heroic); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -1002,14 +996,12 @@ class spell_chogall_absorb_elemental_heroic : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_absorb_elemental_heroic::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_absorb_elemental_heroic::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_absorb_elemental_heroic_AuraScript : public AuraScript { - PrepareAuraScript(spell_chogall_absorb_elemental_heroic_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -1024,14 +1016,12 @@ class spell_chogall_absorb_elemental_heroic_AuraScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_absorb_elemental_heroic_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_chogall_absorb_elemental_heroic_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_chogall_elemental_power : public AuraScript { - PrepareAuraScript(spell_chogall_elemental_power); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (uint8 stackAmount = std::ceil(GetTarget()->GetHealthPct() / 10)) @@ -1041,14 +1031,12 @@ class spell_chogall_elemental_power : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_elemental_power::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_chogall_elemental_power::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_chogall_flaming_destruction_heroic : public AuraScript { - PrepareAuraScript(spell_chogall_flaming_destruction_heroic); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1070,14 +1058,12 @@ class spell_chogall_flaming_destruction_heroic : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_chogall_flaming_destruction_heroic::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_chogall_flaming_destruction_heroic::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; class spell_chogall_empowered_shadows_heroic : public AuraScript { - PrepareAuraScript(spell_chogall_empowered_shadows_heroic); - void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1095,14 +1081,12 @@ class spell_chogall_empowered_shadows_heroic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_empowered_shadows_heroic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_chogall_empowered_shadows_heroic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_chogall_summon_corrupted_adherent : public SpellScript { - PrepareSpellScript(spell_chogall_summon_corrupted_adherent); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1131,7 +1115,7 @@ class spell_chogall_summon_corrupted_adherent : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_summon_corrupted_adherent::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_summon_corrupted_adherent::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1154,8 +1138,6 @@ class CorruptorDeathStateCheck class spell_chogall_fester_blood : public SpellScript { - PrepareSpellScript(spell_chogall_fester_blood); - void FilterAliveTargets(std::list& targets) { if (targets.empty()) @@ -1174,15 +1156,13 @@ class spell_chogall_fester_blood : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_fester_blood::FilterAliveTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_fester_blood::FilterDeadTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_chogall_fester_blood::FilterAliveTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_chogall_fester_blood::FilterDeadTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_chogall_fester_blood_summon : public SpellScript { - PrepareSpellScript(spell_chogall_fester_blood_summon); - void HandleScriptEffect(SpellEffIndex effIndex) { for (uint8 i = 0; i < 4; i++) @@ -1191,14 +1171,12 @@ class spell_chogall_fester_blood_summon : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_fester_blood_summon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_fester_blood_summon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_conversion : public SpellScript { - PrepareSpellScript(spell_chogall_conversion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WORSHIPPING }); @@ -1227,15 +1205,13 @@ class spell_chogall_conversion : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_conversion::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_chogall_conversion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_chogall_conversion::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_chogall_conversion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_worshipping : public AuraScript { - PrepareAuraScript(spell_chogall_worshipping); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WORSHIPPING }); @@ -1263,15 +1239,13 @@ class spell_chogall_worshipping : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_chogall_worshipping::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_chogall_worshipping::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_chogall_worshipping::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_chogall_worshipping::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_chogall_consume_blood_of_the_old_god : public AuraScript { - PrepareAuraScript(spell_chogall_consume_blood_of_the_old_god); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CONSUME_BLOOD_OF_THE_OLD_GOD_TRIGGERED }); @@ -1294,15 +1268,13 @@ class spell_chogall_consume_blood_of_the_old_god : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_chogall_consume_blood_of_the_old_god::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_consume_blood_of_the_old_god::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectRemove.Register(&spell_chogall_consume_blood_of_the_old_god::AfterRemmove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_chogall_consume_blood_of_the_old_god::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_chogall_consume_blood_of_the_old_god_triggered : public SpellScript { - PrepareSpellScript(spell_chogall_consume_blood_of_the_old_god_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CORRUPTED_CHOGALL }); @@ -1319,14 +1291,12 @@ class spell_chogall_consume_blood_of_the_old_god_triggered : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_consume_blood_of_the_old_god_triggered::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_consume_blood_of_the_old_god_triggered::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_corruption_significant : public SpellScript { - PrepareSpellScript(spell_chogall_corruption_significant); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_SIGNIFICANT); @@ -1334,14 +1304,12 @@ class spell_chogall_corruption_significant : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_significant::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_corruption_significant::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_corruption_normal : public SpellScript { - PrepareSpellScript(spell_chogall_corruption_normal); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL); @@ -1349,14 +1317,12 @@ class spell_chogall_corruption_normal : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_normal::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_corruption_normal::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_corruption_normal_alternative : public SpellScript { - PrepareSpellScript(spell_chogall_corruption_normal_alternative); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL); @@ -1364,14 +1330,12 @@ class spell_chogall_corruption_normal_alternative : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_normal_alternative::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_corruption_normal_alternative::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_corruption_of_the_old_god : public SpellScript { - PrepareSpellScript(spell_chogall_corruption_of_the_old_god); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { CorruptionHandler::AddCorruption(GetHitUnit(), CORRUPTION_NORMAL); @@ -1379,14 +1343,12 @@ class spell_chogall_corruption_of_the_old_god : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chogall_corruption_of_the_old_god::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_chogall_corruption_of_the_old_god::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_chogall_corruption_sickness : public AuraScript { - PrepareAuraScript(spell_chogall_corruption_sickness); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Player* player = GetTarget()->ToPlayer()) @@ -1395,14 +1357,12 @@ class spell_chogall_corruption_sickness : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_chogall_corruption_sickness::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_chogall_corruption_sickness::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_chogall_corruption_malformation : public AuraScript { - PrepareAuraScript(spell_chogall_corruption_malformation); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1422,8 +1382,8 @@ class spell_chogall_corruption_malformation : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_chogall_corruption_malformation::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_chogall_corruption_malformation::OnRemove, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_chogall_corruption_malformation::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_chogall_corruption_malformation::OnRemove, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); } }; @@ -1442,8 +1402,6 @@ class VehicleCheck class spell_chogall_shadow_bolt : public SpellScript { - PrepareSpellScript(spell_chogall_shadow_bolt); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1456,14 +1414,12 @@ class spell_chogall_shadow_bolt : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chogall_shadow_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_chogall_shadow_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_chogall_debilitating_beam : public AuraScript { - PrepareAuraScript(spell_chogall_debilitating_beam); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { CorruptionHandler::AddCorruption(GetTarget(), CORRUPTION_NORMAL); @@ -1471,7 +1427,7 @@ class spell_chogall_debilitating_beam : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chogall_debilitating_beam::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_chogall_debilitating_beam::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp index 7e7763643e..3493a5f4c8 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp @@ -633,8 +633,6 @@ class spell_halfus_bind_will : public SpellScriptLoader class spell_halfus_bind_will_SpellScript : public SpellScript { - PrepareSpellScript(spell_halfus_bind_will_SpellScript); - void HandleHit(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -644,7 +642,7 @@ class spell_halfus_bind_will : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_halfus_bind_will_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_halfus_bind_will_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -661,8 +659,6 @@ class spell_halfus_fireball : public SpellScriptLoader class spell_halfus_fireball_SpellScript : public SpellScript { - PrepareSpellScript(spell_halfus_fireball_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -693,8 +689,8 @@ class spell_halfus_fireball : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halfus_fireball_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_halfus_fireball_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_halfus_fireball_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_halfus_fireball_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -711,8 +707,6 @@ class spell_halfus_stone_touch : public SpellScriptLoader class spell_halfus_stone_touch_AuraScript : public AuraScript { - PrepareAuraScript(spell_halfus_stone_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYSIS }); @@ -726,7 +720,7 @@ class spell_halfus_stone_touch : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_halfus_stone_touch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_halfus_stone_touch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -743,8 +737,6 @@ class spell_halfus_cyclone_winds : public SpellScriptLoader class spell_halfus_cyclone_winds_SpellScript : public SpellScript { - PrepareSpellScript(spell_halfus_cyclone_winds_SpellScript); - void SetDestPosition(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -761,7 +753,7 @@ class spell_halfus_cyclone_winds : public SpellScriptLoader void Register() { - OnEffectLaunch += SpellEffectFn(spell_halfus_cyclone_winds_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectLaunch.Register(&spell_halfus_cyclone_winds_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -791,8 +783,6 @@ class spell_halfus_dancing_flames : public SpellScriptLoader class spell_halfus_dancing_flames_SpellScript : public SpellScript { - PrepareSpellScript(spell_halfus_dancing_flames_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -809,7 +799,7 @@ class spell_halfus_dancing_flames : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halfus_dancing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_halfus_dancing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp index 6c09e0e543..b2473f915a 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp @@ -927,8 +927,6 @@ class spell_theralion_dazzling_destruction_dummy : public SpellScriptLoader class spell_theralion_dazzling_destruction_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_dazzling_destruction_dummy_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -945,8 +943,8 @@ class spell_theralion_dazzling_destruction_dummy : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -989,8 +987,6 @@ class spell_theralion_dazzling_destruction : public SpellScriptLoader class spell_theralion_dazzling_destruction_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_dazzling_destruction_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1033,11 +1029,11 @@ class spell_theralion_dazzling_destruction : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffectTrigger, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffectTrigger, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_theralion_dazzling_destruction_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1065,8 +1061,6 @@ class spell_theralion_dazzling_destruction_twilight_realm: public SpellScriptLoa class spell_theralion_dazzling_destruction_twilight_realm_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_dazzling_destruction_twilight_realm_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1077,7 +1071,7 @@ class spell_theralion_dazzling_destruction_twilight_realm: public SpellScriptLoa void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_dazzling_destruction_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_dazzling_destruction_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; @@ -1094,8 +1088,6 @@ class spell_theralion_fabulous_flames_targeting : public SpellScriptLoader class spell_theralion_fabulous_flames_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_fabulous_flames_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.size() <= 1) @@ -1117,8 +1109,8 @@ class spell_theralion_fabulous_flames_targeting : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_theralion_fabulous_flames_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_fabulous_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_theralion_fabulous_flames_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_fabulous_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1152,8 +1144,6 @@ class spell_theralion_engulfing_magic_targeting : public SpellScriptLoader class spell_theralion_engulfing_magic_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_engulfing_magic_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.size() <= 1) @@ -1175,7 +1165,7 @@ class spell_theralion_engulfing_magic_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_engulfing_magic_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_engulfing_magic_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1192,8 +1182,6 @@ class spell_theralion_engulfing_magic : public SpellScriptLoader class spell_theralion_engulfing_magic_AuraScript : public AuraScript { - PrepareAuraScript(spell_theralion_engulfing_magic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ENGULFING_MAGIC_TRIGGERED }); @@ -1215,7 +1203,7 @@ class spell_theralion_engulfing_magic : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_theralion_engulfing_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + OnEffectProc.Register(&spell_theralion_engulfing_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; @@ -1232,9 +1220,7 @@ class spell_valiona_blackout_dummy : public SpellScriptLoader class spell_valiona_blackout_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_blackout_dummy_SpellScript); - - void FilterTargets(std::list& targets) + void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, 1); } @@ -1247,8 +1233,8 @@ class spell_valiona_blackout_dummy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_valiona_blackout_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_blackout_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_valiona_blackout_dummy_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_valiona_blackout_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1265,8 +1251,6 @@ class spell_valiona_blackout: public SpellScriptLoader class spell_valiona_blackout_AuraScript : public AuraScript { - PrepareAuraScript(spell_valiona_blackout_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLACKOUT_DAMAGE }); @@ -1281,7 +1265,7 @@ class spell_valiona_blackout: public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_valiona_blackout_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_valiona_blackout_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; @@ -1298,8 +1282,6 @@ class spell_valiona_blackout_damage : public SpellScriptLoader class spell_valiona_blackout_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_blackout_damage_SpellScript); - bool Load() override { _targetCount = 0; @@ -1321,8 +1303,8 @@ class spell_valiona_blackout_damage : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_blackout_damage_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnHit += SpellHitFn(spell_valiona_blackout_damage_SpellScript::SplitDamage); + OnObjectAreaTargetSelect.Register(&spell_valiona_blackout_damage_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnHit.Register(&spell_valiona_blackout_damage_SpellScript::SplitDamage); } private: @@ -1342,8 +1324,6 @@ class spell_valiona_devouring_flames : public SpellScriptLoader class spell_valiona_devouring_flames_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_devouring_flames_SpellScript); - void ChangeDamage() { if (Unit* caster = GetCaster()) @@ -1355,7 +1335,7 @@ class spell_valiona_devouring_flames : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_valiona_devouring_flames_SpellScript::ChangeDamage); + OnHit.Register(&spell_valiona_devouring_flames_SpellScript::ChangeDamage); } }; @@ -1372,8 +1352,6 @@ class spell_valiona_devouring_flames_targeting : public SpellScriptLoader class spell_valiona_devouring_flames_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_devouring_flames_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1389,7 +1367,7 @@ class spell_valiona_devouring_flames_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_devouring_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_valiona_devouring_flames_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1430,8 +1408,6 @@ class spell_valiona_twilight_meteorite_targeting : public SpellScriptLoader class spell_valiona_twilight_meteorite_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_twilight_meteorite_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1461,8 +1437,8 @@ class spell_valiona_twilight_meteorite_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_meteorite_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_meteorite_targeting_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_meteorite_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_valiona_twilight_meteorite_targeting_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -1479,8 +1455,6 @@ class spell_valiona_twilight_meteorite : public SpellScriptLoader class spell_valiona_twilight_meteorite_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_twilight_meteorite_SpellScript); - bool Load() override { _targetCount = 0; @@ -1502,8 +1476,8 @@ class spell_valiona_twilight_meteorite : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_meteorite_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnHit += SpellHitFn(spell_valiona_twilight_meteorite_SpellScript::SplitDamage); + OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_meteorite_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnHit.Register(&spell_valiona_twilight_meteorite_SpellScript::SplitDamage); } private: @@ -1555,8 +1529,6 @@ class spell_valiona_strafe : public SpellScriptLoader class spell_valiona_strafe_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_strafe_SpellScript); - void SetTarget(WorldObject*& target) { Unit* caster = GetCaster(); @@ -1575,14 +1547,12 @@ class spell_valiona_strafe : public SpellScriptLoader void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_valiona_strafe_SpellScript::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_valiona_strafe_SpellScript::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_valiona_strafe_AuraScript : public AuraScript { - PrepareAuraScript(spell_valiona_strafe_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1607,8 +1577,8 @@ class spell_valiona_strafe : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_valiona_strafe_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_valiona_strafe_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_valiona_strafe_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_valiona_strafe_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1630,8 +1600,6 @@ class spell_valiona_summon_twilight_portal : public SpellScriptLoader class spell_valiona_summon_twilight_portal_AuraScript : public AuraScript { - PrepareAuraScript(spell_valiona_summon_twilight_portal_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL }); @@ -1648,7 +1616,7 @@ class spell_valiona_summon_twilight_portal : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_valiona_summon_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_valiona_summon_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1665,8 +1633,6 @@ class spell_valiona_summon_twilight_sentry : public SpellScriptLoader class spell_valiona_summon_twilight_sentry_AuraScript : public AuraScript { - PrepareAuraScript(spell_valiona_summon_twilight_sentry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_SENTRY }); @@ -1682,7 +1648,7 @@ class spell_valiona_summon_twilight_sentry : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_valiona_summon_twilight_sentry_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_valiona_summon_twilight_sentry_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1699,8 +1665,6 @@ class spell_valiona_twilight_flames : public SpellScriptLoader class spell_valiona_twilight_flames_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_twilight_flames_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TRIGGER_ACTION_THERALION }); @@ -1728,10 +1692,10 @@ class spell_valiona_twilight_flames : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_flames_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_valiona_twilight_flames_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flames_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_valiona_twilight_flames_SpellScript::HandleActionEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_valiona_twilight_flames_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1760,8 +1724,6 @@ class spell_valiona_twilight_flame_twilight_realm: public SpellScriptLoader class spell_valiona_twilight_flame_twilight_realm_SpellScript : public SpellScript { - PrepareSpellScript(spell_valiona_twilight_flame_twilight_realm_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1772,7 +1734,7 @@ class spell_valiona_twilight_flame_twilight_realm: public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_valiona_twilight_flame_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_valiona_twilight_flame_twilight_realm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1789,8 +1751,6 @@ class spell_theralion_and_valiona_twilight_shift : public SpellScriptLoader class spell_theralion_and_valiona_twilight_shift_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1817,7 +1777,7 @@ class spell_theralion_and_valiona_twilight_shift : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1834,8 +1794,6 @@ class spell_theralion_and_valiona_twilight_shift_phase: public SpellScriptLoader class spell_theralion_and_valiona_twilight_shift_phase_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_phase_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1846,7 +1804,7 @@ class spell_theralion_and_valiona_twilight_shift_phase: public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_and_valiona_twilight_shift_phase_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_theralion_and_valiona_twilight_shift_phase_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1863,8 +1821,6 @@ class spell_theralion_and_valiona_twilight_shift_phase_ally: public SpellScriptL class spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1875,7 +1831,7 @@ class spell_theralion_and_valiona_twilight_shift_phase_ally: public SpellScriptL void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_theralion_and_valiona_twilight_shift_phase_ally_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -1892,8 +1848,6 @@ class spell_theralion_and_valiona_twilight_shift_spellclick : public SpellScript class spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TWILIGHT_SHIFT_ALLY }); @@ -1911,8 +1865,8 @@ class spell_theralion_and_valiona_twilight_shift_spellclick : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_theralion_and_valiona_twilight_shift_spellclick_SpellScript::HandleEffectScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1929,8 +1883,6 @@ class spell_theralion_and_valiona_shifting_reality : public SpellScriptLoader class spell_theralion_and_valiona_shifting_reality_SpellScript : public SpellScript { - PrepareSpellScript(spell_theralion_and_valiona_shifting_reality_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1951,7 +1903,7 @@ class spell_theralion_and_valiona_shifting_reality : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_theralion_and_valiona_shifting_reality_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_theralion_and_valiona_shifting_reality_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1968,8 +1920,6 @@ class spell_theralion_and_valiona_collapsing_twilight_portal : public SpellScrip class spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript : public AuraScript { - PrepareAuraScript(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (Unit* target = GetTarget()) @@ -1990,8 +1940,8 @@ class spell_theralion_and_valiona_collapsing_twilight_portal : public SpellScrip void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectApply += AuraEffectApplyFn(spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::Apply, EFFECT_1, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic.Register(&spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_theralion_and_valiona_collapsing_twilight_portal_AuraScript::Apply, EFFECT_1, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp index 2584683a58..18c48f54d1 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp @@ -240,8 +240,6 @@ private: class spell_obsidius_twitchy : public AuraScript { - PrepareAuraScript(spell_obsidius_twitchy); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -260,14 +258,12 @@ class spell_obsidius_twitchy : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_obsidius_twitchy::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_obsidius_twitchy::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_obsidius_transformation : public SpellScript { - PrepareSpellScript(spell_obsidius_transformation); - void HandleEffect(SpellEffIndex /*effIndex*/) { for (uint8 i = 0; i < MAX_SPELL_EFFECTS; i++) @@ -278,14 +274,12 @@ class spell_obsidius_transformation : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_obsidius_transformation::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_obsidius_transformation::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_obsidius_transformation_not_selectable : public AuraScript { - PrepareAuraScript(spell_obsidius_transformation_not_selectable); - void AfterRemmove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -304,14 +298,12 @@ class spell_obsidius_transformation_not_selectable : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_obsidius_transformation_not_selectable::AfterRemmove, EFFECT_0, SPELL_AURA_MOD_UNATTACKABLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_obsidius_transformation_not_selectable::AfterRemmove, EFFECT_0, SPELL_AURA_MOD_UNATTACKABLE, AURA_EFFECT_HANDLE_REAL); } }; class spell_obsidius_transformation_scale : public AuraScript { - PrepareAuraScript(spell_obsidius_transformation_scale); - void HandlePeriodic(AuraEffect const* aurEff) { if (SpellInfo const* spell = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[aurEff->GetEffIndex()].BasePoints)) @@ -322,14 +314,12 @@ class spell_obsidius_transformation_scale : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_obsidius_transformation_scale::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_obsidius_transformation_scale::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_obsidius_crepuscular_veil : public SpellScript { - PrepareSpellScript(spell_obsidius_crepuscular_veil); - void HandleAchievement() { Unit* target = GetHitUnit(); @@ -353,14 +343,12 @@ class spell_obsidius_crepuscular_veil : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_obsidius_crepuscular_veil::HandleAchievement); + AfterHit.Register(&spell_obsidius_crepuscular_veil::HandleAchievement); } }; class spell_obsidius_shadow_of_obsidius : public AuraScript { - PrepareAuraScript(spell_obsidius_shadow_of_obsidius); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { amount = -1; @@ -373,8 +361,8 @@ class spell_obsidius_shadow_of_obsidius : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_obsidius_shadow_of_obsidius::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_obsidius_shadow_of_obsidius::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_obsidius_shadow_of_obsidius::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_obsidius_shadow_of_obsidius::Absorb, EFFECT_0); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp index 3b843aec0b..ef66f6a379 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp @@ -223,8 +223,6 @@ private: class spell_beauty_magma_spit : public AuraScript { - PrepareAuraScript(spell_beauty_magma_spit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -247,7 +245,7 @@ class spell_beauty_magma_spit : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_beauty_magma_spit::AfterRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_beauty_magma_spit::AfterRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp index 10bf6056ea..5d2bf79e9e 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp @@ -332,8 +332,6 @@ private: class spell_corla_nether_dragon_essence : public AuraScript { - PrepareAuraScript(spell_corla_nether_dragon_essence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -352,14 +350,12 @@ class spell_corla_nether_dragon_essence : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_corla_nether_dragon_essence::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_corla_nether_dragon_essence::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_corla_nether_dragon_essence_visual : public SpellScript { - PrepareSpellScript(spell_corla_nether_dragon_essence_visual); - void ModDestHeight(SpellDestination& dest) { Position offset = { frand(-35.0f, 35.0f), frand(-25.0f, 25.0f), 0.0f, 0.0f }; @@ -384,14 +380,12 @@ class spell_corla_nether_dragon_essence_visual : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_corla_nether_dragon_essence_visual::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_corla_nether_dragon_essence_visual::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; class spell_corla_nether_beam : public SpellScript { - PrepareSpellScript(spell_corla_nether_beam); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -454,8 +448,8 @@ class spell_corla_nether_beam : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_corla_nether_beam::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_corla_nether_beam::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_corla_nether_beam::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); + OnEffectHitTarget.Register(&spell_corla_nether_beam::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } private: uint32 _evolutionSpellId = SPELL_EVOLUTION_STACKS_N; @@ -463,8 +457,6 @@ private: class spell_corla_evolution : public SpellScript { - PrepareSpellScript(spell_corla_evolution); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TWILIGHT_EVOLUTION }); @@ -507,14 +499,12 @@ class spell_corla_evolution : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_corla_evolution::HandleEvolve); + AfterHit.Register(&spell_corla_evolution::HandleEvolve); } }; class spell_corla_grievous_whirl : public AuraScript { - PrepareAuraScript(spell_corla_grievous_whirl); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { if (GetTarget()->GetHealth() == GetTarget()->GetMaxHealth()) @@ -523,7 +513,7 @@ class spell_corla_grievous_whirl : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_corla_grievous_whirl::HandleProc, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectProc.Register(&spell_corla_grievous_whirl::HandleProc, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp index 4c9ddc0689..cf1d99d30c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp @@ -171,8 +171,6 @@ struct boss_karsh_steelbender : public BossAI class spell_karsh_quicksilver_armor : public AuraScript { - PrepareAuraScript(spell_karsh_quicksilver_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -198,14 +196,12 @@ class spell_karsh_quicksilver_armor : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_karsh_quicksilver_armor::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_karsh_quicksilver_armor::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_karsh_superheated_quicksilver_armor : public SpellScript { - PrepareSpellScript(spell_karsh_superheated_quicksilver_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEAT_WAVE }); @@ -228,14 +224,12 @@ class spell_karsh_superheated_quicksilver_armor : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_karsh_superheated_quicksilver_armor::HandleHeatWave); + AfterHit.Register(&spell_karsh_superheated_quicksilver_armor::HandleHeatWave); } }; class spell_karsh_superheated_quicksilver_armor_AuraScript : public AuraScript { - PrepareAuraScript(spell_karsh_superheated_quicksilver_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -267,15 +261,13 @@ class spell_karsh_superheated_quicksilver_armor_AuraScript : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_karsh_superheated_quicksilver_armor_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_karsh_superheated_quicksilver_armor_AuraScript::AfterRemmove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_karsh_superheated_quicksilver_armor_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_karsh_superheated_quicksilver_armor_AuraScript::AfterRemmove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; class spell_karsh_superheated_quicksilver_armor_proc : public AuraScript { - PrepareAuraScript(spell_karsh_superheated_quicksilver_armor_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUPERHEATED_QUICKSILVER_ARMOR }); @@ -305,8 +297,8 @@ class spell_karsh_superheated_quicksilver_armor_proc : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_karsh_superheated_quicksilver_armor_proc::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_karsh_superheated_quicksilver_armor_proc::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_karsh_superheated_quicksilver_armor_proc::CheckProc); + OnEffectProc.Register(&spell_karsh_superheated_quicksilver_armor_proc::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp index d4e93543ef..b2790c121c 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp @@ -219,8 +219,6 @@ private: class spell_romogg_quake : public SpellScript { - PrepareSpellScript(spell_romogg_quake); - void HandleScriptEffect(SpellEffIndex effIndex) { GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints, true); @@ -228,14 +226,12 @@ class spell_romogg_quake : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_romogg_quake::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_romogg_quake::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_romogg_chains_of_woe : public SpellScript { - PrepareSpellScript(spell_romogg_chains_of_woe); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 1.6f, 0.0f }); @@ -243,14 +239,12 @@ class spell_romogg_chains_of_woe : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_romogg_chains_of_woe::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); + OnDestinationTargetSelect.Register(&spell_romogg_chains_of_woe::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); } }; class spell_romogg_chains_of_woe_teleport : public SpellScript { - PrepareSpellScript(spell_romogg_chains_of_woe_teleport); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -259,14 +253,12 @@ class spell_romogg_chains_of_woe_teleport : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_romogg_chains_of_woe_teleport::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_romogg_chains_of_woe_teleport::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_romogg_chains_of_woe_teleport_dest : public SpellScript { - PrepareSpellScript(spell_romogg_chains_of_woe_teleport_dest); - void SetDest(SpellDestination& dest) { Position pos = dest._position; @@ -284,14 +276,12 @@ class spell_romogg_chains_of_woe_teleport_dest : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_romogg_chains_of_woe_teleport_dest::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS); + OnDestinationTargetSelect.Register(&spell_romogg_chains_of_woe_teleport_dest::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS); } }; class spell_romogg_chains_of_woe_root : public SpellScript { - PrepareSpellScript(spell_romogg_chains_of_woe_root); - void HandleScriptEffect(SpellEffIndex effIndex) { GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[effIndex].BasePoints, true); @@ -299,14 +289,12 @@ class spell_romogg_chains_of_woe_root : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_romogg_chains_of_woe_root::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_romogg_chains_of_woe_root::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_romogg_call_for_help : public SpellScript { - PrepareSpellScript(spell_romogg_call_for_help); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitCreature()) @@ -316,7 +304,7 @@ class spell_romogg_call_for_help : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_romogg_call_for_help::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_romogg_call_for_help::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; 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 1f13acc9ee..5e1ef469b3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -471,8 +471,6 @@ class spell_direbrew_disarm : public SpellScriptLoader class spell_direbrew_disarm_AuraScript : public AuraScript { - PrepareAuraScript(spell_direbrew_disarm_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DIREBREW_DISARM, SPELL_DIREBREW_DISARM_GROW }); @@ -495,8 +493,8 @@ class spell_direbrew_disarm : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_direbrew_disarm_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); - OnEffectApply += AuraEffectRemoveFn(spell_direbrew_disarm_AuraScript::OnApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_direbrew_disarm_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectApply.Register(&spell_direbrew_disarm_AuraScript::OnApply, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -514,8 +512,6 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScriptLoade class spell_direbrew_summon_mole_machine_target_picker_SpellScript : public SpellScript { - PrepareSpellScript(spell_direbrew_summon_mole_machine_target_picker_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MOLE_MACHINE_MINION_SUMMONER }); @@ -528,7 +524,7 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScriptLoade void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_direbrew_summon_mole_machine_target_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_direbrew_summon_mole_machine_target_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -546,8 +542,6 @@ class spell_send_mug_target_picker : public SpellScriptLoader class spell_send_mug_target_picker_SpellScript : public SpellScript { - PrepareSpellScript(spell_send_mug_target_picker_SpellScript); - void FilterTargets(std::list& targets) { Unit* caster = GetCaster(); @@ -579,8 +573,8 @@ class spell_send_mug_target_picker : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_send_mug_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_send_mug_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_send_mug_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_send_mug_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -598,8 +592,6 @@ class spell_request_second_mug : public SpellScriptLoader class spell_request_second_mug_SpellScript : public SpellScript { - PrepareSpellScript(spell_request_second_mug_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_SECOND_MUG }); @@ -612,7 +604,7 @@ class spell_request_second_mug : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_request_second_mug_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_request_second_mug_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -630,8 +622,6 @@ class spell_send_mug_control_aura : public SpellScriptLoader class spell_send_mug_control_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_send_mug_control_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_MUG_TARGET_PICKER }); @@ -644,7 +634,7 @@ class spell_send_mug_control_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_send_mug_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_send_mug_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -662,8 +652,6 @@ class spell_barreled_control_aura : public SpellScriptLoader class spell_barreled_control_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_barreled_control_aura_AuraScript); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -672,7 +660,7 @@ class spell_barreled_control_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_barreled_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_barreled_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp index d5c4c09130..73bfaf3639 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp @@ -546,8 +546,6 @@ Position const DragonOrb2Offset = { -28.80208f, -232.4497f, 71.34686f }; class spell_bwd_dragon_orb : public SpellScript { - PrepareSpellScript(spell_bwd_dragon_orb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRAGON_ORB_1 }); @@ -566,14 +564,12 @@ class spell_bwd_dragon_orb : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_bwd_dragon_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_bwd_dragon_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; class spell_bwd_grievous_wound : public AuraScript { - PrepareAuraScript(spell_bwd_grievous_wound); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (GetUnitOwner()->HealthAbovePct(90)) @@ -585,14 +581,12 @@ class spell_bwd_grievous_wound : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_bwd_grievous_wound::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_bwd_grievous_wound::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; class spell_bwd_execution_sentence_visual : public SpellScript { - PrepareSpellScript(spell_bwd_execution_sentence_visual); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 15.0f, 0.0f }); @@ -600,14 +594,12 @@ class spell_bwd_execution_sentence_visual : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_bwd_execution_sentence_visual::SetDest, EFFECT_0, TARGET_DEST_TARGET_ENEMY); + OnDestinationTargetSelect.Register(&spell_bwd_execution_sentence_visual::SetDest, EFFECT_0, TARGET_DEST_TARGET_ENEMY); } }; class spell_bwd_execution_sentence_dummy : public SpellScript { - PrepareSpellScript(spell_bwd_execution_sentence_dummy); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -622,14 +614,12 @@ class spell_bwd_execution_sentence_dummy : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_bwd_execution_sentence_dummy::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_bwd_execution_sentence_dummy::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_bwd_execution_sentence : public AuraScript { - PrepareAuraScript(spell_bwd_execution_sentence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXECUTION_SENTENCE_DUMMY }); @@ -644,14 +634,12 @@ class spell_bwd_execution_sentence : public AuraScript void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_bwd_execution_sentence::HandleRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_bwd_execution_sentence::HandleRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_bwd_stoneblood : public SpellScript { - PrepareSpellScript(spell_bwd_stoneblood); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { std::unordered_set aurasToRemove; @@ -677,7 +665,7 @@ class spell_bwd_stoneblood : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_bwd_stoneblood::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_bwd_stoneblood::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp index 239bd40709..8e73603c46 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp @@ -695,8 +695,6 @@ private: class spell_atramedes_modulation : public SpellScript { - PrepareSpellScript(spell_atramedes_modulation); - void ChangeDamage(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -710,14 +708,12 @@ class spell_atramedes_modulation : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_atramedes_modulation::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_atramedes_modulation::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_atramedes_roaring_flame_breath_reverse_cast : public SpellScript { - PrepareSpellScript(spell_atramedes_roaring_flame_breath_reverse_cast); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -726,14 +722,12 @@ class spell_atramedes_roaring_flame_breath_reverse_cast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_atramedes_roaring_flame_breath_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_atramedes_roaring_flame_breath_reverse_cast::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_atramedes_roaring_flame_breath : public AuraScript { - PrepareAuraScript(spell_atramedes_roaring_flame_breath); - void HandleTick(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -742,14 +736,12 @@ class spell_atramedes_roaring_flame_breath : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_roaring_flame_breath::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_atramedes_roaring_flame_breath::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_atramedes_roaring_flame_breath_fire_periodic : public SpellScript { - PrepareSpellScript(spell_atramedes_roaring_flame_breath_fire_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROARING_FLAME_SUMMON }); @@ -763,14 +755,12 @@ class spell_atramedes_roaring_flame_breath_fire_periodic : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_roaring_flame_breath_fire_periodic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_atramedes_roaring_flame_breath_fire_periodic::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_atramedes_resonating_clash_ground : public SpellScript { - PrepareSpellScript(spell_atramedes_resonating_clash_ground); - void HandleScriptEffect(SpellEffIndex effIndex) { Unit* caster = GetCaster(); @@ -788,14 +778,12 @@ class spell_atramedes_resonating_clash_ground : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash_ground::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_atramedes_resonating_clash_ground::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_atramedes_resonating_clash_air : public SpellScript { - PrepareSpellScript(spell_atramedes_resonating_clash_air); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -814,14 +802,12 @@ class spell_atramedes_resonating_clash_air : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash_air::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_atramedes_resonating_clash_air::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_atramedes_resonating_clash: public SpellScript { - PrepareSpellScript(spell_atramedes_resonating_clash); - void HandleScriptEffect(SpellEffIndex effIndex) { GetHitUnit()->RemoveAurasDueToSpell(GetSpellInfo()->Effects[effIndex].BasePoints); @@ -829,14 +815,12 @@ class spell_atramedes_resonating_clash: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_atramedes_resonating_clash::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_atramedes_resonating_clash::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_atramedes_sound_bar : public AuraScript { - PrepareAuraScript(spell_atramedes_sound_bar); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NOISY }); @@ -864,14 +848,12 @@ class spell_atramedes_sound_bar : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_sound_bar::HandleNoisyAura, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_atramedes_sound_bar::HandleNoisyAura, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_atramedes_noisy : public AuraScript { - PrepareAuraScript(spell_atramedes_noisy); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetTarget()->GetInstanceScript()) @@ -881,14 +863,12 @@ class spell_atramedes_noisy : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_noisy::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_atramedes_noisy::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_atramedes_vertigo : public AuraScript { - PrepareAuraScript(spell_atramedes_vertigo); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -913,14 +893,12 @@ class spell_atramedes_vertigo : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_vertigo::AfterRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_atramedes_vertigo::AfterRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; class spell_atramedes_sonic_flames : public SpellScript { - PrepareSpellScript(spell_atramedes_sonic_flames); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -931,14 +909,12 @@ class spell_atramedes_sonic_flames : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_atramedes_sonic_flames::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_atramedes_sonic_flames::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_atramedes_sonic_flames_AuraScript : public AuraScript { - PrepareAuraScript(spell_atramedes_sonic_flames_AuraScript); - void HandlePeriodic(AuraEffect const* aurEff) { Unit* caster = GetCaster(); @@ -951,7 +927,7 @@ class spell_atramedes_sonic_flames_AuraScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_sonic_flames_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_atramedes_sonic_flames_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -970,8 +946,6 @@ private: class spell_atramedes_devastation_trigger : public AuraScript { - PrepareAuraScript(spell_atramedes_devastation_trigger); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -982,14 +956,12 @@ class spell_atramedes_devastation_trigger : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_atramedes_devastation_trigger::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_atramedes_devastation_trigger::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_atramedes_sonic_breath : public SpellScript { - PrepareSpellScript(spell_atramedes_sonic_breath); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1003,14 +975,12 @@ class spell_atramedes_sonic_breath : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_sonic_breath::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_atramedes_sonic_breath::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_atramedes_destroy_shield : public SpellScript { - PrepareSpellScript(spell_atramedes_destroy_shield); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1027,14 +997,12 @@ class spell_atramedes_destroy_shield : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_atramedes_destroy_shield::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_atramedes_destroy_shield::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_atramedes_pestered : public AuraScript { - PrepareAuraScript(spell_atramedes_pestered); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1053,15 +1021,13 @@ class spell_atramedes_pestered : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_atramedes_pestered::AfterApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_atramedes_pestered::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_atramedes_pestered::AfterApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_atramedes_pestered::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); } }; class spell_atramedes_apply_vehicle_periodic : public AuraScript { - PrepareAuraScript(spell_atramedes_apply_vehicle_periodic); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE); @@ -1069,7 +1035,7 @@ class spell_atramedes_apply_vehicle_periodic : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_atramedes_apply_vehicle_periodic::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_atramedes_apply_vehicle_periodic::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp index 61b0392fd8..633a433ebe 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp @@ -528,8 +528,6 @@ private: class spell_chimaeron_caustic_slime_targeting : public SpellScript { - PrepareSpellScript(spell_chimaeron_caustic_slime_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -550,15 +548,13 @@ class spell_chimaeron_caustic_slime_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chimaeron_caustic_slime_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_chimaeron_caustic_slime_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_chimaeron_caustic_slime_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_chimaeron_caustic_slime_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_chimaeron_caustic_slime: public SpellScript { - PrepareSpellScript(spell_chimaeron_caustic_slime); - void CountTargets(std::list& targets) { _targetCount = targets.size(); @@ -574,8 +570,8 @@ class spell_chimaeron_caustic_slime: public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_chimaeron_caustic_slime::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - BeforeHit += SpellHitFn(spell_chimaeron_caustic_slime::SplitDamage); + OnObjectAreaTargetSelect.Register(&spell_chimaeron_caustic_slime::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + BeforeHit.Register(&spell_chimaeron_caustic_slime::SplitDamage); } private: @@ -584,8 +580,6 @@ private: class spell_chimaeron_double_attack : public AuraScript { - PrepareAuraScript(spell_chimaeron_double_attack); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DOUBLE_ATTACK_TRIGGERED }); @@ -600,14 +594,12 @@ class spell_chimaeron_double_attack : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_chimaeron_double_attack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_chimaeron_double_attack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_chimaeron_finkles_mixture : public AuraScript { - PrepareAuraScript(spell_chimaeron_finkles_mixture); - bool Load() override { healthThreshold = GetSpellInfo()->Effects[EFFECT_0].BasePoints; @@ -645,9 +637,9 @@ class spell_chimaeron_finkles_mixture : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_chimaeron_finkles_mixture::HandleMixtureDuration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_chimaeron_finkles_mixture::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_chimaeron_finkles_mixture::Absorb, EFFECT_1); + OnEffectPeriodic.Register(&spell_chimaeron_finkles_mixture::HandleMixtureDuration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + DoEffectCalcAmount.Register(&spell_chimaeron_finkles_mixture::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_chimaeron_finkles_mixture::Absorb, EFFECT_1); } private: @@ -656,8 +648,6 @@ private: class spell_chimaeron_reroute_power : public AuraScript { - PrepareAuraScript(spell_chimaeron_reroute_power); - void HandleActivation(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -667,14 +657,12 @@ class spell_chimaeron_reroute_power : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_chimaeron_reroute_power::HandleActivation, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_chimaeron_reroute_power::HandleActivation, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_chimaeron_feud : public AuraScript { - PrepareAuraScript(spell_chimaeron_feud); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -691,15 +679,13 @@ class spell_chimaeron_feud : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_chimaeron_feud::HandleApply, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_chimaeron_feud::HandleRemove, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_chimaeron_feud::HandleApply, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_chimaeron_feud::HandleRemove, EFFECT_0, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); } }; class spell_chimaeron_shadow_whip : public SpellScript { - PrepareSpellScript(spell_chimaeron_shadow_whip); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->InterruptNonMeleeSpells(true); @@ -707,7 +693,7 @@ class spell_chimaeron_shadow_whip : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_chimaeron_shadow_whip::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_chimaeron_shadow_whip::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp index c765a44bc3..8766679f8a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp @@ -806,8 +806,6 @@ class IsOnVehicleCheck class spell_magmaw_magma_spit: public SpellScript { - PrepareSpellScript(spell_magmaw_magma_spit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGMA_SPIT_MISSILE }); @@ -834,8 +832,8 @@ class spell_magmaw_magma_spit: public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_magma_spit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_magmaw_magma_spit::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_magmaw_magma_spit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_magmaw_magma_spit::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -854,8 +852,6 @@ class VictimCheck class spell_magmaw_mangle : public SpellScript { - PrepareSpellScript(spell_magmaw_mangle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MANGLE_1 }); @@ -881,15 +877,13 @@ class spell_magmaw_mangle : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_mangle::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_magmaw_mangle::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_magmaw_mangle::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_magmaw_mangle::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_magmaw_pillar_of_flame_dummy : public SpellScript { - PrepareSpellScript(spell_magmaw_pillar_of_flame_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -911,7 +905,7 @@ class spell_magmaw_pillar_of_flame_dummy : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_magmaw_pillar_of_flame_dummy::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_magmaw_pillar_of_flame_dummy::HandleHit, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -933,8 +927,6 @@ class DistanceCheck class spell_magmaw_pillar_of_flame_forcecast : public SpellScript { - PrepareSpellScript(spell_magmaw_pillar_of_flame_forcecast); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -956,14 +948,12 @@ class spell_magmaw_pillar_of_flame_forcecast : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_pillar_of_flame_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_magmaw_pillar_of_flame_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_magmaw_ride_vehicle : public SpellScript { - PrepareSpellScript(spell_magmaw_ride_vehicle); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -980,14 +970,12 @@ class spell_magmaw_ride_vehicle : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_magmaw_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_TARGET_ANY); + OnObjectTargetSelect.Register(&spell_magmaw_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_TARGET_ANY); } }; class spell_magmaw_launch_hook : public AuraScript { - PrepareAuraScript(spell_magmaw_launch_hook); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1018,15 +1006,13 @@ class spell_magmaw_launch_hook : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_magmaw_launch_hook::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_magmaw_launch_hook::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_magmaw_eject_passenger : public SpellScript { - PrepareSpellScript(spell_magmaw_eject_passenger); - void EjectPassenger(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -1038,14 +1024,12 @@ class spell_magmaw_eject_passenger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_magmaw_eject_passenger::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_magmaw_eject_passenger::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_magmaw_lava_parasite : public AuraScript { - PrepareAuraScript(spell_magmaw_lava_parasite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1075,14 +1059,12 @@ class spell_magmaw_lava_parasite : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_magmaw_lava_parasite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_magmaw_lava_parasite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_magmaw_blazing_inferno_targeting : public SpellScript { - PrepareSpellScript(spell_magmaw_blazing_inferno_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLAZING_INFERNO }); @@ -1123,15 +1105,13 @@ class spell_magmaw_blazing_inferno_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_blazing_inferno_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_magmaw_blazing_inferno_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_magmaw_blazing_inferno_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_magmaw_blazing_inferno_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_magmaw_shadow_breath_targeting : public SpellScript { - PrepareSpellScript(spell_magmaw_shadow_breath_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_BREATH }); @@ -1158,15 +1138,13 @@ class spell_magmaw_shadow_breath_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_magmaw_shadow_breath_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_magmaw_shadow_breath_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_magmaw_shadow_breath_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_magmaw_shadow_breath_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_magmaw_lava_parasite_summon : public SpellScript { - PrepareSpellScript(spell_magmaw_lava_parasite_summon); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, frand(13.0f, 15.0f), 0.0f }); @@ -1174,14 +1152,12 @@ class spell_magmaw_lava_parasite_summon : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_magmaw_lava_parasite_summon::SetDest, EFFECT_0, TARGET_DEST_DEST_RANDOM); + OnDestinationTargetSelect.Register(&spell_magmaw_lava_parasite_summon::SetDest, EFFECT_0, TARGET_DEST_DEST_RANDOM); } }; class spell_magmaw_massive_crash : public AuraScript { - PrepareAuraScript(spell_magmaw_massive_crash); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* magmaw = GetTarget()->ToCreature()) @@ -1198,15 +1174,13 @@ class spell_magmaw_massive_crash : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_magmaw_massive_crash::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_magmaw_massive_crash::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_magmaw_massive_crash::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_magmaw_massive_crash::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_magmaw_impale_self : public AuraScript { - PrepareAuraScript(spell_magmaw_impale_self); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* magmaw = GetTarget()->ToCreature()) @@ -1223,15 +1197,13 @@ class spell_magmaw_impale_self : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_magmaw_impale_self::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_magmaw_impale_self::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_magmaw_impale_self::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_magmaw_impale_self::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_magmaw_captured : public AuraScript { - PrepareAuraScript(spell_magmaw_captured); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1248,7 +1220,7 @@ class spell_magmaw_captured : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_magmaw_captured::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_magmaw_captured::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index 298e631fc2..81a3013422 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -880,8 +880,6 @@ private: class spell_maloriak_throw_bottle : public SpellScript { - PrepareSpellScript(spell_maloriak_throw_bottle); - void HandleDummyEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -890,14 +888,12 @@ class spell_maloriak_throw_bottle : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_maloriak_throw_bottle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunchTarget.Register(&spell_maloriak_throw_bottle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_maloriak_throw_bottle_triggered : public SpellScript { - PrepareSpellScript(spell_maloriak_throw_bottle_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -939,14 +935,12 @@ class spell_maloriak_throw_bottle_triggered : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_maloriak_throw_bottle_triggered::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_maloriak_throw_bottle_triggered::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_maloriak_consuming_flames: public AuraScript { - PrepareAuraScript(spell_maloriak_consuming_flames); - bool CheckProc(ProcEventInfo& eventInfo) { return eventInfo.GetSpellInfo() && eventInfo.GetDamageInfo(); @@ -960,14 +954,12 @@ class spell_maloriak_consuming_flames: public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_maloriak_consuming_flames::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectProc.Register(&spell_maloriak_consuming_flames::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; class spell_maloriak_flash_freeze_targeting : public SpellScript { - PrepareSpellScript(spell_maloriak_flash_freeze_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLASH_FREEZE_SUMMON }); @@ -1011,15 +1003,13 @@ class spell_maloriak_flash_freeze_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_flash_freeze_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_maloriak_flash_freeze_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_maloriak_flash_freeze_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_maloriak_flash_freeze_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_maloriak_flash_freeze_dummy : public SpellScript { - PrepareSpellScript(spell_maloriak_flash_freeze_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLASH_FREEZE_STUN_NORMAL }); @@ -1049,14 +1039,12 @@ class spell_maloriak_flash_freeze_dummy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_flash_freeze_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_maloriak_flash_freeze_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_maloriak_release_experiments : public SpellScript { - PrepareSpellScript(spell_maloriak_release_experiments); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1086,20 +1074,18 @@ class spell_maloriak_release_experiments : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_release_experiments::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_maloriak_release_experiments::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); if (m_scriptSpellId == SPELL_RELEASE_ALL_MINIONS) { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_release_experiments::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_maloriak_release_experiments::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_maloriak_release_experiments::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); } } }; class spell_maloriak_magma_jets_script : public SpellScript { - PrepareSpellScript(spell_maloriak_magma_jets_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGMA_JETS_SUMMON }); @@ -1126,15 +1112,13 @@ class spell_maloriak_magma_jets_script : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_magma_jets_script::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_maloriak_magma_jets_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_maloriak_magma_jets_script::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_maloriak_magma_jets_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_maloriak_magma_jets_periodic : public AuraScript { - PrepareAuraScript(spell_maloriak_magma_jets_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGMA_JETS_SUMMON_FIRE }); @@ -1158,14 +1142,12 @@ class spell_maloriak_magma_jets_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_magma_jets_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_maloriak_magma_jets_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_maloriak_absolute_zero : public SpellScript { - PrepareSpellScript(spell_maloriak_absolute_zero); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ABSOLUTE_ZERO_EXPLOSION }); @@ -1185,14 +1167,12 @@ class spell_maloriak_absolute_zero : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_maloriak_absolute_zero::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_maloriak_absolute_zero::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_maloriak_vile_swill: public AuraScript { - PrepareAuraScript(spell_maloriak_vile_swill); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VILE_SWILL_SUMMON }); @@ -1208,14 +1188,12 @@ class spell_maloriak_vile_swill: public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_maloriak_vile_swill::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_maloriak_vile_swill::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_maloriak_vile_swill_summon: public AuraScript { - PrepareAuraScript(spell_maloriak_vile_swill_summon); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { int32 summonSpellId = GetSpellInfo()->Effects[EFFECT_0].TriggerSpell; @@ -1237,14 +1215,12 @@ class spell_maloriak_vile_swill_summon: public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_maloriak_vile_swill_summon::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_maloriak_vile_swill_summon::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_maloriak_master_adventurer_award : public AuraScript { - PrepareAuraScript(spell_maloriak_master_adventurer_award); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Player* player = GetTarget()->ToPlayer(); @@ -1277,8 +1253,8 @@ class spell_maloriak_master_adventurer_award : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_maloriak_master_adventurer_award::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_maloriak_master_adventurer_award::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_maloriak_master_adventurer_award::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_maloriak_master_adventurer_award::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp index f2ec35b2d9..a9d888627a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp @@ -1380,8 +1380,6 @@ private: class spell_nefarians_end_electrical_charge : public AuraScript { - PrepareAuraScript(spell_nefarians_end_electrical_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ELECTRICAL_CHARGE_ONYXIA }); @@ -1418,14 +1416,12 @@ class spell_nefarians_end_electrical_charge : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_electrical_charge::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_nefarians_end_electrical_charge::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_nefarians_end_lightning_discharge_triggered_periodic_aura : public AuraScript { - PrepareAuraScript(spell_nefarians_end_lightning_discharge_triggered_periodic_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1454,14 +1450,12 @@ class spell_nefarians_end_lightning_discharge_triggered_periodic_aura : public A void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_lightning_discharge_triggered_periodic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_nefarians_end_lightning_discharge_triggered_periodic_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_nefarians_end_lightning_discharge_cone : public SpellScript { - PrepareSpellScript(spell_nefarians_end_lightning_discharge_cone); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LIGHTNING_DISCHARGE_DAMAGE }); @@ -1485,14 +1479,12 @@ class spell_nefarians_end_lightning_discharge_cone : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_nefarians_end_lightning_discharge_cone::HandleImmunity, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunchTarget.Register(&spell_nefarians_end_lightning_discharge_cone::HandleImmunity, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_nefarians_end_lightning_discharge_damage : public SpellScript { - PrepareSpellScript(spell_nefarians_end_lightning_discharge_damage); - void FilterTargets(std::list& targets) { SpellInfo const* spell = GetSpellInfo(); @@ -1507,14 +1499,12 @@ class spell_nefarians_end_lightning_discharge_damage : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_lightning_discharge_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_nefarians_end_lightning_discharge_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_nefarians_end_children_of_deathwing : public AuraScript { - PrepareAuraScript(spell_nefarians_end_children_of_deathwing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHILDREN_OF_DEATHWING_NEFARIAN }); @@ -1532,14 +1522,12 @@ class spell_nefarians_end_children_of_deathwing : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_children_of_deathwing::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_nefarians_end_children_of_deathwing::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_nefarians_end_animate_bones : public AuraScript { - PrepareAuraScript(spell_nefarians_end_animate_bones); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1548,14 +1536,12 @@ class spell_nefarians_end_animate_bones : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_animate_bones::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_nefarians_end_animate_bones::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_nefarians_end_animate_bones_dummy : public SpellScript { - PrepareSpellScript(spell_nefarians_end_animate_bones_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1585,14 +1571,12 @@ class spell_nefarians_end_animate_bones_dummy : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_animate_bones_dummy::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_nefarians_end_animate_bones_dummy::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_nefarians_end_shadowflame_breath : public SpellScript { - PrepareSpellScript(spell_nefarians_end_shadowflame_breath); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1624,14 +1608,12 @@ class spell_nefarians_end_shadowflame_breath : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadowflame_breath::HandleHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_nefarians_end_shadowflame_breath::HandleHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_nefarians_end_jump_down_to_platform : public SpellScript { - PrepareSpellScript(spell_nefarians_end_jump_down_to_platform); - void SetDest(SpellDestination& dest) { Position positions[MaxChromaticPrototypes]; @@ -1664,14 +1646,12 @@ class spell_nefarians_end_jump_down_to_platform : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_nefarians_end_jump_down_to_platform::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_nefarians_end_jump_down_to_platform::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_nefarians_end_shadow_of_cowardice : public SpellScript { - PrepareSpellScript(spell_nefarians_end_shadow_of_cowardice); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_OF_COWARDICE_DAMAGE }); @@ -1690,14 +1670,12 @@ class spell_nefarians_end_shadow_of_cowardice : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadow_of_cowardice::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_nefarians_end_shadow_of_cowardice::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_nefarians_end_onyxia_start_fight_2_effect : public SpellScript { - PrepareSpellScript(spell_nefarians_end_onyxia_start_fight_2_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_OF_COWARDICE_DAMAGE }); @@ -1727,15 +1705,13 @@ class spell_nefarians_end_onyxia_start_fight_2_effect : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_onyxia_start_fight_2_effect::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_onyxia_start_fight_2_effect::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_nefarians_end_onyxia_start_fight_2_effect::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_nefarians_end_onyxia_start_fight_2_effect::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_nefarians_end_empowering_strikes : public AuraScript { - PrepareAuraScript(spell_nefarians_end_empowering_strikes); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1744,14 +1720,12 @@ class spell_nefarians_end_empowering_strikes : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_empowering_strikes::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_nefarians_end_empowering_strikes::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_nefarians_end_brushfire_pre_start_periodic : public AuraScript { - PrepareAuraScript(spell_nefarians_end_brushfire_pre_start_periodic); - bool Load() override { _nextTriggerTickNumber = 1; @@ -1781,7 +1755,7 @@ class spell_nefarians_end_brushfire_pre_start_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_brushfire_pre_start_periodic::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_nefarians_end_brushfire_pre_start_periodic::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: @@ -1791,8 +1765,6 @@ private: class spell_nefarians_end_brushfire_start : public SpellScript { - PrepareSpellScript(spell_nefarians_end_brushfire_start); - void HandleDummyEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -1801,14 +1773,12 @@ class spell_nefarians_end_brushfire_start : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_brushfire_start::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_nefarians_end_brushfire_start::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_nefarians_end_brushfire_growth : public AuraScript { - PrepareAuraScript(spell_nefarians_end_brushfire_growth); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { if (Creature* creature = GetTarget()->ToCreature()) @@ -1818,14 +1788,12 @@ class spell_nefarians_end_brushfire_growth : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_brushfire_growth::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_nefarians_end_brushfire_growth::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_nefarians_end_shadowblaze : public SpellScript { - PrepareSpellScript(spell_nefarians_end_shadowblaze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1859,14 +1827,12 @@ class spell_nefarians_end_shadowblaze : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_shadowblaze::HandleHit, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_nefarians_end_shadowblaze::HandleHit, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_nefarians_end_dominion_dummy : public SpellScript { - PrepareSpellScript(spell_nefarians_end_dominion_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DOMINION_OVERRIDE_ACTION_BAR }); @@ -1882,14 +1848,12 @@ class spell_nefarians_end_dominion_dummy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nefarians_end_dominion_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_nefarians_end_dominion_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_nefarians_end_dominion : public AuraScript { - PrepareAuraScript(spell_nefarians_end_dominion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1922,15 +1886,13 @@ class spell_nefarians_end_dominion : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_nefarians_end_dominion::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_dominion::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_nefarians_end_dominion::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_nefarians_end_dominion::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); } }; class spell_nefarians_end_determine_farthest_portal_stalker : public AuraScript { - PrepareAuraScript(spell_nefarians_end_determine_farthest_portal_stalker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DOMINION_PORTAL_TRIGGER }); @@ -1971,14 +1933,12 @@ class spell_nefarians_end_determine_farthest_portal_stalker : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_nefarians_end_determine_farthest_portal_stalker::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_nefarians_end_determine_farthest_portal_stalker::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_nefarians_end_dominion_portal_trigger : public SpellScript { - PrepareSpellScript(spell_nefarians_end_dominion_portal_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2012,14 +1972,12 @@ class spell_nefarians_end_dominion_portal_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_dominion_portal_trigger::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_nefarians_end_dominion_portal_trigger::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_nefarians_end_free_your_mind : public AuraScript { - PrepareAuraScript(spell_nefarians_end_free_your_mind); - void AfterRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -2029,14 +1987,12 @@ class spell_nefarians_end_free_your_mind : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_free_your_mind::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_nefarians_end_free_your_mind::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_nefarians_end_siphon_power : public SpellScript { - PrepareSpellScript(spell_nefarians_end_siphon_power); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STOLEN_POWER }); @@ -2049,14 +2005,12 @@ class spell_nefarians_end_siphon_power : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nefarians_end_siphon_power::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_nefarians_end_siphon_power::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_nefarians_end_explosive_cinders : public AuraScript { - PrepareAuraScript(spell_nefarians_end_explosive_cinders); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXPLOSIVE_CINDERS_EXPLOSION }); @@ -2070,7 +2024,7 @@ class spell_nefarians_end_explosive_cinders : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_nefarians_end_explosive_cinders::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_nefarians_end_explosive_cinders::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp index 251d180612..3c9c6f9eb6 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp @@ -1217,8 +1217,6 @@ class GuidCheck class spell_omnotron_controller_recharge : public SpellScript { - PrepareSpellScript(spell_omnotron_controller_recharge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1277,15 +1275,13 @@ class spell_omnotron_controller_recharge : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_controller_recharge::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_omnotron_controller_recharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_omnotron_controller_recharge::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_omnotron_controller_recharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_omnotron_recharging : public AuraScript { - PrepareAuraScript(spell_omnotron_recharging); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired)) @@ -1296,14 +1292,12 @@ class spell_omnotron_recharging : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_recharging::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_omnotron_recharging::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); } }; class spell_omnotron_activated : public AuraScript { - PrepareAuraScript(spell_omnotron_activated); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHUTTING_DOWN }); @@ -1325,15 +1319,13 @@ class spell_omnotron_activated : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_activated::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_activated::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_omnotron_activated::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectRemove.Register(&spell_omnotron_activated::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_omnotron_inactive : public SpellScript { - PrepareSpellScript(spell_omnotron_inactive); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RECHARGING_ELECTRON }); @@ -1350,14 +1342,12 @@ class spell_omnotron_inactive : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_omnotron_inactive::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_omnotron_inactive::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_omnotron_electrical_discharge_trigger : public SpellScript { - PrepareSpellScript(spell_omnotron_electrical_discharge_trigger); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1374,15 +1364,13 @@ class spell_omnotron_electrical_discharge_trigger : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_electrical_discharge_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_omnotron_electrical_discharge_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_omnotron_electrical_discharge_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_omnotron_electrical_discharge_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_omnotron_electrical_discharge : public SpellScript { - PrepareSpellScript(spell_omnotron_electrical_discharge); - bool Load() override { _chainTargetCount = 0; @@ -1398,7 +1386,7 @@ class spell_omnotron_electrical_discharge : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_omnotron_electrical_discharge::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_omnotron_electrical_discharge::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } private: uint8 _chainTargetCount; @@ -1406,8 +1394,6 @@ private: class spell_omnotron_unstable_shield : public AuraScript { - PrepareAuraScript(spell_omnotron_unstable_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STATIC_SHOCK }); @@ -1435,15 +1421,13 @@ class spell_omnotron_unstable_shield : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_omnotron_unstable_shield::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_omnotron_unstable_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_omnotron_unstable_shield::CheckProc); + OnEffectProc.Register(&spell_omnotron_unstable_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; class spell_omnotron_aquiring_target : public SpellScript { - PrepareSpellScript(spell_omnotron_aquiring_target); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1463,15 +1447,13 @@ class spell_omnotron_aquiring_target : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_aquiring_target::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_omnotron_aquiring_target::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_omnotron_aquiring_target::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_omnotron_aquiring_target::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_omnotron_acquiring_target_periodic : public AuraScript { - PrepareAuraScript(spell_omnotron_acquiring_target_periodic); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1481,14 +1463,12 @@ class spell_omnotron_acquiring_target_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_acquiring_target_periodic::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_omnotron_acquiring_target_periodic::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_omnotron_barrier : public AuraScript { - PrepareAuraScript(spell_omnotron_barrier); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BACKDRAFT }); @@ -1503,14 +1483,12 @@ class spell_omnotron_barrier : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_omnotron_barrier::HandleAbsorbRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_omnotron_barrier::HandleAbsorbRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; class spell_omnotron_shadow_infusion : public SpellScript { - PrepareSpellScript(spell_omnotron_shadow_infusion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_CONDUCTOR }); @@ -1523,14 +1501,12 @@ class spell_omnotron_shadow_infusion : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_omnotron_shadow_infusion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_omnotron_shadow_infusion::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_omnotron_shadow_conductor : public SpellScript { - PrepareSpellScript(spell_omnotron_shadow_conductor); - void ChangeDamage(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1545,14 +1521,12 @@ class spell_omnotron_shadow_conductor : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_omnotron_shadow_conductor::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_omnotron_shadow_conductor::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_omnotron_overcharge : public SpellScript { - PrepareSpellScript(spell_omnotron_overcharge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1583,14 +1557,12 @@ class spell_omnotron_overcharge : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_omnotron_overcharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_omnotron_overcharge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_omnotron_overcharged_power_generator : public AuraScript { - PrepareAuraScript(spell_omnotron_overcharged_power_generator); - void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1604,14 +1576,12 @@ class spell_omnotron_overcharged_power_generator : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_omnotron_overcharged_power_generator::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_omnotron_overcharged_power_generator::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_omnotron_flamethrower : public SpellScript { - PrepareSpellScript(spell_omnotron_flamethrower); - void FilterTargets(std::list& targets) { if (targets.size() >= 2) @@ -1622,7 +1592,7 @@ class spell_omnotron_flamethrower : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104); + OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index 63d7a9206a..fb69a399d0 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -208,8 +208,6 @@ class spell_egg_event : public SpellScriptLoader class spell_egg_eventSpellScript : public SpellScript { - PrepareSpellScript(spell_egg_eventSpellScript); - void HandleOnHit() { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -218,7 +216,7 @@ class spell_egg_event : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_egg_eventSpellScript::HandleOnHit); + OnHit.Register(&spell_egg_eventSpellScript::HandleOnHit); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index 7c49c5ab25..abf80eed87 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -252,8 +252,6 @@ public: class spell_vael_burning_adrenaline_AuraScript : public AuraScript { - PrepareAuraScript(spell_vael_burning_adrenaline_AuraScript); - 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 @@ -264,7 +262,7 @@ public: void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_vael_burning_adrenaline_AuraScript::OnAuraRemoveHandler, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_vael_burning_adrenaline_AuraScript::OnAuraRemoveHandler, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; 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 f155f3a1d9..b9e323f356 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -131,8 +131,6 @@ class spell_baron_geddon_inferno : public SpellScriptLoader class spell_baron_geddon_inferno_AuraScript : public AuraScript { - PrepareAuraScript(spell_baron_geddon_inferno_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -142,7 +140,7 @@ class spell_baron_geddon_inferno : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_baron_geddon_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_baron_geddon_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index fa51ae8c30..20015d023b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -127,8 +127,6 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader class spell_shazzrah_gate_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_shazzrah_gate_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAZZRAH_GATE }); @@ -156,8 +154,8 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_shazzrah_gate_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_shazzrah_gate_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_shazzrah_gate_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_shazzrah_gate_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp index 86ce820c35..894eef6e49 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp @@ -377,8 +377,6 @@ class spell_ripsnarl_go_for_the_throat_targeting : public SpellScriptLoader class spell_ripsnarl_go_for_the_throat_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_ripsnarl_go_for_the_throat_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -400,8 +398,8 @@ class spell_ripsnarl_go_for_the_throat_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ripsnarl_go_for_the_throat_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_ripsnarl_go_for_the_throat_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ripsnarl_go_for_the_throat_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_ripsnarl_go_for_the_throat_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -418,8 +416,6 @@ class spell_ripsnarl_summon_vapor_targeting : public SpellScriptLoader class spell_ripsnarl_summon_vapor_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_ripsnarl_summon_vapor_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -448,8 +444,8 @@ class spell_ripsnarl_summon_vapor_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ripsnarl_summon_vapor_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_ripsnarl_summon_vapor_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ripsnarl_summon_vapor_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_ripsnarl_summon_vapor_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp index 363751395c..519dd8f3d3 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp @@ -284,8 +284,6 @@ class spell_cookie_throw_food_targeting : public SpellScriptLoader class spell_cookie_throw_food_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_cookie_throw_food_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -302,8 +300,8 @@ class spell_cookie_throw_food_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_cookie_throw_food_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_cookie_throw_food_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_cookie_throw_food_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_cookie_throw_food_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -320,8 +318,6 @@ class spell_cookie_satiated : public SpellScriptLoader class spell_cookie_satiated_SpellScript : public SpellScript { - PrepareSpellScript(spell_cookie_satiated_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -340,7 +336,7 @@ class spell_cookie_satiated : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_cookie_satiated_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_cookie_satiated_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp index 56e6ff63e4..1d97641fb7 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp @@ -461,8 +461,6 @@ class spell_foe_reaper_5000_acquire_target : public SpellScriptLoader class spell_foe_reaper_5000_acquire_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_foe_reaper_5000_acquire_target_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -479,8 +477,8 @@ class spell_foe_reaper_5000_acquire_target : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_foe_reaper_5000_acquire_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_acquire_target_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_foe_reaper_5000_acquire_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_foe_reaper_5000_acquire_target_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -512,8 +510,6 @@ class spell_foe_reaper_5000_fixate_targeting : public SpellScriptLoader class spell_foe_reaper_5000_fixate_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_foe_reaper_5000_fixate_targeting_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -535,8 +531,8 @@ class spell_foe_reaper_5000_fixate_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_foe_reaper_5000_fixate_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_fixate_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_foe_reaper_5000_fixate_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_foe_reaper_5000_fixate_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -553,8 +549,6 @@ class spell_foe_reaper_5000_fixate : public SpellScriptLoader class spell_foe_reaper_5000_fixate_SpellScript : public SpellScript { - PrepareSpellScript(spell_foe_reaper_5000_fixate_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIXATE_TAUNT }); @@ -568,7 +562,7 @@ class spell_foe_reaper_5000_fixate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_foe_reaper_5000_fixate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_foe_reaper_5000_fixate_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp index f74b3998e4..3eed136889 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp @@ -345,8 +345,6 @@ private: class spell_glubtok_blossom_targeting : public SpellScript { - PrepareSpellScript(spell_glubtok_blossom_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -385,8 +383,8 @@ class spell_glubtok_blossom_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_glubtok_blossom_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_glubtok_blossom_targeting::HandleBlossomEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_glubtok_blossom_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_glubtok_blossom_targeting::HandleBlossomEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp index 8d9bc15faa..f0dee38b1d 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp @@ -573,8 +573,6 @@ private: class spell_helix_throw_bomb_targeting : public SpellScript { - PrepareSpellScript(spell_helix_throw_bomb_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -591,15 +589,13 @@ class spell_helix_throw_bomb_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_throw_bomb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_helix_throw_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_helix_throw_bomb_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_helix_throw_bomb_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_helix_sticky_bomb_periodic_trigger : public AuraScript { - PrepareAuraScript(spell_helix_sticky_bomb_periodic_trigger); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -623,14 +619,12 @@ class spell_helix_sticky_bomb_periodic_trigger : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_helix_sticky_bomb_periodic_trigger::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_helix_sticky_bomb_periodic_trigger::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_helix_oaf_grab_targeting : public SpellScript { - PrepareSpellScript(spell_helix_oaf_grab_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -647,15 +641,13 @@ class spell_helix_oaf_grab_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_oaf_grab_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_helix_oaf_grab_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_helix_oaf_grab_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_helix_oaf_grab_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_helix_force_player_to_ride_oaf : public SpellScript { - PrepareSpellScript(spell_helix_force_player_to_ride_oaf); - void HandleHit(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -664,14 +656,12 @@ class spell_helix_force_player_to_ride_oaf : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_helix_force_player_to_ride_oaf::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_helix_force_player_to_ride_oaf::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_helix_oaf_smash : public SpellScript { - PrepareSpellScript(spell_helix_oaf_smash); - void HandleLaunch(SpellEffIndex effIndex) { // We do our own knockback here because the boss is immune to knockback effects @@ -696,14 +686,12 @@ class spell_helix_oaf_smash : public SpellScript void Register() { - OnEffectLaunch += SpellEffectFn(spell_helix_oaf_smash::HandleLaunch, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); + OnEffectLaunch.Register(&spell_helix_oaf_smash::HandleLaunch, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; class spell_helix_helix_ride : public AuraScript { - PrepareAuraScript(spell_helix_helix_ride); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE); @@ -711,14 +699,12 @@ class spell_helix_helix_ride : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_helix_helix_ride::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_helix_helix_ride::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL); } }; class spell_helix_ride_face_targeting : public SpellScript { - PrepareSpellScript(spell_helix_ride_face_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -771,15 +757,13 @@ class spell_helix_ride_face_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_helix_ride_face_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_helix_ride_face_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_helix_ride_face_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_helix_ride_face_targeting::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_helix_helix_ride_face_timer_aura : public AuraScript { - PrepareAuraScript(spell_helix_helix_ride_face_timer_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -816,14 +800,12 @@ class spell_helix_helix_ride_face_timer_aura : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_helix_helix_ride_face_timer_aura::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_helix_helix_ride_face_timer_aura::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_helix_chest_bomb_emote : public SpellScript { - PrepareSpellScript(spell_helix_chest_bomb_emote); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -834,14 +816,12 @@ class spell_helix_chest_bomb_emote : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_helix_chest_bomb_emote::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_helix_chest_bomb_emote::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_helix_chest_bomb : public AuraScript { - PrepareAuraScript(spell_helix_chest_bomb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHEST_BOMB_DAMAGE }); @@ -855,14 +835,12 @@ class spell_helix_chest_bomb : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_helix_chest_bomb::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_helix_chest_bomb::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_helix_ride_vehicle : public AuraScript { - PrepareAuraScript(spell_helix_ride_vehicle); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_PLAYER_VEHICLE); @@ -870,7 +848,7 @@ class spell_helix_ride_vehicle : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_helix_ride_vehicle::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_helix_ride_vehicle::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp index 612584fe43..732a3c4ed6 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp @@ -704,8 +704,6 @@ class spell_vanessa_backslash_targeting : public SpellScriptLoader class spell_vanessa_backslash_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_vanessa_backslash_targeting_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BACKSLASH }); @@ -727,8 +725,8 @@ class spell_vanessa_backslash_targeting : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_vanessa_backslash_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_vanessa_backslash_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_vanessa_backslash_targeting_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_vanessa_backslash_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 65369ae90e..dcf927116d 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -562,8 +562,6 @@ class go_deadmines_defias_cannon : public GameObjectScript class spell_deadmines_on_fire : public AuraScript { - PrepareAuraScript(spell_deadmines_on_fire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_EXPLOSIVE_SUICIDE }); @@ -576,7 +574,7 @@ class spell_deadmines_on_fire : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_deadmines_on_fire::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE_PERCENT, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_deadmines_on_fire::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE_PERCENT, AURA_EFFECT_HANDLE_REAL); } }; @@ -587,8 +585,6 @@ class spell_deadmines_ride_magma_vehicle : public SpellScriptLoader class spell_deadmines_ride_magma_vehicle_SpellScript : public SpellScript { - PrepareSpellScript(spell_deadmines_ride_magma_vehicle_SpellScript); - void HandleHit(SpellEffIndex effIndex) { Unit* target = GetHitUnit(); @@ -597,7 +593,7 @@ class spell_deadmines_ride_magma_vehicle : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deadmines_ride_magma_vehicle_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_deadmines_ride_magma_vehicle_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -615,8 +611,6 @@ class spell_deadmines_magma_trap_throw_to_location : public SpellScriptLoader class spell_deadmines_magma_trap_throw_to_location_SpellScript : public SpellScript { - PrepareSpellScript(spell_deadmines_magma_trap_throw_to_location_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitDest()) @@ -625,7 +619,7 @@ class spell_deadmines_magma_trap_throw_to_location : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_deadmines_magma_trap_throw_to_location_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST); + OnEffectLaunch.Register(&spell_deadmines_magma_trap_throw_to_location_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST); } }; @@ -642,8 +636,6 @@ class spell_deadmines_bloodbath : public SpellScriptLoader class spell_deadmines_bloodbath_AuraScript : public AuraScript { - PrepareAuraScript(spell_deadmines_bloodbath_AuraScript); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -654,7 +646,7 @@ class spell_deadmines_bloodbath : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_deadmines_bloodbath_AuraScript::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_deadmines_bloodbath_AuraScript::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp index 541fda2f74..9684a14cd7 100644 --- a/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp +++ b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp @@ -198,8 +198,6 @@ Position const CynthiaEscapePos[] = class spell_gilneas_quest_save_the_children : public SpellScript { - PrepareSpellScript(spell_gilneas_quest_save_the_children); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GILNEAS_QUEST_SAVE_JAMES }); @@ -221,9 +219,9 @@ class spell_gilneas_quest_save_the_children : public SpellScript void Register() override { if (m_scriptSpellId == SPELL_GILNEAS_QUEST_SAVE_JAMES) - OnEffectHitTarget += SpellEffectFn(spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); else - OnEffectHitTarget += SpellEffectFn(spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gilneas_quest_save_the_children::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -482,8 +480,6 @@ private: class spell_gilneas_launch : public SpellScript { - PrepareSpellScript(spell_gilneas_launch); - void TransferDestination(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -494,7 +490,7 @@ class spell_gilneas_launch : public SpellScript void Register() { - OnEffectLaunch += SpellEffectFn(spell_gilneas_launch::TransferDestination, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_gilneas_launch::TransferDestination, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -517,8 +513,6 @@ class FireBoulderInFrontCheck class spell_gilneas_fiery_boulder : public SpellScript { - PrepareSpellScript(spell_gilneas_fiery_boulder); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -534,7 +528,7 @@ class spell_gilneas_fiery_boulder : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gilneas_fiery_boulder::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_gilneas_fiery_boulder::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -559,8 +553,6 @@ Position const AttackMastiffSummonPositions[] = class spell_gilneas_call_attack_mastiff : public SpellScript { - PrepareSpellScript(spell_gilneas_call_attack_mastiff); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -573,14 +565,12 @@ class spell_gilneas_call_attack_mastiff : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gilneas_call_attack_mastiff::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gilneas_call_attack_mastiff::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_gilneas_forcecast_cataclysm_1 : public SpellScript { - PrepareSpellScript(spell_gilneas_forcecast_cataclysm_1); - void HandleForcecast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -590,7 +580,7 @@ class spell_gilneas_forcecast_cataclysm_1 : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gilneas_forcecast_cataclysm_1::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_gilneas_forcecast_cataclysm_1::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -617,8 +607,6 @@ private: class spell_gilneas_worgen_intro_completion : public SpellScript { - PrepareSpellScript(spell_gilneas_worgen_intro_completion); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -629,7 +617,7 @@ class spell_gilneas_worgen_intro_completion : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gilneas_worgen_intro_completion::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_gilneas_worgen_intro_completion::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp index f502246e26..f76495614c 100644 --- a/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp +++ b/src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.cpp @@ -553,8 +553,6 @@ class spell_collecting_fallout : public SpellScriptLoader class spell_collecting_fallout_SpellScript : public SpellScript { - PrepareSpellScript(spell_collecting_fallout_SpellScript); - void OnLaunch(SpellEffIndex effIndex) { // estimated 25% chance of success @@ -572,8 +570,8 @@ class spell_collecting_fallout : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_collecting_fallout_SpellScript::OnLaunch, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL); - OnEffectLaunch += SpellEffectFn(spell_collecting_fallout_SpellScript::HandleFail, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); + OnEffectLaunch.Register(&spell_collecting_fallout_SpellScript::OnLaunch, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL); + OnEffectLaunch.Register(&spell_collecting_fallout_SpellScript::HandleFail, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); } bool _spellFail = true; diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp index c5881cd2b8..17cd5540c3 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp @@ -506,8 +506,6 @@ private: class spell_drahga_burning_shadowbolt : public SpellScript { - PrepareSpellScript(spell_drahga_burning_shadowbolt); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BURNING_SHADOWBOLT_DUMMY }); @@ -521,14 +519,12 @@ class spell_drahga_burning_shadowbolt : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_drahga_burning_shadowbolt::CastDummySpell, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_drahga_burning_shadowbolt::CastDummySpell, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_drahga_devouring_flames : public SpellScript { - PrepareSpellScript(spell_drahga_devouring_flames); - void ChangeDamage() { if (Unit* caster = GetCaster()) @@ -542,7 +538,7 @@ class spell_drahga_devouring_flames : public SpellScript void Register() override { - OnHit += SpellHitFn(spell_drahga_devouring_flames::ChangeDamage); + OnHit.Register(&spell_drahga_devouring_flames::ChangeDamage); } }; diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp index 2708b0b82a..4e301bbe46 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp @@ -423,8 +423,6 @@ private: class spell_erudax_shadow_gale_trigger : public SpellScript { - PrepareSpellScript(spell_erudax_shadow_gale_trigger); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SHADOW_GALE_STALKER }); @@ -437,14 +435,12 @@ class spell_erudax_shadow_gale_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_erudax_shadow_gale_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_erudax_shadow_gale_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_erudax_shadow_gale : public SpellScript { - PrepareSpellScript(spell_erudax_shadow_gale); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -465,15 +461,13 @@ class spell_erudax_shadow_gale : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_erudax_shadow_gale_aura : public SpellScript { - PrepareSpellScript(spell_erudax_shadow_gale_aura); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -487,14 +481,12 @@ class spell_erudax_shadow_gale_aura : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_shadow_gale_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_erudax_shadow_gale_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_erudax_twilight_corruption : public SpellScript { - PrepareSpellScript(spell_erudax_twilight_corruption); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -508,14 +500,12 @@ class spell_erudax_twilight_corruption : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_erudax_twilight_corruption::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_erudax_twilight_corruption::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_erudax_twilight_corruption_AuraScript : public AuraScript { - PrepareAuraScript(spell_erudax_twilight_corruption_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -552,8 +542,8 @@ class spell_erudax_twilight_corruption_AuraScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_erudax_twilight_corruption_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - OnEffectRemove += AuraEffectRemoveFn(spell_erudax_twilight_corruption_AuraScript::OnAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_erudax_twilight_corruption_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectRemove.Register(&spell_erudax_twilight_corruption_AuraScript::OnAuraRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp index 919e1e7295..88e8fadde8 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp @@ -334,8 +334,6 @@ class spell_throngus_mighty_stomp : public SpellScriptLoader class spell_throngus_mighty_stomp_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_mighty_stomp_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -353,8 +351,8 @@ class spell_throngus_mighty_stomp : public SpellScriptLoader void Register() { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_mighty_stomp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_throngus_mighty_stomp_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_throngus_mighty_stomp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_throngus_mighty_stomp_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -371,8 +369,6 @@ class spell_throngus_pick_weapon : public SpellScriptLoader class spell_throngus_pick_weapon_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_pick_weapon_SpellScript); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (GetCaster()->GetEntry() == BOSS_FORGEMASTER_THRONGUS) @@ -381,7 +377,7 @@ class spell_throngus_pick_weapon : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_throngus_pick_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_throngus_pick_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -398,8 +394,6 @@ class spell_throngus_flame_arrow_barrage : public SpellScriptLoader class spell_throngus_flame_arrow_barrage_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_flame_arrow_barrage_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -417,8 +411,8 @@ class spell_throngus_flame_arrow_barrage : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_flame_arrow_barrage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_throngus_flame_arrow_barrage_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_throngus_flame_arrow_barrage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_throngus_flame_arrow_barrage_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -435,8 +429,6 @@ class spell_throngus_flaming_arrow : public SpellScriptLoader class spell_throngus_flaming_arrow_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_flaming_arrow_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -447,7 +439,7 @@ class spell_throngus_flaming_arrow : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_flaming_arrow_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_throngus_flaming_arrow_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -464,8 +456,6 @@ class spell_throngus_personal_phalanx : public SpellScriptLoader class spell_throngus_personal_phalanx_AuraScript : public AuraScript { - PrepareAuraScript(spell_throngus_personal_phalanx_AuraScript); - void AfterApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -490,8 +480,8 @@ class spell_throngus_personal_phalanx : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_throngus_personal_phalanx_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_personal_phalanx_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_throngus_personal_phalanx_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_throngus_personal_phalanx_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY, AURA_EFFECT_HANDLE_REAL); } }; @@ -508,8 +498,6 @@ class spell_throngus_personal_phalanx_aoe : public SpellScriptLoader class spell_throngus_personal_phalanx_aoe_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_personal_phalanx_aoe_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -526,8 +514,8 @@ class spell_throngus_personal_phalanx_aoe : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_throngus_personal_phalanx_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_throngus_personal_phalanx_aoe_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_throngus_personal_phalanx_aoe_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_throngus_personal_phalanx_aoe_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -544,8 +532,6 @@ class spell_throngus_fixate_effect : public SpellScriptLoader class spell_throngus_fixate_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_fixate_effect_SpellScript); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -554,7 +540,7 @@ class spell_throngus_fixate_effect : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_throngus_fixate_effect_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_throngus_fixate_effect_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -571,8 +557,6 @@ class spell_throngus_burning_dual_blades : public SpellScriptLoader class spell_throngus_burning_dual_blades_AuraScript : public AuraScript { - PrepareAuraScript(spell_throngus_burning_dual_blades_AuraScript); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -591,8 +575,8 @@ class spell_throngus_burning_dual_blades : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_throngus_burning_dual_blades_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_burning_dual_blades_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_throngus_burning_dual_blades_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_throngus_burning_dual_blades_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE, AURA_EFFECT_HANDLE_REAL); } }; @@ -609,8 +593,6 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader class spell_throngus_disorienting_roar_SpellScript : public SpellScript { - PrepareSpellScript(spell_throngus_disorienting_roar_SpellScript); - void HandleHeroicDifficulty() { if (Unit* target = GetHitUnit()) @@ -621,7 +603,7 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_throngus_disorienting_roar_SpellScript::HandleHeroicDifficulty); + AfterHit.Register(&spell_throngus_disorienting_roar_SpellScript::HandleHeroicDifficulty); } }; @@ -632,8 +614,6 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader class spell_throngus_disorienting_roar_AuraScript : public AuraScript { - PrepareAuraScript(spell_throngus_disorienting_roar_AuraScript); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { if (Aura* aura = GetAura()) @@ -652,7 +632,7 @@ class spell_throngus_disorienting_roar : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_throngus_disorienting_roar_AuraScript::CheckProc); + DoCheckProc.Register(&spell_throngus_disorienting_roar_AuraScript::CheckProc); } }; @@ -669,8 +649,6 @@ class spell_throngus_encumbered : public SpellScriptLoader class spell_throngus_encumbered_AuraScript : public AuraScript { - PrepareAuraScript(spell_throngus_encumbered_AuraScript); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, WEAPON_MODEL_MACE); @@ -683,8 +661,8 @@ class spell_throngus_encumbered : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_throngus_encumbered_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_encumbered_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_throngus_encumbered_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_throngus_encumbered_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } }; @@ -701,8 +679,6 @@ class spell_throngus_impaling_slam : public SpellScriptLoader class spell_throngus_impaling_slam_AuraScript : public AuraScript { - PrepareAuraScript(spell_throngus_impaling_slam_AuraScript); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -719,8 +695,8 @@ class spell_throngus_impaling_slam : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_throngus_impaling_slam_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_throngus_impaling_slam_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_throngus_impaling_slam_AuraScript::AfterApply, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_throngus_impaling_slam_AuraScript::AfterRemove, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp index 33b2642fb9..7a638552c8 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp @@ -309,8 +309,6 @@ private: class spell_umbriss_summon_blitz_trigger : public SpellScript { - PrepareSpellScript(spell_umbriss_summon_blitz_trigger); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -332,15 +330,13 @@ class spell_umbriss_summon_blitz_trigger : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_umbriss_summon_blitz_trigger::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_umbriss_summon_blitz_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_umbriss_summon_blitz_trigger::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_umbriss_summon_blitz_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_umbriss_summon_ground_siege_trigger : public SpellScript { - PrepareSpellScript(spell_umbriss_summon_ground_siege_trigger); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -357,15 +353,13 @@ class spell_umbriss_summon_ground_siege_trigger : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_umbriss_summon_ground_siege_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_umbriss_summon_ground_siege_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_umbriss_summon_ground_siege_trigger::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_umbriss_summon_ground_siege_trigger::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_umbriss_bleeding_wound : public AuraScript { - PrepareAuraScript(spell_umbriss_bleeding_wound); - void HandleRemoval(AuraEffect const* aurEff) { if (Unit* owner = GetOwner()->ToUnit()) @@ -375,7 +369,7 @@ class spell_umbriss_bleeding_wound : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_umbriss_bleeding_wound::HandleRemoval, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_umbriss_bleeding_wound::HandleRemoval, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp index b44c1bfbe9..9561fe911d 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp @@ -280,8 +280,6 @@ private: class spell_grim_batol_engulfing_flames : public SpellScript { - PrepareSpellScript(spell_grim_batol_engulfing_flames); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitCreature()) @@ -290,7 +288,7 @@ class spell_grim_batol_engulfing_flames : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_grim_batol_engulfing_flames::HandleEffect, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_grim_batol_engulfing_flames::HandleEffect, EFFECT_1, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index cc791b7062..0b48cd81c4 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 }); @@ -407,7 +405,7 @@ class spell_rain_of_bones : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rain_of_bones_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_rain_of_bones_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index f631729fd0..49a837fe12 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -483,8 +483,6 @@ private: 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 }); @@ -498,7 +496,7 @@ class spell_felblood_kaelthas_flame_strike : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_felblood_kaelthas_flame_strike::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_felblood_kaelthas_flame_strike::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave_chapter_1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave_chapter_1.cpp index 7b60ca5608..780d1e4525 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave_chapter_1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave_chapter_1.cpp @@ -1039,8 +1039,6 @@ enum GiftOfTheHarvester class spell_gift_of_the_harvester : public SpellScript { - PrepareSpellScript(spell_gift_of_the_harvester); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1061,7 +1059,7 @@ class spell_gift_of_the_harvester : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gift_of_the_harvester::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gift_of_the_harvester::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index 68b36383b8..7161d2c8ac 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -169,8 +169,6 @@ class spell_shadow_portal : public SpellScriptLoader class spell_shadow_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_shadow_portal_SpellScript); - public: spell_shadow_portal_SpellScript() { @@ -235,7 +233,7 @@ class spell_shadow_portal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_shadow_portal_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } InstanceScript* _instance; @@ -298,8 +296,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(); @@ -370,7 +366,7 @@ class spell_shadow_portal_rooms : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_shadow_portal_rooms_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } InstanceScript* _instance = nullptr; diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index ae5c0704b8..e2a9739985 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); @@ -166,7 +164,7 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_magesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_kormok_summon_bone_magesSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -184,9 +182,7 @@ 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 + bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BONE_MINIONS }); } @@ -202,7 +198,7 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kormok_summon_bone_minionsSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_kormok_summon_bone_minionsSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 83fb7b87ae..a6de3c4424 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -402,8 +402,6 @@ class spell_apothecary_lingering_fumes : public SpellScriptLoader class spell_apothecary_lingering_fumes_SpellScript : public SpellScript { - PrepareSpellScript(spell_apothecary_lingering_fumes_SpellScript); - void HandleAfterCast() { Unit* caster = GetCaster(); @@ -425,8 +423,8 @@ class spell_apothecary_lingering_fumes : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_apothecary_lingering_fumes_SpellScript::HandleAfterCast); - OnEffectHitTarget += SpellEffectFn(spell_apothecary_lingering_fumes_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + AfterCast.Register(&spell_apothecary_lingering_fumes_SpellScript::HandleAfterCast); + OnEffectHitTarget.Register(&spell_apothecary_lingering_fumes_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -444,8 +442,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader class spell_apothecary_validate_area_SpellScript : public SpellScript { - PrepareSpellScript(spell_apothecary_validate_area_SpellScript); - void FilterTargets(std::list& targets) { targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BUNNY_LOCKDOWN)); @@ -466,8 +462,8 @@ class spell_apothecary_validate_area : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_apothecary_validate_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_apothecary_validate_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_apothecary_validate_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_apothecary_validate_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -485,8 +481,6 @@ class spell_apothecary_throw_cologne : public SpellScriptLoader class spell_apothecary_throw_cologne_SpellScript : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_cologne_SpellScript); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_COLOGNE_SPILL, true); @@ -494,7 +488,7 @@ class spell_apothecary_throw_cologne : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_apothecary_throw_cologne_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_apothecary_throw_cologne_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -512,8 +506,6 @@ class spell_apothecary_throw_perfume : public SpellScriptLoader class spell_apothecary_throw_perfume_SpellScript : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_perfume_SpellScript); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PERFUME_SPILL, true); @@ -521,7 +513,7 @@ class spell_apothecary_throw_perfume : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_apothecary_throw_perfume_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_apothecary_throw_perfume_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -539,8 +531,6 @@ class spell_apothecary_perfume_spill : public SpellScriptLoader class spell_apothecary_perfume_spill_AuraScript : public AuraScript { - PrepareAuraScript(spell_apothecary_perfume_spill_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_PERFUME_SPILL_DAMAGE, true); @@ -548,7 +538,7 @@ class spell_apothecary_perfume_spill : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_apothecary_perfume_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_apothecary_perfume_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -566,8 +556,6 @@ class spell_apothecary_cologne_spill : public SpellScriptLoader class spell_apothecary_cologne_spill_AuraScript : public AuraScript { - PrepareAuraScript(spell_apothecary_cologne_spill_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_COLOGNE_SPILL_DAMAGE, true); @@ -575,7 +563,7 @@ class spell_apothecary_cologne_spill : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_apothecary_cologne_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_apothecary_cologne_spill_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp index 285f5681ba..6847e3730c 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp @@ -221,8 +221,6 @@ private: class spell_ashbury_asphyxiate : public AuraScript { - PrepareAuraScript(spell_ashbury_asphyxiate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ASPHYXIATE_ROOT }); @@ -251,14 +249,12 @@ class spell_ashbury_asphyxiate : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ashbury_asphyxiate::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_ashbury_asphyxiate::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_ashbury_pain_and_suffering : public AuraScript { - PrepareAuraScript(spell_ashbury_pain_and_suffering); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PAIN_AND_SUFFERING_DUMMY }); @@ -276,14 +272,12 @@ class spell_ashbury_pain_and_suffering : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ashbury_pain_and_suffering::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_ashbury_pain_and_suffering::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; class spell_ashbury_dark_archangel_form : public AuraScript { - PrepareAuraScript(spell_ashbury_dark_archangel_form); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CALAMITY }); @@ -300,7 +294,7 @@ class spell_ashbury_dark_archangel_form : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_ashbury_dark_archangel_form::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_ashbury_dark_archangel_form::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp index 462d3e8d12..1e23b1857f 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp @@ -546,9 +546,7 @@ public: class spell_sfk_summon_worgen_spirit_SpellScript : public SpellScript { - PrepareSpellScript(spell_sfk_summon_worgen_spirit_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( { @@ -583,7 +581,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_sfk_summon_worgen_spirit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_sfk_summon_worgen_spirit_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp index ef3fe47b24..527d0f6fec 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp @@ -408,10 +408,6 @@ class spell_sfk_forsaken_ability : public SpellScriptLoader class spell_sfk_forsaken_ability_AuraScript : public AuraScript { - PrepareAuraScript(spell_sfk_forsaken_ability_AuraScript); - - - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -451,7 +447,7 @@ class spell_sfk_forsaken_ability : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sfk_forsaken_ability_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_sfk_forsaken_ability_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -468,8 +464,6 @@ public: class spell_sfk_unholy_power_SpellScript : public SpellScript { - PrepareSpellScript(spell_sfk_unholy_power_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -498,7 +492,7 @@ public: void Register() override { - AfterHit += SpellHitFn(spell_sfk_unholy_power_SpellScript::HandleStacks); + AfterHit.Register(&spell_sfk_unholy_power_SpellScript::HandleStacks); } }; @@ -515,8 +509,6 @@ public: class spell_sfk_unholy_empowerment_SpellScript : public SpellScript { - PrepareSpellScript(spell_sfk_unholy_empowerment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -549,7 +541,7 @@ public: void Register() override { - AfterHit += SpellHitFn(spell_sfk_unholy_empowerment_SpellScript::HandleStacks); + AfterHit.Register(&spell_sfk_unholy_empowerment_SpellScript::HandleStacks); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp index cf6cc85580..03965a9e5e 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp @@ -247,8 +247,6 @@ private: class spell_godfrey_summon_bloodthirsty_ghouls : public AuraScript { - PrepareAuraScript(spell_godfrey_summon_bloodthirsty_ghouls); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -267,7 +265,7 @@ class spell_godfrey_summon_bloodthirsty_ghouls : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_summon_bloodthirsty_ghouls::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_godfrey_summon_bloodthirsty_ghouls::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: bool _useLeftGun = true; @@ -275,8 +273,6 @@ private: class spell_godfrey_pistol_barrage : public AuraScript { - PrepareAuraScript(spell_godfrey_pistol_barrage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -318,9 +314,9 @@ class spell_godfrey_pistol_barrage : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_godfrey_pistol_barrage::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_godfrey_pistol_barrage::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_pistol_barrage::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectApply.Register(&spell_godfrey_pistol_barrage::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_godfrey_pistol_barrage::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_godfrey_pistol_barrage::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } private: bool _useLeftGun = true; @@ -328,8 +324,6 @@ private: class spell_godfrey_pistol_barrage_aoe : public SpellScript { - PrepareSpellScript(spell_godfrey_pistol_barrage_aoe); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, 1); @@ -337,14 +331,12 @@ class spell_godfrey_pistol_barrage_aoe : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_godfrey_pistol_barrage_aoe::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_godfrey_pistol_barrage_aoe::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_godfrey_cursed_bullets : public AuraScript { - PrepareAuraScript(spell_godfrey_cursed_bullets); - void OnPeriodic(AuraEffect const* aurEff) { if (aurEff->GetTickNumber() == 1) @@ -355,7 +347,7 @@ class spell_godfrey_cursed_bullets : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_godfrey_cursed_bullets::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_godfrey_cursed_bullets::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } private: uint32 _baseDamage = 0; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp index 62b50bf2e1..ee365e1dad 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp @@ -221,8 +221,6 @@ struct boss_lord_walden : public BossAI class spell_walden_toxic_coagulent : public AuraScript { - PrepareAuraScript(spell_walden_toxic_coagulent); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FULLY_COAGULATED }); @@ -239,14 +237,12 @@ class spell_walden_toxic_coagulent : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_walden_toxic_coagulent::AfterApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_walden_toxic_coagulent::AfterApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; class spell_walden_conjure_poisonous_mixture : public SpellScript { - PrepareSpellScript(spell_walden_conjure_poisonous_mixture); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, 1); @@ -254,14 +250,12 @@ class spell_walden_conjure_poisonous_mixture : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_walden_conjure_poisonous_mixture::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_walden_conjure_poisonous_mixture::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY); } }; class spell_walden_ice_shards : public AuraScript { - PrepareAuraScript(spell_walden_ice_shards); - void HandleEffectPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -276,14 +270,12 @@ class spell_walden_ice_shards : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_walden_ice_shards::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_walden_ice_shards::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_walden_conjure_mystery_toxin : public SpellScript { - PrepareSpellScript(spell_walden_conjure_mystery_toxin); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 4.58f, 0.0f }); @@ -291,14 +283,12 @@ class spell_walden_conjure_mystery_toxin : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_walden_conjure_mystery_toxin::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_walden_conjure_mystery_toxin::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; class spell_walden_toxic_catalyst : public SpellScript { - PrepareSpellScript(spell_walden_toxic_catalyst); - void FilterTargets(std::list& targets) { targets.remove_if([](WorldObject* obj)->bool @@ -310,7 +300,7 @@ class spell_walden_toxic_catalyst : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_walden_toxic_catalyst::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_walden_toxic_catalyst::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 20d84191e6..d1725a50ee 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -54,8 +54,6 @@ enum SKShieldOfBones class spell_sfk_shield_of_bones : public AuraScript { - PrepareAuraScript(spell_sfk_shield_of_bones); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHIELD_OF_BONES_TRIGGERED }); @@ -70,7 +68,7 @@ class spell_sfk_shield_of_bones : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_sfk_shield_of_bones::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_sfk_shield_of_bones::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index 9b9f6e3eab..d0b2365a30 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -303,8 +303,6 @@ public: class spell_ysida_saved_credit : public SpellScript { - PrepareSpellScript(spell_ysida_saved_credit); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_YSIDA_SAVED }); @@ -329,8 +327,8 @@ class spell_ysida_saved_credit : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ysida_saved_credit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_ysida_saved_credit::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_ysida_saved_credit::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_ysida_saved_credit::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 9aa0a8eb5e..939cb3c08a 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -597,8 +597,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 ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -611,7 +609,7 @@ class spell_kalecgos_tap_check : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kalecgos_tap_check::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_kalecgos_tap_check::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -632,8 +630,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( @@ -661,16 +657,14 @@ class spell_kalecgos_spectral_blast : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kalecgos_spectral_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_kalecgos_spectral_blast::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_kalecgos_spectral_blast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_kalecgos_spectral_blast::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 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( @@ -693,15 +687,13 @@ class spell_kalecgos_spectral_realm_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kalecgos_spectral_realm_trigger::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_kalecgos_spectral_realm_trigger::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 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( @@ -722,15 +714,13 @@ class spell_kalecgos_spectral_realm_aura : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_kalecgos_spectral_realm_aura::OnRemove, EFFECT_0, SPELL_AURA_MOD_INVISIBILITY_DETECT, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_kalecgos_spectral_realm_aura::OnRemove, EFFECT_0, SPELL_AURA_MOD_INVISIBILITY_DETECT, AURA_EFFECT_HANDLE_REAL); } }; // 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( @@ -775,10 +765,10 @@ class spell_kalecgos_curse_of_boundless_agony : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_kalecgos_curse_of_boundless_agony::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_kalecgos_curse_of_boundless_agony::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_kalecgos_curse_of_boundless_agony::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - AfterEffectRemove += AuraEffectRemoveFn(spell_kalecgos_curse_of_boundless_agony::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_kalecgos_curse_of_boundless_agony::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_kalecgos_curse_of_boundless_agony::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic.Register(&spell_kalecgos_curse_of_boundless_agony::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + AfterEffectRemove.Register(&spell_kalecgos_curse_of_boundless_agony::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 8fea996466..e69170b7df 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -579,8 +579,6 @@ class spell_summon_blood_elves_script : SpellScriptLoader class spell_summon_blood_elves_script_SpellScript : public SpellScript { - PrepareSpellScript(spell_summon_blood_elves_script_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonBloodElvesSpells); @@ -594,7 +592,7 @@ class spell_summon_blood_elves_script : SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_summon_blood_elves_script_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_summon_blood_elves_script_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -611,8 +609,6 @@ class spell_muru_darkness : SpellScriptLoader class spell_muru_darkness_SpellScript : public SpellScript { - PrepareSpellScript(spell_muru_darkness_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonDarkFiendSpells); @@ -626,7 +622,7 @@ class spell_muru_darkness : SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_muru_darkness_SpellScript::HandleAfterCast); + AfterCast.Register(&spell_muru_darkness_SpellScript::HandleAfterCast); } }; @@ -643,8 +639,6 @@ class spell_dark_fiend_skin : public SpellScriptLoader class spell_dark_fiend_skin_AuraScript : public AuraScript { - PrepareAuraScript(spell_dark_fiend_skin_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByEnemySpell)) @@ -662,7 +656,7 @@ class spell_dark_fiend_skin : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_dark_fiend_skin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dark_fiend_skin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -679,8 +673,6 @@ class spell_transform_visual_missile_periodic : public SpellScriptLoader class spell_transform_visual_missile_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_transform_visual_missile_periodic_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true); @@ -688,7 +680,7 @@ class spell_transform_visual_missile_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_transform_visual_missile_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_transform_visual_missile_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -705,8 +697,6 @@ class spell_summon_blood_elves_periodic : public SpellScriptLoader class spell_summon_blood_elves_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_summon_blood_elves_periodic_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true); @@ -714,7 +704,7 @@ class spell_summon_blood_elves_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_summon_blood_elves_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_summon_blood_elves_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp index 5891683503..87dacf6290 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp @@ -200,8 +200,6 @@ struct boss_commander_ulthok : public BossAI class spell_ulthok_dark_fissure : public AuraScript { - PrepareAuraScript(spell_ulthok_dark_fissure); - void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -215,7 +213,7 @@ class spell_ulthok_dark_fissure : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ulthok_dark_fissure::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_ulthok_dark_fissure::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp index 3c8016d106..0b8d5d4a35 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp @@ -463,8 +463,6 @@ private: class spell_nazjar_waterspout : public SpellScript { - PrepareSpellScript(spell_nazjar_waterspout); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -473,14 +471,12 @@ class spell_nazjar_waterspout : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nazjar_waterspout::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_nazjar_waterspout::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_nazjar_waterspout_targeting : public SpellScript { - PrepareSpellScript(spell_nazjar_waterspout_targeting); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -510,8 +506,8 @@ class spell_nazjar_waterspout_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_nazjar_waterspout_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_nazjar_waterspout_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_nazjar_waterspout_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_nazjar_waterspout_targeting::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp index 940deb34f6..f4f295e1fa 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp @@ -734,8 +734,6 @@ private: class spell_ozumat_charge_to_window : public SpellScript { - PrepareSpellScript(spell_ozumat_charge_to_window); - void SetDest(SpellDestination& dest) { if (Unit* caster = GetCaster()) @@ -749,14 +747,12 @@ class spell_ozumat_charge_to_window : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_charge_to_window::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_ozumat_charge_to_window::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_ozumat_jump_to_ground : public SpellScript { - PrepareSpellScript(spell_ozumat_jump_to_ground); - void SetDest(SpellDestination& dest) { if (Unit* caster = GetCaster()) @@ -791,16 +787,14 @@ class spell_ozumat_jump_to_ground : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_jump_to_ground::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); - BeforeCast += SpellCastFn(spell_ozumat_jump_to_ground::DisableHoverEffects); - AfterCast += SpellCastFn(spell_ozumat_jump_to_ground::PrepareNeptulonAttack); + OnDestinationTargetSelect.Register(&spell_ozumat_jump_to_ground::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + BeforeCast.Register(&spell_ozumat_jump_to_ground::DisableHoverEffects); + AfterCast.Register(&spell_ozumat_jump_to_ground::PrepareNeptulonAttack); } }; class spell_ozumat_shadow_blast : public SpellScript { - PrepareSpellScript(spell_ozumat_shadow_blast); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 5.0f, 0.0f }); @@ -808,14 +802,12 @@ class spell_ozumat_shadow_blast : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; class spell_ozumat_shadow_blast_AuraScript : public AuraScript { - PrepareAuraScript(spell_ozumat_shadow_blast_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_BLAST_MISSILE }); @@ -836,14 +828,12 @@ class spell_ozumat_shadow_blast_AuraScript : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_ozumat_shadow_blast_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ozumat_shadow_blast_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_ozumat_shadow_blast_missile : public SpellScript { - PrepareSpellScript(spell_ozumat_shadow_blast_missile); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -858,15 +848,13 @@ class spell_ozumat_shadow_blast_missile : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast_missile::SetDest, EFFECT_0, TARGET_DEST_CASTER); - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozumat_shadow_blast_missile::SetDest, EFFECT_1, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast_missile::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_ozumat_shadow_blast_missile::SetDest, EFFECT_1, TARGET_DEST_CASTER); } }; class spell_ozumat_blight_of_ozumat : public SpellScript { - PrepareSpellScript(spell_ozumat_blight_of_ozumat); - void HandleHit(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -875,7 +863,7 @@ class spell_ozumat_blight_of_ozumat : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ozumat_blight_of_ozumat::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ozumat_blight_of_ozumat::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -892,8 +880,6 @@ class PurifyHeightCheck class spell_ozumat_purify : public SpellScript { - PrepareSpellScript(spell_ozumat_purify); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -904,7 +890,7 @@ class spell_ozumat_purify : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ozumat_purify::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_ozumat_purify::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp index 101195b2b5..89b2303159 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp @@ -308,8 +308,6 @@ class InCombatCheck class spell_tott_trigger_murloc : public SpellScript { - PrepareSpellScript(spell_tott_trigger_murloc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TRIGGER_MURLOC_END }); @@ -331,7 +329,7 @@ class spell_tott_trigger_murloc : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_tott_trigger_murloc::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_tott_trigger_murloc::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -370,8 +368,6 @@ private: class spell_tott_camera: public SpellScript { - PrepareSpellScript(spell_tott_camera); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitPlayer()) @@ -380,7 +376,7 @@ class spell_tott_camera: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_tott_camera::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_tott_camera::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -391,8 +387,6 @@ enum ShockDefense class spell_tott_shock_defense_script : public SpellScript { - PrepareSpellScript(spell_tott_shock_defense_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHOCK_DEFENSE_DEST }); @@ -406,14 +400,12 @@ class spell_tott_shock_defense_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_tott_shock_defense_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_tott_shock_defense_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_tott_ulthok_intro_visual_impact: public SpellScript { - PrepareSpellScript(spell_tott_ulthok_intro_visual_impact); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -422,14 +414,12 @@ class spell_tott_ulthok_intro_visual_impact: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_tott_ulthok_intro_visual_impact::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_tott_ulthok_intro_visual_impact::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_tott_shock_defense : public SpellScript { - PrepareSpellScript(spell_tott_shock_defense); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -445,7 +435,7 @@ class spell_tott_shock_defense : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_tott_shock_defense::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_tott_shock_defense::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 6cb2ced121..5b75969bb3 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -548,8 +548,6 @@ struct npc_akilzon_amani_kidnapper : public PassiveAI class spell_akilzon_electrical_storm : public AuraScript { - PrepareAuraScript(spell_akilzon_electrical_storm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -581,15 +579,13 @@ class spell_akilzon_electrical_storm : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_akilzon_electrical_storm::AfterApply, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_akilzon_electrical_storm::AfterRemove, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_akilzon_electrical_storm::AfterApply, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_akilzon_electrical_storm::AfterRemove, EFFECT_0, SPELL_AURA_BLOCK_SPELL_FAMILY, AURA_EFFECT_HANDLE_REAL); } }; class spell_akilzon_electrical_storm_damage : public SpellScript { - PrepareSpellScript(spell_akilzon_electrical_storm_damage); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -603,15 +599,13 @@ class spell_akilzon_electrical_storm_damage : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_akilzon_electrical_storm_damage::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_akilzon_electrical_overloard_graphic_pulse : public SpellScript { - PrepareSpellScript(spell_akilzon_electrical_overloard_graphic_pulse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -632,14 +626,12 @@ class spell_akilzon_electrical_overloard_graphic_pulse : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_akilzon_electrical_overloard_graphic_pulse::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_akilzon_electrical_overloard_graphic_pulse::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_akilzon_teleport_self : public SpellScript { - PrepareSpellScript(spell_akilzon_teleport_self); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 10.0f, 0.0f }); @@ -647,14 +639,12 @@ class spell_akilzon_teleport_self : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_akilzon_teleport_self::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_akilzon_teleport_self::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; class spell_akilzon_grab_passenger : public SpellScript { - PrepareSpellScript(spell_akilzon_grab_passenger); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -663,14 +653,12 @@ class spell_akilzon_grab_passenger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_akilzon_grab_passenger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_akilzon_grab_passenger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_akilzon_summon_amani_kidnapper : public SpellScript { - PrepareSpellScript(spell_akilzon_summon_amani_kidnapper); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f }); @@ -678,7 +666,7 @@ class spell_akilzon_summon_amani_kidnapper : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_akilzon_summon_amani_kidnapper::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_akilzon_summon_amani_kidnapper::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp index 356c30407e..3224e31a05 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp @@ -483,8 +483,6 @@ class NonVictimTargetSelector class spell_mandokir_decapitate : public SpellScript { - PrepareSpellScript(spell_mandokir_decapitate); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -507,15 +505,13 @@ class spell_mandokir_decapitate : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_decapitate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mandokir_decapitate::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_mandokir_decapitate::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mandokir_decapitate::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_mandokir_bloodletting : public AuraScript { - PrepareAuraScript(spell_mandokir_bloodletting); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -540,14 +536,12 @@ class spell_mandokir_bloodletting : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mandokir_bloodletting::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_mandokir_bloodletting::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_mandokir_spirit_vengeance_cancel : public SpellScript { - PrepareSpellScript(spell_mandokir_spirit_vengeance_cancel); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -556,15 +550,13 @@ class spell_mandokir_spirit_vengeance_cancel : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mandokir_spirit_vengeance_cancel::HandleScript, EFFECT_1, SPELL_EFFECT_DUMMY); } }; class spell_mandokir_devastating_slam : public SpellScript { - PrepareSpellScript(spell_mandokir_devastating_slam); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -586,15 +578,13 @@ class spell_mandokir_devastating_slam : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_devastating_slam::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mandokir_devastating_slam::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_mandokir_devastating_slam::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mandokir_devastating_slam::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_mandokir_ohgan_orders : public SpellScript { - PrepareSpellScript(spell_mandokir_ohgan_orders); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -612,15 +602,13 @@ class spell_mandokir_ohgan_orders : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mandokir_ohgan_orders::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_mandokir_ohgan_orders::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_mandokir_ohgan_orders::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_mandokir_ohgan_orders::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_mandokir_ohgan_orders_trigger : public SpellScript { - PrepareSpellScript(spell_mandokir_ohgan_orders_trigger); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -637,14 +625,12 @@ class spell_mandokir_ohgan_orders_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mandokir_ohgan_orders_trigger::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mandokir_ohgan_orders_trigger::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_mandokir_reanimate_ohgan : public SpellScript { - PrepareSpellScript(spell_mandokir_reanimate_ohgan); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -657,14 +643,12 @@ class spell_mandokir_reanimate_ohgan : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mandokir_reanimate_ohgan::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mandokir_reanimate_ohgan::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_clear_all : public SpellScript { - PrepareSpellScript(spell_clear_all); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -673,7 +657,7 @@ class spell_clear_all : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_clear_all::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_clear_all::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp index fd040038fb..5787295711 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp @@ -429,8 +429,6 @@ private: class spell_venoxis_venomous_effusion : public SpellScript { - PrepareSpellScript(spell_venoxis_venomous_effusion); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -443,14 +441,12 @@ class spell_venoxis_venomous_effusion : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_venoxis_venomous_effusion::SetDest, EFFECT_1, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_venoxis_venomous_effusion::SetDest, EFFECT_1, TARGET_DEST_CASTER); } }; class spell_venoxis_whispers_of_hethiss : public AuraScript { - PrepareAuraScript(spell_venoxis_whispers_of_hethiss); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -461,14 +457,12 @@ class spell_venoxis_whispers_of_hethiss : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_venoxis_whispers_of_hethiss::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_venoxis_whispers_of_hethiss::HandleTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_venoxis_toxic_link_targeting : public SpellScript { - PrepareSpellScript(spell_venoxis_toxic_link_targeting); - void FilterTargets(std::list& targets) { if (targets.size() > 2) @@ -483,15 +477,13 @@ class spell_venoxis_toxic_link_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_toxic_link_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_venoxis_toxic_link_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_venoxis_toxic_link_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_venoxis_toxic_link_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_venoxis_toxic_link : public AuraScript { - PrepareAuraScript(spell_venoxis_toxic_link); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) @@ -500,14 +492,12 @@ class spell_venoxis_toxic_link : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_venoxis_toxic_link::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_venoxis_toxic_link::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_venoxis_toxic_link_ally : public SpellScript { - PrepareSpellScript(spell_venoxis_toxic_link_ally); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TOXIC_LINK_AURA }); @@ -530,14 +520,12 @@ class spell_venoxis_toxic_link_ally : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_toxic_link_ally::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_venoxis_toxic_link_ally::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_venoxis_pool_of_acrid_tears : public AuraScript { - PrepareAuraScript(spell_venoxis_pool_of_acrid_tears); - void HandlePeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -551,14 +539,12 @@ class spell_venoxis_pool_of_acrid_tears : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_venoxis_pool_of_acrid_tears::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_venoxis_pool_of_acrid_tears::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_venoxis_blood_venom_forcecast : public SpellScript { - PrepareSpellScript(spell_venoxis_blood_venom_forcecast); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -576,15 +562,13 @@ class spell_venoxis_blood_venom_forcecast : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_venoxis_blood_venom_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_venoxis_blood_venom_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_venoxis_blood_venom_forcecast::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_venoxis_blood_venom_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_venom_withdrawal : public SpellScript { - PrepareSpellScript(spell_venom_withdrawal); - void HandleKnockback(SpellEffIndex effIndex) { // Let's do our own knockback to make sure that we hit our sniffed position @@ -602,7 +586,7 @@ class spell_venom_withdrawal : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_venom_withdrawal::HandleKnockback, EFFECT_2, SPELL_EFFECT_LEAP_BACK); + OnEffectHitTarget.Register(&spell_venom_withdrawal::HandleKnockback, EFFECT_2, SPELL_EFFECT_LEAP_BACK); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp index e5a0cee0db..12ac12dded 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp @@ -348,8 +348,6 @@ private: class spell_kilnara_tears_of_blood : public AuraScript { - PrepareAuraScript(spell_kilnara_tears_of_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WAIL_OF_SORROW }); @@ -366,7 +364,7 @@ class spell_kilnara_tears_of_blood : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_kilnara_tears_of_blood::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_kilnara_tears_of_blood::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -385,8 +383,6 @@ class AttackerVictimCheck class spell_kilnara_wave_of_agony : public SpellScript { - PrepareSpellScript(spell_kilnara_wave_of_agony); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -408,15 +404,13 @@ class spell_kilnara_wave_of_agony : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kilnara_wave_of_agony::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kilnara_wave_of_agony::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_kilnara_wave_of_agony::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_kilnara_wave_of_agony::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_kilnara_wave_of_agony_dummy : public AuraScript { - PrepareAuraScript(spell_kilnara_wave_of_agony_dummy); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (Unit* caster = GetCaster()) @@ -431,14 +425,12 @@ class spell_kilnara_wave_of_agony_dummy : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_kilnara_wave_of_agony_dummy::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_kilnara_wave_of_agony_dummy::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_kilnara_primal_awakening : public AuraScript { - PrepareAuraScript(spell_kilnara_primal_awakening); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* creature = GetTarget()->ToCreature()) @@ -448,14 +440,12 @@ class spell_kilnara_primal_awakening : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_kilnara_primal_awakening::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_kilnara_primal_awakening::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; class spell_kilnara_gaping_wound : public SpellScript { - PrepareSpellScript(spell_kilnara_gaping_wound); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -471,7 +461,7 @@ class spell_kilnara_gaping_wound : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kilnara_gaping_wound::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_kilnara_gaping_wound::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp index 8483333e08..9be3f8737b 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -607,8 +607,6 @@ private: struct spell_jindo_shadow_spike : public SpellScript { - PrepareSpellScript(spell_jindo_shadow_spike); - void HandleDummyEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -617,14 +615,12 @@ struct spell_jindo_shadow_spike : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_jindo_shadow_spike::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_jindo_shadow_spike::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; struct spell_jindo_call_spirit : public SpellScript { - PrepareSpellScript(spell_jindo_call_spirit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SPIRIT }); @@ -637,14 +633,12 @@ struct spell_jindo_call_spirit : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_jindo_call_spirit::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_jindo_call_spirit::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; struct spell_jindo_spirit_warriors_gaze : public SpellScript { - PrepareSpellScript(spell_jindo_spirit_warriors_gaze); - void HandleDummyEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -653,14 +647,12 @@ struct spell_jindo_spirit_warriors_gaze : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_jindo_spirit_warriors_gaze::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_jindo_spirit_warriors_gaze::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; struct spell_jindo_body_slam : public SpellScript { - PrepareSpellScript(spell_jindo_body_slam); - void HandleShieldBreakEffect(SpellEffIndex /*effIndex*/) { Unit* target = GetHitCreature(); @@ -676,7 +668,7 @@ struct spell_jindo_body_slam : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_jindo_body_slam::HandleShieldBreakEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_jindo_body_slam::HandleShieldBreakEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index 5bc8a97731..20fa5115f0 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -480,8 +480,6 @@ private: class spell_zanzil_zanzili_fire : public AuraScript { - PrepareAuraScript(spell_zanzil_zanzili_fire); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (Creature* zanzil = GetTarget()->ToCreature()) @@ -491,14 +489,12 @@ class spell_zanzil_zanzili_fire : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_zanzil_zanzili_fire::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_zanzil_zanzili_fire::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_zanzil_zanzils_resurrection_elixir : public AuraScript { - PrepareAuraScript(spell_zanzil_zanzils_resurrection_elixir); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -523,7 +519,7 @@ class spell_zanzil_zanzils_resurrection_elixir : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_zanzil_zanzils_resurrection_elixir::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_zanzil_zanzils_resurrection_elixir::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -546,8 +542,6 @@ class UnusedGuidTargetSelector class spell_zanzil_zanzils_resurrection_elixir_red_script : public SpellScript { - PrepareSpellScript(spell_zanzil_zanzils_resurrection_elixir_red_script); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -595,16 +589,14 @@ class spell_zanzil_zanzils_resurrection_elixir_red_script : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectLaunchTarget += SpellEffectFn(spell_zanzil_zanzils_resurrection_elixir_red_script::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunchTarget.Register(&spell_zanzil_zanzils_resurrection_elixir_red_script::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_zanzil_zanzils_graveyard_gas : public SpellScript { - PrepareSpellScript(spell_zanzil_zanzils_graveyard_gas); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -652,16 +644,14 @@ class spell_zanzil_zanzils_graveyard_gas : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zanzil_zanzils_graveyard_gas::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_zanzil_zanzils_graveyard_gas::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectLaunchTarget += SpellEffectFn(spell_zanzil_zanzils_graveyard_gas::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_zanzil_zanzils_graveyard_gas::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_zanzil_zanzils_graveyard_gas::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunchTarget.Register(&spell_zanzil_zanzils_graveyard_gas::HandleGuidReservation, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_zanzil_frostburn_formula : public AuraScript { - PrepareAuraScript(spell_zanzil_frostburn_formula); - bool CheckProc(ProcEventInfo& eventInfo) { if (Unit* target = eventInfo.GetProcTarget()) @@ -673,7 +663,7 @@ class spell_zanzil_frostburn_formula : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_zanzil_frostburn_formula::CheckProc); + DoCheckProc.Register(&spell_zanzil_frostburn_formula::CheckProc); } }; diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp index 170602fb75..ba65866dc5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp @@ -226,8 +226,6 @@ private: class spell_zulgurub_rolling_boulders : public AuraScript { - PrepareAuraScript(spell_zulgurub_rolling_boulders); - void HandleTick(AuraEffect const* /*aurEff*/) { // Serverside spell. We just skip that part and do it directly via script @@ -239,7 +237,7 @@ class spell_zulgurub_rolling_boulders : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_zulgurub_rolling_boulders::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_zulgurub_rolling_boulders::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -475,8 +473,6 @@ enum SigilShatter class spell_zulgurub_sigil_shatter : public SpellScript { - PrepareSpellScript(spell_zulgurub_sigil_shatter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -519,9 +515,9 @@ class spell_zulgurub_sigil_shatter : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfFlameTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfFrostTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_zulgurub_sigil_shatter::FilterSigilOfDeathTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfFlameTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfFrostTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_zulgurub_sigil_shatter::FilterSigilOfDeathTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -532,8 +528,6 @@ enum AncientGuardian class spell_zulgurub_ancient_guardian : public AuraScript { - PrepareAuraScript(spell_zulgurub_ancient_guardian); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ANCIENT_GUARDIAN_HEAL }); @@ -558,8 +552,8 @@ class spell_zulgurub_ancient_guardian : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_zulgurub_ancient_guardian::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_zulgurub_ancient_guardian::Absorb, EFFECT_1); + DoEffectCalcAmount.Register(&spell_zulgurub_ancient_guardian::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_zulgurub_ancient_guardian::Absorb, EFFECT_1); } }; @@ -650,8 +644,6 @@ enum ToadExplode class spell_zulgurub_toad_explode : public SpellScript { - PrepareSpellScript(spell_zulgurub_toad_explode); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TOAD_EXPLODE }); @@ -664,7 +656,7 @@ class spell_zulgurub_toad_explode : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_zulgurub_toad_explode::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_zulgurub_toad_explode::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 66e48158ad..b011fc641c 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -44,8 +44,6 @@ class spell_razelikh_teleport_group : public SpellScriptLoader class spell_razelikh_teleport_group_SpellScript : public SpellScript { - PrepareSpellScript(spell_razelikh_teleport_group_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_SINGLE, SPELL_TELEPORT_SINGLE_IN_GROUP }); @@ -69,7 +67,7 @@ class spell_razelikh_teleport_group : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_razelikh_teleport_group_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_razelikh_teleport_group_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; 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 4dc7c6ddc1..5e8d3f85d2 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 @@ -373,8 +373,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); @@ -383,7 +381,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_a_trip_to_ironforge_quest_complete_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_a_trip_to_ironforge_quest_complete_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -405,8 +403,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); @@ -415,7 +411,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_follow_that_gyrocopter_quest_start_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_follow_that_gyrocopter_quest_start_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); } }; @@ -437,8 +433,6 @@ public: class spell_low_health_SpellScript : public SpellScript { - PrepareSpellScript(spell_low_health_SpellScript); - void HandleDummyEffect(SpellEffIndex /*eff*/) { if (Creature* target = GetHitCreature()) @@ -450,7 +444,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_low_health_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_low_health_SpellScript::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp index e303122101..4776cbb604 100644 --- a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp @@ -1164,8 +1164,6 @@ struct npc_brazie_vehicle_notifier : public ScriptedAI class spell_brazie_summon_plant : public SpellScript { - PrepareSpellScript(spell_brazie_summon_plant); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1210,16 +1208,14 @@ class spell_brazie_summon_plant : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_brazie_summon_plant::CheckLocation); - OnEffectHitTarget += SpellEffectFn(spell_brazie_summon_plant::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); - OnEffectHit += SpellEffectFn(spell_brazie_summon_plant::PreventEffect, EFFECT_0, SPELL_EFFECT_TRANS_DOOR); + OnCheckCast.Register(&spell_brazie_summon_plant::CheckLocation); + OnEffectHitTarget.Register(&spell_brazie_summon_plant::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_brazie_summon_plant::PreventEffect, EFFECT_0, SPELL_EFFECT_TRANS_DOOR); } }; class spell_brazie_highlight : public SpellScript { - PrepareSpellScript(spell_brazie_highlight); - void SetDest(SpellDestination& dest) { dest.Relocate(EmptySpotPositions[0]); @@ -1227,14 +1223,12 @@ class spell_brazie_highlight : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_highlight::SetDest, EFFECT_1, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_brazie_highlight::SetDest, EFFECT_1, TARGET_DEST_NEARBY_ENTRY); } }; class spell_brazie_create_random_seed_sack : public SpellScript { - PrepareSpellScript(spell_brazie_create_random_seed_sack); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CREATE_RANDOM_FREEZYA_SACK }); @@ -1248,14 +1242,12 @@ class spell_brazie_create_random_seed_sack : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_brazie_create_random_seed_sack::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_brazie_create_random_seed_sack::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_brazie_spit : public SpellScript { - PrepareSpellScript(spell_brazie_spit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1295,7 +1287,7 @@ class spell_brazie_spit : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104); + OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104); } }; diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp index dec7fcd921..acfd607f90 100644 --- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp @@ -99,8 +99,6 @@ public: class spell_siege_cannon_SpellScript : public SpellScript { - PrepareSpellScript(spell_siege_cannon_SpellScript); - void SelectRandomTarget(std::list& targets) { if (targets.empty()) @@ -113,7 +111,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siege_cannon_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_siege_cannon_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 123b539795..606849d308 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -28,8 +28,6 @@ class spell_westfall_unbound_energy : public SpellScript { - PrepareSpellScript(spell_westfall_unbound_energy); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -47,7 +45,7 @@ class spell_westfall_unbound_energy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_westfall_unbound_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_westfall_unbound_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -112,8 +110,6 @@ private: class spell_westfall_reaping_blows : public AuraScript { - PrepareAuraScript(spell_westfall_reaping_blows); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -123,14 +119,12 @@ class spell_westfall_reaping_blows : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_westfall_reaping_blows::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_westfall_reaping_blows::HandlePeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_westfall_wake_harvest_golem : public SpellScript { - PrepareSpellScript(spell_westfall_wake_harvest_golem); - SpellCastResult CheckTarget() { Unit* target = GetExplTargetUnit(); @@ -155,16 +149,13 @@ class spell_westfall_wake_harvest_golem : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_westfall_wake_harvest_golem::CheckTarget); - OnEffectHitTarget += SpellEffectFn(spell_westfall_wake_harvest_golem::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnCheckCast.Register(&spell_westfall_wake_harvest_golem::CheckTarget); + OnEffectHitTarget.Register(&spell_westfall_wake_harvest_golem::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_westfall_quest_credit_jangolode_event : public SpellScript { - PrepareSpellScript(spell_westfall_quest_credit_jangolode_event); - - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->ExitVehicle(); @@ -172,7 +163,7 @@ class spell_westfall_quest_credit_jangolode_event : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_westfall_quest_credit_jangolode_event::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_westfall_quest_credit_jangolode_event::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -489,8 +480,6 @@ private: class spell_westfall_summon_ragamuffin_looter : public SpellScript { - PrepareSpellScript(spell_westfall_summon_ragamuffin_looter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -513,14 +502,12 @@ class spell_westfall_summon_ragamuffin_looter : public SpellScript void Register() override { - OnEffectLaunch += SpellEffectFn(spell_westfall_summon_ragamuffin_looter::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_westfall_summon_ragamuffin_looter::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_westfall_aggro_hobo : public SpellScript { - PrepareSpellScript(spell_westfall_aggro_hobo); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitCreature()) @@ -530,7 +517,7 @@ class spell_westfall_aggro_hobo : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_westfall_aggro_hobo::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_westfall_aggro_hobo::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp index 2b3f62132d..985b93f5cb 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_anetheron.cpp @@ -268,8 +268,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 }); @@ -288,7 +286,7 @@ class spell_anetheron_vampiric_aura : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_anetheron_vampiric_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_anetheron_vampiric_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp index 47116792b0..5b059b8020 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_archimonde.cpp @@ -544,8 +544,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 }); @@ -559,7 +557,7 @@ class spell_archimonde_drain_world_tree_dummy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_archimonde_drain_world_tree_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_archimonde_drain_world_tree_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp index 50abfe0be5..7fe4fc9f49 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/boss_kazrogal.cpp @@ -187,8 +187,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& targets) { targets.remove_if(MarkTargetFilter()); @@ -196,14 +194,12 @@ class spell_mark_of_kazrogal : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_mark_of_kazrogal_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; 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 }); @@ -223,7 +219,7 @@ class spell_mark_of_kazrogal : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + OnEffectPeriodic.Register(&spell_mark_of_kazrogal_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; 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 bbb4a92502..31ad9e0bee 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 @@ -141,8 +141,6 @@ class boss_salramm : public CreatureScript 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); @@ -151,7 +149,7 @@ class spell_salramm_steal_flesh : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_salramm_steal_flesh::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_salramm_steal_flesh::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 2550295681..5372e38fd6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1668,8 +1668,6 @@ struct npc_stratholme_rp_dummy : NullCreatureAI class spell_stratholme_crusader_strike : public SpellScript { - PrepareSpellScript(spell_stratholme_crusader_strike); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -1679,7 +1677,7 @@ class spell_stratholme_crusader_strike : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_stratholme_crusader_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_stratholme_crusader_strike::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp index b640619110..ffdb924fc0 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DragonSoul/boss_madness_of_deathwing.cpp @@ -1654,8 +1654,6 @@ private: class spell_madness_of_deathwing_presence_of_the_aspects : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_presence_of_the_aspects); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1676,14 +1674,12 @@ class spell_madness_of_deathwing_presence_of_the_aspects : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_presence_of_the_aspects::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_presence_of_the_aspects::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_madness_of_deathwing_carrying_winds_jump : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_carrying_winds_jump); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue()); @@ -1691,14 +1687,12 @@ class spell_madness_of_deathwing_carrying_winds_jump : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_carrying_winds_jump::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_carrying_winds_jump::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_carrying_winds_triggered : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_carrying_winds_triggered); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue()); @@ -1706,14 +1700,12 @@ class spell_madness_of_deathwing_carrying_winds_triggered : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_carrying_winds_triggered::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_carrying_winds_triggered::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_limb_emerge_visual : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_limb_emerge_visual); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { uint32 visualKitId = RAND(SPELL_VISUAL_KIT_LIMB_EMERGE_1, SPELL_VISUAL_KIT_LIMB_EMERGE_2, SPELL_VISUAL_KIT_LIMB_EMERGE_3); @@ -1722,14 +1714,12 @@ class spell_madness_of_deathwing_limb_emerge_visual : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_limb_emerge_visual::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_limb_emerge_visual::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_madness_of_deathwing_agonizing_pain : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_agonizing_pain); - void HandleDamage(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -1742,14 +1732,12 @@ class spell_madness_of_deathwing_agonizing_pain : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_agonizing_pain::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_agonizing_pain::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_madness_of_deathwing_assault_aspects : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_assault_aspects); - void CountPlayers(std::list& targets) { std::array playersOnPlatform = { }; @@ -1792,15 +1780,13 @@ class spell_madness_of_deathwing_assault_aspects : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_assault_aspects::CountPlayers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - AfterCast += SpellCastFn(spell_madness_of_deathwing_assault_aspects::NotifyDeathwing); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_assault_aspects::CountPlayers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast.Register(&spell_madness_of_deathwing_assault_aspects::NotifyDeathwing); } }; class spell_madness_of_deathwing_face_trigger : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_face_trigger); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->CastSpell(GetHitUnit(), GetEffectValue()); @@ -1808,14 +1794,12 @@ class spell_madness_of_deathwing_face_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_face_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_face_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_summon_tail : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_summon_tail); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1844,14 +1828,12 @@ class spell_madness_of_deathwing_summon_tail : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_summon_tail::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_summon_tail::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_madness_of_deathwing_crush : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_crush); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1879,14 +1861,12 @@ class spell_madness_of_deathwing_crush : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_crush::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_crush::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_madness_of_deathwing_hemorrhage : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_hemorrhage); - void SetDest(SpellDestination& dest) { if (Creature* caster = GetCaster()->ToCreature()) @@ -1897,14 +1877,12 @@ class spell_madness_of_deathwing_hemorrhage : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_madness_of_deathwing_hemorrhage::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_madness_of_deathwing_hemorrhage::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_madness_of_deathwing_hemorrhage_script : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_hemorrhage_script); - void SetTarget(WorldObject*& target) { InstanceScript* instance = GetCaster()->GetInstanceScript(); @@ -1924,15 +1902,13 @@ class spell_madness_of_deathwing_hemorrhage_script : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_madness_of_deathwing_hemorrhage_script::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_hemorrhage_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectTargetSelect.Register(&spell_madness_of_deathwing_hemorrhage_script::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_hemorrhage_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_regenerative_blood_periodic : public AuraScript { - PrepareAuraScript(spell_madness_of_deathwing_regenerative_blood_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1962,7 +1938,7 @@ class spell_madness_of_deathwing_regenerative_blood_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_regenerative_blood_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_madness_of_deathwing_regenerative_blood_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: int32 _basePoints = 0; @@ -1970,8 +1946,6 @@ private: class spell_madness_of_deathwing_regenerative_blood_script : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_regenerative_blood_script); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->SetPower(POWER_ENERGY, GetEffectValue()); @@ -1979,14 +1953,12 @@ class spell_madness_of_deathwing_regenerative_blood_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_regenerative_blood_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_regenerative_blood_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_elementium_meteor_script: public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_elementium_meteor_script); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -1999,14 +1971,12 @@ class spell_madness_of_deathwing_elementium_meteor_script: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_elementium_meteor_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_elementium_meteor_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_elementium_meteor_visual : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_elementium_meteor_visual); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2032,14 +2002,12 @@ class spell_madness_of_deathwing_elementium_meteor_visual : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_elementium_meteor_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_elementium_meteor_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_madness_of_deathwing_burning_blood : public AuraScript { - PrepareAuraScript(spell_madness_of_deathwing_burning_blood); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -2057,14 +2025,12 @@ class spell_madness_of_deathwing_burning_blood : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_madness_of_deathwing_burning_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_madness_of_deathwing_spawn_blistering_tentacles : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_spawn_blistering_tentacles); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -2076,14 +2042,12 @@ class spell_madness_of_deathwing_spawn_blistering_tentacles : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_spawn_blistering_tentacles::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_spawn_blistering_tentacles::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_time_zone : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_time_zone); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2109,14 +2073,12 @@ class spell_madness_of_deathwing_time_zone : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_time_zone::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_time_zone::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_madness_of_deathwing_trigger_concentration : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_trigger_concentration); - bool Load() override { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -2162,7 +2124,7 @@ class spell_madness_of_deathwing_trigger_concentration : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_concentration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_concentration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } private: ObjectGuid _aspectGUID; @@ -2170,8 +2132,6 @@ private: class spell_madness_of_deathwing_concentration : public AuraScript { - PrepareAuraScript(spell_madness_of_deathwing_concentration); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -2191,15 +2151,13 @@ class spell_madness_of_deathwing_concentration : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_madness_of_deathwing_concentration::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_madness_of_deathwing_concentration::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_madness_of_deathwing_concentration::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_madness_of_deathwing_concentration::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_madness_of_deathwing_trigger_aspect_buffs : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_trigger_aspect_buffs); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2245,14 +2203,12 @@ class spell_madness_of_deathwing_trigger_aspect_buffs : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_aspect_buffs::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_aspect_buffs::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_share_health : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_share_health); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHARE_HEALTH_2 }); @@ -2265,14 +2221,12 @@ class spell_madness_of_deathwing_share_health : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_share_health::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_share_health::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_summon_elementium_terror : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_summon_elementium_terror); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { for (uint8 i = 0; i < 2; ++i) @@ -2281,14 +2235,12 @@ class spell_madness_of_deathwing_summon_elementium_terror : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_summon_elementium_terror::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_summon_elementium_terror::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_summon_impaling_tentacle : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_summon_impaling_tentacle); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -2299,14 +2251,12 @@ class spell_madness_of_deathwing_summon_impaling_tentacle : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_summon_impaling_tentacle::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_summon_impaling_tentacle::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_shrapnel : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_shrapnel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHRAPNEL }); @@ -2348,9 +2298,9 @@ class spell_madness_of_deathwing_shrapnel : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_shrapnel::FilterFragments, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_shrapnel::FilterPlayers, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - AfterCast += SpellCastFn(spell_madness_of_deathwing_shrapnel::HandleShrapnels); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_shrapnel::FilterFragments, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_shrapnel::FilterPlayers, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast.Register(&spell_madness_of_deathwing_shrapnel::HandleShrapnels); } private: GuidVector _targetGUIDs; @@ -2359,8 +2309,6 @@ private: class spell_madness_of_deathwing_fire_dragon_soul: public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_fire_dragon_soul); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Creature* deathwing = GetHitCreature()) @@ -2370,14 +2318,12 @@ class spell_madness_of_deathwing_fire_dragon_soul: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_fire_dragon_soul::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_fire_dragon_soul::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_fire_dragon_soul_aspects : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_fire_dragon_soul_aspects); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2431,14 +2377,12 @@ class spell_madness_of_deathwing_fire_dragon_soul_aspects : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_fire_dragon_soul_aspects::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_fire_dragon_soul_aspects::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_trigger_aspect_yell : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_trigger_aspect_yell); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -2459,15 +2403,13 @@ class spell_madness_of_deathwing_trigger_aspect_yell : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_trigger_aspect_yell::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_trigger_aspect_yell::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_trigger_aspect_yell::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_trigger_aspect_yell::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_madness_of_deathwing_corrupted_blood_stacker : public AuraScript { - PrepareAuraScript(spell_madness_of_deathwing_corrupted_blood_stacker); - void HandlePeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); @@ -2494,7 +2436,7 @@ class spell_madness_of_deathwing_corrupted_blood_stacker : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_corrupted_blood_stacker::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_madness_of_deathwing_corrupted_blood_stacker::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: uint8 _hemorrHageSteps = 0; @@ -2502,8 +2444,6 @@ private: class spell_madness_of_deathwing_corrupted_blood: public AuraScript { - PrepareAuraScript(spell_madness_of_deathwing_corrupted_blood); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { if (AuraEffect* bonusEffect = GetEffect(EFFECT_1)) @@ -2516,14 +2456,12 @@ class spell_madness_of_deathwing_corrupted_blood: public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_madness_of_deathwing_corrupted_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_madness_of_deathwing_corrupted_blood::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_madness_of_deathwing_spellweave : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_spellweave); - void FilterFragments(std::list& targets) { targets.remove_if([this](WorldObject const* target)->bool @@ -2534,14 +2472,12 @@ class spell_madness_of_deathwing_spellweave : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_madness_of_deathwing_spellweave::FilterFragments, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_madness_of_deathwing_spellweave::FilterFragments, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); } }; class spell_madness_of_deathwing_elementium_blast : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_elementium_blast); - void HandleDamage(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -2561,14 +2497,12 @@ class spell_madness_of_deathwing_elementium_blast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_madness_of_deathwing_elementium_blast::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_madness_of_deathwing_elementium_blast::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_madness_of_deathwing_cataclysm : public SpellScript { - PrepareSpellScript(spell_madness_of_deathwing_cataclysm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CATACLYSM_VISUAL }); @@ -2581,7 +2515,7 @@ class spell_madness_of_deathwing_cataclysm : public SpellScript void Register() override { - AfterCast += SpellCastFn(spell_madness_of_deathwing_cataclysm::HandleVisual); + AfterCast.Register(&spell_madness_of_deathwing_cataclysm::HandleVisual); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp index d5566757c0..1e89bb3c66 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EndTime/boss_murozond.cpp @@ -468,8 +468,6 @@ private: // 101590 - Rewind Time class spell_murozond_rewind_time_forcecast : public SpellScript { - PrepareSpellScript(spell_murozond_rewind_time_forcecast); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -480,15 +478,13 @@ class spell_murozond_rewind_time_forcecast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_murozond_rewind_time_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_murozond_rewind_time_forcecast::HandleSummon, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; // 108026 - (Serverside/Non-DB2) Rewind Time class spell_murozond_rewind_time : public SpellScript { - PrepareSpellScript(spell_murozond_rewind_time); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Creature* target = GetHitCreature(); @@ -501,15 +497,13 @@ class spell_murozond_rewind_time : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_murozond_rewind_time::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_murozond_rewind_time::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 102571 - Clone Master Health class spell_murozond_clone_master_health : public SpellScript { - PrepareSpellScript(spell_murozond_clone_master_health); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -526,7 +520,7 @@ class spell_murozond_clone_master_health : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_murozond_clone_master_health::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_murozond_clone_master_health::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp index 33756ce966..be0801f03f 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp @@ -501,8 +501,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)) @@ -520,7 +518,7 @@ class spell_alysrazor_cosmetic_egg_xplosion : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_alysrazor_cosmetic_egg_xplosion_SpellScript::HandleExplosion, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -537,8 +535,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({ SPELL_GENERIC_DUMMY_CAST, SPELL_KNOCKBACK_RIGHT, SPELL_KNOCKBACK_LEFT, SPELL_KNOCKBACK_FORWARD, SPELL_KNOCKBACK_BACK }); @@ -598,8 +594,8 @@ class spell_alysrazor_turn_monstrosity : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alysrazor_turn_monstrosity_SpellScript::KnockBarrage, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alysrazor_turn_monstrosity_SpellScript::TurnBird, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -616,8 +612,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; @@ -638,8 +632,8 @@ class spell_alysrazor_aggro_closest : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); - AfterCast += SpellCastFn(spell_alysrazor_aggro_closest_SpellScript::UpdateThreat); + OnEffectHitTarget.Register(&spell_alysrazor_aggro_closest_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + AfterCast.Register(&spell_alysrazor_aggro_closest_SpellScript::UpdateThreat); } }; @@ -656,8 +650,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 }); @@ -670,7 +662,7 @@ class spell_alysrazor_fieroblast : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_alysrazor_fieroblast_SpellScript::FireItUp); + AfterCast.Register(&spell_alysrazor_fieroblast_SpellScript::FireItUp); } }; diff --git a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp index 4f393481ce..7c605693c0 100644 --- a/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp +++ b/src/server/scripts/Kalimdor/Firelands/boss_baleroc.cpp @@ -407,8 +407,6 @@ class spell_countdown_p1 : public SpellScriptLoader class spell_countdown_p1_SpellScript : public SpellScript { - PrepareSpellScript(spell_countdown_p1_SpellScript); - bool Load() override { target1 = nullptr; @@ -447,9 +445,9 @@ class spell_countdown_p1 : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_countdown_p1_SpellScript::CastSpellLink); - OnEffectHitTarget += SpellEffectFn(spell_countdown_p1_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_countdown_p1_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast.Register(&spell_countdown_p1_SpellScript::CastSpellLink); + OnEffectHitTarget.Register(&spell_countdown_p1_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_countdown_p1_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } WorldObject* target1; @@ -469,8 +467,6 @@ class spell_countdown_p2 : public SpellScriptLoader class spell_countdown_p2_AuraScript : public AuraScript { - PrepareAuraScript(spell_countdown_p2_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired)) @@ -480,7 +476,7 @@ class spell_countdown_p2 : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_countdown_p2_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_countdown_p2_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -497,8 +493,6 @@ class spell_countdown_p3 : public SpellScriptLoader class spell_countdown_p3_SpellScript : public SpellScript { - PrepareSpellScript(spell_countdown_p3_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -524,7 +518,7 @@ class spell_countdown_p3 : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_countdown_p3_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_countdown_p3_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -541,8 +535,6 @@ class spell_decimating_strike : public SpellScriptLoader class spell_decimating_strike_SpellScript : public SpellScript { - PrepareSpellScript(spell_decimating_strike_SpellScript); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_UNIT) @@ -571,7 +563,7 @@ class spell_decimating_strike : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_decimating_strike_SpellScript::ChangeDamage); + OnHit.Register(&spell_decimating_strike_SpellScript::ChangeDamage); } }; @@ -588,8 +580,6 @@ class spell_shards_of_torment : public SpellScriptLoader class spell_shards_of_torment_SpellScript : public SpellScript { - PrepareSpellScript(spell_shards_of_torment_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -621,8 +611,8 @@ class spell_shards_of_torment : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_shards_of_torment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_shards_of_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_shards_of_torment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_shards_of_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -653,8 +643,6 @@ class spell_baleroc_torment : public SpellScriptLoader class spell_baleroc_torment_SpellScript : public SpellScript { - PrepareSpellScript(spell_baleroc_torment_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -692,7 +680,7 @@ class spell_baleroc_torment : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_baleroc_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_baleroc_torment_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -709,8 +697,6 @@ class spell_baleroc_tormented : public SpellScriptLoader class spell_baleroc_tormented_SpellScript : public SpellScript { - PrepareSpellScript(spell_baleroc_tormented_SpellScript); - void ChangeDamage() { //SetHitDamage(GetHitDamage()*GetHitUnit()->GetAuraCount(m_scriptSpellId)); @@ -731,15 +717,13 @@ class spell_baleroc_tormented : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_baleroc_tormented_SpellScript::ChangeDamage); + OnHit.Register(&spell_baleroc_tormented_SpellScript::ChangeDamage); } }; class spell_baleroc_tormented_AuraScript : public AuraScript { - PrepareAuraScript(spell_baleroc_tormented_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByDeath)) @@ -753,7 +737,7 @@ class spell_baleroc_tormented : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_baleroc_tormented_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_baleroc_tormented_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -775,8 +759,6 @@ class spell_baleroc_tormented_debuff : public SpellScriptLoader class spell_baleroc_tormented_debuff_AuraScript : public AuraScript { - PrepareAuraScript(spell_baleroc_tormented_debuff_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetTarget()->GetInstanceScript()) @@ -786,7 +768,7 @@ class spell_baleroc_tormented_debuff : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_baleroc_tormented_debuff_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_baleroc_tormented_debuff_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; @@ -803,8 +785,6 @@ class spell_baleroc_tormented_heroic : public SpellScriptLoader class spell_baleroc_tormented_heroic_SpellScript : public SpellScript { - PrepareSpellScript(spell_baleroc_tormented_heroic_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -819,7 +799,7 @@ class spell_baleroc_tormented_heroic : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_baleroc_tormented_heroic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_baleroc_tormented_heroic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp index 0b07dd123d..c0853365a8 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp @@ -440,8 +440,6 @@ private: class spell_ammunae_consume_life_energy : public SpellScript { - PrepareSpellScript(spell_ammunae_consume_life_energy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -502,15 +500,13 @@ class spell_ammunae_consume_life_energy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ammunae_consume_life_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_ammunae_consume_life_energy::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_ammunae_consume_life_energy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_ammunae_consume_life_energy::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_ammunae_summon_bloodpetal_blossom : public SpellScript { - PrepareSpellScript(spell_ammunae_summon_bloodpetal_blossom); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -527,15 +523,13 @@ class spell_ammunae_summon_bloodpetal_blossom : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ammunae_summon_bloodpetal_blossom::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_ammunae_summon_bloodpetal_blossom::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_ammunae_summon_bloodpetal_blossom::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHitTarget.Register(&spell_ammunae_summon_bloodpetal_blossom::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_ammunae_rampant_growth : public SpellScript { - PrepareSpellScript(spell_ammunae_rampant_growth); - void HandleDespawn(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -544,14 +538,12 @@ class spell_ammunae_rampant_growth : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ammunae_rampant_growth::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_ammunae_rampant_growth::HandleDespawn, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_ammunae_fixate : public SpellScript { - PrepareSpellScript(spell_ammunae_fixate); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -560,7 +552,7 @@ class spell_ammunae_fixate : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ammunae_fixate::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ammunae_fixate::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index afee9153ea..652cba5c6d 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -520,8 +520,6 @@ class PlayerCheck // 77437 - Destruction Protocol class spell_anraphet_destruction_protocol : public SpellScript { - PrepareSpellScript(spell_anraphet_destruction_protocol); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -547,16 +545,14 @@ class spell_anraphet_destruction_protocol : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anraphet_destruction_protocol::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_anraphet_destruction_protocol::HandlePlayerDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_anraphet_destruction_protocol::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_anraphet_destruction_protocol::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_anraphet_destruction_protocol::HandlePlayerDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_anraphet_destruction_protocol::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; class spell_anraphet_alpha_beams : public SpellScript { - PrepareSpellScript(spell_anraphet_alpha_beams); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -567,14 +563,12 @@ class spell_anraphet_alpha_beams : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anraphet_alpha_beams::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_anraphet_alpha_beams::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_anraphet_omega_stance : public AuraScript { - PrepareAuraScript(spell_anraphet_omega_stance); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->CastSpell(GetTarget(), SPELL_OMEGA_STANCE_SUMMON, true); @@ -588,16 +582,14 @@ class spell_anraphet_omega_stance : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_anraphet_omega_stance::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_anraphet_omega_stance::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_anraphet_omega_stance::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_anraphet_omega_stance::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; // 77106 - Omega Stance (Summon) class spell_anraphet_omega_stance_summon : public SpellScript { - PrepareSpellScript(spell_anraphet_omega_stance_summon); - void SetDestPosition(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -613,15 +605,13 @@ class spell_anraphet_omega_stance_summon : public SpellScript void Register() { - OnEffectLaunch += SpellEffectFn(spell_anraphet_omega_stance_summon::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectLaunch.Register(&spell_anraphet_omega_stance_summon::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); } }; // 77127 Omega Stance Spider Effect class spell_anraphet_omega_stance_spider_effect : public SpellScript { - PrepareSpellScript(spell_anraphet_omega_stance_spider_effect); - void SetDestPosition(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -638,7 +628,7 @@ class spell_anraphet_omega_stance_spider_effect : public SpellScript void Register() { - OnEffectLaunch += SpellEffectFn(spell_anraphet_omega_stance_spider_effect::SetDestPosition, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_anraphet_omega_stance_spider_effect::SetDestPosition, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index c1982449e2..dd5e5d3ae8 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -301,8 +301,6 @@ private: class spell_earthrager_ptah_flame_bolt : public SpellScript { - PrepareSpellScript(spell_earthrager_ptah_flame_bolt); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -316,14 +314,12 @@ class spell_earthrager_ptah_flame_bolt : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_flame_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_earthrager_ptah_flame_bolt::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_earthrager_ptah_sandstorm : public SpellScript { - PrepareSpellScript(spell_earthrager_ptah_sandstorm); - void PlaySoundID(SpellEffIndex /*effIndex*/) { if (Player* player = GetHitUnit()->ToPlayer()) @@ -332,14 +328,12 @@ class spell_earthrager_ptah_sandstorm : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_earthrager_ptah_sandstorm::PlaySoundID, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_earthrager_ptah_sandstorm::PlaySoundID, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_earthrager_ptah_explosion : public AuraScript { - PrepareAuraScript(spell_earthrager_ptah_explosion); - void SetFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -349,7 +343,6 @@ class spell_earthrager_ptah_explosion : public AuraScript void RemoveFlags(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - Unit* target = GetTarget(); target->RemoveFlag(UNIT_FIELD_FLAGS, uint32(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_UNK_29 | UNIT_FLAG_UNK_31)); target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH); @@ -357,15 +350,13 @@ class spell_earthrager_ptah_explosion : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_earthrager_ptah_explosion::SetFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_earthrager_ptah_explosion::RemoveFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_earthrager_ptah_explosion::SetFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_earthrager_ptah_explosion::RemoveFlags, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_earthrager_ptah_consume : public SpellScript { - PrepareSpellScript(spell_earthrager_ptah_consume); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -393,7 +384,7 @@ class spell_earthrager_ptah_consume : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_earthrager_ptah_consume::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_earthrager_ptah_consume::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp index e64e541af6..414af2e1dc 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp @@ -482,8 +482,6 @@ public: class spell_isiset_astral_rain_controller_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_astral_rain_controller_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -510,7 +508,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_astral_rain_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_isiset_astral_rain_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -528,8 +526,6 @@ public: class spell_isiset_mana_shield_controller_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_mana_shield_controller_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -556,7 +552,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_mana_shield_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_isiset_mana_shield_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -574,8 +570,6 @@ public: class spell_isiset_astral_familiar_controller_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_astral_familiar_controller_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ @@ -602,7 +596,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_astral_familiar_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_isiset_astral_familiar_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -620,8 +614,6 @@ public: class spell_isiset_veil_of_sky_AuraScript : public AuraScript { - PrepareAuraScript(spell_isiset_veil_of_sky_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VEIL_OF_SKY_DAMAGE }); @@ -644,7 +636,7 @@ public: void Register() override { - AfterEffectManaShield += AuraEffectManaShieldFn(spell_isiset_veil_of_sky_AuraScript::Trigger, EFFECT_0); + AfterEffectManaShield.Register(&spell_isiset_veil_of_sky_AuraScript::Trigger, EFFECT_0); } private: @@ -666,8 +658,6 @@ public: class spell_isiset_supernova_filter_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_supernova_filter_SpellScript); - void FilterTargets(std::list& targets) { Unit* caster = GetCaster(); @@ -676,7 +666,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_isiset_supernova_filter_SpellScript::FilterTargets, m_scriptSpellId == SPELL_SUPERNOVA_EFFECT ? EFFECT_1 : EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_isiset_supernova_filter_SpellScript::FilterTargets, m_scriptSpellId == SPELL_SUPERNOVA_EFFECT ? EFFECT_1 : EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -694,8 +684,6 @@ public: class spell_isiset_mirror_image_starry_sky_spawner_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_mirror_image_starry_sky_spawner_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_STARRY_SKY_N, SPELL_MIRROR_IMAGE_STARRY_SKY_E, SPELL_MIRROR_IMAGE_STARRY_SKY_W }); @@ -717,7 +705,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_mirror_image_starry_sky_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_isiset_mirror_image_starry_sky_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -735,8 +723,6 @@ public: class spell_isiset_mirror_image_spawner_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_mirror_image_spawner_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRROR_IMAGE_N, SPELL_MIRROR_IMAGE_E, SPELL_MIRROR_IMAGE_W }); @@ -758,7 +744,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_mirror_image_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_isiset_mirror_image_spawner_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -777,8 +763,6 @@ public: class spell_isiset_image_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_image_explosion_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { InstanceScript* const instance = GetCaster()->GetInstanceScript(); @@ -804,7 +788,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_image_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_isiset_image_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -822,8 +806,6 @@ public: class spell_isiset_call_of_sky_SpellScript : public SpellScript { - PrepareSpellScript(spell_isiset_call_of_sky_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -833,7 +815,7 @@ public: void Register() override { - OnEffectLaunch += SpellEffectFn(spell_isiset_call_of_sky_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_isiset_call_of_sky_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp index d061ef0409..d701a9fdc3 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp @@ -382,8 +382,6 @@ private: class spell_rajh_summon_meteor : public SpellScript { - PrepareSpellScript(spell_rajh_summon_meteor); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, 1); @@ -391,14 +389,12 @@ class spell_rajh_summon_meteor : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rajh_summon_meteor::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_rajh_summon_meteor::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_rajh_summon_sun_orb : public SpellScript { - PrepareSpellScript(spell_rajh_summon_sun_orb); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 15.0f, 0.0f }); @@ -406,14 +402,12 @@ class spell_rajh_summon_sun_orb : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_rajh_summon_sun_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT_RIGHT); + OnDestinationTargetSelect.Register(&spell_rajh_summon_sun_orb::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT_RIGHT); } }; class spell_rajh_summon_sun_orb_power_cost : public AuraScript { - PrepareAuraScript(spell_rajh_summon_sun_orb_power_cost); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -422,7 +416,7 @@ class spell_rajh_summon_sun_orb_power_cost : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rajh_summon_sun_orb_power_cost::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_rajh_summon_sun_orb_power_cost::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp index fcc1fb7d33..7e3513997b 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp @@ -499,8 +499,6 @@ public: class spell_setesh_chaos_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_setesh_chaos_blast_SpellScript); - void FilterTargets(std::list& unitList) { if (unitList.empty()) @@ -513,7 +511,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_setesh_chaos_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_setesh_chaos_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; 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 e0772501b0..add2ad1bb2 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -336,8 +336,6 @@ struct go_anhuur_beacon_of_light : public GameObjectAI // 75592 - Divine Reckoning class spell_anhuur_divine_reckoning : public AuraScript { - PrepareAuraScript(spell_anhuur_divine_reckoning); - void OnPeriodic(AuraEffect const* aurEff) { if (Unit* caster = GetCaster()) @@ -353,7 +351,7 @@ class spell_anhuur_divine_reckoning : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_anhuur_divine_reckoning::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_anhuur_divine_reckoning::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -361,8 +359,6 @@ class spell_anhuur_divine_reckoning : public AuraScript // 76573 - Shield of Light (right) class spell_anhuur_shield_of_light : public SpellScript { - PrepareSpellScript(spell_anhuur_shield_of_light); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -377,15 +373,13 @@ class spell_anhuur_shield_of_light : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_anhuur_shield_of_light::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; // 75322 - Reverberating Hymn class spell_anhuur_reverberating_hymn : public AuraScript { - PrepareAuraScript(spell_anhuur_reverberating_hymn); - void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired)) @@ -396,7 +390,7 @@ class spell_anhuur_reverberating_hymn : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_anhuur_reverberating_hymn::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_anhuur_reverberating_hymn::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -404,8 +398,6 @@ class spell_anhuur_reverberating_hymn : public AuraScript // 76608 - Disable Beacon Beams R class spell_anhuur_disable_beacon_beams : public SpellScript { - PrepareSpellScript(spell_anhuur_disable_beacon_beams); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->InterruptNonMeleeSpells(true, GetEffectValue()); @@ -420,15 +412,13 @@ class spell_anhuur_disable_beacon_beams : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_anhuur_disable_beacon_beams::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_anhuur_disable_beacon_beams::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit.Register(&spell_anhuur_disable_beacon_beams::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_anhuur_burning_light_forcecast : public SpellScript { - PrepareSpellScript(spell_anhuur_burning_light_forcecast); - void FilterTargets(std::list& targets) { Unit* caster = GetCaster(); @@ -446,7 +436,7 @@ class spell_anhuur_burning_light_forcecast : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_burning_light_forcecast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_anhuur_burning_light_forcecast::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp index 8fb418844b..2926ffc5a3 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp @@ -96,8 +96,6 @@ struct go_hoo_the_makers_lift_controller : public GameObjectAI class spell_hoo_flame_ring_visual : public SpellScript { - PrepareSpellScript(spell_hoo_flame_ring_visual); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -123,8 +121,8 @@ class spell_hoo_flame_ring_visual : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hoo_flame_ring_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_hoo_flame_ring_visual::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_hoo_flame_ring_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHitTarget.Register(&spell_hoo_flame_ring_visual::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp index ba7e5c3d20..bf3f4ccac1 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp @@ -350,8 +350,6 @@ struct npc_husam_shockwave_visual : public NullCreatureAI class spell_husam_hammer_fist : public AuraScript { - PrepareAuraScript(spell_husam_hammer_fist); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -362,14 +360,12 @@ class spell_husam_hammer_fist : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_husam_hammer_fist::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_husam_hammer_fist::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_husam_shockwave : public SpellScript { - PrepareSpellScript(spell_husam_shockwave); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHOCKWAVE_VISUAL }); @@ -382,14 +378,12 @@ class spell_husam_shockwave : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_husam_shockwave::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_husam_shockwave::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_husam_shockwave_summon_search : public SpellScript { - PrepareSpellScript(spell_husam_shockwave_summon_search); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHOCKWAVE_SUMMON_EFFECT }); @@ -403,14 +397,12 @@ class spell_husam_shockwave_summon_search : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_husam_shockwave_summon_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_husam_shockwave_summon_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_husam_mystic_trap : public SpellScript { - PrepareSpellScript(spell_husam_mystic_trap); - void FilterTargets(std::list& targets) { if (targets.size() < 3) @@ -421,14 +413,12 @@ class spell_husam_mystic_trap : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_husam_mystic_trap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_husam_mystic_trap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_husam_detonate_traps : public SpellScript { - PrepareSpellScript(spell_husam_detonate_traps); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -438,14 +428,12 @@ class spell_husam_detonate_traps : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_husam_detonate_traps::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_husam_detonate_traps::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_husam_bad_intentions : public SpellScript { - PrepareSpellScript(spell_husam_bad_intentions); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -458,14 +446,12 @@ class spell_husam_bad_intentions : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_husam_bad_intentions::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_husam_bad_intentions::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_husam_hurl : public SpellScript { - PrepareSpellScript(spell_husam_hurl); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Vehicle* vehicle = GetCaster()->GetVehicleKit()) @@ -482,14 +468,12 @@ class spell_husam_hurl : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_husam_hurl::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_husam_hurl::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_husam_land_mine_player_search_effect : public SpellScript { - PrepareSpellScript(spell_husam_land_mine_player_search_effect); - void HandleDummyEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -500,7 +484,7 @@ class spell_husam_land_mine_player_search_effect : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_husam_land_mine_player_search_effect::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_husam_land_mine_player_search_effect::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp index 6ea66bf57a..d2a05baa14 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp @@ -680,8 +680,6 @@ public: class spell_barim_plague_of_ages_first_SpellScript : public SpellScript { - PrepareSpellScript(spell_barim_plague_of_ages_first_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -692,7 +690,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_barim_plague_of_ages_first_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_barim_plague_of_ages_first_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -709,8 +707,6 @@ public: class spell_barim_plague_of_ages_second_SpellScript : public SpellScript { - PrepareSpellScript(spell_barim_plague_of_ages_second_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -721,7 +717,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_barim_plague_of_ages_second_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_barim_plague_of_ages_second_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -738,8 +734,6 @@ public: class spell_barim_repentance_script_SpellScript : public SpellScript { - PrepareSpellScript(spell_barim_repentance_script_SpellScript); - void EffectScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* playerTarget = GetHitPlayer()) @@ -748,7 +742,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_barim_repentance_script_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_barim_repentance_script_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -765,8 +759,6 @@ public: class spell_barim_repentance_pull_SpellScript : public SpellScript { - PrepareSpellScript(spell_barim_repentance_pull_SpellScript); - void HandPullEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -791,7 +783,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_barim_repentance_pull_SpellScript::HandPullEffect, EFFECT_0, SPELL_EFFECT_PULL_TOWARDS); + OnEffectHitTarget.Register(&spell_barim_repentance_pull_SpellScript::HandPullEffect, EFFECT_0, SPELL_EFFECT_PULL_TOWARDS); } }; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp index 25ea5dd9fa..c060a93520 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp @@ -531,8 +531,6 @@ class spell_lockmaw_scent_of_blood : public SpellScriptLoader class spell_lockmaw_scent_of_blood_SpellScript : public SpellScript { - PrepareSpellScript(spell_lockmaw_scent_of_blood_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -543,7 +541,7 @@ class spell_lockmaw_scent_of_blood : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_scent_of_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_lockmaw_scent_of_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -560,8 +558,6 @@ class spell_lockmaw_paralytic_blow_dart : public SpellScriptLoader class spell_lockmaw_paralytic_blow_dart_SpellScript : public SpellScript { - PrepareSpellScript(spell_lockmaw_paralytic_blow_dart_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -572,7 +568,7 @@ class spell_lockmaw_paralytic_blow_dart : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_paralytic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_lockmaw_paralytic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -589,8 +585,6 @@ class spell_lockmaw_random_aggro_taunt : public SpellScriptLoader class spell_lockmaw_random_aggro_taunt_SpellScript : public SpellScript { - PrepareSpellScript(spell_lockmaw_random_aggro_taunt_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -606,8 +600,8 @@ class spell_lockmaw_random_aggro_taunt : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_lockmaw_random_aggro_taunt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_lockmaw_random_aggro_taunt_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_lockmaw_random_aggro_taunt_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_lockmaw_random_aggro_taunt_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp index 038b88ee09..dddb04216d 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp @@ -531,8 +531,6 @@ class spell_siamat_thunder_crash : public SpellScriptLoader class spell_siamat_thunder_crash_AuraScript : public AuraScript { - PrepareAuraScript(spell_siamat_thunder_crash_AuraScript); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -543,7 +541,7 @@ class spell_siamat_thunder_crash : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_thunder_crash_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_siamat_thunder_crash_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -560,8 +558,6 @@ class spell_siamat_wailing_winds : public SpellScriptLoader class spell_siamat_wailing_winds_AuraScript : public AuraScript { - PrepareAuraScript(spell_siamat_wailing_winds_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WAILING_WINDS_DAMAGE }); @@ -575,7 +571,7 @@ class spell_siamat_wailing_winds : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_wailing_winds_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_siamat_wailing_winds_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -592,8 +588,6 @@ public: class spell_siamat_wailing_winds_player_AuraScript : public AuraScript { - PrepareAuraScript(spell_siamat_wailing_winds_player_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -605,7 +599,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_wailing_winds_player_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_siamat_wailing_winds_player_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -622,9 +616,7 @@ public: class spell_siamat_wailing_winds_knockback_SpellScript : public SpellScript { - PrepareSpellScript(spell_siamat_wailing_winds_knockback_SpellScript); - - void EffectScriptEffect(SpellEffIndex /*effIndex*/) + void EffectScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) if (Unit* victim = GetHitUnit()) @@ -641,7 +633,7 @@ public: void Register() { - OnEffectHitTarget += SpellEffectFn(spell_siamat_wailing_winds_knockback_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_siamat_wailing_winds_knockback_SpellScript::EffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -658,9 +650,7 @@ public: class spell_siamat_cloud_burst_SpellScript : public SpellScript { - PrepareSpellScript(spell_siamat_cloud_burst_SpellScript); - - void FilterTargets(std::list& targets) + void FilterTargets(std::list& targets) { if (targets.empty()) return; @@ -670,7 +660,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_cloud_burst_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_siamat_cloud_burst_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -687,9 +677,7 @@ public: class spell_siamat_gathered_storms_SpellScript : public SpellScript { - PrepareSpellScript(spell_siamat_gathered_storms_SpellScript); - - void FilterTargets(std::list& targets) + void FilterTargets(std::list& targets) { if (targets.empty()) return; @@ -699,7 +687,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_gathered_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_siamat_gathered_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -716,8 +704,6 @@ class spell_siamat_absorb_storms : public SpellScriptLoader class spell_siamat_absorb_storms_AuraScript : public AuraScript { - PrepareAuraScript(spell_siamat_absorb_storms_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -727,14 +713,12 @@ class spell_siamat_absorb_storms : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_siamat_absorb_storms_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_siamat_absorb_storms_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_siamat_absorb_storms_SpellScript : public SpellScript { - PrepareSpellScript(spell_siamat_absorb_storms_SpellScript); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -756,8 +740,8 @@ class spell_siamat_absorb_storms : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_siamat_absorb_storms_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_siamat_absorb_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_siamat_absorb_storms_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_siamat_absorb_storms_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 4d9e0d2d7b..0bcb3368c0 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)) @@ -265,8 +263,8 @@ class spell_egg_explosion : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_egg_explosion_SpellScript::HandleAfterCast); - OnEffectHitTarget += SpellEffectFn(spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + AfterCast.Register(&spell_egg_explosion_SpellScript::HandleAfterCast); + OnEffectHitTarget.Register(&spell_egg_explosion_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index ded0c6d67d..345025d799 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -229,8 +229,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& targets) { targets.remove_if(PlayerOrPetCheck()); @@ -238,7 +236,7 @@ class spell_skeram_arcane_explosion : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_skeram_arcane_explosion_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -256,8 +254,6 @@ public: class spell_skeram_true_fulfillment_SpellScript : public SpellScript { - PrepareSpellScript(spell_skeram_true_fulfillment_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TRUE_FULFILLMENT_2, SPELL_GENERIC_DISMOUNT }); @@ -271,7 +267,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_skeram_true_fulfillment_SpellScript::HandleEffect, EFFECT_0, SPELL_AURA_MOD_CHARM); + OnEffectHitTarget.Register(&spell_skeram_true_fulfillment_SpellScript::HandleEffect, EFFECT_0, SPELL_AURA_MOD_CHARM); } }; diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp index c0e01510dc..c8bfdc2d44 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp @@ -754,8 +754,6 @@ private: class spell_alakir_lightning_strike_script : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_strike_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -784,14 +782,12 @@ class spell_alakir_lightning_strike_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alakir_lightning_strike_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_alakir_lightning_strike_periodic : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_strike_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -821,14 +817,12 @@ class spell_alakir_lightning_strike_periodic : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_periodic::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alakir_lightning_strike_periodic::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_alakir_lightning_strike_damage : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_strike_damage); - void HandleDamageReuction(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -840,14 +834,12 @@ class spell_alakir_lightning_strike_damage : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_strike_damage::HandleDamageReuction, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_alakir_lightning_strike_damage::HandleDamageReuction, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_alakir_electrocute : public AuraScript { - PrepareAuraScript(spell_alakir_electrocute); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* caster = GetCaster(); @@ -872,7 +864,7 @@ class spell_alakir_electrocute : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_electrocute::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_alakir_electrocute::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -904,8 +896,6 @@ class SquallLineGapTargetSelector class spell_alakir_squall_line_pre_aura : public SpellScript { - PrepareSpellScript(spell_alakir_squall_line_pre_aura); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -917,14 +907,12 @@ class spell_alakir_squall_line_pre_aura : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_squall_line_pre_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_alakir_squall_line_pre_aura::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_alakir_squall_line_script : public SpellScript { - PrepareSpellScript(spell_alakir_squall_line_script); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -941,14 +929,12 @@ class spell_alakir_squall_line_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_squall_line_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alakir_squall_line_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_alakir_relentless_storm_initial_vehicle_ride_trigger : public SpellScript { - PrepareSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride_trigger); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RELENTLESS_STORM_INITIAL_VEHICLE_RIDE }); @@ -963,14 +949,12 @@ class spell_alakir_relentless_storm_initial_vehicle_ride_trigger : public SpellS void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_relentless_storm_initial_vehicle_ride_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_alakir_relentless_storm_initial_vehicle_ride_trigger::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_alakir_relentless_storm_initial_vehicle_ride : public SpellScript { - PrepareSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -981,14 +965,12 @@ class spell_alakir_relentless_storm_initial_vehicle_ride : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_alakir_relentless_storm_initial_vehicle_ride::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_alakir_relentless_storm_initial_vehicle_ride::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_alakir_wind_burst : public AuraScript { - PrepareAuraScript(spell_alakir_wind_burst); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->SetCanFly(true, true); @@ -996,14 +978,12 @@ class spell_alakir_wind_burst : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_wind_burst::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_alakir_wind_burst::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_alakir_lightning_clouds_periodic : public AuraScript { - PrepareAuraScript(spell_alakir_lightning_clouds_periodic); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LIGHTNING_CLOUDS_VISUAL_DEST }); @@ -1020,7 +1000,7 @@ class spell_alakir_lightning_clouds_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_alakir_lightning_clouds_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_alakir_lightning_clouds_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1039,8 +1019,6 @@ class LightningCloudsAltitudeTargetSelector class spell_alakir_lightning_clouds_damage : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_clouds_damage); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1051,14 +1029,12 @@ class spell_alakir_lightning_clouds_damage : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_clouds_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_clouds_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_alakir_lightning_clouds_targeting : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_clouds_targeting); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_LIGHTNING_CLOUDS_SUMMON }); @@ -1078,14 +1054,12 @@ class spell_alakir_lightning_clouds_targeting : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_clouds_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_alakir_lightning_clouds_targeting::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_alakir_lightning_clouds_dummy : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_clouds_dummy); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1096,7 +1070,7 @@ class spell_alakir_lightning_clouds_dummy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_clouds_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_clouds_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -1115,8 +1089,6 @@ class LightningRodTargetSelector class spell_alakir_lightning_rod_damage : public SpellScript { - PrepareSpellScript(spell_alakir_lightning_rod_damage); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1127,14 +1099,12 @@ class spell_alakir_lightning_rod_damage : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_lightning_rod_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_alakir_lightning_rod_damage::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; class spell_alakir_relentless_storm : public SpellScript { - PrepareSpellScript(spell_alakir_relentless_storm); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -1145,7 +1115,7 @@ class spell_alakir_relentless_storm : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_alakir_relentless_storm::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_alakir_relentless_storm::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; @@ -1164,8 +1134,6 @@ class RelentlessStormTargetSelector class spell_alakir_storm_distance_check: public SpellScript { - PrepareSpellScript(spell_alakir_storm_distance_check); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RELENTLESS_STORM_RIDE }); @@ -1186,15 +1154,13 @@ class spell_alakir_storm_distance_check: public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_alakir_storm_distance_check::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_alakir_storm_distance_check::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_alakir_storm_distance_check::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_alakir_storm_distance_check::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_alakir_lightning_script: public SpellScript { - PrepareSpellScript(spell_alakir_lightning_script); - void HandleScriptEffect(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -1206,7 +1172,7 @@ class spell_alakir_lightning_script: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alakir_lightning_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_alakir_lightning_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp index aa8ed3d6bc..597aafd4fd 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp @@ -1074,8 +1074,6 @@ private: class spell_conclave_of_wind_winds_pre_effect_warning : public AuraScript { - PrepareAuraScript(spell_conclave_of_wind_winds_pre_effect_warning); - void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired)) @@ -1087,14 +1085,12 @@ class spell_conclave_of_wind_winds_pre_effect_warning : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_conclave_of_wind_winds_pre_effect_warning::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_conclave_of_wind_winds_pre_effect_warning::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; class spell_conclave_of_wind_teleport_to_center : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_teleport_to_center); - void SetDest(SpellDestination& dest) { if (Creature* creature = GetCaster()->ToCreature()) @@ -1103,14 +1099,12 @@ class spell_conclave_of_wind_teleport_to_center : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_conclave_of_wind_teleport_to_center::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_conclave_of_wind_teleport_to_center::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_conclave_of_wind_winds : public AuraScript { - PrepareAuraScript(spell_conclave_of_wind_winds); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1148,14 +1142,12 @@ class spell_conclave_of_wind_winds : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_conclave_of_wind_winds::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_conclave_of_wind_winds::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_conclave_of_wind_wind_blast : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_wind_blast); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -1166,14 +1158,12 @@ class spell_conclave_of_wind_wind_blast : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_wind_blast::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_conclave_of_wind_wind_blast::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_conclave_of_wind_wind_blast_AuraScript : public AuraScript { - PrepareAuraScript(spell_conclave_of_wind_wind_blast_AuraScript); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1183,14 +1173,12 @@ class spell_conclave_of_wind_wind_blast_AuraScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_conclave_of_wind_wind_blast_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_conclave_of_wind_wind_blast_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_conclave_of_wind_wind_blast_triggered : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_wind_blast_triggered); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -1201,14 +1189,12 @@ class spell_conclave_of_wind_wind_blast_triggered : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_wind_blast_triggered::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_conclave_of_wind_wind_blast_triggered::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_conclave_of_wind_hurricane : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_hurricane); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HURRICANE_RIDE_VEHICLE }); @@ -1221,14 +1207,12 @@ class spell_conclave_of_wind_hurricane : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_conclave_of_wind_hurricane::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_conclave_of_wind_hurricane::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_conclave_of_wind_hurricane_ride_vehicle : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_hurricane_ride_vehicle); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -1239,15 +1223,12 @@ class spell_conclave_of_wind_hurricane_ride_vehicle : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_conclave_of_wind_hurricane_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_conclave_of_wind_hurricane_ride_vehicle::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; class spell_conclave_of_wind_toxic_spores : public SpellScript -{ - PrepareSpellScript(spell_conclave_of_wind_toxic_spores); - - // Handle the cast as non-triggered to inform the client and its addons properly +{ // Handle the cast as non-triggered to inform the client and its addons properly void HandleCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1256,14 +1237,12 @@ class spell_conclave_of_wind_toxic_spores : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_conclave_of_wind_toxic_spores::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_conclave_of_wind_toxic_spores::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; class spell_conclave_of_wind_sleet_storm : public SpellScript { - PrepareSpellScript(spell_conclave_of_wind_sleet_storm); - bool Load() override { _targetCount = 0; @@ -1285,8 +1264,8 @@ class spell_conclave_of_wind_sleet_storm : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_conclave_of_wind_sleet_storm::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnHit += SpellHitFn(spell_conclave_of_wind_sleet_storm::SplitDamage); + OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_sleet_storm::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnHit.Register(&spell_conclave_of_wind_sleet_storm::SplitDamage); } private: diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp index dcaca3035d..a2ccdbdb7f 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp @@ -178,8 +178,6 @@ class spell_totfw_jet_stream : public SpellScriptLoader class spell_totfw_jet_stream_SpellScript : public SpellScript { - PrepareSpellScript(spell_totfw_jet_stream_SpellScript); - void HandleForcecast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -188,7 +186,7 @@ class spell_totfw_jet_stream : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_totfw_jet_stream_SpellScript::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_totfw_jet_stream_SpellScript::HandleForcecast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -205,8 +203,6 @@ class spell_totfw_catch_fall_summon : public SpellScriptLoader class spell_totfw_catch_fall_summon_SpellScript : public SpellScript { - PrepareSpellScript(spell_totfw_catch_fall_summon_SpellScript); - void SetDestPosition(SpellEffIndex /*effIndex*/) { float x = GetExplTargetDest()->GetPositionX(); @@ -219,7 +215,7 @@ class spell_totfw_catch_fall_summon : public SpellScriptLoader void Register() { - OnEffectLaunch += SpellEffectFn(spell_totfw_catch_fall_summon_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectLaunch.Register(&spell_totfw_catch_fall_summon_SpellScript::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); } }; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index eba8b68047..8b750f5710 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -227,8 +227,6 @@ private: // 88276 - Call The Wind class spell_altairus_call_the_wind : public SpellScript { - PrepareSpellScript(spell_altairus_call_the_wind); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CALL_THE_WIND_AURA }); @@ -256,16 +254,14 @@ class spell_altairus_call_the_wind : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_altairus_call_the_wind::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_altairus_call_the_wind::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_altairus_call_the_wind::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_altairus_call_the_wind::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 88282 - Upwind of Altairus class spell_altairus_upwind_of_altairus : public SpellScript { - PrepareSpellScript(spell_altairus_upwind_of_altairus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -296,15 +292,13 @@ class spell_altairus_upwind_of_altairus : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_altairus_upwind_of_altairus::HandleUpwind, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_altairus_upwind_of_altairus::HandleUpwind, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; // 88772 - Call the Wind class spell_altairus_call_the_wind_channel : public SpellScript { - PrepareSpellScript(spell_altairus_call_the_wind_channel); - void SetTarget(WorldObject*& target) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -315,15 +309,13 @@ class spell_altairus_call_the_wind_channel : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_altairus_call_the_wind_channel::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_altairus_call_the_wind_channel::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; // 88322 - Chilling Breath class spell_altairus_chilling_breath : public SpellScript { - PrepareSpellScript(spell_altairus_chilling_breath); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetHitUnit(), uint32(GetEffectValue())); @@ -331,13 +323,11 @@ class spell_altairus_chilling_breath : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_altairus_chilling_breath::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_altairus_chilling_breath::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_altairus_safe_area : public AuraScript { - PrepareAuraScript(spell_altairus_safe_area); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LIGHTNING_BLAST }); @@ -362,7 +352,7 @@ class spell_altairus_safe_area : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_altairus_safe_area::HandleLightningBlast, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_altairus_safe_area::HandleLightningBlast, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp index af7fcad3f5..e1e6d2d8b2 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp @@ -559,8 +559,6 @@ private: // 86632 - SOTS Targeting class spell_asaad_sots_targeting : public SpellScript { - PrepareSpellScript(spell_asaad_sots_targeting); - void SelectRandom(std::list& targets) { Trinity::Containers::RandomResize(targets, 1); @@ -574,16 +572,14 @@ class spell_asaad_sots_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_sots_targeting::SelectRandom, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_asaad_sots_targeting::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_asaad_sots_targeting::SelectRandom, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_asaad_sots_targeting::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 86926 - SOTS Trigger (makes Asaad channel Unstable Grounding Field) class spell_asaad_sots_trigger : public SpellScript { - PrepareSpellScript(spell_asaad_sots_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_UNSTABLE_GROUNDING_FIELD }); @@ -596,7 +592,7 @@ class spell_asaad_sots_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_asaad_sots_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_asaad_sots_trigger::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -606,8 +602,6 @@ class spell_asaad_sots_trigger : public SpellScript // 86925 - Storm Rune Beam C class spell_asaad_storm_rune_beam : public SpellScript { - PrepareSpellScript(spell_asaad_storm_rune_beam); - void SetTarget(WorldObject*& target) { InstanceScript* instance = GetCaster()->GetInstanceScript(); @@ -637,15 +631,13 @@ class spell_asaad_storm_rune_beam : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_storm_rune_beam::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_asaad_storm_rune_beam::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; // 87517 - Grounding Field Visual Beams class spell_asaad_grounding_field_visual_beams : public SpellScript { - PrepareSpellScript(spell_asaad_grounding_field_visual_beams); - void SetTargetA(WorldObject*& target) { target = GetStormTarget(POINT_STORM_A); @@ -663,9 +655,9 @@ class spell_asaad_grounding_field_visual_beams : public SpellScript void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetA, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetB, EFFECT_1, TARGET_UNIT_NEARBY_ENTRY); - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_asaad_grounding_field_visual_beams::SetTargetC, EFFECT_2, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetA, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetB, EFFECT_1, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_asaad_grounding_field_visual_beams::SetTargetC, EFFECT_2, TARGET_UNIT_NEARBY_ENTRY); } private: Creature * GetStormTarget(uint32 point) @@ -681,8 +673,6 @@ private: // 87553/93994 - Supremacy of the Storm (massive aoe damage) class spell_asaad_supremacy_of_the_storm : public SpellScript { - PrepareSpellScript(spell_asaad_supremacy_of_the_storm); - void FilterTargets(std::list& targets) { InstanceScript* instance = GetCaster()->GetInstanceScript(); @@ -709,7 +699,7 @@ class spell_asaad_supremacy_of_the_storm : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_supremacy_of_the_storm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_asaad_supremacy_of_the_storm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -731,8 +721,6 @@ class AboveGroundCheck class spell_asaad_supremacy_of_the_storm_visual : public SpellScript { - PrepareSpellScript(spell_asaad_supremacy_of_the_storm_visual); - void FilterTargets(std::list& targets) { InstanceScript* instance = GetCaster()->GetInstanceScript(); @@ -763,14 +751,12 @@ class spell_asaad_supremacy_of_the_storm_visual : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_supremacy_of_the_storm_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_asaad_supremacy_of_the_storm_visual::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_asaad_static_cling : public SpellScript { - PrepareSpellScript(spell_asaad_static_cling); - void FilterTargets(std::list& targets) { targets.remove_if(AboveGroundCheck()); @@ -778,15 +764,13 @@ class spell_asaad_static_cling : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_static_cling::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_asaad_static_cling::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_asaad_static_cling::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_asaad_static_cling::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; class spell_asaad_summon_skyfall_star : public SpellScript { - PrepareSpellScript(spell_asaad_summon_skyfall_star); - void SetDest(SpellDestination& dest) { Creature* caster = GetCaster()->ToCreature(); @@ -805,7 +789,7 @@ class spell_asaad_summon_skyfall_star : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_asaad_summon_skyfall_star::SetDest, EFFECT_0, TARGET_DEST_DEST_RADIUS); + OnDestinationTargetSelect.Register(&spell_asaad_summon_skyfall_star::SetDest, EFFECT_0, TARGET_DEST_DEST_RADIUS); } }; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp index beb137f67d..9bf332bc8a 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp @@ -231,8 +231,6 @@ private: class spell_ertan_storms_edge : public SpellScript { - PrepareSpellScript(spell_ertan_storms_edge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -260,14 +258,12 @@ class spell_ertan_storms_edge : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ertan_storms_edge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ertan_storms_edge::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_ertan_storms_edge_script : public SpellScript { - PrepareSpellScript(spell_ertan_storms_edge_script); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -276,7 +272,7 @@ class spell_ertan_storms_edge_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ertan_storms_edge_script::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ertan_storms_edge_script::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index 16d9a59d5b..7cf0db00a9 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -477,8 +477,6 @@ struct npc_vp_catch_fall : public NullCreatureAI // 85294 - Lurk Search class spell_vp_lurk_search_periodic : public AuraScript { - PrepareAuraScript(spell_vp_lurk_search_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -506,14 +504,12 @@ class spell_vp_lurk_search_periodic : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_vp_lurk_search_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_vp_lurk_search_periodic::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_vp_lurk_search : public SpellScript { - PrepareSpellScript(spell_vp_lurk_search); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -582,16 +578,14 @@ class spell_vp_lurk_search : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_vp_lurk_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_vp_lurk_search::HandleLightningBolt, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_vp_lurk_search::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_vp_lurk_search::HandleLightningBolt, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 85267 - Feign Death class spell_vp_feign_death : public SpellScript { - PrepareSpellScript(spell_vp_feign_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LURK }); @@ -604,14 +598,12 @@ class spell_vp_feign_death : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_vp_feign_death::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_vp_feign_death::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_vp_feign_death_AuraScript : public AuraScript { - PrepareAuraScript(spell_vp_feign_death_AuraScript); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29); @@ -624,16 +616,14 @@ class spell_vp_feign_death_AuraScript : public AuraScript void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_vp_feign_death_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_vp_feign_death_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_vp_feign_death_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_vp_feign_death_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; // 85281 - Lurk Ressurect class spell_vp_lurk_ressurect : public AuraScript { - PrepareAuraScript(spell_vp_lurk_ressurect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LURK }); @@ -648,15 +638,13 @@ class spell_vp_lurk_ressurect : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_vp_lurk_ressurect::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_vp_lurk_ressurect::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 85084 - Howling Gale class spell_vp_howling_gale : public AuraScript { - PrepareAuraScript(spell_vp_howling_gale); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -678,15 +666,13 @@ class spell_vp_howling_gale : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_vp_howling_gale::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_vp_howling_gale::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; // 85159, 85085 - Howling Gale class spell_vp_howling_gale_knockback : public AuraScript { - PrepareAuraScript(spell_vp_howling_gale_knockback); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->ModifyAuraState(AURA_STATE_UNKNOWN22, true); @@ -699,16 +685,14 @@ class spell_vp_howling_gale_knockback : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_vp_howling_gale_knockback::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_vp_howling_gale_knockback::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_vp_howling_gale_knockback::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_vp_howling_gale_knockback::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 84978, 84989, 85395, 85396, 85017 - Slipstream class spell_slipstream : public SpellScript { - PrepareSpellScript(spell_slipstream); - void SetTarget(WorldObject*& target) { InstanceScript* instance = GetCaster()->GetInstanceScript(); @@ -749,15 +733,13 @@ class spell_slipstream : public SpellScript } void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_slipstream::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); + OnObjectTargetSelect.Register(&spell_slipstream::SetTarget, EFFECT_0, TARGET_UNIT_NEARBY_ENTRY); } }; // 87726 - Grounding Field class spell_grounding_field : public SpellScript { - PrepareSpellScript(spell_grounding_field); - void GetNearbyGroundFields() { std::list groundingFields; @@ -789,8 +771,8 @@ class spell_grounding_field : public SpellScript void Register() override { - BeforeCast += SpellCastFn(spell_grounding_field::GetNearbyGroundFields); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_grounding_field::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + BeforeCast.Register(&spell_grounding_field::GetNearbyGroundFields); + OnObjectAreaTargetSelect.Register(&spell_grounding_field::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } private: bool prevent = false; @@ -800,8 +782,6 @@ private: // 87850 - Skyfall class spell_skyfall : public SpellScript { - PrepareSpellScript(spell_skyfall); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -814,15 +794,13 @@ class spell_skyfall : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_skyfall::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_skyfall::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 88201 - Healing Well class spell_vp_healing_well : public SpellScript { - PrepareSpellScript(spell_vp_healing_well); - void SetDest(SpellDestination& dest) { float offset = GetCaster()->GetFloorZ() - GetCaster()->GetPositionZ(); @@ -831,7 +809,7 @@ class spell_vp_healing_well : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_vp_healing_well::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_vp_healing_well::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; @@ -841,8 +819,6 @@ Position const AsaadTeleportPos = { -1193.67f, 472.835f, 634.8653f, 0.0f }; class spell_vp_catch_fall : public SpellScript { - PrepareSpellScript(spell_vp_catch_fall); - void SetDest(SpellDestination& dest) { float z = GetCaster()->GetPositionZ(); @@ -858,7 +834,7 @@ class spell_vp_catch_fall : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_vp_catch_fall::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_vp_catch_fall::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; diff --git a/src/server/scripts/Kalimdor/zone_ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index d9950ba35e..1d6ef0c45f 100644 --- a/src/server/scripts/Kalimdor/zone_ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp @@ -367,8 +367,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))) @@ -377,7 +375,7 @@ class spell_destroy_karangs_banner : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_destroy_karangs_banner_SpellScript::HandleAfterCast); + AfterCast.Register(&spell_destroy_karangs_banner_SpellScript::HandleAfterCast); } }; diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 6715039f70..ec2d65276e 100644 --- a/src/server/scripts/Kalimdor/zone_durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp @@ -41,8 +41,6 @@ class spell_voodoo : public SpellScriptLoader class spell_voodoo_SpellScript : public SpellScript { - PrepareSpellScript(spell_voodoo_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BREW, SPELL_GHOSTLY, SPELL_HEX1, SPELL_HEX2, SPELL_HEX3, SPELL_GROW, SPELL_LAUNCH }); @@ -57,7 +55,7 @@ class spell_voodoo : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_voodoo_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -69,8 +67,6 @@ class spell_voodoo : public SpellScriptLoader class spell_zuni_lvl_1_trigger_aura : public SpellScript { - PrepareSpellScript(spell_zuni_lvl_1_trigger_aura); - void HandleDummy(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetCaster(), GetSpellInfo()->Effects[EFFECT_0].BasePoints, true); @@ -78,7 +74,7 @@ class spell_zuni_lvl_1_trigger_aura : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_zuni_lvl_1_trigger_aura::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_zuni_lvl_1_trigger_aura::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Kalimdor/zone_felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 9ff2a37e04..3ed2e0c15e 100644 --- a/src/server/scripts/Kalimdor/zone_felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp @@ -128,8 +128,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)) @@ -155,8 +153,8 @@ public: void Register() override { - OnCheckCast += SpellCheckCastFn(spell_swipe_honey_SpellScript::CheckTarget); - OnEffectHitTarget += SpellEffectFn(spell_swipe_honey_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_swipe_honey_SpellScript::CheckTarget); + OnEffectHitTarget.Register(&spell_swipe_honey_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -178,12 +176,11 @@ enum BeesBEES class spell_beesbees : public SpellScriptLoader { -public: spell_beesbees() : SpellScriptLoader("spell_beesbees") { } + 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()) @@ -199,7 +196,7 @@ public: spell_beesbees() : SpellScriptLoader("spell_beesbees") { } void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_beesbees_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_beesbees_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -225,12 +222,11 @@ Position const FerliSpawnPos = { 3850.44f, -1323.34f, 213.2113f, 5.637414f }; class spell_ruumbos_silly_dance : public SpellScriptLoader { -public: spell_ruumbos_silly_dance() : SpellScriptLoader("spell_ruumbos_silly_dance") { } + public: + spell_ruumbos_silly_dance() : SpellScriptLoader("spell_ruumbos_silly_dance") { } class spell_ruumbos_silly_dance_SpellScript : public SpellScript { - PrepareSpellScript(spell_ruumbos_silly_dance_SpellScript); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { if (Player* player = GetHitPlayer()) @@ -247,7 +243,7 @@ public: spell_ruumbos_silly_dance() : SpellScriptLoader("spell_ruumbos_silly_dan void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ruumbos_silly_dance_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ruumbos_silly_dance_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp index e65fcaa724..f321d5e131 100644 --- a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp +++ b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp @@ -614,8 +614,6 @@ struct npc_mh_arch_druid_fandral_staghelm : public PassiveAI class spell_mh_summon_emerald_flameweaver : public SpellScript { - PrepareSpellScript(spell_mh_summon_emerald_flameweaver); - void SetDest(SpellDestination& dest) { dest.Relocate(EmeraldFlameweaverSummonPos); @@ -623,7 +621,7 @@ class spell_mh_summon_emerald_flameweaver : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mh_summon_emerald_flameweaver::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_mh_summon_emerald_flameweaver::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; @@ -631,8 +629,6 @@ Position const RagnarosSummonPos = { 4039.558f, -3061.701f, 972.6672f, 0.104719f class spell_mh_ragnaros : public SpellScript { - PrepareSpellScript(spell_mh_ragnaros); - void SetDest(SpellDestination& dest) { dest.Relocate(RagnarosSummonPos); @@ -640,14 +636,12 @@ class spell_mh_ragnaros : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mh_ragnaros::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_mh_ragnaros::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; class spell_mh_flamebreaker : public AuraScript { - PrepareAuraScript(spell_mh_flamebreaker); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -658,14 +652,12 @@ class spell_mh_flamebreaker : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mh_flamebreaker::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mh_flamebreaker::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_mh_weakening : public AuraScript { - PrepareAuraScript(spell_mh_weakening); - void HandleTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -675,7 +667,7 @@ class spell_mh_weakening : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mh_weakening::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mh_weakening::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -686,8 +678,6 @@ enum BaronGeddonInferno class spell_mh_inferno : public AuraScript { - PrepareAuraScript(spell_mh_inferno); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_INFERNO_TRIGGERED }); @@ -708,14 +698,12 @@ class spell_mh_inferno : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mh_inferno::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mh_inferno::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_mh_fandral_creator_aura : public AuraScript { - PrepareAuraScript(spell_mh_fandral_creator_aura); - void HandleAuraRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -725,7 +713,7 @@ class spell_mh_fandral_creator_aura : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_mh_fandral_creator_aura::HandleAuraRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mh_fandral_creator_aura::HandleAuraRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Kalimdor/zone_uldum.cpp b/src/server/scripts/Kalimdor/zone_uldum.cpp index fcea7fa484..ff596e8208 100644 --- a/src/server/scripts/Kalimdor/zone_uldum.cpp +++ b/src/server/scripts/Kalimdor/zone_uldum.cpp @@ -60,8 +60,6 @@ enum UldumIntro // 86748 - Intialize Uldum Intro class spell_uldum_initialize_uldum_intro : public SpellScript { - PrepareSpellScript(spell_uldum_initialize_uldum_intro); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -97,15 +95,13 @@ class spell_uldum_initialize_uldum_intro : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_uldum_initialize_uldum_intro::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_uldum_initialize_uldum_intro::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 86848 - Master Ping all Actors class spell_uldum_master_ping_all_actors : public SpellScript { - PrepareSpellScript(spell_uldum_master_ping_all_actors); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PING_ALL_ACTORS_00 }); @@ -118,15 +114,13 @@ class spell_uldum_master_ping_all_actors : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_uldum_master_ping_all_actors::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_uldum_master_ping_all_actors::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 86960 - Master Summon Beam Target 02 class spell_uldum_master_summon_beam_target_02 : public SpellScript { - PrepareSpellScript(spell_uldum_master_summon_beam_target_02); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BEAM_TARGET_BUNNY_02 }); @@ -139,15 +133,13 @@ class spell_uldum_master_summon_beam_target_02 : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_uldum_master_summon_beam_target_02::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_uldum_master_summon_beam_target_02::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 87010 - Master Summon Skarf class spell_uldum_master_summon_skarf : public SpellScript { - PrepareSpellScript(spell_uldum_master_summon_skarf); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SKARF }); @@ -160,15 +152,13 @@ class spell_uldum_master_summon_skarf : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_uldum_master_summon_skarf::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_uldum_master_summon_skarf::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 95747 - Player Summon Camera class spell_uldum_player_summon_camera : public SpellScript { - PrepareSpellScript(spell_uldum_player_summon_camera); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_CAMERA_BUNNY }); @@ -181,7 +171,7 @@ class spell_uldum_player_summon_camera : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_uldum_player_summon_camera::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_uldum_player_summon_camera::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -429,8 +419,6 @@ enum SummonSchnottz // 88107 - Gobbles Initialize class spell_gobbles_initialize : public SpellScript { - PrepareSpellScript(spell_gobbles_initialize); - void HandleScript(SpellEffIndex /*eff*/) { if (Player* player = GetHitUnit()->ToPlayer()) @@ -444,15 +432,13 @@ class spell_gobbles_initialize : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gobbles_initialize::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gobbles_initialize::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 88108 - Summon Schnottz class spell_summon_schnottz : public SpellScript { - PrepareSpellScript(spell_summon_schnottz); - void SetDest(SpellDestination& dest) { if (Creature * Schnottz = GetCaster()->FindNearestCreature(NPC_SCHNOTTZ, 10.0f, true)) @@ -461,7 +447,7 @@ class spell_summon_schnottz : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_summon_schnottz::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_summon_schnottz::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index 67aa7a05c6..bc2c2d4c6e 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -422,8 +422,6 @@ class npc_crystal_shard : public CreatureScript class spell_corborus_crystal_barrage_targeting : public SpellScript { - PrepareSpellScript(spell_corborus_crystal_barrage_targeting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRYSTAL_BARRAGE }); @@ -448,15 +446,13 @@ class spell_corborus_crystal_barrage_targeting : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_corborus_crystal_barrage_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_corborus_crystal_barrage_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_corborus_crystal_barrage_targeting::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_corborus_crystal_barrage_targeting::HandleEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_corborus_crystal_barrage : public AuraScript { - PrepareAuraScript(spell_corborus_crystal_barrage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRYSTAL_BARRAGE_SHARD }); @@ -472,7 +468,7 @@ class spell_corborus_crystal_barrage : public AuraScript void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_corborus_crystal_barrage::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_corborus_crystal_barrage::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; 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 e44e4c3d95..94af7419a1 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp @@ -566,8 +566,6 @@ class npc_azil_seismic_shard : public CreatureScript class spell_azil_summon_wave_south : public SpellScript { - PrepareSpellScript(spell_azil_summon_wave_south); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ADD_SOUTH }); @@ -582,14 +580,12 @@ class spell_azil_summon_wave_south : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_summon_wave_south::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_azil_summon_wave_south::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_azil_summon_wave_west : public SpellScript { - PrepareSpellScript(spell_azil_summon_wave_west); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ADD_WEST }); @@ -604,14 +600,12 @@ class spell_azil_summon_wave_west : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_summon_wave_west::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_azil_summon_wave_west::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_azil_summon_follower : public SpellScript { - PrepareSpellScript(spell_azil_summon_follower); - void SetDestPosition(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -627,7 +621,7 @@ class spell_azil_summon_follower : public SpellScript void Register() { - OnEffectLaunch += SpellEffectFn(spell_azil_summon_follower::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectLaunch.Register(&spell_azil_summon_follower::SetDestPosition, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -645,8 +639,6 @@ public: class spell_azil_gravity_well_damage_nearby : public SpellScript { - PrepareSpellScript(spell_azil_gravity_well_damage_nearby); - void SetRadiusMod() { GetSpell()->SetSpellValue(SPELLVALUE_RADIUS_MOD, int32(GetCaster()->GetObjectScale() * 10000 * 2 / 3)); @@ -664,16 +656,14 @@ class spell_azil_gravity_well_damage_nearby : public SpellScript void Register() override { - BeforeCast += SpellCastFn(spell_azil_gravity_well_damage_nearby::SetRadiusMod); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_azil_gravity_well_damage_nearby::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_azil_gravity_well_damage_nearby::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + BeforeCast.Register(&spell_azil_gravity_well_damage_nearby::SetRadiusMod); + OnObjectAreaTargetSelect.Register(&spell_azil_gravity_well_damage_nearby::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_azil_gravity_well_damage_nearby::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_azil_gravity_well_damage : public SpellScript { - PrepareSpellScript(spell_azil_gravity_well_damage); - void CalculateDamage(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -690,14 +680,12 @@ class spell_azil_gravity_well_damage : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_gravity_well_damage::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_azil_gravity_well_damage::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_azil_gravity_well_pull : public SpellScript { - PrepareSpellScript(spell_azil_gravity_well_pull); - void SetRadiusMod() { GetSpell()->SetSpellValue(SPELLVALUE_RADIUS_MOD, int32(GetCaster()->GetObjectScale() * 10000 * 2 / 3)); @@ -705,14 +693,12 @@ class spell_azil_gravity_well_pull : public SpellScript void Register() override { - BeforeCast += SpellCastFn(spell_azil_gravity_well_pull::SetRadiusMod); + BeforeCast.Register(&spell_azil_gravity_well_pull::SetRadiusMod); } }; class spell_azil_seismic_shard_change_seat : public SpellScript { - PrepareSpellScript(spell_azil_seismic_shard_change_seat); - void ExitVehicle() { GetCaster()->ExitVehicle(); @@ -720,14 +706,12 @@ class spell_azil_seismic_shard_change_seat : public SpellScript void Register() override { - BeforeCast += SpellCastFn(spell_azil_seismic_shard_change_seat::ExitVehicle); + BeforeCast.Register(&spell_azil_seismic_shard_change_seat::ExitVehicle); } }; class spell_azil_seismic_shard : public SpellScript { - PrepareSpellScript(spell_azil_seismic_shard); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* target = GetHitUnit()->ToCreature(); @@ -741,14 +725,12 @@ class spell_azil_seismic_shard : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_seismic_shard::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_azil_seismic_shard::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_azil_force_grip : public SpellScript { - PrepareSpellScript(spell_azil_force_grip); - void HandleScript(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -763,14 +745,12 @@ class spell_azil_force_grip : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_force_grip::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_azil_force_grip::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_azil_force_grip_AuraScript : public AuraScript { - PrepareAuraScript(spell_azil_force_grip_AuraScript); - void OnAuraRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) @@ -784,14 +764,12 @@ class spell_azil_force_grip_AuraScript : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_azil_force_grip_AuraScript::OnAuraRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_azil_force_grip_AuraScript::OnAuraRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_azil_force_grip_change_seat : public SpellScript { - PrepareSpellScript(spell_azil_force_grip_change_seat); - void HandleScript(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -801,7 +779,7 @@ class spell_azil_force_grip_change_seat : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_azil_force_grip_change_seat::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_azil_force_grip_change_seat::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 3fa668ecfd..baa3e1e364 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -185,8 +185,6 @@ class boss_ozruk : public CreatureScript class spell_ozruk_rupture : public AuraScript { - PrepareAuraScript(spell_ozruk_rupture); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUPTURE_SUMMON }); @@ -212,14 +210,12 @@ class spell_ozruk_rupture : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ozruk_rupture::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_ozruk_rupture::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; class spell_ozuruk_rupture_summon : public SpellScript { - PrepareSpellScript(spell_ozuruk_rupture_summon); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -238,14 +234,12 @@ class spell_ozuruk_rupture_summon : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ozuruk_rupture_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); + OnDestinationTargetSelect.Register(&spell_ozuruk_rupture_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); } }; class spell_ozruk_elementium_spike_shield : public SpellScript { - PrepareSpellScript(spell_ozruk_elementium_spike_shield); - void HandleBouncerSpikes() { Unit* caster = GetCaster(); @@ -260,14 +254,12 @@ class spell_ozruk_elementium_spike_shield : public SpellScript void Register() override { - OnCast += SpellCastFn(spell_ozruk_elementium_spike_shield::HandleBouncerSpikes); + OnCast.Register(&spell_ozruk_elementium_spike_shield::HandleBouncerSpikes); } }; class spell_ozruk_paralyze : public SpellScript { - PrepareSpellScript(spell_ozruk_paralyze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYZE_STUN }); @@ -281,14 +273,12 @@ class spell_ozruk_paralyze : public SpellScript void Register() override { - OnHit += SpellHitFn(spell_ozruk_paralyze::HandleDummy); + OnHit.Register(&spell_ozruk_paralyze::HandleDummy); } }; class spell_ozruk_paralyze_stun : public AuraScript { - PrepareAuraScript(spell_ozruk_paralyze_stun); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYZE_DAMAGE }); @@ -303,7 +293,7 @@ class spell_ozruk_paralyze_stun : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_ozruk_paralyze_stun::OnAuraRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ozruk_paralyze_stun::OnAuraRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp index ae8902493e..afd6f39b4c 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp @@ -348,8 +348,6 @@ private: class spell_slabhide_stalactite : public SpellScript { - PrepareSpellScript(spell_slabhide_stalactite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_STALACTITE_SUMMON_TRIGGER }); @@ -363,14 +361,12 @@ class spell_slabhide_stalactite : public SpellScript void Register() override { - OnHit += SpellHitFn(spell_slabhide_stalactite::SummonStalactiteTrigger); + OnHit.Register(&spell_slabhide_stalactite::SummonStalactiteTrigger); } }; class spell_slabhide_stalactite_summon : public SpellScript { - PrepareSpellScript(spell_slabhide_stalactite_summon); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 55.0f, 0.0f }); @@ -378,14 +374,12 @@ class spell_slabhide_stalactite_summon : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_slabhide_stalactite_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_slabhide_stalactite_summon::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; class spell_slabhide_stalactite_dest_relocation : public SpellScript { - PrepareSpellScript(spell_slabhide_stalactite_dest_relocation); - void SetDest(SpellDestination& dest) { if (Unit* caster = GetCaster()) @@ -401,14 +395,12 @@ class spell_slabhide_stalactite_dest_relocation : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_slabhide_stalactite_dest_relocation::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_slabhide_stalactite_dest_relocation::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; class spell_slabhide_crystal_storm_periodic : public SpellScript { - PrepareSpellScript(spell_slabhide_crystal_storm_periodic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRYSTAL_STORM }); @@ -422,7 +414,7 @@ class spell_slabhide_crystal_storm_periodic : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_slabhide_crystal_storm_periodic::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_slabhide_crystal_storm_periodic::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp index a642d7ed84..475991fa89 100644 --- a/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.cpp @@ -258,8 +258,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) @@ -267,7 +265,7 @@ class spell_force_of_earth : public SpellScriptLoader void Register() { - OnEffectLaunch += SpellEffectFn(spell_force_of_earth_SpellScript::DummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_force_of_earth_SpellScript::DummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -285,9 +283,7 @@ public: class spell_sc_anchor_here_SpellScript : public SpellScript { - PrepareSpellScript(spell_sc_anchor_here_SpellScript); - - void HandleScript(SpellEffIndex /*effIndex*/) + void HandleScript(SpellEffIndex /*effIndex*/) { if (Creature* creature = GetHitUnit()->ToCreature()) creature->SetHomePosition(creature->GetPositionX(), creature->GetPositionY(), creature->GetPositionZ(), creature->GetOrientation()); @@ -295,7 +291,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sc_anchor_here_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_sc_anchor_here_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -313,8 +309,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)) @@ -330,7 +324,7 @@ class spell_sc_twilight_documents : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_sc_twilight_documents_SpellScript::SpawnGameObject, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_sc_twilight_documents_SpellScript::SpawnGameObject, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -362,8 +356,6 @@ class spell_sc_quake : public SpellScriptLoader class spell_sc_quake_SpellScript : public SpellScript { - PrepareSpellScript(spell_sc_quake_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(JumpCheck()); @@ -371,7 +363,7 @@ class spell_sc_quake : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sc_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_sc_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -383,8 +375,6 @@ class spell_sc_quake : public SpellScriptLoader class spell_sc_ring_wyrm_knockback : public SpellScript { - PrepareSpellScript(spell_sc_ring_wyrm_knockback); - void SetDest(SpellDestination& dest) { Unit* caster = GetCaster(); @@ -398,7 +388,7 @@ class spell_sc_ring_wyrm_knockback : public SpellScript void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_sc_ring_wyrm_knockback::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_sc_ring_wyrm_knockback::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; 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 5895c3ea92..69cbb3dd04 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp @@ -236,8 +236,6 @@ class spell_ahn_kahet_swarm : public SpellScriptLoader class spell_ahn_kahet_swarm_SpellScript : public SpellScript { - PrepareSpellScript(spell_ahn_kahet_swarm_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWARM_BUFF }); @@ -266,8 +264,8 @@ class spell_ahn_kahet_swarm : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ahn_kahet_swarm_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnEffectHit += SpellEffectFn(spell_ahn_kahet_swarm_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ahn_kahet_swarm_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHit.Register(&spell_ahn_kahet_swarm_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } uint32 _targetCount = 0; 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 8c732dd2f2..90db5182e0 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp @@ -440,8 +440,6 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScriptLoader class spell_prince_taldaram_conjure_flame_sphere_SpellScript : public SpellScript { - PrepareSpellScript(spell_prince_taldaram_conjure_flame_sphere_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_SPHERE_SUMMON_1, SPELL_FLAME_SPHERE_SUMMON_2, SPELL_FLAME_SPHERE_SUMMON_3 }); @@ -461,7 +459,7 @@ class spell_prince_taldaram_conjure_flame_sphere : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_prince_taldaram_conjure_flame_sphere_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_prince_taldaram_conjure_flame_sphere_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -479,8 +477,6 @@ class spell_prince_taldaram_flame_sphere_summon : public SpellScriptLoader class spell_prince_taldaram_flame_sphere_summon_SpellScript : public SpellScript { - PrepareSpellScript(spell_prince_taldaram_flame_sphere_summon_SpellScript); - void SetDest(SpellDestination& dest) { Position offset = { 0.0f, 0.0f, 5.5f, 0.0f }; @@ -489,7 +485,7 @@ class spell_prince_taldaram_flame_sphere_summon : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_prince_taldaram_flame_sphere_summon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_prince_taldaram_flame_sphere_summon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index 82174d1461..41cb98fd2c 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -289,8 +289,6 @@ class instance_ahnkahet : public InstanceMapScript // 56584 - Combined Toxins class spell_combined_toxins : public AuraScript { - PrepareAuraScript(spell_combined_toxins); - bool CheckProc(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo) { // only procs on poisons (damage class check to exclude stuff like Envenom) @@ -300,7 +298,7 @@ class spell_combined_toxins : public AuraScript void Register() override { - DoCheckEffectProc += AuraCheckEffectProcFn(spell_combined_toxins::CheckProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_DAMAGE); + DoCheckEffectProc.Register(&spell_combined_toxins::CheckProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp index 3d43c517c0..c7378939d3 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_anubarak.cpp @@ -645,8 +645,6 @@ class spell_anubarak_pound : public SpellScriptLoader class spell_anubarak_pound_SpellScript : public SpellScript { - PrepareSpellScript(spell_anubarak_pound_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POUND_DAMAGE }); @@ -660,7 +658,7 @@ class spell_anubarak_pound : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_anubarak_pound_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_anubarak_pound_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -678,8 +676,6 @@ class spell_anubarak_carrion_beetles : public SpellScriptLoader class spell_anubarak_carrion_beetles_AuraScript : public AuraScript { public: - PrepareAuraScript(spell_anubarak_carrion_beetles_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CARRION_BEETLE }); @@ -693,7 +689,7 @@ class spell_anubarak_carrion_beetles : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_anubarak_carrion_beetles_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_anubarak_carrion_beetles_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp index 3f363d259b..5e7dc9ccde 100644 --- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/boss_hadronox.cpp @@ -942,7 +942,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); bool Validate(SpellInfo const* /*spell*/) override { @@ -978,8 +977,8 @@ class spell_hadronox_periodic_summon_template_AuraScript : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hadronox_periodic_summon_template_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_hadronox_periodic_summon_template_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_hadronox_periodic_summon_template_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_hadronox_periodic_summon_template_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: @@ -1045,8 +1044,6 @@ class spell_hadronox_leeching_poison : public SpellScriptLoader class spell_hadronox_leeching_poison_AuraScript : public AuraScript { - PrepareAuraScript(spell_hadronox_leeching_poison_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LEECH_POISON_HEAL }); @@ -1066,7 +1063,7 @@ class spell_hadronox_leeching_poison : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_hadronox_leeching_poison_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_LEECH, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_hadronox_leeching_poison_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_LEECH, AURA_EFFECT_HANDLE_REAL); } }; @@ -1083,8 +1080,6 @@ class spell_hadronox_web_doors : public SpellScriptLoader class spell_hadronox_web_doors_SpellScript : public SpellScript { - PrepareSpellScript(spell_hadronox_web_doors_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_CHAMPION_PERIODIC, SPELL_SUMMON_CRYPT_FIEND_PERIODIC, SPELL_SUMMON_NECROMANCER_PERIODIC }); @@ -1102,7 +1097,7 @@ class spell_hadronox_web_doors : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hadronox_web_doors_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_hadronox_web_doors_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; 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 77265e91f7..758b8bca86 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 @@ -916,8 +916,6 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader class spell_gatewatcher_subboss_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_gatewatcher_subboss_trigger_SpellScript); - void HandleTargets(std::list& targetList) { // Remove any Watchers that are already in combat @@ -951,7 +949,7 @@ class spell_gatewatcher_subboss_trigger : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gatewatcher_subboss_trigger_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_gatewatcher_subboss_trigger_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -968,8 +966,6 @@ class spell_anub_ar_skirmisher_fixate : public SpellScriptLoader class spell_anub_ar_skirmisher_fixate_SpellScript : public SpellScript { - PrepareSpellScript(spell_anub_ar_skirmisher_fixate_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FIXATE_TRIGGERED }); @@ -983,7 +979,7 @@ class spell_anub_ar_skirmisher_fixate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_anub_ar_skirmisher_fixate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_anub_ar_skirmisher_fixate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1000,8 +996,6 @@ class spell_gatewatcher_web_wrap : public SpellScriptLoader class spell_gatewatcher_web_wrap_AuraScript : public AuraScript { - PrepareAuraScript(spell_gatewatcher_web_wrap_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_WEB_WRAP_WRAPPED }); @@ -1018,7 +1012,7 @@ class spell_gatewatcher_web_wrap : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_gatewatcher_web_wrap_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_ROOT, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_gatewatcher_web_wrap_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_ROOT, AURA_EFFECT_HANDLE_REAL); } }; 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 8805294039..c8e0b09a59 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 @@ -333,8 +333,6 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader class spell_baltharus_enervating_brand_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_baltharus_enervating_brand_trigger_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SIPHONED_MIGHT }); @@ -350,7 +348,7 @@ class spell_baltharus_enervating_brand_trigger : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_baltharus_enervating_brand_trigger_SpellScript::HandleSiphonedMight); + OnHit.Register(&spell_baltharus_enervating_brand_trigger_SpellScript::HandleSiphonedMight); } }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index dac1c33733..c97240df07 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -1406,8 +1406,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()) @@ -1420,7 +1418,7 @@ class spell_halion_meteor_strike_marker : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_halion_meteor_strike_marker_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_halion_meteor_strike_marker_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1437,8 +1435,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) { } @@ -1468,9 +1464,9 @@ class spell_halion_combustion_consumption : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_halion_combustion_consumption_AuraScript::AddMarkStack, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - AfterEffectApply += AuraEffectApplyFn(spell_halion_combustion_consumption_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_halion_combustion_consumption_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_halion_combustion_consumption_AuraScript::AddMarkStack, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + AfterEffectApply.Register(&spell_halion_combustion_consumption_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_halion_combustion_consumption_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } uint32 _markSpell; @@ -1492,8 +1488,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 ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -1514,7 +1508,7 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_halion_combustion_consumption_periodic_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_halion_combustion_consumption_periodic_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1532,8 +1526,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) { } @@ -1565,8 +1557,8 @@ class spell_halion_marks : public SpellScriptLoader void Register() override { - OnDispel += AuraDispelFn(spell_halion_marks_AuraScript::BeforeDispel); - AfterEffectRemove += AuraEffectRemoveFn(spell_halion_marks_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnDispel.Register(&spell_halion_marks_AuraScript::BeforeDispel); + AfterEffectRemove.Register(&spell_halion_marks_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } uint32 _summonSpellId; @@ -1590,8 +1582,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); @@ -1608,7 +1598,7 @@ class spell_halion_damage_aoe_summon : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_halion_damage_aoe_summon_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit.Register(&spell_halion_damage_aoe_summon_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -1627,8 +1617,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) @@ -1639,14 +1627,14 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader return ValidateSpellInfo({ _beforeHitSpellId }); } - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*handle*/) + void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAurasDueToSpell(SPELL_TWILIGHT_REALM); if (InstanceScript* instance = GetTarget()->GetInstanceScript()) instance->SendEncounterUnit(ENCOUNTER_FRAME_UNK7); } - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*handle*/) + void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); if (!target) @@ -1661,11 +1649,11 @@ class spell_halion_twilight_realm_handlers : public SpellScriptLoader { if (!_isApply) { - AfterEffectApply += AuraEffectApplyFn(spell_halion_twilight_realm_handlers_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_halion_twilight_realm_handlers_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_halion_twilight_realm_handlers_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_halion_twilight_realm_handlers_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } else - AfterEffectApply += AuraEffectApplyFn(spell_halion_twilight_realm_handlers_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PHASE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_halion_twilight_realm_handlers_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PHASE, AURA_EFFECT_HANDLE_REAL); } bool _isApply; @@ -1689,8 +1677,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 }); @@ -1704,7 +1690,7 @@ class spell_halion_clear_debuffs : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_halion_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_halion_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1736,8 +1722,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& unitList) { if (unitList.empty()) @@ -1756,7 +1740,7 @@ class spell_halion_twilight_cutter : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halion_twilight_cutter_SpellScript::RemoveNotBetween, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_halion_twilight_cutter_SpellScript::RemoveNotBetween, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1773,8 +1757,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* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_TWILIGHT_PORTAL }); @@ -1789,7 +1771,7 @@ class spell_halion_twilight_phasing : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_halion_twilight_phasing_SpellScript::Phase); + OnHit.Register(&spell_halion_twilight_phasing_SpellScript::Phase); } }; @@ -1807,8 +1789,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 }; @@ -1823,8 +1803,8 @@ class spell_halion_summon_exit_portals : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_halion_summon_exit_portals_SpellScript::SetDest0, EFFECT_0, TARGET_DEST_CASTER); - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_halion_summon_exit_portals_SpellScript::SetDest1, EFFECT_1, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_halion_summon_exit_portals_SpellScript::SetDest0, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_halion_summon_exit_portals_SpellScript::SetDest1, EFFECT_1, TARGET_DEST_CASTER); } }; @@ -1841,8 +1821,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& unitList) { if (!unitList.empty()) @@ -1856,8 +1834,8 @@ class spell_halion_spawn_living_embers : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_halion_spawn_living_embers_SpellScript::SelectMeteorFlames, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_halion_spawn_living_embers_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_halion_spawn_living_embers_SpellScript::SelectMeteorFlames, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_halion_spawn_living_embers_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1874,8 +1852,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); @@ -1884,7 +1860,7 @@ class spell_halion_blazing_aura : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_halion_blazing_aura_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_halion_blazing_aura_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_FORCE_CAST); } }; 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 e37226b922..f270c8f930 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_saviana_ragefire.cpp @@ -225,8 +225,6 @@ class spell_saviana_conflagration_init : public SpellScriptLoader class spell_saviana_conflagration_init_SpellScript : public SpellScript { - PrepareSpellScript(spell_saviana_conflagration_init_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FLAME_BEACON, SPELL_CONFLAGRATION_2 }); @@ -249,8 +247,8 @@ class spell_saviana_conflagration_init : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_saviana_conflagration_init_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_init_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_saviana_conflagration_init_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_saviana_conflagration_init_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -268,8 +266,6 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader class spell_saviana_conflagration_throwback_SpellScript : public SpellScript { - PrepareSpellScript(spell_saviana_conflagration_throwback_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -279,7 +275,7 @@ class spell_saviana_conflagration_throwback : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_saviana_conflagration_throwback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_saviana_conflagration_throwback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp index dd9c858d94..cad9b53f06 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.cpp @@ -183,8 +183,6 @@ class spell_ruby_sanctum_rallying_shout : public SpellScriptLoader class spell_ruby_sanctum_rallying_shout_SpellScript : public SpellScript { - PrepareSpellScript(spell_ruby_sanctum_rallying_shout_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RALLY }); @@ -203,8 +201,8 @@ class spell_ruby_sanctum_rallying_shout : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ruby_sanctum_rallying_shout_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnEffectHit += SpellEffectFn(spell_ruby_sanctum_rallying_shout_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ruby_sanctum_rallying_shout_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHit.Register(&spell_ruby_sanctum_rallying_shout_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } private: 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 e7bc2ca802..93e183b018 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/boss_argent_challenge.cpp @@ -131,8 +131,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& unitList) { unitList.remove_if(OrientationCheck(GetCaster())); @@ -140,8 +138,8 @@ class spell_eadric_radiance : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_eadric_radiance_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -649,8 +647,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); @@ -673,8 +669,8 @@ class spell_paletress_summon_memory : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paletress_summon_memory_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_paletress_summon_memory_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_paletress_summon_memory_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_paletress_summon_memory_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; 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 1139cae587..079fe57acd 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp @@ -839,8 +839,6 @@ class spell_impale : public SpellScriptLoader class spell_impale_SpellScript : public SpellScript { - PrepareSpellScript(spell_impale_SpellScript); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -853,7 +851,7 @@ class spell_impale : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_impale_SpellScript::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_impale_SpellScript::HandleDamageCalc, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -870,8 +868,6 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader class spell_anubarak_leeching_swarm_AuraScript : public AuraScript { - PrepareAuraScript(spell_anubarak_leeching_swarm_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LEECHING_SWARM_DMG, SPELL_LEECHING_SWARM_HEAL }); @@ -894,7 +890,7 @@ class spell_anubarak_leeching_swarm : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_anubarak_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_anubarak_leeching_swarm_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; 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 b684409d32..0f44ecb7f3 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_faction_champions.cpp @@ -2263,8 +2263,6 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader class spell_faction_champion_warl_unstable_affliction_AuraScript : public AuraScript { - PrepareAuraScript(spell_faction_champion_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNSTABLE_AFFLICTION_DISPEL }); @@ -2278,7 +2276,7 @@ class spell_faction_champion_warl_unstable_affliction : public SpellScriptLoader void Register() override { - AfterDispel += AuraDispelFn(spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel); + AfterDispel.Register(&spell_faction_champion_warl_unstable_affliction_AuraScript::HandleDispel); } }; @@ -2295,8 +2293,6 @@ class spell_faction_champion_death_grip : public SpellScriptLoader class spell_faction_champion_death_grip_SpellScript : public SpellScript { - PrepareSpellScript(spell_faction_champion_death_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DEATH_GRIP_PULL }); @@ -2313,7 +2309,7 @@ class spell_faction_champion_death_grip : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_faction_champion_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_faction_champion_death_grip_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2331,8 +2327,6 @@ class spell_toc_bloodlust : public SpellScriptLoader class spell_toc_bloodlust_SpellScript : public SpellScript { - PrepareSpellScript(spell_toc_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ AURA_SATED }); @@ -2351,9 +2345,9 @@ class spell_toc_bloodlust : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); - AfterHit += SpellHitFn(spell_toc_bloodlust_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_toc_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); + AfterHit.Register(&spell_toc_bloodlust_SpellScript::ApplyDebuff); } }; @@ -2370,8 +2364,6 @@ class spell_toc_heroism : public SpellScriptLoader class spell_toc_heroism_SpellScript : public SpellScript { - PrepareSpellScript(spell_toc_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ AURA_EXHAUSTION }); @@ -2390,9 +2382,9 @@ class spell_toc_heroism : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); - AfterHit += SpellHitFn(spell_toc_heroism_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_toc_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ALLY); + AfterHit.Register(&spell_toc_heroism_SpellScript::ApplyDebuff); } }; 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 e08a58c11d..1fd380cb71 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_lord_jaraxxus.cpp @@ -493,8 +493,6 @@ class spell_mistress_kiss : public SpellScriptLoader class spell_mistress_kiss_AuraScript : public AuraScript { - PrepareAuraScript(spell_mistress_kiss_AuraScript); - bool Load() override { if (GetCaster()) @@ -519,7 +517,7 @@ class spell_mistress_kiss : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mistress_kiss_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_mistress_kiss_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -551,8 +549,6 @@ class spell_mistress_kiss_area : public SpellScriptLoader class spell_mistress_kiss_area_SpellScript : public SpellScript { - PrepareSpellScript(spell_mistress_kiss_area_SpellScript); - void FilterTargets(std::list& targets) { // get a list of players with mana @@ -572,8 +568,8 @@ class spell_mistress_kiss_area : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mistress_kiss_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mistress_kiss_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_mistress_kiss_area_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mistress_kiss_area_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -590,9 +586,7 @@ public: class spell_fel_streak_visual_SpellScript : public SpellScript { - PrepareSpellScript(spell_fel_streak_visual_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FEL_STREAK }); } @@ -604,7 +598,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_fel_streak_visual_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_fel_streak_visual_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; 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 694c3b4908..e1ca6ae002 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp @@ -856,8 +856,6 @@ class spell_gormok_fire_bomb : public SpellScriptLoader class spell_gormok_fire_bomb_SpellScript : public SpellScript { - PrepareSpellScript(spell_gormok_fire_bomb_SpellScript); - void TriggerFireBomb(SpellEffIndex /*effIndex*/) { if (const WorldLocation* pos = GetExplTargetDest()) @@ -869,7 +867,7 @@ class spell_gormok_fire_bomb : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_gormok_fire_bomb_SpellScript::TriggerFireBomb, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); + OnEffectHit.Register(&spell_gormok_fire_bomb_SpellScript::TriggerFireBomb, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; @@ -1174,8 +1172,6 @@ public: class spell_gormok_jump_to_hand_AuraScript : public AuraScript { - PrepareAuraScript(spell_gormok_jump_to_hand_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_PLAYER }); @@ -1206,7 +1202,7 @@ public: void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_gormok_jump_to_hand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gormok_jump_to_hand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1223,8 +1219,6 @@ public: class spell_gormok_ride_player_AuraScript : public AuraScript { - PrepareAuraScript(spell_gormok_ride_player_AuraScript); - bool Load() override { if (GetCaster() && GetCaster()->GetEntry() == NPC_SNOBOLD_VASSAL) @@ -1252,8 +1246,8 @@ public: void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gormok_ride_player_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gormok_ride_player_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_gormok_ride_player_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gormok_ride_player_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1270,8 +1264,6 @@ public: class spell_gormok_snobolled_AuraScript : public AuraScript { - PrepareAuraScript(spell_gormok_snobolled_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_PLAYER }); @@ -1285,7 +1277,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gormok_snobolled_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gormok_snobolled_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1302,8 +1294,6 @@ public: class spell_jormungars_paralytic_toxin_AuraScript : public AuraScript { - PrepareAuraScript(spell_jormungars_paralytic_toxin_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PARALYSIS }); @@ -1348,10 +1338,10 @@ public: void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_jormungars_paralytic_toxin_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_jormungars_paralytic_toxin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_jormungars_paralytic_toxin_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_jormungars_paralytic_toxin_AuraScript::HandleDummy, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_jormungars_paralytic_toxin_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_jormungars_paralytic_toxin_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); + DoEffectCalcAmount.Register(&spell_jormungars_paralytic_toxin_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED); + OnEffectPeriodic.Register(&spell_jormungars_paralytic_toxin_AuraScript::HandleDummy, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1368,9 +1358,7 @@ public: class spell_jormungars_snakes_spray_SpellScript : public SpellScript { - PrepareSpellScript(spell_jormungars_snakes_spray_SpellScript); - - public: + public: spell_jormungars_snakes_spray_SpellScript(uint32 spellId) : SpellScript(), _spellId(spellId) { } bool Validate(SpellInfo const* /*spell*/) override @@ -1386,7 +1374,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_jormungars_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_jormungars_snakes_spray_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } private: @@ -1409,8 +1397,6 @@ public: class spell_jormungars_paralysis_AuraScript : public AuraScript { - PrepareAuraScript(spell_jormungars_paralysis_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1423,7 +1409,7 @@ public: void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_jormungars_paralysis_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_jormungars_paralysis_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; 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 d237500f82..a4dacbc29f 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp @@ -689,8 +689,6 @@ class spell_powering_up : public SpellScriptLoader class spell_powering_up_SpellScript : public SpellScript { - PrepareSpellScript(spell_powering_up_SpellScript); - uint32 spellId = 0; uint32 poweringUp = 0; @@ -729,7 +727,7 @@ class spell_powering_up : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_powering_up_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_powering_up_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -746,8 +744,6 @@ class spell_valkyr_essences : public SpellScriptLoader class spell_valkyr_essences_AuraScript : public AuraScript { - PrepareAuraScript(spell_valkyr_essences_AuraScript); - uint32 spellId = 0; bool Load() override @@ -822,7 +818,7 @@ class spell_valkyr_essences : public SpellScriptLoader void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_valkyr_essences_AuraScript::Absorb, EFFECT_0); + OnEffectAbsorb.Register(&spell_valkyr_essences_AuraScript::Absorb, EFFECT_0); } }; @@ -839,8 +835,6 @@ class spell_power_of_the_twins : public SpellScriptLoader class spell_power_of_the_twins_AuraScript : public AuraScript { - PrepareAuraScript(spell_power_of_the_twins_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -866,8 +860,8 @@ class spell_power_of_the_twins : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_power_of_the_twins_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_power_of_the_twins_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_power_of_the_twins_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_power_of_the_twins_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp index b73dad1ebf..a872d4a2ff 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_novos.cpp @@ -374,8 +374,6 @@ class spell_novos_summon_minions : public SpellScriptLoader class spell_novos_summon_minions_SpellScript : public SpellScript { - PrepareSpellScript(spell_novos_summon_minions_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_COPY_OF_MINIONS }); @@ -389,7 +387,7 @@ class spell_novos_summon_minions : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_novos_summon_minions_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_novos_summon_minions_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp index 1adbce85f2..7b73e89156 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_tharon_ja.cpp @@ -213,8 +213,6 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader class spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript : public SpellScript { - PrepareSpellScript(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GIFT_OF_THARON_JA }); @@ -228,7 +226,7 @@ class spell_tharon_ja_clear_gift_of_tharon_ja : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_tharon_ja_clear_gift_of_tharon_ja_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp index 3cfdbcd167..71eee55427 100644 --- a/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp +++ b/src/server/scripts/Northrend/DraktharonKeep/boss_trollgore.cpp @@ -233,8 +233,6 @@ class spell_trollgore_consume : public SpellScriptLoader class spell_trollgore_consume_SpellScript : public SpellScript { - PrepareSpellScript(spell_trollgore_consume_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CONSUME_BUFF }); @@ -248,7 +246,7 @@ class spell_trollgore_consume : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_trollgore_consume_SpellScript::HandleConsume, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_trollgore_consume_SpellScript::HandleConsume, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -266,8 +264,6 @@ class spell_trollgore_corpse_explode : public SpellScriptLoader class spell_trollgore_corpse_explode_AuraScript : public AuraScript { - PrepareAuraScript(spell_trollgore_corpse_explode_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CORPSE_EXPLODE_DAMAGE }); @@ -288,8 +284,8 @@ class spell_trollgore_corpse_explode : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_trollgore_corpse_explode_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_trollgore_corpse_explode_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_trollgore_corpse_explode_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_trollgore_corpse_explode_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -307,8 +303,6 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader class spell_trollgore_invader_taunt_SpellScript : public SpellScript { - PrepareSpellScript(spell_trollgore_invader_taunt_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -322,7 +316,7 @@ class spell_trollgore_invader_taunt : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_trollgore_invader_taunt_SpellScript::HandleTaunt, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_trollgore_invader_taunt_SpellScript::HandleTaunt, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp index 05d6987ebf..ac8a010bf3 100644 --- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/boss_bronjahm.cpp @@ -267,8 +267,6 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader class spell_bronjahm_magic_bane_SpellScript : public SpellScript { - PrepareSpellScript(spell_bronjahm_magic_bane_SpellScript); - void RecalculateDamage() { if (GetHitUnit()->GetPowerType() != POWER_MANA) @@ -282,7 +280,7 @@ class spell_bronjahm_magic_bane : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_bronjahm_magic_bane_SpellScript::RecalculateDamage); + OnHit.Register(&spell_bronjahm_magic_bane_SpellScript::RecalculateDamage); } }; @@ -299,8 +297,6 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader class spell_bronjahm_consume_soul_SpellScript : public SpellScript { - PrepareSpellScript(spell_bronjahm_consume_soul_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -309,7 +305,7 @@ class spell_bronjahm_consume_soul : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_bronjahm_consume_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_bronjahm_consume_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -338,8 +334,6 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader class spell_bronjahm_soulstorm_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_bronjahm_soulstorm_visual_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(SoulstormVisualSpells); @@ -353,7 +347,7 @@ class spell_bronjahm_soulstorm_visual : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_bronjahm_soulstorm_visual_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_bronjahm_soulstorm_visual_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -370,8 +364,6 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader class spell_bronjahm_soulstorm_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_bronjahm_soulstorm_targeting_SpellScript); - void FilterTargets(std::list& targets) { Unit* caster = GetCaster(); @@ -383,7 +375,7 @@ class spell_bronjahm_soulstorm_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_bronjahm_soulstorm_targeting_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_DEST_AREA_ENEMY); } }; 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 5f4d603aab..23c9fdcaab 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 @@ -359,8 +359,6 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScriptLoader class spell_devourer_of_souls_mirrored_soul_SpellScript : public SpellScript { - PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_PROC_AURA }); @@ -374,7 +372,7 @@ class spell_devourer_of_souls_mirrored_soul : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_devourer_of_souls_mirrored_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_devourer_of_souls_mirrored_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -392,8 +390,6 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader class spell_devourer_of_souls_mirrored_soul_proc_AuraScript : public AuraScript { - PrepareAuraScript(spell_devourer_of_souls_mirrored_soul_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_DAMAGE }); @@ -417,8 +413,8 @@ class spell_devourer_of_souls_mirrored_soul_proc : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_devourer_of_souls_mirrored_soul_proc_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_devourer_of_souls_mirrored_soul_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_devourer_of_souls_mirrored_soul_proc_AuraScript::CheckProc); + OnEffectProc.Register(&spell_devourer_of_souls_mirrored_soul_proc_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -436,8 +432,6 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript class spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript : public SpellScript { - PrepareSpellScript(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIRRORED_SOUL_BUFF }); @@ -461,8 +455,8 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_devourer_of_souls_mirrored_soul_target_selector_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -474,8 +468,6 @@ class spell_devourer_of_souls_mirrored_soul_target_selector : public SpellScript class spell_devourer_of_souls_well_of_souls_periodic_visual_effect : public SpellScript { - PrepareSpellScript(spell_devourer_of_souls_well_of_souls_periodic_visual_effect); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 20.0f, 0.0f }); @@ -483,7 +475,7 @@ class spell_devourer_of_souls_well_of_souls_periodic_visual_effect : public Spel void Register() { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_devourer_of_souls_well_of_souls_periodic_visual_effect::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); + OnDestinationTargetSelect.Register(&spell_devourer_of_souls_well_of_souls_periodic_visual_effect::SetDest, EFFECT_0, TARGET_DEST_CASTER_RANDOM); } }; diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp index c7298c2efb..64582fb285 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().HasFlag(AuraRemoveFlags::ByEnemySpell)) @@ -157,7 +155,7 @@ class spell_marwyn_shared_suffering : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_marwyn_shared_suffering_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_marwyn_shared_suffering_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; 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 4431202bbf..ef8571f52f 100644 --- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp @@ -2740,8 +2740,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()) @@ -2756,7 +2754,7 @@ class spell_hor_start_halls_of_reflection_quest_ae : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hor_start_halls_of_reflection_quest_ae_SpellScript::StartQuests, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hor_start_halls_of_reflection_quest_ae_SpellScript::StartQuests, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2774,8 +2772,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; @@ -2800,7 +2796,7 @@ class spell_hor_evasion : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_hor_evasion_SpellScript::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS); + OnDestinationTargetSelect.Register(&spell_hor_evasion_SpellScript::SetDest, EFFECT_0, TARGET_DEST_TARGET_RADIUS); } }; @@ -2818,8 +2814,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)) @@ -2833,7 +2827,7 @@ class spell_hor_gunship_cannon_fire : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_hor_gunship_cannon_fire_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_hor_gunship_cannon_fire_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2846,8 +2840,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 ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -2863,7 +2855,7 @@ class spell_hor_quel_delars_will : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hor_quel_delars_will::HandleReagent, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_hor_quel_delars_will::HandleReagent, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; 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 943d49d3f2..193fcc90cb 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_forgemaster_garfrost.cpp @@ -261,8 +261,6 @@ class spell_garfrost_permafrost : public SpellScriptLoader class spell_garfrost_permafrost_SpellScript : public SpellScript { - PrepareSpellScript(spell_garfrost_permafrost_SpellScript); - void PreventHitByLoS() { if (Unit* target = GetHitUnit()) @@ -305,8 +303,8 @@ class spell_garfrost_permafrost : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::PreventHitByLoS); - AfterHit += SpellHitFn(spell_garfrost_permafrost_SpellScript::RestoreImmunity); + BeforeHit.Register(&spell_garfrost_permafrost_SpellScript::PreventHitByLoS); + AfterHit.Register(&spell_garfrost_permafrost_SpellScript::RestoreImmunity); } bool prevented = false; diff --git a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp index 4003b49ef2..798b457ea4 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_krickandick.cpp @@ -537,8 +537,6 @@ class spell_krick_explosive_barrage : public SpellScriptLoader class spell_krick_explosive_barrage_AuraScript : public AuraScript { - PrepareAuraScript(spell_krick_explosive_barrage_AuraScript); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -555,7 +553,7 @@ class spell_krick_explosive_barrage : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_krick_explosive_barrage_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_krick_explosive_barrage_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -572,8 +570,6 @@ class spell_ick_explosive_barrage : public SpellScriptLoader class spell_ick_explosive_barrage_AuraScript : public AuraScript { - PrepareAuraScript(spell_ick_explosive_barrage_AuraScript); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -593,8 +589,8 @@ class spell_ick_explosive_barrage : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_ick_explosive_barrage_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_ick_explosive_barrage_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_ick_explosive_barrage_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ick_explosive_barrage_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -611,8 +607,6 @@ class spell_exploding_orb_hasty_grow : public SpellScriptLoader class spell_exploding_orb_hasty_grow_AuraScript : public AuraScript { - PrepareAuraScript(spell_exploding_orb_hasty_grow_AuraScript); - void OnStackChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetStackAmount() == 15) @@ -629,7 +623,7 @@ class spell_exploding_orb_hasty_grow : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_exploding_orb_hasty_grow_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply.Register(&spell_exploding_orb_hasty_grow_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAPPLY); } }; @@ -646,8 +640,6 @@ class spell_krick_pursuit : public SpellScriptLoader class spell_krick_pursuit_SpellScript : public SpellScript { - PrepareSpellScript(spell_krick_pursuit_SpellScript); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -663,14 +655,12 @@ class spell_krick_pursuit : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_krick_pursuit_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_krick_pursuit_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_krick_pursuit_AuraScript : public AuraScript { - PrepareAuraScript(spell_krick_pursuit_AuraScript); - void HandleExtraEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -680,7 +670,7 @@ class spell_krick_pursuit : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_krick_pursuit_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -702,8 +692,6 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader class spell_krick_pursuit_confusion_AuraScript : public AuraScript { - PrepareAuraScript(spell_krick_pursuit_confusion_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->ApplySpellImmune(0, IMMUNITY_STATE, SPELL_AURA_MOD_TAUNT, true); @@ -718,8 +706,8 @@ class spell_krick_pursuit_confusion : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_krick_pursuit_confusion_AuraScript::OnApply, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_krick_pursuit_confusion_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_krick_pursuit_confusion_AuraScript::OnApply, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_krick_pursuit_confusion_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_LINKED, AURA_EFFECT_HANDLE_REAL); } }; 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 c12c89e302..40b0fa1c65 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/boss_scourgelord_tyrannus.cpp @@ -425,8 +425,6 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader class spell_tyrannus_overlord_brand_AuraScript : public AuraScript { - PrepareAuraScript(spell_tyrannus_overlord_brand_AuraScript); - public: spell_tyrannus_overlord_brand_AuraScript() { @@ -465,8 +463,8 @@ class spell_tyrannus_overlord_brand : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_overlord_brand_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_tyrannus_overlord_brand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_tyrannus_overlord_brand_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_tyrannus_overlord_brand_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } PlayerAI* oldAI; @@ -486,8 +484,6 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader class spell_tyrannus_mark_of_rimefang_AuraScript : public AuraScript { - PrepareAuraScript(spell_tyrannus_mark_of_rimefang_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -501,7 +497,7 @@ class spell_tyrannus_mark_of_rimefang : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_tyrannus_mark_of_rimefang_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_tyrannus_mark_of_rimefang_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -519,8 +515,6 @@ class spell_tyrannus_rimefang_icy_blast : public SpellScriptLoader class spell_tyrannus_rimefang_icy_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_tyrannus_rimefang_icy_blast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICY_BLAST_AURA }); @@ -536,7 +530,7 @@ class spell_tyrannus_rimefang_icy_blast : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_tyrannus_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); + OnEffectHit.Register(&spell_tyrannus_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); } }; 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 fddf2c7df4..00690f0f1c 100644 --- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp +++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.cpp @@ -240,8 +240,6 @@ class spell_trash_npc_glacial_strike : public SpellScriptLoader class spell_trash_npc_glacial_strike_AuraScript : public AuraScript { - PrepareAuraScript(spell_trash_npc_glacial_strike_AuraScript); - void PeriodicTick(AuraEffect const* /*aurEff*/) { if (GetTarget()->IsFullHealth()) @@ -253,7 +251,7 @@ class spell_trash_npc_glacial_strike : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); + OnEffectPeriodic.Register(&spell_trash_npc_glacial_strike_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE_PERCENT); } }; @@ -313,8 +311,6 @@ class spell_pos_ice_shards : public SpellScriptLoader class spell_pos_ice_shards_SpellScript : public SpellScript { - PrepareSpellScript(spell_pos_ice_shards_SpellScript); - bool Load() override { // This script should execute only in Pit of Saron @@ -329,7 +325,7 @@ class spell_pos_ice_shards : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pos_ice_shards_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pos_ice_shards_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp index c29f70efbb..4a2ca89757 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_gal_darah.cpp @@ -248,8 +248,6 @@ class spell_gal_darah_impaling_charge : public SpellScriptLoader class spell_gal_darah_impaling_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_gal_darah_impaling_charge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_IMPALING_CHARGE_CONTROL_VEHICLE }); @@ -272,7 +270,7 @@ class spell_gal_darah_impaling_charge : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gal_darah_impaling_charge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_CHARGE); + OnEffectHitTarget.Register(&spell_gal_darah_impaling_charge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_CHARGE); } }; @@ -290,8 +288,6 @@ public: class spell_gal_darah_stampede_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_gal_darah_stampede_charge_SpellScript); - void OnHit(SpellEffIndex /*effIndex*/) { if (Creature* caster = GetCaster()->ToCreature()) @@ -300,7 +296,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gal_darah_stampede_charge_SpellScript::OnHit, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_gal_darah_stampede_charge_SpellScript::OnHit, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp index 70a8fadb9c..4cc2f632bf 100644 --- a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp +++ b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp @@ -221,8 +221,6 @@ class spell_moorabi_mojo_frenzy : public SpellScriptLoader class spell_moorabi_mojo_frenzy_AuraScript : public AuraScript { - PrepareAuraScript(spell_moorabi_mojo_frenzy_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MOJO_FRENZY_CAST_SPEED }); @@ -239,7 +237,7 @@ class spell_moorabi_mojo_frenzy : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_moorabi_mojo_frenzy_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_moorabi_mojo_frenzy_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; 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 86871f6c6f..cbf203afae 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp @@ -1181,8 +1181,6 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader class spell_taldaram_glittering_sparks_SpellScript : public SpellScript { - PrepareSpellScript(spell_taldaram_glittering_sparks_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1191,7 +1189,7 @@ class spell_taldaram_glittering_sparks : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_taldaram_glittering_sparks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_taldaram_glittering_sparks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1210,8 +1208,6 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader class spell_taldaram_summon_flame_ball_SpellScript : public SpellScript { - PrepareSpellScript(spell_taldaram_summon_flame_ball_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1220,7 +1216,7 @@ class spell_taldaram_summon_flame_ball : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_taldaram_summon_flame_ball_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_taldaram_summon_flame_ball_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1239,8 +1235,6 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader class spell_flame_ball_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_flame_ball_visual_AuraScript); - bool Load() override { if (GetCaster()->GetEntry() == NPC_BALL_OF_FLAME || GetCaster()->GetEntry() == NPC_BALL_OF_INFERNO_FLAME) @@ -1271,7 +1265,7 @@ class spell_taldaram_flame_ball_visual : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_flame_ball_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_flame_ball_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -1292,8 +1286,6 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader class spell_taldaram_ball_of_inferno_flame_SpellScript : public SpellScript { - PrepareSpellScript(spell_taldaram_ball_of_inferno_flame_SpellScript); - void ModAuraStack() { if (Aura* aur = GetHitAura()) @@ -1302,7 +1294,7 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_taldaram_ball_of_inferno_flame_SpellScript::ModAuraStack); + AfterHit.Register(&spell_taldaram_ball_of_inferno_flame_SpellScript::ModAuraStack); } }; @@ -1313,8 +1305,6 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader class spell_taldaram_ball_of_inferno_flame_AuraScript : public AuraScript { - PrepareAuraScript(spell_taldaram_ball_of_inferno_flame_AuraScript); - void HandleStackDrop(ProcEventInfo& /*eventInfo*/) { ModStackAmount(-1); @@ -1322,7 +1312,7 @@ class spell_taldaram_ball_of_inferno_flame : public SpellScriptLoader void Register() override { - OnProc += AuraProcFn(spell_taldaram_ball_of_inferno_flame_AuraScript::HandleStackDrop); + OnProc.Register(&spell_taldaram_ball_of_inferno_flame_AuraScript::HandleStackDrop); } }; @@ -1340,8 +1330,6 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader class spell_valanar_kinetic_bomb_SpellScript : public SpellScript { - PrepareSpellScript(spell_valanar_kinetic_bomb_SpellScript); - void SetDest(SpellDestination& dest) { Position const offset = { 0.0f, 0.0f, 20.0f, 0.0f }; @@ -1350,14 +1338,12 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_valanar_kinetic_bomb_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_valanar_kinetic_bomb_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; class spell_valanar_kinetic_bomb_AuraScript : public AuraScript { - PrepareAuraScript(spell_valanar_kinetic_bomb_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_KINETIC_BOMB_EXPLOSION, SPELL_KINETIC_BOMB_VISUAL }); @@ -1380,7 +1366,7 @@ class spell_valanar_kinetic_bomb : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_valanar_kinetic_bomb_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_valanar_kinetic_bomb_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1403,8 +1389,6 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader class spell_valanar_kinetic_bomb_knockback_SpellScript : public SpellScript { - PrepareSpellScript(spell_valanar_kinetic_bomb_knockback_SpellScript); - void KnockIntoAir() { if (Creature* target = GetHitCreature()) @@ -1413,7 +1397,7 @@ class spell_valanar_kinetic_bomb_knockback : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); + BeforeHit.Register(&spell_valanar_kinetic_bomb_knockback_SpellScript::KnockIntoAir); } }; @@ -1431,8 +1415,6 @@ class spell_valanar_kinetic_bomb_absorb : public SpellScriptLoader class spell_valanar_kinetic_bomb_absorb_AuraScript : public AuraScript { - PrepareAuraScript(spell_valanar_kinetic_bomb_absorb_AuraScript); - void OnAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) { absorbAmount = CalculatePct(dmgInfo.GetDamage(), aurEff->GetAmount()); @@ -1442,7 +1424,7 @@ class spell_valanar_kinetic_bomb_absorb : public SpellScriptLoader void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_valanar_kinetic_bomb_absorb_AuraScript::OnAbsorb, EFFECT_0); + OnEffectAbsorb.Register(&spell_valanar_kinetic_bomb_absorb_AuraScript::OnAbsorb, EFFECT_0); } }; @@ -1460,8 +1442,6 @@ class spell_blood_council_shadow_prison : public SpellScriptLoader class spell_blood_council_shadow_prison_AuraScript : public AuraScript { - PrepareAuraScript(spell_blood_council_shadow_prison_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADOW_PRISON_DAMAGE }); @@ -1475,7 +1455,7 @@ class spell_blood_council_shadow_prison : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_council_shadow_prison_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_blood_council_shadow_prison_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1493,8 +1473,6 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader class spell_blood_council_shadow_prison_SpellScript : public SpellScript { - PrepareSpellScript(spell_blood_council_shadow_prison_SpellScript); - void AddExtraDamage() { if (Aura* aur = GetHitUnit()->GetAura(GetSpellInfo()->Id)) @@ -1504,7 +1482,7 @@ class spell_blood_council_shadow_prison_damage : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_blood_council_shadow_prison_SpellScript::AddExtraDamage); + OnHit.Register(&spell_blood_council_shadow_prison_SpellScript::AddExtraDamage); } }; 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 d898766b4a..ee8d01f692 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 @@ -477,8 +477,6 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader class spell_blood_queen_vampiric_bite_SpellScript : public SpellScript { - PrepareSpellScript(spell_blood_queen_vampiric_bite_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_PLR, SPELL_FRENZIED_BLOODTHIRST, SPELL_PRESENCE_OF_THE_DARKFALLEN }); @@ -529,9 +527,9 @@ class spell_blood_queen_vampiric_bite : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_blood_queen_vampiric_bite_SpellScript::CheckTarget); - BeforeHit += SpellHitFn(spell_blood_queen_vampiric_bite_SpellScript::OnCast); - OnEffectHitTarget += SpellEffectFn(spell_blood_queen_vampiric_bite_SpellScript::HandlePresence, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); + OnCheckCast.Register(&spell_blood_queen_vampiric_bite_SpellScript::CheckTarget); + BeforeHit.Register(&spell_blood_queen_vampiric_bite_SpellScript::OnCast); + OnEffectHitTarget.Register(&spell_blood_queen_vampiric_bite_SpellScript::HandlePresence, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); } }; @@ -548,8 +546,6 @@ class spell_blood_queen_frenzied_bloodthirst : public SpellScriptLoader class spell_blood_queen_frenzied_bloodthirst_AuraScript : public AuraScript { - PrepareAuraScript(spell_blood_queen_frenzied_bloodthirst_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (InstanceScript* instance = GetTarget()->GetInstanceScript()) @@ -575,8 +571,8 @@ class spell_blood_queen_frenzied_bloodthirst : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_blood_queen_frenzied_bloodthirst_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_blood_queen_frenzied_bloodthirst_AuraScript::OnApply, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_blood_queen_frenzied_bloodthirst_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); } }; @@ -607,8 +603,6 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader class spell_blood_queen_bloodbolt_SpellScript : public SpellScript { - PrepareSpellScript(spell_blood_queen_bloodbolt_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TWILIGHT_BLOODBOLT }); @@ -637,8 +631,8 @@ class spell_blood_queen_bloodbolt : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_bloodbolt_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_blood_queen_bloodbolt_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_blood_queen_bloodbolt_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_blood_queen_bloodbolt_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -656,8 +650,6 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader class spell_blood_queen_essence_of_the_blood_queen_AuraScript : public AuraScript { - PrepareAuraScript(spell_blood_queen_essence_of_the_blood_queen_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ESSENCE_OF_THE_BLOOD_QUEEN_HEAL }); @@ -676,7 +668,7 @@ class spell_blood_queen_essence_of_the_blood_queen : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_blood_queen_essence_of_the_blood_queen_AuraScript::OnProc, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_blood_queen_essence_of_the_blood_queen_AuraScript::OnProc, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -693,8 +685,6 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader class spell_blood_queen_pact_of_the_darkfallen_SpellScript : public SpellScript { - PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_SpellScript); - void FilterTargets(std::list& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_PACT_OF_THE_DARKFALLEN)); @@ -724,7 +714,7 @@ class spell_blood_queen_pact_of_the_darkfallen : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_blood_queen_pact_of_the_darkfallen_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -741,8 +731,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader class spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript : public AuraScript { - PrepareAuraScript(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PACT_OF_THE_DARKFALLEN_DAMAGE }); @@ -760,7 +748,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_blood_queen_pact_of_the_darkfallen_dmg_AuraScript::PeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -777,8 +765,6 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo class spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript : public SpellScript { - PrepareSpellScript(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(Trinity::UnitAuraCheck(true, SPELL_PACT_OF_THE_DARKFALLEN)); @@ -787,7 +773,7 @@ class spell_blood_queen_pact_of_the_darkfallen_dmg_target : public SpellScriptLo void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_blood_queen_pact_of_the_darkfallen_dmg_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp index 8684eac0b3..e4325bfe7b 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp @@ -1037,8 +1037,6 @@ class spell_deathbringer_blood_link : public SpellScriptLoader class spell_deathbringer_blood_link_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_link_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_POWER, SPELL_BLOOD_POWER }); @@ -1052,7 +1050,7 @@ class spell_deathbringer_blood_link : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_deathbringer_blood_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1069,8 +1067,6 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader class spell_deathbringer_blood_link_AuraScript : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_THE_FALLEN_CHAMPION }); @@ -1086,7 +1082,7 @@ class spell_deathbringer_blood_link_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathbringer_blood_link_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_deathbringer_blood_link_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1103,8 +1099,6 @@ class spell_deathbringer_blood_power : public SpellScriptLoader class spell_deathbringer_blood_power_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_power_SpellScript); - void ModAuraValue() { if (Aura* aura = GetHitAura()) @@ -1113,14 +1107,12 @@ class spell_deathbringer_blood_power : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_deathbringer_blood_power_SpellScript::ModAuraValue); + AfterHit.Register(&spell_deathbringer_blood_power_SpellScript::ModAuraValue); } }; class spell_deathbringer_blood_power_AuraScript : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_power_AuraScript); - void RecalculateHook(AuraEffect const* /*aurEffect*/, int32& amount, bool& canBeRecalculated) { amount = int32(GetUnitOwner()->GetPower(POWER_ENERGY)); @@ -1129,8 +1121,8 @@ class spell_deathbringer_blood_power : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_0, SPELL_AURA_MOD_SCALE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + DoEffectCalcAmount.Register(&spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_0, SPELL_AURA_MOD_SCALE); + DoEffectCalcAmount.Register(&spell_deathbringer_blood_power_AuraScript::RecalculateHook, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; @@ -1152,8 +1144,6 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader class spell_deathbringer_rune_of_blood_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_rune_of_blood_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1167,7 +1157,7 @@ class spell_deathbringer_rune_of_blood : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deathbringer_rune_of_blood_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_deathbringer_rune_of_blood_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1185,8 +1175,6 @@ class spell_deathbringer_blood_beast_blood_link : public SpellScriptLoader class spell_deathbringer_blood_beast_blood_link_AuraScript : public AuraScript { - PrepareAuraScript(spell_deathbringer_blood_beast_blood_link_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1200,7 +1188,7 @@ class spell_deathbringer_blood_beast_blood_link : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_deathbringer_blood_beast_blood_link_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_deathbringer_blood_beast_blood_link_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1217,8 +1205,6 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader class spell_deathbringer_blood_nova_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_nova_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLOOD_LINK_DUMMY }); @@ -1232,7 +1218,7 @@ class spell_deathbringer_blood_nova : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_nova_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_deathbringer_blood_nova_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1249,8 +1235,6 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader class spell_deathbringer_blood_nova_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_blood_nova_targeting_SpellScript); - void FilterTargetsInitial(std::list& targets) { if (targets.empty()) @@ -1294,9 +1278,9 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_deathbringer_blood_nova_targeting_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_deathbringer_blood_nova_targeting_SpellScript::FilterTargetsSubsequent, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_deathbringer_blood_nova_targeting_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } WorldObject* target = nullptr; @@ -1315,8 +1299,6 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader class spell_deathbringer_boiling_blood_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_boiling_blood_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1335,7 +1317,7 @@ class spell_deathbringer_boiling_blood : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_deathbringer_boiling_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_deathbringer_boiling_blood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1352,8 +1334,6 @@ class spell_deathbringer_remove_marks : public SpellScriptLoader class spell_deathbringer_remove_marks_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathbringer_remove_marks_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1362,7 +1342,7 @@ class spell_deathbringer_remove_marks : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deathbringer_remove_marks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_deathbringer_remove_marks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp index a9eb859862..e3b1c24041 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_festergut.cpp @@ -374,8 +374,6 @@ class spell_festergut_pungent_blight : public SpellScriptLoader class spell_festergut_pungent_blight_SpellScript : public SpellScript { - PrepareSpellScript(spell_festergut_pungent_blight_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -393,7 +391,7 @@ class spell_festergut_pungent_blight : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_festergut_pungent_blight_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_festergut_pungent_blight_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -410,8 +408,6 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader class spell_festergut_gastric_bloat_SpellScript : public SpellScript { - PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_GASTRIC_EXPLOSION }); @@ -429,7 +425,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_festergut_gastric_bloat_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_festergut_gastric_bloat_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -446,8 +442,6 @@ class spell_festergut_blighted_spores : public SpellScriptLoader class spell_festergut_blighted_spores_AuraScript : public AuraScript { - PrepareAuraScript(spell_festergut_blighted_spores_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_INOCULATED }); @@ -463,7 +457,7 @@ class spell_festergut_blighted_spores : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_festergut_blighted_spores_AuraScript::ExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; 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 aef223ccf6..16906d192f 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp @@ -1815,8 +1815,6 @@ class spell_igb_rocket_pack : public SpellScriptLoader class spell_igb_rocket_pack_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_rocket_pack_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROCKET_PACK_DAMAGE, SPELL_ROCKET_BURST }); @@ -1837,8 +1835,8 @@ class spell_igb_rocket_pack : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_igb_rocket_pack_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - OnEffectRemove += AuraEffectRemoveFn(spell_igb_rocket_pack_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_igb_rocket_pack_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove.Register(&spell_igb_rocket_pack_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1855,8 +1853,6 @@ class spell_igb_rocket_pack_useable : public SpellScriptLoader class spell_igb_rocket_pack_useable_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_rocket_pack_useable_AuraScript); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -1885,9 +1881,9 @@ class spell_igb_rocket_pack_useable : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_igb_rocket_pack_useable_AuraScript::CheckAreaTarget); - AfterEffectApply += AuraEffectApplyFn(spell_igb_rocket_pack_useable_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_igb_rocket_pack_useable_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + DoCheckAreaTarget.Register(&spell_igb_rocket_pack_useable_AuraScript::CheckAreaTarget); + AfterEffectApply.Register(&spell_igb_rocket_pack_useable_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_igb_rocket_pack_useable_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1904,8 +1900,6 @@ class spell_igb_on_gunship_deck : public SpellScriptLoader class spell_igb_on_gunship_deck_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_on_gunship_deck_AuraScript); - bool Load() override { if (InstanceScript* instance = GetOwner()->GetInstanceScript()) @@ -1929,8 +1923,8 @@ class spell_igb_on_gunship_deck : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_igb_on_gunship_deck_AuraScript::CheckAreaTarget); - AfterEffectApply += AuraEffectApplyFn(spell_igb_on_gunship_deck_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + DoCheckAreaTarget.Register(&spell_igb_on_gunship_deck_AuraScript::CheckAreaTarget); + AfterEffectApply.Register(&spell_igb_on_gunship_deck_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } uint32 _teamInInstance = 0; @@ -1949,8 +1943,6 @@ class spell_igb_periodic_trigger_with_power_cost : public SpellScriptLoader class spell_igb_periodic_trigger_with_power_cost_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_periodic_trigger_with_power_cost_AuraScript); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1959,7 +1951,7 @@ class spell_igb_periodic_trigger_with_power_cost : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_igb_periodic_trigger_with_power_cost_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_igb_periodic_trigger_with_power_cost_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1976,8 +1968,6 @@ class spell_igb_cannon_blast : public SpellScriptLoader class spell_igb_cannon_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_cannon_blast_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1996,7 +1986,7 @@ class spell_igb_cannon_blast : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_igb_cannon_blast_SpellScript::CheckEnergy); + AfterHit.Register(&spell_igb_cannon_blast_SpellScript::CheckEnergy); } }; @@ -2013,8 +2003,6 @@ class spell_igb_incinerating_blast : public SpellScriptLoader class spell_igb_incinerating_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_incinerating_blast_SpellScript); - void StoreEnergy() { _energyLeft = GetCaster()->GetPower(POWER_ENERGY) - 10; @@ -2032,9 +2020,9 @@ class spell_igb_incinerating_blast : public SpellScriptLoader void Register() override { - OnCast += SpellCastFn(spell_igb_incinerating_blast_SpellScript::StoreEnergy); - AfterCast += SpellCastFn(spell_igb_incinerating_blast_SpellScript::RemoveEnergy); - OnEffectLaunchTarget += SpellEffectFn(spell_igb_incinerating_blast_SpellScript::CalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnCast.Register(&spell_igb_incinerating_blast_SpellScript::StoreEnergy); + AfterCast.Register(&spell_igb_incinerating_blast_SpellScript::RemoveEnergy); + OnEffectLaunchTarget.Register(&spell_igb_incinerating_blast_SpellScript::CalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } uint32 _energyLeft = 0; @@ -2053,8 +2041,6 @@ class spell_igb_overheat : public SpellScriptLoader class spell_igb_overheat_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_overheat_AuraScript); - bool Load() override { if (GetAura()->GetType() != UNIT_AURA_TYPE) @@ -2091,8 +2077,8 @@ class spell_igb_overheat : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_igb_overheat_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_igb_overheat_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_igb_overheat_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_igb_overheat_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -2109,8 +2095,6 @@ class spell_igb_below_zero : public SpellScriptLoader class spell_igb_below_zero_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_below_zero_SpellScript); - void RemovePassengers() { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_EJECT_ALL_PASSENGERS_BELOW_ZERO, TRIGGERED_FULL_MASK); @@ -2118,7 +2102,7 @@ class spell_igb_below_zero : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_igb_below_zero_SpellScript::RemovePassengers); + BeforeHit.Register(&spell_igb_below_zero_SpellScript::RemovePassengers); } }; @@ -2135,8 +2119,6 @@ class spell_igb_teleport_to_enemy_ship : public SpellScriptLoader class spell_igb_teleport_to_enemy_ship_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_teleport_to_enemy_ship_SpellScript); - void RelocateTransportOffset(SpellEffIndex /*effIndex*/) { WorldLocation const* dest = GetHitDest(); @@ -2152,7 +2134,7 @@ class spell_igb_teleport_to_enemy_ship : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_igb_teleport_to_enemy_ship_SpellScript::RelocateTransportOffset, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); + OnEffectHitTarget.Register(&spell_igb_teleport_to_enemy_ship_SpellScript::RelocateTransportOffset, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; @@ -2169,8 +2151,6 @@ class spell_igb_burning_pitch_selector : public SpellScriptLoader class spell_igb_burning_pitch_selector_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_burning_pitch_selector_SpellScript); - void FilterTargets(std::list& targets) { uint32 team = HORDE; @@ -2200,8 +2180,8 @@ class spell_igb_burning_pitch_selector : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_igb_burning_pitch_selector_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_igb_burning_pitch_selector_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_igb_burning_pitch_selector_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_igb_burning_pitch_selector_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2218,8 +2198,6 @@ class spell_igb_burning_pitch : public SpellScriptLoader class spell_igb_burning_pitch_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_burning_pitch_SpellScript); - void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2229,7 +2207,7 @@ class spell_igb_burning_pitch : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_igb_burning_pitch_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_igb_burning_pitch_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2246,8 +2224,6 @@ class spell_igb_rocket_artillery : public SpellScriptLoader class spell_igb_rocket_artillery_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_rocket_artillery_SpellScript); - void SelectRandomTarget(std::list& targets) { if (!targets.empty()) @@ -2266,8 +2242,8 @@ class spell_igb_rocket_artillery : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_igb_rocket_artillery_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_igb_rocket_artillery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_igb_rocket_artillery_SpellScript::SelectRandomTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_igb_rocket_artillery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2284,8 +2260,6 @@ class spell_igb_rocket_artillery_explosion : public SpellScriptLoader class spell_igb_rocket_artillery_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_rocket_artillery_explosion_SpellScript); - void DamageGunship(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -2294,7 +2268,7 @@ class spell_igb_rocket_artillery_explosion : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_igb_rocket_artillery_explosion_SpellScript::DamageGunship, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); + OnEffectHit.Register(&spell_igb_rocket_artillery_explosion_SpellScript::DamageGunship, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; @@ -2311,8 +2285,6 @@ class spell_igb_gunship_fall_teleport : public SpellScriptLoader class spell_igb_gunship_fall_teleport_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_gunship_fall_teleport_SpellScript); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2334,8 +2306,8 @@ class spell_igb_gunship_fall_teleport : public SpellScriptLoader void Register() override { - OnObjectTargetSelect += SpellObjectTargetSelectFn(spell_igb_gunship_fall_teleport_SpellScript::SelectTransport, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); - OnEffectLaunch += SpellEffectFn(spell_igb_gunship_fall_teleport_SpellScript::RelocateDest, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); + OnObjectTargetSelect.Register(&spell_igb_gunship_fall_teleport_SpellScript::SelectTransport, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnEffectLaunch.Register(&spell_igb_gunship_fall_teleport_SpellScript::RelocateDest, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; @@ -2352,8 +2324,6 @@ class spell_igb_check_for_players : public SpellScriptLoader class spell_igb_check_for_players_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_check_for_players_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2378,9 +2348,9 @@ class spell_igb_check_for_players : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_igb_check_for_players_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - AfterCast += SpellCastFn(spell_igb_check_for_players_SpellScript::TriggerWipe); - OnEffectHitTarget += SpellEffectFn(spell_igb_check_for_players_SpellScript::TeleportPlayer, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_igb_check_for_players_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + AfterCast.Register(&spell_igb_check_for_players_SpellScript::TriggerWipe); + OnEffectHitTarget.Register(&spell_igb_check_for_players_SpellScript::TeleportPlayer, EFFECT_0, SPELL_EFFECT_DUMMY); } uint32 _playerCount = 0; @@ -2399,8 +2369,6 @@ class spell_igb_teleport_players_on_victory : public SpellScriptLoader class spell_igb_teleport_players_on_victory_SpellScript : public SpellScript { - PrepareSpellScript(spell_igb_teleport_players_on_victory_SpellScript); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2417,7 +2385,7 @@ class spell_igb_teleport_players_on_victory : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_igb_teleport_players_on_victory_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_igb_teleport_players_on_victory_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); } }; @@ -2435,8 +2403,6 @@ public: class spell_igb_battle_experience_check_AuraScript : public AuraScript { - PrepareAuraScript(spell_igb_battle_experience_check_AuraScript); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { return false; @@ -2444,7 +2410,7 @@ public: void Register() override { - DoCheckProc += AuraCheckProcFn(spell_igb_battle_experience_check_AuraScript::CheckProc); + DoCheckProc.Register(&spell_igb_battle_experience_check_AuraScript::CheckProc); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp index 3c398a575b..62f2ad3c67 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp @@ -786,8 +786,6 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader class spell_deathwhisper_mana_barrier_AuraScript : public AuraScript { - PrepareAuraScript(spell_deathwhisper_mana_barrier_AuraScript); - void HandlePeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -801,7 +799,7 @@ class spell_deathwhisper_mana_barrier : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_deathwhisper_mana_barrier_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_deathwhisper_mana_barrier_AuraScript::HandlePeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -834,8 +832,6 @@ class spell_deathwhisper_dominated_mind : public SpellScriptLoader class spell_deathwhisper_dominated_mind_AuraScript : public AuraScript { - PrepareAuraScript(spell_deathwhisper_dominated_mind_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DOMINATE_MIND_SCALE }); @@ -849,7 +845,7 @@ class spell_deathwhisper_dominated_mind : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_deathwhisper_dominated_mind_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_deathwhisper_dominated_mind_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); } }; @@ -866,8 +862,6 @@ class spell_deathwhisper_summon_spirits : public SpellScriptLoader class spell_deathwhisper_summon_spirits_SpellScript : public SpellScript { - PrepareSpellScript(spell_deathwhisper_summon_spirits_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SHADE }); @@ -880,7 +874,7 @@ class spell_deathwhisper_summon_spirits : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_deathwhisper_summon_spirits_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_deathwhisper_summon_spirits_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp index 4df8c339a2..3338bf2e0e 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp @@ -507,8 +507,6 @@ class spell_marrowgar_coldflame : public SpellScriptLoader class spell_marrowgar_coldflame_SpellScript : public SpellScript { - PrepareSpellScript(spell_marrowgar_coldflame_SpellScript); - void SelectTarget(std::list& targets) { targets.clear(); @@ -531,8 +529,8 @@ class spell_marrowgar_coldflame : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_coldflame_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_marrowgar_coldflame_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -549,8 +547,6 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScriptLoader class spell_marrowgar_coldflame_SpellScript : public SpellScript { - PrepareSpellScript(spell_marrowgar_coldflame_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -560,7 +556,7 @@ class spell_marrowgar_coldflame_bonestorm : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_marrowgar_coldflame_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -577,8 +573,6 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader class spell_marrowgar_coldflame_damage_AuraScript : public AuraScript { - PrepareAuraScript(spell_marrowgar_coldflame_damage_AuraScript); - bool CanBeAppliedOn(Unit* target) { if (target->HasAura(SPELL_IMPALED)) @@ -596,7 +590,7 @@ class spell_marrowgar_coldflame_damage : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_marrowgar_coldflame_damage_AuraScript::CanBeAppliedOn); + DoCheckAreaTarget.Register(&spell_marrowgar_coldflame_damage_AuraScript::CanBeAppliedOn); } }; @@ -613,8 +607,6 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader class spell_marrowgar_bone_spike_graveyard_SpellScript : public SpellScript { - PrepareSpellScript(spell_marrowgar_bone_spike_graveyard_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(BoneSpikeSummonId); @@ -665,8 +657,8 @@ class spell_marrowgar_bone_spike_graveyard : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_marrowgar_bone_spike_graveyard_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_marrowgar_bone_spike_graveyard_SpellScript::HandleSpikes, EFFECT_1, SPELL_EFFECT_APPLY_AURA); + OnCheckCast.Register(&spell_marrowgar_bone_spike_graveyard_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_marrowgar_bone_spike_graveyard_SpellScript::HandleSpikes, EFFECT_1, SPELL_EFFECT_APPLY_AURA); } }; @@ -683,8 +675,6 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader class spell_marrowgar_bone_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_marrowgar_bone_storm_SpellScript); - void RecalculateDamage() { SetHitDamage(int32(GetHitDamage() / std::max(std::sqrt(GetHitUnit()->GetExactDist2d(GetCaster())), 1.0f))); @@ -692,7 +682,7 @@ class spell_marrowgar_bone_storm : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); + OnHit.Register(&spell_marrowgar_bone_storm_SpellScript::RecalculateDamage); } }; @@ -708,10 +698,8 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader spell_marrowgar_bone_slice() : SpellScriptLoader("spell_marrowgar_bone_slice") { } class spell_marrowgar_bone_slice_SpellScript : public SpellScript - { - PrepareSpellScript(spell_marrowgar_bone_slice_SpellScript); - - public: + { + public: spell_marrowgar_bone_slice_SpellScript() { _targetCount = 0; @@ -741,9 +729,9 @@ class spell_marrowgar_bone_slice : public SpellScriptLoader void Register() override { - BeforeCast += SpellCastFn(spell_marrowgar_bone_slice_SpellScript::ClearSpikeImmunities); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_marrowgar_bone_slice_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnHit += SpellHitFn(spell_marrowgar_bone_slice_SpellScript::SplitDamage); + BeforeCast.Register(&spell_marrowgar_bone_slice_SpellScript::ClearSpikeImmunities); + OnObjectAreaTargetSelect.Register(&spell_marrowgar_bone_slice_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnHit.Register(&spell_marrowgar_bone_slice_SpellScript::SplitDamage); } uint32 _targetCount; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp index b4d51eac2c..9facf081f0 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp @@ -842,8 +842,6 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader class spell_putricide_gaseous_bloat_AuraScript : public AuraScript { - PrepareAuraScript(spell_putricide_gaseous_bloat_AuraScript); - void HandleExtraEffect(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -870,8 +868,8 @@ class spell_putricide_gaseous_bloat : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_gaseous_bloat_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - OnProc += AuraProcFn(spell_putricide_gaseous_bloat_AuraScript::HandleProc); + OnEffectPeriodic.Register(&spell_putricide_gaseous_bloat_AuraScript::HandleExtraEffect, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnProc.Register(&spell_putricide_gaseous_bloat_AuraScript::HandleProc); } }; @@ -888,8 +886,6 @@ class spell_putricide_ooze_channel : public SpellScriptLoader class spell_putricide_ooze_channel_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_ooze_channel_SpellScript); - bool Validate(SpellInfo const* spell) override { return ValidateSpellInfo({ spell->ExcludeTargetAuraSpell }); @@ -934,10 +930,10 @@ class spell_putricide_ooze_channel : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); - AfterHit += SpellHitFn(spell_putricide_ooze_channel_SpellScript::StartAttack); + OnObjectAreaTargetSelect.Register(&spell_putricide_ooze_channel_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_putricide_ooze_channel_SpellScript::SetTarget, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + AfterHit.Register(&spell_putricide_ooze_channel_SpellScript::StartAttack); } WorldObject* _target = nullptr; @@ -971,8 +967,6 @@ class spell_putricide_slime_puddle : public SpellScriptLoader class spell_putricide_slime_puddle_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_slime_puddle_SpellScript); - void ScaleRange(std::list& targets) { targets.remove_if(ExactDistanceCheck(GetCaster(), 2.5f * GetCaster()->GetObjectScale())); @@ -980,8 +974,8 @@ class spell_putricide_slime_puddle : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_putricide_slime_puddle_SpellScript::ScaleRange, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); } }; @@ -999,8 +993,6 @@ class spell_putricide_slime_puddle_aura : public SpellScriptLoader class spell_putricide_slime_puddle_aura_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_slime_puddle_aura_SpellScript); - void ReplaceAura() { if (Unit* target = GetHitUnit()) @@ -1009,7 +1001,7 @@ class spell_putricide_slime_puddle_aura : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_putricide_slime_puddle_aura_SpellScript::ReplaceAura); + OnHit.Register(&spell_putricide_slime_puddle_aura_SpellScript::ReplaceAura); } }; @@ -1026,8 +1018,6 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader class spell_putricide_unstable_experiment_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_unstable_experiment_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1057,7 +1047,7 @@ class spell_putricide_unstable_experiment : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_unstable_experiment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_putricide_unstable_experiment_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1074,8 +1064,6 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader class spell_putricide_ooze_eruption_searcher_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_ooze_eruption_searcher_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { uint32 adhesiveId = sSpellMgr->GetSpellIdForDifficulty(SPELL_VOLATILE_OOZE_ADHESIVE, GetCaster()); @@ -1088,7 +1076,7 @@ class spell_putricide_ooze_eruption_searcher : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_ooze_eruption_searcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_putricide_ooze_eruption_searcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1106,8 +1094,6 @@ class spell_putricide_ooze_tank_protection : public SpellScriptLoader class spell_putricide_ooze_tank_protection_AuraScript : public AuraScript { - PrepareAuraScript(spell_putricide_ooze_tank_protection_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell, spellInfo->Effects[EFFECT_1].TriggerSpell }); @@ -1123,8 +1109,8 @@ class spell_putricide_ooze_tank_protection : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_putricide_ooze_tank_protection_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); - OnEffectProc += AuraEffectProcFn(spell_putricide_ooze_tank_protection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_putricide_ooze_tank_protection_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_putricide_ooze_tank_protection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1141,8 +1127,6 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader class spell_putricide_choking_gas_bomb_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_choking_gas_bomb_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { uint32 skipIndex = urand(0, 2); @@ -1158,7 +1142,7 @@ class spell_putricide_choking_gas_bomb : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_choking_gas_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_putricide_choking_gas_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1175,8 +1159,6 @@ class spell_putricide_unbound_plague : public SpellScriptLoader class spell_putricide_unbound_plague_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_unbound_plague_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNBOUND_PLAGUE, SPELL_UNBOUND_PLAGUE_SEARCHER }); @@ -1230,8 +1212,8 @@ class spell_putricide_unbound_plague : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_unbound_plague_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_putricide_unbound_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_putricide_unbound_plague_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHitTarget.Register(&spell_putricide_unbound_plague_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1248,8 +1230,6 @@ class spell_putricide_eat_ooze : public SpellScriptLoader class spell_putricide_eat_ooze_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_eat_ooze_SpellScript); - void SelectTarget(std::list& targets) { if (targets.empty()) @@ -1282,8 +1262,8 @@ class spell_putricide_eat_ooze : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_eat_ooze_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_eat_ooze_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_putricide_eat_ooze_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_putricide_eat_ooze_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); } }; @@ -1300,8 +1280,6 @@ class spell_putricide_mutated_plague : public SpellScriptLoader class spell_putricide_mutated_plague_AuraScript : public AuraScript { - PrepareAuraScript(spell_putricide_mutated_plague_AuraScript); - void HandleTriggerSpell(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1338,8 +1316,8 @@ class spell_putricide_mutated_plague : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_putricide_mutated_plague_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_putricide_mutated_plague_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectRemove.Register(&spell_putricide_mutated_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -1356,8 +1334,6 @@ class spell_putricide_mutation_init : public SpellScriptLoader class spell_putricide_mutation_init_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_mutation_init_SpellScript); - SpellCastResult CheckRequirementInternal(SpellCustomErrors& extendedError) { InstanceScript* instance = GetExplTargetUnit()->GetInstanceScript(); @@ -1404,14 +1380,12 @@ class spell_putricide_mutation_init : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_putricide_mutation_init_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_putricide_mutation_init_SpellScript::CheckRequirement); } }; class spell_putricide_mutation_init_AuraScript : public AuraScript { - PrepareAuraScript(spell_putricide_mutation_init_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { uint32 spellId = 70311; @@ -1423,7 +1397,7 @@ class spell_putricide_mutation_init : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutation_init_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_putricide_mutation_init_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1445,8 +1419,6 @@ class spell_putricide_mutated_transformation_dismiss : public SpellScriptLoader class spell_putricide_mutated_transformation_dismiss_AuraScript : public AuraScript { - PrepareAuraScript(spell_putricide_mutated_transformation_dismiss_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Vehicle* veh = GetTarget()->GetVehicleKit()) @@ -1455,7 +1427,7 @@ class spell_putricide_mutated_transformation_dismiss : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_putricide_mutated_transformation_dismiss_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_putricide_mutated_transformation_dismiss_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -1472,8 +1444,6 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader class spell_putricide_mutated_transformation_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_mutated_transformation_SpellScript); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1516,7 +1486,7 @@ class spell_putricide_mutated_transformation : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit.Register(&spell_putricide_mutated_transformation_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -1533,8 +1503,6 @@ class spell_putricide_mutated_transformation_dmg : public SpellScriptLoader class spell_putricide_mutated_transformation_dmg_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_mutated_transformation_dmg_SpellScript); - void FilterTargetsInitial(std::list& targets) { if (Unit* owner = ObjectAccessor::GetUnit(*GetCaster(), GetCaster()->GetCreatorGUID())) @@ -1543,7 +1511,7 @@ class spell_putricide_mutated_transformation_dmg : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_putricide_mutated_transformation_dmg_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_putricide_mutated_transformation_dmg_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -1559,10 +1527,7 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader spell_putricide_regurgitated_ooze() : SpellScriptLoader("spell_putricide_regurgitated_ooze") { } class spell_putricide_regurgitated_ooze_SpellScript : public SpellScript - { - PrepareSpellScript(spell_putricide_regurgitated_ooze_SpellScript); - - // the only purpose of this hook is to fail the achievement + { // the only purpose of this hook is to fail the achievement void ExtraEffect(SpellEffIndex /*effIndex*/) { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) @@ -1571,7 +1536,7 @@ class spell_putricide_regurgitated_ooze : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_regurgitated_ooze_SpellScript::ExtraEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_putricide_regurgitated_ooze_SpellScript::ExtraEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -1589,8 +1554,6 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader class spell_putricide_clear_aura_effect_value_SpellScript : public SpellScript { - PrepareSpellScript(spell_putricide_clear_aura_effect_value_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1600,7 +1563,7 @@ class spell_putricide_clear_aura_effect_value : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_putricide_clear_aura_effect_value_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_putricide_clear_aura_effect_value_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1618,8 +1581,6 @@ class spell_stinky_precious_decimate : public SpellScriptLoader class spell_stinky_precious_decimate_SpellScript : public SpellScript { - PrepareSpellScript(spell_stinky_precious_decimate_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->GetHealthPct() > float(GetEffectValue())) @@ -1631,7 +1592,7 @@ class spell_stinky_precious_decimate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_stinky_precious_decimate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_stinky_precious_decimate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp index d84c1a5f20..f342ef3536 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp @@ -460,8 +460,6 @@ class spell_rotface_ooze_flood : public SpellScriptLoader class spell_rotface_ooze_flood_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_ooze_flood_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (!GetHitUnit()) @@ -492,8 +490,8 @@ class spell_rotface_ooze_flood : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rotface_ooze_flood_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_ooze_flood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_rotface_ooze_flood_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_rotface_ooze_flood_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -510,8 +508,6 @@ class spell_rotface_mutated_infection : public SpellScriptLoader class spell_rotface_mutated_infection_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_mutated_infection_SpellScript); - void FilterTargets(std::list& targets) { // remove targets with this aura already @@ -534,15 +530,13 @@ class spell_rotface_mutated_infection : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_mutated_infection_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); - AfterHit += SpellHitFn(spell_rotface_mutated_infection_SpellScript::NotifyTargets); + OnObjectAreaTargetSelect.Register(&spell_rotface_mutated_infection_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + AfterHit.Register(&spell_rotface_mutated_infection_SpellScript::NotifyTargets); } }; class spell_rotface_mutated_infection_AuraScript : public AuraScript { - PrepareAuraScript(spell_rotface_mutated_infection_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_2].CalcValue()) }); @@ -556,7 +550,7 @@ class spell_rotface_mutated_infection : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_rotface_mutated_infection_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_rotface_mutated_infection_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -578,8 +572,6 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader class spell_rotface_little_ooze_combine_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_little_ooze_combine_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (!(GetHitCreature() && GetHitUnit()->IsAlive())) @@ -593,7 +585,7 @@ class spell_rotface_little_ooze_combine : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rotface_little_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_rotface_little_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -610,8 +602,6 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader class spell_rotface_large_ooze_combine_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_large_ooze_combine_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (!(GetHitCreature() && GetHitCreature()->IsAlive())) @@ -635,7 +625,7 @@ class spell_rotface_large_ooze_combine : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_rotface_large_ooze_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -652,8 +642,6 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader class spell_rotface_large_ooze_buff_combine_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_large_ooze_buff_combine_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (!(GetHitCreature() && GetHitCreature()->IsAlive())) @@ -690,7 +678,7 @@ class spell_rotface_large_ooze_buff_combine : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rotface_large_ooze_buff_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_rotface_large_ooze_buff_combine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -707,8 +695,6 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader class spell_rotface_unstable_ooze_explosion_init_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_unstable_ooze_explosion_init_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_UNSTABLE_OOZE_EXPLOSION_TRIGGER }); @@ -728,7 +714,7 @@ class spell_rotface_unstable_ooze_explosion_init : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rotface_unstable_ooze_explosion_init_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_rotface_unstable_ooze_explosion_init_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -745,8 +731,6 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader class spell_rotface_unstable_ooze_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_unstable_ooze_explosion_SpellScript); - void CheckTarget(SpellEffIndex effIndex) { PreventHitDefaultEffect(EFFECT_0); @@ -765,7 +749,7 @@ class spell_rotface_unstable_ooze_explosion : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_rotface_unstable_ooze_explosion_SpellScript::CheckTarget, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); + OnEffectHit.Register(&spell_rotface_unstable_ooze_explosion_SpellScript::CheckTarget, EFFECT_0, SPELL_EFFECT_TRIGGER_MISSILE); } }; @@ -782,8 +766,6 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader class spell_rotface_unstable_ooze_explosion_suicide_AuraScript : public AuraScript { - PrepareAuraScript(spell_rotface_unstable_ooze_explosion_suicide_AuraScript); - void DespawnSelf(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -798,7 +780,7 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rotface_unstable_ooze_explosion_suicide_AuraScript::DespawnSelf, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_rotface_unstable_ooze_explosion_suicide_AuraScript::DespawnSelf, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -815,8 +797,6 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader class spell_rotface_vile_gas_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_rotface_vile_gas_trigger_SpellScript); - void FilterTargets(std::list& targets) { targets.sort(Trinity::ObjectDistanceOrderPred(GetCaster())); @@ -862,8 +842,8 @@ class spell_rotface_vile_gas_trigger : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rotface_vile_gas_trigger_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_rotface_vile_gas_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_rotface_vile_gas_trigger_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_rotface_vile_gas_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp index c6b5bbecca..e0f9c25219 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp @@ -1064,8 +1064,6 @@ class spell_sindragosa_s_fury : public SpellScriptLoader class spell_sindragosa_s_fury_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_s_fury_SpellScript); - bool Load() override { // This script should execute only in Icecrown Citadel @@ -1126,9 +1124,9 @@ class spell_sindragosa_s_fury : public SpellScriptLoader void Register() override { - BeforeCast += SpellCastFn(spell_sindragosa_s_fury_SpellScript::SelectDest); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_s_fury_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_sindragosa_s_fury_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + BeforeCast.Register(&spell_sindragosa_s_fury_SpellScript::SelectDest); + OnObjectAreaTargetSelect.Register(&spell_sindragosa_s_fury_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_sindragosa_s_fury_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } uint32 _targetCount = 0; @@ -1160,8 +1158,6 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader class spell_sindragosa_unchained_magic_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_unchained_magic_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(UnchainedMagicTargetSelector()); @@ -1172,7 +1168,7 @@ class spell_sindragosa_unchained_magic : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_unchained_magic_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_sindragosa_unchained_magic_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1189,8 +1185,6 @@ class spell_sindragosa_frost_breath : public SpellScriptLoader class spell_sindragosa_frost_breath_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_frost_breath_SpellScript); - void HandleInfusion() { Player* target = GetHitPlayer(); @@ -1217,7 +1211,7 @@ class spell_sindragosa_frost_breath : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_sindragosa_frost_breath_SpellScript::HandleInfusion); + AfterHit.Register(&spell_sindragosa_frost_breath_SpellScript::HandleInfusion); } }; @@ -1234,8 +1228,6 @@ class spell_sindragosa_instability : public SpellScriptLoader class spell_sindragosa_instability_AuraScript : public AuraScript { - PrepareAuraScript(spell_sindragosa_instability_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BACKLASH }); @@ -1249,7 +1241,7 @@ class spell_sindragosa_instability : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_sindragosa_instability_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_sindragosa_instability_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1266,8 +1258,6 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader class spell_sindragosa_frost_beacon_AuraScript : public AuraScript { - PrepareAuraScript(spell_sindragosa_frost_beacon_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICE_TOMB_DAMAGE }); @@ -1282,7 +1272,7 @@ class spell_sindragosa_frost_beacon : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_frost_beacon_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_sindragosa_frost_beacon_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1299,8 +1289,6 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader class spell_sindragosa_ice_tomb_AuraScript : public AuraScript { - PrepareAuraScript(spell_sindragosa_ice_tomb_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_ICE_TOMB)) @@ -1341,8 +1329,8 @@ class spell_sindragosa_ice_tomb : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sindragosa_ice_tomb_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - AfterEffectRemove += AuraEffectRemoveFn(spell_sindragosa_ice_tomb_AuraScript::HandleRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_sindragosa_ice_tomb_AuraScript::PeriodicTick, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectRemove.Register(&spell_sindragosa_ice_tomb_AuraScript::HandleRemove, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -1359,8 +1347,6 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader class spell_sindragosa_icy_grip_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_icy_grip_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICY_GRIP_JUMP }); @@ -1374,7 +1360,7 @@ class spell_sindragosa_icy_grip : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sindragosa_icy_grip_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_sindragosa_icy_grip_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1405,8 +1391,6 @@ class spell_sindragosa_mystic_buffet : public SpellScriptLoader class spell_sindragosa_mystic_buffet_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_mystic_buffet_SpellScript); - void FilterTargets(std::list& targets) { targets.remove_if(MysticBuffetTargetFilter(GetCaster())); @@ -1414,7 +1398,7 @@ class spell_sindragosa_mystic_buffet : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_mystic_buffet_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_sindragosa_mystic_buffet_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1431,8 +1415,6 @@ class spell_rimefang_icy_blast : public SpellScriptLoader class spell_rimefang_icy_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_rimefang_icy_blast_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICY_BLAST_AREA }); @@ -1448,7 +1430,7 @@ class spell_rimefang_icy_blast : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); + OnEffectHit.Register(&spell_rimefang_icy_blast_SpellScript::HandleTriggerMissile, EFFECT_1, SPELL_EFFECT_TRIGGER_MISSILE); } }; @@ -1481,8 +1463,6 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader class spell_frostwarden_handler_order_whelp_SpellScript : public SpellScript { - PrepareSpellScript(spell_frostwarden_handler_order_whelp_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FOCUS_FIRE }); @@ -1516,8 +1496,8 @@ class spell_frostwarden_handler_order_whelp : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_order_whelp_SpellScript::HandleForcedCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_frostwarden_handler_order_whelp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_frostwarden_handler_order_whelp_SpellScript::HandleForcedCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_frostwarden_handler_order_whelp_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; @@ -1534,8 +1514,6 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader class spell_frostwarden_handler_focus_fire_SpellScript : public SpellScript { - PrepareSpellScript(spell_frostwarden_handler_focus_fire_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1545,14 +1523,12 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_frostwarden_handler_focus_fire_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_frostwarden_handler_focus_fire_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_frostwarden_handler_focus_fire_AuraScript : public AuraScript { - PrepareAuraScript(spell_frostwarden_handler_focus_fire_AuraScript); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1565,7 +1541,7 @@ class spell_frostwarden_handler_focus_fire : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_frostwarden_handler_focus_fire_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_frostwarden_handler_focus_fire_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1587,9 +1563,7 @@ public: class spell_sindragosa_ice_tomb_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_sindragosa_ice_tomb_target_SpellScript); - - void FilterTargets(std::list& unitList) + void FilterTargets(std::list& unitList) { Unit* caster = GetCaster(); unitList.remove_if(FrostBeaconSelector(caster)); @@ -1604,8 +1578,8 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sindragosa_ice_tomb_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectLaunchTarget += SpellEffectFn(spell_sindragosa_ice_tomb_target_SpellScript::HandleSindragosaTalk, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_sindragosa_ice_tomb_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectLaunchTarget.Register(&spell_sindragosa_ice_tomb_target_SpellScript::HandleSindragosaTalk, EFFECT_0, SPELL_EFFECT_DUMMY); } }; 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 0c61b23db7..966d36dfd1 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -2058,8 +2058,6 @@ class spell_the_lich_king_infest : public SpellScriptLoader class spell_the_lich_king_infest_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_infest_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (GetUnitOwner()->HealthAbovePct(90)) @@ -2080,8 +2078,8 @@ class spell_the_lich_king_infest : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_the_lich_king_infest_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic.Register(&spell_the_lich_king_infest_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -2098,8 +2096,6 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NECROTIC_PLAGUE_JUMP }); @@ -2120,7 +2116,7 @@ class spell_the_lich_king_necrotic_plague : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -2136,10 +2132,8 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader spell_the_lich_king_necrotic_plague_jump() : SpellScriptLoader("spell_the_lich_king_necrotic_plague_jump") { } class spell_the_lich_king_necrotic_plague_SpellScript : public SpellScript - { - PrepareSpellScript(spell_the_lich_king_necrotic_plague_SpellScript); - - public: + { + public: spell_the_lich_king_necrotic_plague_SpellScript() { _hadAura = false; @@ -2169,9 +2163,9 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_necrotic_plague_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - BeforeHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); - OnHit += SpellHitFn(spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_necrotic_plague_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + BeforeHit.Register(&spell_the_lich_king_necrotic_plague_SpellScript::CheckAura); + OnHit.Register(&spell_the_lich_king_necrotic_plague_SpellScript::AddMissingStack); } bool _hadAura; @@ -2179,8 +2173,6 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader class spell_the_lich_king_necrotic_plague_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_necrotic_plague_AuraScript); - public: spell_the_lich_king_necrotic_plague_AuraScript() { @@ -2232,10 +2224,10 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::OnDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); - AfterEffectApply += AuraEffectRemoveFn(spell_the_lich_king_necrotic_plague_AuraScript::AfterDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + OnEffectApply.Register(&spell_the_lich_king_necrotic_plague_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_the_lich_king_necrotic_plague_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_the_lich_king_necrotic_plague_AuraScript::OnDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply.Register(&spell_the_lich_king_necrotic_plague_AuraScript::AfterDispel, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); } int32 _lastAmount; @@ -2259,8 +2251,6 @@ class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader class spell_the_lich_king_shadow_trap_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_shadow_trap_visual_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired)) @@ -2269,7 +2259,7 @@ class spell_the_lich_king_shadow_trap_visual : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_the_lich_king_shadow_trap_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2286,8 +2276,6 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader class spell_the_lich_king_shadow_trap_periodic_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_shadow_trap_periodic_SpellScript); - void CheckTargetCount(std::list& targets) { if (targets.empty()) @@ -2298,7 +2286,7 @@ class spell_the_lich_king_shadow_trap_periodic : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_shadow_trap_periodic_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -2315,8 +2303,6 @@ class spell_the_lich_king_quake : public SpellScriptLoader class spell_the_lich_king_quake_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_quake_SpellScript); - bool Load() override { return GetCaster()->GetInstanceScript() != nullptr; @@ -2336,8 +2322,8 @@ class spell_the_lich_king_quake : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHit += SpellEffectFn(spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_quake_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHit.Register(&spell_the_lich_king_quake_SpellScript::HandleSendEvent, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; @@ -2354,8 +2340,6 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader class spell_the_lich_king_ice_burst_target_search_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_ice_burst_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ICE_BURST }); @@ -2378,7 +2362,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_ice_burst_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -2395,8 +2379,6 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader class spell_the_lich_king_raging_spirit_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_raging_spirit_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2405,7 +2387,7 @@ class spell_the_lich_king_raging_spirit : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_the_lich_king_raging_spirit_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2437,8 +2419,6 @@ class spell_the_lich_king_defile : public SpellScriptLoader class spell_the_lich_king_defile_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_defile_SpellScript); - void CorrectRange(std::list& targets) { targets.remove_if(ExactDistanceCheck(GetCaster(), 10.0f * GetCaster()->GetObjectScale())); @@ -2456,9 +2436,9 @@ class spell_the_lich_king_defile : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnHit += SpellHitFn(spell_the_lich_king_defile_SpellScript::ChangeDamageAndGrow); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_defile_SpellScript::CorrectRange, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit.Register(&spell_the_lich_king_defile_SpellScript::ChangeDamageAndGrow); } }; @@ -2475,8 +2455,6 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader class spell_the_lich_king_summon_into_air_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_summon_into_air_SpellScript); - void ModDestHeight(SpellEffIndex effIndex) { static Position const offset = {0.0f, 0.0f, 15.0f, 0.0f}; @@ -2494,7 +2472,7 @@ class spell_the_lich_king_summon_into_air : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit.Register(&spell_the_lich_king_summon_into_air_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -2511,8 +2489,6 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader class spell_the_lich_king_soul_reaper_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_soul_reaper_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SOUL_REAPER_BUFF }); @@ -2526,7 +2502,7 @@ class spell_the_lich_king_soul_reaper : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_the_lich_king_soul_reaper_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -2543,8 +2519,6 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader class spell_the_lich_king_valkyr_target_search_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_valkyr_target_search_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CHARGE }); @@ -2580,9 +2554,9 @@ class spell_the_lich_king_valkyr_target_search : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_valkyr_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_valkyr_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_valkyr_target_search_SpellScript::ReplaceTarget, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_the_lich_king_valkyr_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } WorldObject* _target = nullptr; @@ -2601,8 +2575,6 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader class spell_the_lich_king_cast_back_to_caster_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_cast_back_to_caster_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { GetHitUnit()->CastSpell(GetCaster(), uint32(GetEffectValue()), true); @@ -2610,7 +2582,7 @@ class spell_the_lich_king_cast_back_to_caster : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_the_lich_king_cast_back_to_caster_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2627,8 +2599,6 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader class spell_the_lich_king_life_siphon_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_life_siphon_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_LIFE_SIPHON_HEAL }); @@ -2641,7 +2611,7 @@ class spell_the_lich_king_life_siphon : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); + AfterHit.Register(&spell_the_lich_king_life_siphon_SpellScript::TriggerHeal); } }; @@ -2658,8 +2628,6 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader class spell_the_lich_king_vile_spirits_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_vile_spirits_AuraScript); - public: spell_the_lich_king_vile_spirits_AuraScript() { @@ -2681,7 +2649,7 @@ class spell_the_lich_king_vile_spirits : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_the_lich_king_vile_spirits_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } bool _is25Man; @@ -2700,8 +2668,6 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader class spell_the_lich_king_vile_spirits_visual_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_vile_spirits_visual_SpellScript); - void ModDestHeight(SpellEffIndex /*effIndex*/) { Position offset = {0.0f, 0.0f, 15.0f, 0.0f}; @@ -2710,7 +2676,7 @@ class spell_the_lich_king_vile_spirits_visual : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunch.Register(&spell_the_lich_king_vile_spirits_visual_SpellScript::ModDestHeight, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2726,10 +2692,8 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa spell_the_lich_king_vile_spirit_move_target_search() : SpellScriptLoader("spell_the_lich_king_vile_spirit_move_target_search") { } class spell_the_lich_king_vile_spirit_move_target_search_SpellScript : public SpellScript - { - PrepareSpellScript(spell_the_lich_king_vile_spirit_move_target_search_SpellScript); - - public: + { + public: spell_the_lich_king_vile_spirit_move_target_search_SpellScript() { _target = nullptr; @@ -2762,8 +2726,8 @@ class spell_the_lich_king_vile_spirit_move_target_search : public SpellScriptLoa void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_vile_spirit_move_target_search_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_the_lich_king_vile_spirit_move_target_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } WorldObject* _target; @@ -2782,8 +2746,6 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL class spell_the_lich_king_vile_spirit_damage_target_search_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2806,7 +2768,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_the_lich_king_vile_spirit_damage_target_search_SpellScript::CheckTargetCount, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -2823,8 +2785,6 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader class spell_the_lich_king_harvest_soul_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_harvest_soul_AuraScript); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -2839,7 +2799,7 @@ class spell_the_lich_king_harvest_soul : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_the_lich_king_harvest_soul_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -2856,8 +2816,6 @@ class spell_the_lich_king_lights_favor : public SpellScriptLoader class spell_the_lich_king_lights_favor_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_lights_favor_AuraScript); - void OnPeriodic(AuraEffect const* /*aurEff*/) { if (Unit* caster = GetCaster()) @@ -2875,8 +2833,8 @@ class spell_the_lich_king_lights_favor : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + OnEffectPeriodic.Register(&spell_the_lich_king_lights_favor_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_the_lich_king_lights_favor_AuraScript::CalculateBonus, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); } }; @@ -2893,8 +2851,6 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader class spell_the_lich_king_soul_rip_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_soul_rip_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -2905,7 +2861,7 @@ class spell_the_lich_king_soul_rip : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_the_lich_king_soul_rip_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -2921,10 +2877,8 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader spell_the_lich_king_restore_soul() : SpellScriptLoader("spell_the_lich_king_restore_soul") { } class spell_the_lich_king_restore_soul_SpellScript : public SpellScript - { - PrepareSpellScript(spell_the_lich_king_restore_soul_SpellScript); - - public: + { + public: spell_the_lich_king_restore_soul_SpellScript() { _instance = nullptr; @@ -2962,8 +2916,8 @@ class spell_the_lich_king_restore_soul : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); - BeforeHit += SpellHitFn(spell_the_lich_king_restore_soul_SpellScript::RemoveAura); + OnEffectHit.Register(&spell_the_lich_king_restore_soul_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + BeforeHit.Register(&spell_the_lich_king_restore_soul_SpellScript::RemoveAura); } InstanceScript* _instance; @@ -2982,8 +2936,6 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader class spell_the_lich_king_dark_hunger_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_dark_hunger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DARK_HUNGER_HEAL }); @@ -3002,7 +2954,7 @@ class spell_the_lich_king_dark_hunger : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_the_lich_king_dark_hunger_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_the_lich_king_dark_hunger_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -3019,8 +2971,6 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader class spell_the_lich_king_in_frostmourne_room_AuraScript : public AuraScript { - PrepareAuraScript(spell_the_lich_king_in_frostmourne_room_AuraScript); - bool Load() override { return GetOwner()->GetInstanceScript() != nullptr; @@ -3035,7 +2985,7 @@ class spell_the_lich_king_in_frostmourne_room : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_the_lich_king_in_frostmourne_room_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -3052,8 +3002,6 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader class spell_the_lich_king_summon_spirit_bomb_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_summon_spirit_bomb_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3062,7 +3010,7 @@ class spell_the_lich_king_summon_spirit_bomb : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_the_lich_king_summon_spirit_bomb_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3079,8 +3027,6 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader class spell_the_lich_king_trigger_vile_spirit_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_trigger_vile_spirit_SpellScript); - void ActivateSpirit() { Creature* target = GetHitCreature(); @@ -3092,7 +3038,7 @@ class spell_the_lich_king_trigger_vile_spirit : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_the_lich_king_trigger_vile_spirit_SpellScript::ActivateSpirit); + OnHit.Register(&spell_the_lich_king_trigger_vile_spirit_SpellScript::ActivateSpirit); } }; @@ -3109,8 +3055,6 @@ class spell_the_lich_king_jump : public SpellScriptLoader class spell_the_lich_king_jump_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_jump_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3127,7 +3071,7 @@ class spell_the_lich_king_jump : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3144,8 +3088,6 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader class spell_the_lich_king_jump_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_jump_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3154,7 +3096,7 @@ class spell_the_lich_king_jump_remove_aura : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_the_lich_king_jump_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3171,8 +3113,6 @@ class spell_the_lich_king_harvest_souls_teleport : public SpellScriptLoader class spell_the_lich_king_harvest_souls_teleport_SpellScript : public SpellScript { - PrepareSpellScript(spell_the_lich_king_harvest_souls_teleport_SpellScript); - void RelocateTransportOffset(SpellEffIndex /*effIndex*/) { float randCoordX = frand(-18.0f, 18.0f); @@ -3182,7 +3122,7 @@ class spell_the_lich_king_harvest_souls_teleport : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_lich_king_harvest_souls_teleport_SpellScript::RelocateTransportOffset, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS); + OnEffectHitTarget.Register(&spell_the_lich_king_harvest_souls_teleport_SpellScript::RelocateTransportOffset, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp index caa0f62ee6..98233709bc 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp @@ -1124,8 +1124,6 @@ class spell_dreamwalker_mana_void : public SpellScriptLoader class spell_dreamwalker_mana_void_AuraScript : public AuraScript { - PrepareAuraScript(spell_dreamwalker_mana_void_AuraScript); - void PeriodicTick(AuraEffect const* aurEff) { // first 3 ticks have amplitude 1 second @@ -1137,7 +1135,7 @@ class spell_dreamwalker_mana_void : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_mana_void_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_dreamwalker_mana_void_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1154,8 +1152,6 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader class spell_dreamwalker_decay_periodic_timer_AuraScript : public AuraScript { - PrepareAuraScript(spell_dreamwalker_decay_periodic_timer_AuraScript); - bool Load() override { _decayRate = GetId() != SPELL_TIMER_BLAZING_SKELETON ? 1000 : 5000; @@ -1173,7 +1169,7 @@ class spell_dreamwalker_decay_periodic_timer : public SpellScriptLoader void Register() override { - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dreamwalker_decay_periodic_timer_AuraScript::DecayPeriodicTimer, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectUpdatePeriodic.Register(&spell_dreamwalker_decay_periodic_timer_AuraScript::DecayPeriodicTimer, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } int32 _decayRate = 0; @@ -1192,8 +1188,6 @@ class spell_dreamwalker_summoner : public SpellScriptLoader class spell_dreamwalker_summoner_SpellScript : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summoner_SpellScript); - bool Load() override { if (!GetCaster()->GetInstanceScript()) @@ -1223,8 +1217,8 @@ class spell_dreamwalker_summoner : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dreamwalker_summoner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summoner_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnObjectAreaTargetSelect.Register(&spell_dreamwalker_summoner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_dreamwalker_summoner_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -1241,8 +1235,6 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader class spell_dreamwalker_summon_suppresser_AuraScript : public AuraScript { - PrepareAuraScript(spell_dreamwalker_summon_suppresser_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SUPPRESSER }); @@ -1276,8 +1268,8 @@ class spell_dreamwalker_summon_suppresser : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_summon_suppresser_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - AfterEffectApply += AuraEffectApplyFn(spell_dreamwalker_summon_suppresser_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_dreamwalker_summon_suppresser_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectApply.Register(&spell_dreamwalker_summon_suppresser_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -1294,8 +1286,6 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader class spell_dreamwalker_summon_suppresser_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_suppresser_effect_SpellScript); - bool Load() override { if (!GetCaster()->GetInstanceScript()) @@ -1314,7 +1304,7 @@ class spell_dreamwalker_summon_suppresser_effect : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_suppresser_effect_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_dreamwalker_summon_suppresser_effect_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -1331,8 +1321,6 @@ class spell_dreamwalker_summon_dream_portal : public SpellScriptLoader class spell_dreamwalker_summon_dream_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_dream_portal_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1345,7 +1333,7 @@ class spell_dreamwalker_summon_dream_portal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_dream_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dreamwalker_summon_dream_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1362,8 +1350,6 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScriptLoader class spell_dreamwalker_summon_nightmare_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_dreamwalker_summon_nightmare_portal_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1376,7 +1362,7 @@ class spell_dreamwalker_summon_nightmare_portal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_summon_nightmare_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dreamwalker_summon_nightmare_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1393,8 +1379,6 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader class spell_dreamwalker_nightmare_cloud_AuraScript : public AuraScript { - PrepareAuraScript(spell_dreamwalker_nightmare_cloud_AuraScript); - public: spell_dreamwalker_nightmare_cloud_AuraScript() { @@ -1416,7 +1400,7 @@ class spell_dreamwalker_nightmare_cloud : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dreamwalker_nightmare_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_dreamwalker_nightmare_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } InstanceScript* _instance; @@ -1435,8 +1419,6 @@ class spell_dreamwalker_twisted_nightmares : public SpellScriptLoader class spell_dreamwalker_twisted_nightmares_SpellScript : public SpellScript { - PrepareSpellScript(spell_dreamwalker_twisted_nightmares_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1447,7 +1429,7 @@ class spell_dreamwalker_twisted_nightmares : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dreamwalker_twisted_nightmares_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_dreamwalker_twisted_nightmares_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_FORCE_CAST); } }; diff --git a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp index 5aef3f957d..963dd87558 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp @@ -1672,8 +1672,6 @@ class spell_icc_stoneform : public SpellScriptLoader class spell_icc_stoneform_AuraScript : public AuraScript { - PrepareAuraScript(spell_icc_stoneform_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -1698,8 +1696,8 @@ class spell_icc_stoneform : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_icc_stoneform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_icc_stoneform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_icc_stoneform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_icc_stoneform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1716,8 +1714,6 @@ class spell_icc_sprit_alarm : public SpellScriptLoader class spell_icc_sprit_alarm_SpellScript : public SpellScript { - PrepareSpellScript(spell_icc_sprit_alarm_SpellScript); - void HandleEvent(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1761,7 +1757,7 @@ class spell_icc_sprit_alarm : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_icc_sprit_alarm_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_icc_sprit_alarm_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); } }; @@ -1789,8 +1785,6 @@ class spell_svalna_revive_champion : public SpellScriptLoader class spell_svalna_revive_champion_SpellScript : public SpellScript { - PrepareSpellScript(spell_svalna_revive_champion_SpellScript); - void RemoveAliveTarget(std::list& targets) { targets.remove_if(AliveCheck()); @@ -1812,8 +1806,8 @@ class spell_svalna_revive_champion : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_svalna_revive_champion_SpellScript::RemoveAliveTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHit += SpellEffectFn(spell_svalna_revive_champion_SpellScript::Land, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_svalna_revive_champion_SpellScript::RemoveAliveTarget, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHit.Register(&spell_svalna_revive_champion_SpellScript::Land, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1830,8 +1824,6 @@ class spell_svalna_remove_spear : public SpellScriptLoader class spell_svalna_remove_spear_SpellScript : public SpellScript { - PrepareSpellScript(spell_svalna_remove_spear_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1845,7 +1837,7 @@ class spell_svalna_remove_spear : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_svalna_remove_spear_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_svalna_remove_spear_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1863,8 +1855,6 @@ class spell_icc_soul_missile : public SpellScriptLoader class spell_icc_soul_missile_SpellScript : public SpellScript { - PrepareSpellScript(spell_icc_soul_missile_SpellScript); - void RelocateDest(SpellDestination& dest) { static Position const offset = { 0.0f, 0.0f, 200.0f, 0.0f }; @@ -1873,7 +1863,7 @@ class spell_icc_soul_missile : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_icc_soul_missile_SpellScript::RelocateDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_icc_soul_missile_SpellScript::RelocateDest, EFFECT_0, TARGET_DEST_CASTER); } }; @@ -1885,8 +1875,6 @@ class spell_icc_soul_missile : public SpellScriptLoader class spell_trigger_spell_from_caster_SpellScript : public SpellScript { - PrepareSpellScript(spell_trigger_spell_from_caster_SpellScript); - public: spell_trigger_spell_from_caster_SpellScript(uint32 triggerId, TriggerCastFlags triggerFlags) : SpellScript(), _triggerId(triggerId), _triggerFlags(triggerFlags) { } @@ -1904,7 +1892,7 @@ class spell_trigger_spell_from_caster_SpellScript : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_trigger_spell_from_caster_SpellScript::HandleTrigger); + AfterHit.Register(&spell_trigger_spell_from_caster_SpellScript::HandleTrigger); } uint32 _triggerId; diff --git a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp index ab676e400e..53228902ef 100644 --- a/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp +++ b/src/server/scripts/Northrend/IsleOfConquest/isle_of_conquest.cpp @@ -146,8 +146,6 @@ class spell_ioc_gunship_portal : public SpellScriptLoader class spell_ioc_gunship_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_ioc_gunship_portal_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -169,7 +167,7 @@ class spell_ioc_gunship_portal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ioc_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ioc_gunship_portal_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -186,8 +184,6 @@ class spell_ioc_parachute_ic : public SpellScriptLoader class spell_ioc_parachute_ic_AuraScript : public AuraScript { - PrepareAuraScript(spell_ioc_parachute_ic_AuraScript); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { if (Player* target = GetTarget()->ToPlayer()) @@ -197,7 +193,7 @@ class spell_ioc_parachute_ic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ioc_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_ioc_parachute_ic_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -239,8 +235,6 @@ class spell_ioc_launch : public SpellScriptLoader class spell_ioc_launch_SpellScript : public SpellScript { - PrepareSpellScript(spell_ioc_launch_SpellScript); - void Launch() { if (!GetCaster()->ToCreature() || !GetExplTargetDest()) @@ -251,7 +245,7 @@ class spell_ioc_launch : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_ioc_launch_SpellScript::Launch); + AfterHit.Register(&spell_ioc_launch_SpellScript::Launch); } }; @@ -276,8 +270,6 @@ class spell_ioc_seaforium_blast_credit : public SpellScriptLoader class spell_ioc_seaforium_blast_credit_SpellScript : public SpellScript { - PrepareSpellScript(spell_ioc_seaforium_blast_credit_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_A_BOMB_INABLE_CREDIT, SPELL_A_BOMB_INATION_CREDIT }); @@ -301,7 +293,7 @@ class spell_ioc_seaforium_blast_credit : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ioc_seaforium_blast_credit_SpellScript::HandleAchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); + OnEffectHitTarget.Register(&spell_ioc_seaforium_blast_credit_SpellScript::HandleAchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp index 17c94046a4..a4c411c796 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp @@ -697,8 +697,6 @@ class spell_four_horsemen_mark : public SpellScriptLoader class spell_four_horsemen_mark_AuraScript : public AuraScript { - PrepareAuraScript(spell_four_horsemen_mark_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -735,7 +733,7 @@ class spell_four_horsemen_mark : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_four_horsemen_mark_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_four_horsemen_mark_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp index 272bb4da4f..0d908f1363 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp @@ -304,8 +304,6 @@ public: class spell_gluth_decimate_SpellScript : public SpellScript { - PrepareSpellScript(spell_gluth_decimate_SpellScript); - // handles the damaging effect of the decimate spell. void HandleScriptEffect(SpellEffIndex /* index */) { @@ -330,8 +328,8 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gluth_decimate_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHit += SpellEffectFn(spell_gluth_decimate_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); + OnEffectHitTarget.Register(&spell_gluth_decimate_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit.Register(&spell_gluth_decimate_SpellScript::HandleEvent, EFFECT_2, SPELL_EFFECT_SEND_EVENT); } bool Load() override @@ -356,8 +354,6 @@ public: class spell_gluth_zombiechow_search_SpellScript : public SpellScript { - PrepareSpellScript(spell_gluth_zombiechow_search_SpellScript); - void HealForEachTargetHit() { GetCaster()->ModifyHealth(int32(GetCaster()->CountPctFromMaxHealth(5))); @@ -365,7 +361,7 @@ public: void Register() override { - AfterHit += SpellHitFn(spell_gluth_zombiechow_search_SpellScript::HealForEachTargetHit); + AfterHit.Register(&spell_gluth_zombiechow_search_SpellScript::HealForEachTargetHit); } bool Load() override diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp index 83868e16bf..532dcf3c6a 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp @@ -975,8 +975,6 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader class spell_gothik_shadow_bolt_volley_SpellScript : public SpellScript { - PrepareSpellScript(spell_gothik_shadow_bolt_volley_SpellScript); - void FilterTargets(std::list& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_SHADOW_MARK)); @@ -984,7 +982,7 @@ class spell_gothik_shadow_bolt_volley : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_gothik_shadow_bolt_volley_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp index a12504142b..873d299af9 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp @@ -147,8 +147,6 @@ class spell_grobbulus_mutating_injection : public SpellScriptLoader class spell_grobbulus_mutating_injection_AuraScript : public AuraScript { - PrepareAuraScript(spell_grobbulus_mutating_injection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MUTATING_EXPLOSION, SPELL_POISON_CLOUD }); @@ -169,7 +167,7 @@ class spell_grobbulus_mutating_injection : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_grobbulus_mutating_injection_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_grobbulus_mutating_injection_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -187,8 +185,6 @@ class spell_grobbulus_poison_cloud : public SpellScriptLoader class spell_grobbulus_poison_cloud_AuraScript : public AuraScript { - PrepareAuraScript(spell_grobbulus_poison_cloud_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -205,7 +201,7 @@ class spell_grobbulus_poison_cloud : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_grobbulus_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_grobbulus_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 1ff13af790..4a5b652a73 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -232,8 +232,6 @@ class spell_heigan_eruption : public SpellScriptLoader class spell_heigan_eruption_SpellScript : public SpellScript { - PrepareSpellScript(spell_heigan_eruption_SpellScript); - void HandleScript(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); @@ -248,7 +246,7 @@ class spell_heigan_eruption : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_heigan_eruption_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_heigan_eruption_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp index 1b19eb2147..9db689d318 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp @@ -885,8 +885,6 @@ public: class spell_kelthuzad_chains_AuraScript : public AuraScript { - PrepareAuraScript(spell_kelthuzad_chains_AuraScript); - void HandleApply(AuraEffect const* /*eff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -905,8 +903,8 @@ public: void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_kelthuzad_chains_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectApplyFn(spell_kelthuzad_chains_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_kelthuzad_chains_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_kelthuzad_chains_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); } }; @@ -923,8 +921,6 @@ public: class spell_kelthuzad_detonate_mana_AuraScript : public AuraScript { - PrepareAuraScript(spell_kelthuzad_detonate_mana_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MANA_DETONATION_DAMAGE }); @@ -944,7 +940,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_kelthuzad_detonate_mana_AuraScript::HandleScript, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_kelthuzad_detonate_mana_AuraScript::HandleScript, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp index 4c16354be2..bce99c0d77 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_loatheb.cpp @@ -169,8 +169,6 @@ class spell_loatheb_deathbloom : public SpellScriptLoader class spell_loatheb_deathbloom_AuraScript : public AuraScript { - PrepareAuraScript(spell_loatheb_deathbloom_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DEATHBLOOM_FINAL_DAMAGE }); @@ -186,7 +184,7 @@ class spell_loatheb_deathbloom : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_loatheb_deathbloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_loatheb_deathbloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp index 4c0895f6ee..48e9fdad03 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp @@ -501,8 +501,6 @@ class spell_sapphiron_change_blizzard_target : public SpellScriptLoader class spell_sapphiron_change_blizzard_target_AuraScript : public AuraScript { - PrepareAuraScript(spell_sapphiron_change_blizzard_target_AuraScript); - void HandlePeriodic(AuraEffect const* /*eff*/) { TempSummon* me = GetTarget()->ToTempSummon(); @@ -524,7 +522,7 @@ class spell_sapphiron_change_blizzard_target : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sapphiron_change_blizzard_target_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_sapphiron_change_blizzard_target_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -541,8 +539,6 @@ class spell_sapphiron_icebolt : public SpellScriptLoader class spell_sapphiron_icebolt_AuraScript : public AuraScript { - PrepareAuraScript(spell_sapphiron_icebolt_AuraScript); - void HandleApply(AuraEffect const* /*eff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->ApplySpellImmune(SPELL_ICEBOLT, IMMUNITY_DAMAGE, SPELL_SCHOOL_MASK_FROST, true); @@ -570,9 +566,9 @@ class spell_sapphiron_icebolt : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_sapphiron_icebolt_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_sapphiron_icebolt_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sapphiron_icebolt_AuraScript::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + AfterEffectApply.Register(&spell_sapphiron_icebolt_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_sapphiron_icebolt_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_sapphiron_icebolt_AuraScript::HandlePeriodic, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } ObjectGuid _block; @@ -591,8 +587,6 @@ class spell_sapphiron_summon_blizzard : public SpellScriptLoader class spell_sapphiron_summon_blizzard_SpellScript : public SpellScript { - PrepareSpellScript(spell_sapphiron_summon_blizzard_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BLIZZARD }); @@ -620,7 +614,7 @@ class spell_sapphiron_summon_blizzard : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sapphiron_summon_blizzard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_sapphiron_summon_blizzard_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp index f7b95ff11c..27ed687c9d 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp @@ -987,8 +987,6 @@ class spell_thaddius_polarity_charge : public SpellScriptLoader class spell_thaddius_polarity_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_thaddius_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1070,7 +1068,7 @@ class spell_thaddius_polarity_charge : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thaddius_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_thaddius_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -1087,8 +1085,6 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader class spell_thaddius_polarity_shift_SpellScript : public SpellScript { - PrepareSpellScript(spell_thaddius_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1123,7 +1119,7 @@ class spell_thaddius_polarity_shift : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_thaddius_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_thaddius_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1140,8 +1136,6 @@ class spell_thaddius_magnetic_pull : public SpellScriptLoader class spell_thaddius_magnetic_pull_SpellScript : public SpellScript { - PrepareSpellScript(spell_thaddius_magnetic_pull_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MAGNETIC_PULL }); @@ -1209,7 +1203,7 @@ class spell_thaddius_magnetic_pull : public SpellScriptLoader void Register() override { - OnCast += SpellCastFn(spell_thaddius_magnetic_pull_SpellScript::HandleCast); + OnCast.Register(&spell_thaddius_magnetic_pull_SpellScript::HandleCast); } }; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index 5f7fb0edae..8093fbd0e0 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -1593,8 +1593,6 @@ class spell_malygos_portal_beam : public SpellScriptLoader class spell_malygos_portal_beam_AuraScript : public AuraScript { - PrepareAuraScript(spell_malygos_portal_beam_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1619,8 +1617,8 @@ class spell_malygos_portal_beam : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_malygos_portal_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_portal_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_malygos_portal_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_malygos_portal_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1637,8 +1635,6 @@ class spell_malygos_random_portal : public SpellScriptLoader class spell_malygos_random_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_malygos_random_portal_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1658,7 +1654,7 @@ class spell_malygos_random_portal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_malygos_random_portal_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_malygos_random_portal_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1693,8 +1689,6 @@ class spell_malygos_arcane_storm : public SpellScriptLoader class spell_malygos_arcane_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_malygos_arcane_storm_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1732,8 +1726,8 @@ class spell_malygos_arcane_storm : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_arcane_storm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectLaunchTarget += SpellEffectFn(spell_malygos_arcane_storm_SpellScript::HandleVisual, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnObjectAreaTargetSelect.Register(&spell_malygos_arcane_storm_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectLaunchTarget.Register(&spell_malygos_arcane_storm_SpellScript::HandleVisual, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1750,9 +1744,7 @@ public: class spell_malygos_vortex_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_malygos_vortex_dummy_SpellScript); - - bool Load() override + bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; } @@ -1770,7 +1762,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_malygos_vortex_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_malygos_vortex_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1787,8 +1779,6 @@ class spell_malygos_vortex_visual : public SpellScriptLoader class spell_malygos_vortex_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_malygos_vortex_visual_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1829,7 +1819,7 @@ class spell_malygos_vortex_visual : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_vortex_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_malygos_vortex_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1861,8 +1851,6 @@ class spell_arcane_overload : public SpellScriptLoader class spell_arcane_overload_SpellScript : public SpellScript { - PrepareSpellScript(spell_arcane_overload_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1877,7 +1865,7 @@ class spell_arcane_overload : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_arcane_overload_SpellScript::ResizeEffectRadiusTargetChecker, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_arcane_overload_SpellScript::ResizeEffectRadiusTargetChecker, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1894,8 +1882,6 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader class spell_nexus_lord_align_disk_aggro_SpellScript : public SpellScript { - PrepareSpellScript(spell_nexus_lord_align_disk_aggro_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1910,7 +1896,7 @@ class spell_nexus_lord_align_disk_aggro : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nexus_lord_align_disk_aggro_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_nexus_lord_align_disk_aggro_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1945,8 +1931,6 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader class spell_scion_of_eternity_arcane_barrage_SpellScript : public SpellScript { - PrepareSpellScript(spell_scion_of_eternity_arcane_barrage_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT && GetCaster()->GetInstanceScript() != nullptr; @@ -2007,8 +1991,8 @@ class spell_scion_of_eternity_arcane_barrage : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_scion_of_eternity_arcane_barrage_SpellScript::FilterMeleeHoverDiskPassangers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnHit += SpellHitFn(spell_scion_of_eternity_arcane_barrage_SpellScript::TriggerDamageSpellFromPlayer); + OnObjectAreaTargetSelect.Register(&spell_scion_of_eternity_arcane_barrage_SpellScript::FilterMeleeHoverDiskPassangers, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit.Register(&spell_scion_of_eternity_arcane_barrage_SpellScript::TriggerDamageSpellFromPlayer); } }; @@ -2025,8 +2009,6 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader class spell_malygos_destroy_platform_channel_AuraScript : public AuraScript { - PrepareAuraScript(spell_malygos_destroy_platform_channel_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2047,7 +2029,7 @@ class spell_malygos_destroy_platform_channel : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_malygos_destroy_platform_channel_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_malygos_destroy_platform_channel_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2064,8 +2046,6 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL class spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript : public SpellScript { - PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2084,7 +2064,7 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_alexstrasza_bunny_destroy_platform_boom_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2101,8 +2081,6 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader class spell_alexstrasza_bunny_destroy_platform_event_SpellScript : public SpellScript { - PrepareSpellScript(spell_alexstrasza_bunny_destroy_platform_event_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2123,8 +2101,8 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); - OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit.Register(&spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2142,8 +2120,6 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader class spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript : public SpellScript { - PrepareSpellScript(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2158,7 +2134,7 @@ class spell_wyrmrest_skytalon_summon_red_dragon_buddy : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_RADIUS); + OnDestinationTargetSelect.Register(&spell_wyrmrest_skytalon_summon_red_dragon_buddy_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_RADIUS); } }; @@ -2175,8 +2151,6 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2190,7 +2164,7 @@ class spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_wyrmrest_skytalon_ride_red_dragon_buddy_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2207,8 +2181,6 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade class spell_malygos_surge_of_power_warning_selector_25_SpellScript : public SpellScript { - PrepareSpellScript(spell_malygos_surge_of_power_warning_selector_25_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2252,8 +2224,8 @@ class spell_malygos_surge_of_power_warning_selector_25 : public SpellScriptLoade void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::SendThreeTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - AfterHit += SpellHitFn(spell_malygos_surge_of_power_warning_selector_25_SpellScript::ExecuteMainSpell); + OnObjectAreaTargetSelect.Register(&spell_malygos_surge_of_power_warning_selector_25_SpellScript::SendThreeTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + AfterHit.Register(&spell_malygos_surge_of_power_warning_selector_25_SpellScript::ExecuteMainSpell); } }; @@ -2270,8 +2242,6 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader class spell_malygos_surge_of_power_25_SpellScript : public SpellScript { - PrepareSpellScript(spell_malygos_surge_of_power_25_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2304,7 +2274,7 @@ class spell_malygos_surge_of_power_25 : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_malygos_surge_of_power_25_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_malygos_surge_of_power_25_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -2321,8 +2291,6 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader class spell_alexstrasza_gift_beam_AuraScript : public AuraScript { - PrepareAuraScript(spell_alexstrasza_gift_beam_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -2347,8 +2315,8 @@ class spell_alexstrasza_gift_beam : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_alexstrasza_gift_beam_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_alexstrasza_gift_beam_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2365,8 +2333,6 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader class spell_alexstrasza_gift_beam_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_alexstrasza_gift_beam_visual_AuraScript); - public: spell_alexstrasza_gift_beam_visual_AuraScript() { @@ -2408,8 +2374,8 @@ class spell_alexstrasza_gift_beam_visual : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_alexstrasza_gift_beam_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_alexstrasza_gift_beam_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_alexstrasza_gift_beam_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } GameObject* _alexstraszaGift; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp index 32cd25dc35..9f644e39cb 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp @@ -262,8 +262,6 @@ class spell_intense_cold : public SpellScriptLoader class spell_intense_cold_AuraScript : public AuraScript { - PrepareAuraScript(spell_intense_cold_AuraScript); - void HandlePeriodicTick(AuraEffect const* aurEff) { if (aurEff->GetBase()->GetStackAmount() < 2) @@ -277,7 +275,7 @@ class spell_intense_cold : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_intense_cold_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_intense_cold_AuraScript::HandlePeriodicTick, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp index fad31e038d..ca80617f20 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_ormorok.cpp @@ -269,8 +269,6 @@ class spell_crystal_spike : public SpellScriptLoader class spell_crystal_spike_AuraScript : public AuraScript { - PrepareAuraScript(spell_crystal_spike_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -285,7 +283,7 @@ class spell_crystal_spike : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_crystal_spike_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_crystal_spike_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp index cc23ce1786..84fa8a0c4a 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_eregos.cpp @@ -269,8 +269,6 @@ class spell_eregos_planar_shift : public SpellScriptLoader class spell_eregos_planar_shift_AuraScript : public AuraScript { - PrepareAuraScript(spell_eregos_planar_shift_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* creature = GetTarget()->ToCreature()) @@ -279,7 +277,7 @@ class spell_eregos_planar_shift : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_eregos_planar_shift_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_IMMUNITY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_eregos_planar_shift_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index 21b01c2ff1..139cb6b4ed 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -269,8 +269,6 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader class spell_varos_centrifuge_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_varos_centrifuge_shield_AuraScript); - bool Load() override { Unit* caster = GetCaster(); @@ -303,8 +301,8 @@ class spell_varos_centrifuge_shield : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectApply += AuraEffectApplyFn(spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_varos_centrifuge_shield_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_varos_centrifuge_shield_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -321,8 +319,6 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader class spell_varos_energize_core_area_enemySpellScript : public SpellScript { - PrepareSpellScript(spell_varos_energize_core_area_enemySpellScript); - void FilterTargets(std::list& targets) { Creature* varos = GetCaster()->ToCreature(); @@ -348,7 +344,7 @@ class spell_varos_energize_core_area_enemy : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_enemySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_varos_energize_core_area_enemySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -365,8 +361,6 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader class spell_varos_energize_core_area_entrySpellScript : public SpellScript { - PrepareSpellScript(spell_varos_energize_core_area_entrySpellScript); - void FilterTargets(std::list& targets) { Creature* varos = GetCaster()->ToCreature(); @@ -392,7 +386,7 @@ class spell_varos_energize_core_area_entry : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_varos_energize_core_area_entrySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_varos_energize_core_area_entrySpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 0bbd03c93c..77b277a626 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -416,8 +416,6 @@ class spell_oculus_call_ruby_emerald_amber_drake : public SpellScriptLoader class spell_oculus_call_ruby_emerald_amber_drake_SpellScript : public SpellScript { - PrepareSpellScript(spell_oculus_call_ruby_emerald_amber_drake_SpellScript); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -427,7 +425,7 @@ class spell_oculus_call_ruby_emerald_amber_drake : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_oculus_call_ruby_emerald_amber_drake_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); + OnDestinationTargetSelect.Register(&spell_oculus_call_ruby_emerald_amber_drake_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_FRONT); } }; @@ -447,8 +445,6 @@ class spell_oculus_ride_ruby_emerald_amber_drake_que : public SpellScriptLoader class spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript : public AuraScript { - PrepareAuraScript(spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript); - void HandlePeriodic(AuraEffect const* aurEff) { // caster of the triggered spell is wrong for an unknown reason, handle it here correctly @@ -459,7 +455,7 @@ class spell_oculus_ride_ruby_emerald_amber_drake_que : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_oculus_ride_ruby_emerald_amber_drake_que_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -477,8 +473,6 @@ class spell_oculus_evasive_maneuvers : public SpellScriptLoader class spell_oculus_evasive_maneuvers_AuraScript : public AuraScript { - PrepareAuraScript(spell_oculus_evasive_maneuvers_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUBY_EVASIVE_CHARGES }); @@ -494,7 +488,7 @@ class spell_oculus_evasive_maneuvers : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_oculus_evasive_maneuvers_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_oculus_evasive_maneuvers_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -512,8 +506,6 @@ class spell_oculus_shock_lance : public SpellScriptLoader class spell_oculus_shock_lance_SpellScript : public SpellScript { - PrepareSpellScript(spell_oculus_shock_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -536,7 +528,7 @@ class spell_oculus_shock_lance : public SpellScriptLoader void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_oculus_shock_lance_SpellScript::CalcDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_oculus_shock_lance_SpellScript::CalcDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -554,8 +546,6 @@ class spell_oculus_stop_time : public SpellScriptLoader class spell_oculus_stop_time_AuraScript : public AuraScript { - PrepareAuraScript(spell_oculus_stop_time_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -574,7 +564,7 @@ class spell_oculus_stop_time : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_oculus_stop_time_AuraScript::Apply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_oculus_stop_time_AuraScript::Apply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -592,8 +582,6 @@ class spell_oculus_temporal_rift : public SpellScriptLoader class spell_oculus_temporal_rift_AuraScript : public AuraScript { - PrepareAuraScript(spell_oculus_temporal_rift_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AMBER_SHOCK_CHARGE }); @@ -619,7 +607,7 @@ class spell_oculus_temporal_rift : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_oculus_temporal_rift_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_oculus_temporal_rift_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_DUMMY); } }; @@ -637,8 +625,6 @@ class spell_oculus_touch_the_nightmare : public SpellScriptLoader class spell_oculus_touch_the_nightmare_SpellScript : public SpellScript { - PrepareSpellScript(spell_oculus_touch_the_nightmare_SpellScript); - void HandleDamageCalc(SpellEffIndex /*effIndex*/) { SetHitDamage(int32(GetCaster()->CountPctFromMaxHealth(30))); @@ -646,7 +632,7 @@ class spell_oculus_touch_the_nightmare : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_oculus_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_oculus_touch_the_nightmare_SpellScript::HandleDamageCalc, EFFECT_2, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -664,8 +650,6 @@ class spell_oculus_dream_funnel : public SpellScriptLoader class spell_oculus_dream_funnel_AuraScript : public AuraScript { - PrepareAuraScript(spell_oculus_dream_funnel_AuraScript); - void HandleEffectCalcAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { if (Unit* caster = GetCaster()) @@ -676,8 +660,8 @@ class spell_oculus_dream_funnel : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); + DoEffectCalcAmount.Register(&spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_oculus_dream_funnel_AuraScript::HandleEffectCalcAmount, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp index 245d011350..f24f620400 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp @@ -217,8 +217,6 @@ class spell_loken_pulsing_shockwave : public SpellScriptLoader class spell_loken_pulsing_shockwave_SpellScript : public SpellScript { - PrepareSpellScript(spell_loken_pulsing_shockwave_SpellScript); - void CalculateDamage(SpellEffIndex /*effIndex*/) { if (!GetHitUnit()) @@ -231,7 +229,7 @@ class spell_loken_pulsing_shockwave : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_loken_pulsing_shockwave_SpellScript::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_loken_pulsing_shockwave_SpellScript::CalculateDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp index c3692c2ec8..a5780983fe 100644 --- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp +++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/boss_krystallus.cpp @@ -149,8 +149,6 @@ class spell_krystallus_shatter : public SpellScriptLoader class spell_krystallus_shatter_SpellScript : public SpellScript { - PrepareSpellScript(spell_krystallus_shatter_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -162,7 +160,7 @@ class spell_krystallus_shatter : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_krystallus_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_krystallus_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -179,8 +177,6 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader class spell_krystallus_shatter_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_krystallus_shatter_effect_SpellScript); - void CalculateDamage() { if (!GetHitUnit()) @@ -197,7 +193,7 @@ class spell_krystallus_shatter_effect : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_krystallus_shatter_effect_SpellScript::CalculateDamage); + OnHit.Register(&spell_krystallus_shatter_effect_SpellScript::CalculateDamage); } }; 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 fe6cc08da8..137294efeb 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 @@ -1066,8 +1066,6 @@ class spell_algalon_phase_punch : public SpellScriptLoader class spell_algalon_phase_punch_AuraScript : public AuraScript { - PrepareAuraScript(spell_algalon_phase_punch_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1086,8 +1084,8 @@ class spell_algalon_phase_punch : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_phase_punch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - OnEffectRemove += AuraEffectRemoveFn(spell_algalon_phase_punch_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_algalon_phase_punch_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove.Register(&spell_algalon_phase_punch_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1120,8 +1118,6 @@ class spell_algalon_arcane_barrage : public SpellScriptLoader class spell_algalon_arcane_barrage_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_arcane_barrage_SpellScript); - void SelectTarget(std::list& targets) { targets.remove_if(NotVictimFilter(GetCaster())); @@ -1129,7 +1125,7 @@ class spell_algalon_arcane_barrage : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_arcane_barrage_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_algalon_arcane_barrage_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1155,8 +1151,6 @@ class spell_algalon_trigger_3_adds : public SpellScriptLoader class spell_algalon_trigger_3_adds_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_trigger_3_adds_SpellScript); - void SelectTarget(std::list& targets) { targets.remove_if(ActiveConstellationFilter()); @@ -1174,8 +1168,8 @@ class spell_algalon_trigger_3_adds : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_trigger_3_adds_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_algalon_trigger_3_adds_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_algalon_trigger_3_adds_SpellScript::SelectTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_algalon_trigger_3_adds_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1192,8 +1186,6 @@ class spell_algalon_collapse : public SpellScriptLoader class spell_algalon_collapse_AuraScript : public AuraScript { - PrepareAuraScript(spell_algalon_collapse_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1202,7 +1194,7 @@ class spell_algalon_collapse : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_collapse_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_algalon_collapse_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1219,8 +1211,6 @@ class spell_algalon_big_bang : public SpellScriptLoader class spell_algalon_big_bang_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_big_bang_SpellScript); - public: spell_algalon_big_bang_SpellScript() { @@ -1246,8 +1236,8 @@ class spell_algalon_big_bang : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_algalon_big_bang_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - AfterCast += SpellCastFn(spell_algalon_big_bang_SpellScript::CheckTargets); + OnObjectAreaTargetSelect.Register(&spell_algalon_big_bang_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast.Register(&spell_algalon_big_bang_SpellScript::CheckTargets); } uint32 _targetCount; @@ -1266,8 +1256,6 @@ class spell_algalon_remove_phase : public SpellScriptLoader class spell_algalon_remove_phase_AuraScript : public AuraScript { - PrepareAuraScript(spell_algalon_remove_phase_AuraScript); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -1276,7 +1264,7 @@ class spell_algalon_remove_phase : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_algalon_remove_phase_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_algalon_remove_phase_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1294,8 +1282,6 @@ class spell_algalon_cosmic_smash : public SpellScriptLoader class spell_algalon_cosmic_smash_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_cosmic_smash_SpellScript); - void ModDestHeight(SpellDestination& dest) { Position const offset = { 0.0f, 0.0f, 65.0f, 0.0f }; @@ -1304,7 +1290,7 @@ class spell_algalon_cosmic_smash : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_algalon_cosmic_smash_SpellScript::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_SUMMON); + OnDestinationTargetSelect.Register(&spell_algalon_cosmic_smash_SpellScript::ModDestHeight, EFFECT_0, TARGET_DEST_CASTER_SUMMON); } }; @@ -1321,8 +1307,6 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader class spell_algalon_cosmic_smash_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_cosmic_smash_damage_SpellScript); - void RecalculateDamage() { if (!GetExplTargetDest() || !GetHitUnit()) @@ -1335,7 +1319,7 @@ class spell_algalon_cosmic_smash_damage : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_algalon_cosmic_smash_damage_SpellScript::RecalculateDamage); + OnHit.Register(&spell_algalon_cosmic_smash_damage_SpellScript::RecalculateDamage); } }; @@ -1352,8 +1336,6 @@ class spell_algalon_supermassive_fail : public SpellScriptLoader class spell_algalon_supermassive_fail_SpellScript : public SpellScript { - PrepareSpellScript(spell_algalon_supermassive_fail_SpellScript); - void RecalculateDamage() { if (!GetHitPlayer()) @@ -1364,7 +1346,7 @@ class spell_algalon_supermassive_fail : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_algalon_supermassive_fail_SpellScript::RecalculateDamage); + OnHit.Register(&spell_algalon_supermassive_fail_SpellScript::RecalculateDamage); } }; 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 2166f02cb5..d0d6e22798 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 @@ -659,8 +659,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()) @@ -670,7 +668,7 @@ class spell_shield_of_runes : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_shield_of_runes_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_shield_of_runes_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; @@ -687,8 +685,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()) @@ -698,7 +694,7 @@ class spell_assembly_meltdown : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_assembly_meltdown_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); + OnEffectHitTarget.Register(&spell_assembly_meltdown_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; @@ -715,8 +711,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 }); @@ -736,8 +730,8 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_assembly_rune_of_summoning_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - OnEffectRemove += AuraEffectRemoveFn(spell_assembly_rune_of_summoning_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_assembly_rune_of_summoning_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove.Register(&spell_assembly_rune_of_summoning_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp index 0e088a2fa7..4ad0ccff9d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_auriaya.cpp @@ -506,8 +506,6 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader class spell_auriaya_strenght_of_the_pack_SpellScript : public SpellScript { - PrepareSpellScript(spell_auriaya_strenght_of_the_pack_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(SanctumSentryCheck()); @@ -515,7 +513,7 @@ class spell_auriaya_strenght_of_the_pack : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_strenght_of_the_pack_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_auriaya_strenght_of_the_pack_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -532,8 +530,6 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader class spell_auriaya_sentinel_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_auriaya_sentinel_blast_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(PlayerOrPetCheck()); @@ -541,8 +537,8 @@ class spell_auriaya_sentinel_blast : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_auriaya_sentinel_blast_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } }; 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 c82db30ca0..5693072fdf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp @@ -1508,8 +1508,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(); @@ -1530,8 +1528,8 @@ class spell_load_into_catapult : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_load_into_catapult_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_load_into_catapult_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply.Register(&spell_load_into_catapult_AuraScript::OnApply, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_load_into_catapult_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1553,8 +1551,6 @@ class spell_auto_repair : public SpellScriptLoader class spell_auto_repair_SpellScript : public SpellScript { - PrepareSpellScript(spell_auto_repair_SpellScript); - void CheckCooldownForTarget() { if (GetHitUnit()->HasAuraEffect(SPELL_AUTO_REPAIR, EFFECT_2)) // Check presence of dummy aura indicating cooldown @@ -1596,8 +1592,8 @@ class spell_auto_repair : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_auto_repair_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - BeforeHit += SpellHitFn(spell_auto_repair_SpellScript::CheckCooldownForTarget); + OnEffectHitTarget.Register(&spell_auto_repair_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + BeforeHit.Register(&spell_auto_repair_SpellScript::CheckCooldownForTarget); } }; @@ -1614,8 +1610,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(); @@ -1639,8 +1633,8 @@ class spell_systems_shutdown : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_systems_shutdown_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_systems_shutdown_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_systems_shutdown_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_systems_shutdown_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; @@ -1695,10 +1689,8 @@ class spell_pursue : public SpellScriptLoader spell_pursue() : SpellScriptLoader("spell_pursue") { } class spell_pursue_SpellScript : public SpellScript - { - PrepareSpellScript(spell_pursue_SpellScript); - - private: + { + private: // EFFECT #0 - select target void FilterTargets(std::list& targets) { @@ -1723,8 +1715,8 @@ class spell_pursue : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_pursue_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_pursue_SpellScript::FilterTargetsSubsequently, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); } WorldObject* _target = nullptr; @@ -1743,7 +1735,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(); @@ -1789,7 +1780,7 @@ class spell_vehicle_throw_passenger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_vehicle_throw_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_vehicle_throw_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp index 514265317d..43c56a2cf3 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp @@ -1525,8 +1525,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(); @@ -1555,7 +1553,7 @@ class spell_freya_attuned_to_nature_dose_reduction : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_freya_attuned_to_nature_dose_reduction_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_freya_attuned_to_nature_dose_reduction_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1572,8 +1570,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); @@ -1587,7 +1583,7 @@ class spell_freya_iron_roots : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_freya_iron_roots_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit.Register(&spell_freya_iron_roots_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; 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 64a034676c..004cb00d1c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp @@ -455,8 +455,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 }); @@ -470,7 +468,7 @@ class spell_general_vezax_mark_of_the_faceless : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_general_vezax_mark_of_the_faceless_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_general_vezax_mark_of_the_faceless_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -487,8 +485,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& targets) { targets.remove(GetExplTargetWorldObject()); @@ -499,7 +495,7 @@ class spell_general_vezax_mark_of_the_faceless_leech : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_general_vezax_mark_of_the_faceless_leech_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_general_vezax_mark_of_the_faceless_leech_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); } }; @@ -516,8 +512,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 }); @@ -536,7 +530,7 @@ class spell_general_vezax_saronite_vapors : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_general_vezax_saronite_vapors_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_general_vezax_saronite_vapors_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp index 47357acaef..e087592399 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp @@ -983,8 +983,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(); @@ -1018,7 +1016,7 @@ class spell_biting_cold : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_biting_cold_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } private: @@ -1039,8 +1037,6 @@ public: class spell_biting_cold_dot_AuraScript : public AuraScript { - PrepareAuraScript(spell_biting_cold_dot_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* caster = GetCaster(); @@ -1056,7 +1052,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_biting_cold_dot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_biting_cold_dot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index f1a6e7ce49..e730ad534d 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -453,8 +453,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 }); @@ -477,8 +475,8 @@ class spell_ignis_slag_pot : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignis_slag_pot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_ignis_slag_pot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_ignis_slag_pot_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_ignis_slag_pot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp index f2e9d6d06b..063dccbcdf 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_kologarn.cpp @@ -333,8 +333,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(); @@ -349,7 +347,7 @@ class spell_ulduar_rubble_summon : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ulduar_rubble_summonSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ulduar_rubble_summonSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -388,8 +386,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) @@ -425,9 +421,9 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_ulduar_stone_grip_cast_target_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } private: @@ -448,8 +444,6 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader class spell_ulduar_cancel_stone_gripSpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_cancel_stone_gripSpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -471,7 +465,7 @@ class spell_ulduar_cancel_stone_grip : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ulduar_cancel_stone_gripSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ulduar_cancel_stone_gripSpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -488,8 +482,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 (!GetHitPlayer() || !GetHitPlayer()->GetVehicle()) @@ -509,7 +501,7 @@ class spell_ulduar_squeezed_lifeless : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ulduar_squeezed_lifeless_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); + OnEffectHitTarget.Register(&spell_ulduar_squeezed_lifeless_SpellScript::HandleInstaKill, EFFECT_1, SPELL_EFFECT_INSTAKILL); } }; @@ -526,8 +518,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*/) @@ -546,7 +536,7 @@ class spell_ulduar_stone_grip_absorb : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_absorb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ulduar_stone_grip_absorb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; @@ -563,8 +553,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*/) { if (Player* owner = GetOwner()->ToPlayer()) @@ -598,8 +586,8 @@ class spell_ulduar_stone_grip : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_ulduar_stone_grip_AuraScript::OnRemoveStun, EFFECT_2, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_ulduar_stone_grip_AuraScript::OnRemoveVehicle, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ulduar_stone_grip_AuraScript::OnRemoveStun, EFFECT_2, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -616,8 +604,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& unitList) { unitList.remove_if(PlayerOrPetCheck()); @@ -625,7 +611,7 @@ class spell_kologarn_stone_shout : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_kologarn_stone_shout_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_kologarn_stone_shout_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -642,8 +628,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); @@ -652,8 +636,8 @@ class spell_kologarn_summon_focused_eyebeam : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); - OnEffectHitTarget += SpellEffectFn(spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_kologarn_summon_focused_eyebeam_SpellScript::HandleForceCast, EFFECT_1, SPELL_EFFECT_FORCE_CAST); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp index 15c57822e2..0a0cbfbb7c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp @@ -1686,8 +1686,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()) @@ -1707,8 +1705,8 @@ class spell_mimiron_bomb_bot : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_bomb_bot_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_bomb_bot_SpellScript::HandleDespawn, EFFECT_1, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mimiron_bomb_bot_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_mimiron_bomb_bot_SpellScript::HandleDespawn, EFFECT_1, SPELL_EFFECT_APPLY_AURA); } }; @@ -1726,8 +1724,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()) @@ -1736,7 +1732,7 @@ class spell_mimiron_clear_fires : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_clear_fires_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mimiron_clear_fires_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1754,8 +1750,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()) @@ -1764,7 +1758,7 @@ class spell_mimiron_despawn_assault_bots : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_despawn_assault_bots_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mimiron_despawn_assault_bots_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1781,10 +1775,8 @@ class spell_mimiron_fire_search : public SpellScriptLoader spell_mimiron_fire_search() : SpellScriptLoader("spell_mimiron_fire_search") { } class spell_mimiron_fire_search_SpellScript : public SpellScript - { - PrepareSpellScript(spell_mimiron_fire_search_SpellScript); - - public: + { + public: spell_mimiron_fire_search_SpellScript() { _noTarget = false; @@ -1835,9 +1827,9 @@ class spell_mimiron_fire_search : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_mimiron_fire_search_SpellScript::HandleAftercast); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_fire_search_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_fire_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + AfterCast.Register(&spell_mimiron_fire_search_SpellScript::HandleAftercast); + OnObjectAreaTargetSelect.Register(&spell_mimiron_fire_search_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_mimiron_fire_search_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } private: @@ -1858,8 +1850,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& targets) { targets.remove_if([](WorldObject* obj) { return obj->ToUnit() && (obj->ToUnit()->GetVehicleBase() || obj->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE)); }); @@ -1867,7 +1857,7 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_magnetic_core_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_mimiron_magnetic_core_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY); } }; @@ -1878,8 +1868,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 }); @@ -1911,9 +1899,9 @@ class spell_mimiron_magnetic_core : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_mimiron_magnetic_core_AuraScript::OnApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_mimiron_magnetic_core_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_mimiron_magnetic_core_AuraScript::OnRemoveSelf, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_mimiron_magnetic_core_AuraScript::OnApply, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mimiron_magnetic_core_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mimiron_magnetic_core_AuraScript::OnRemoveSelf, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1931,8 +1919,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 }); @@ -1961,8 +1947,8 @@ class spell_mimiron_napalm_shell : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_napalm_shell_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_napalm_shell_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_mimiron_napalm_shell_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mimiron_napalm_shell_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1980,8 +1966,6 @@ class spell_mimiron_p3wx2_laser_barrage : public SpellScriptLoader class spell_mimiron_p3wx2_laser_barrage_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_p3wx2_laser_barrage_SpellScript); - void OnHit(SpellEffIndex /*effIndex*/) { GetCaster()->SetChannelObjectGuid(GetHitUnit()->GetGUID()); @@ -1989,7 +1973,7 @@ class spell_mimiron_p3wx2_laser_barrage : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_p3wx2_laser_barrage_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mimiron_p3wx2_laser_barrage_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -2007,8 +1991,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 }); @@ -2027,7 +2009,7 @@ class spell_mimiron_plasma_blast : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_plasma_blast_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mimiron_plasma_blast_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2045,8 +2027,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()) @@ -2062,8 +2042,8 @@ class spell_mimiron_proximity_explosion : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_proximity_explosion_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_proximity_explosion_SpellScript::HandleAura, EFFECT_1, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mimiron_proximity_explosion_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_mimiron_proximity_explosion_SpellScript::HandleAura, EFFECT_1, SPELL_EFFECT_APPLY_AURA); } }; @@ -2081,8 +2061,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 }); @@ -2096,7 +2074,7 @@ class spell_mimiron_proximity_mines : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_proximity_mines_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mimiron_proximity_mines_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2114,8 +2092,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 }); @@ -2136,8 +2112,8 @@ class spell_mimiron_proximity_trigger : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_proximity_trigger_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHit += SpellEffectFn(spell_mimiron_proximity_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_mimiron_proximity_trigger_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHit.Register(&spell_mimiron_proximity_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2155,8 +2131,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 }); @@ -2176,8 +2150,8 @@ class spell_mimiron_rapid_burst : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectApplyFn(spell_mimiron_rapid_burst_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mimiron_rapid_burst_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_mimiron_rapid_burst_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_mimiron_rapid_burst_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -2195,8 +2169,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 }); @@ -2222,8 +2194,8 @@ class spell_mimiron_rocket_strike : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_rocket_strike_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_rocket_strike_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_mimiron_rocket_strike_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_mimiron_rocket_strike_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2241,8 +2213,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 }); @@ -2269,9 +2239,9 @@ class spell_mimiron_rocket_strike_damage : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_mimiron_rocket_strike_damage_SpellScript::HandleAfterCast); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_rocket_strike_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_rocket_strike_damage_SpellScript::HandleFriendlyFire, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + AfterCast.Register(&spell_mimiron_rocket_strike_damage_SpellScript::HandleAfterCast); + OnEffectHitTarget.Register(&spell_mimiron_rocket_strike_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_mimiron_rocket_strike_damage_SpellScript::HandleFriendlyFire, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -2289,8 +2259,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 }); @@ -2321,8 +2289,8 @@ class spell_mimiron_rocket_strike_target_select : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_rocket_strike_target_select_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_rocket_strike_target_select_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_mimiron_rocket_strike_target_select_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mimiron_rocket_strike_target_select_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2340,8 +2308,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()) @@ -2350,7 +2316,7 @@ class spell_mimiron_self_repair : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_mimiron_self_repair_SpellScript::HandleScript); + AfterHit.Register(&spell_mimiron_self_repair_SpellScript::HandleScript); } }; @@ -2369,8 +2335,6 @@ class spell_mimiron_spinning_up : public SpellScriptLoader class spell_mimiron_spinning_up_SpellScript : public SpellScript { - PrepareSpellScript(spell_mimiron_spinning_up_SpellScript); - void OnHit(SpellEffIndex /*effIndex*/) { if (GetHitUnit() != GetCaster()) @@ -2379,7 +2343,7 @@ class spell_mimiron_spinning_up : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_spinning_up_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mimiron_spinning_up_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -2397,8 +2361,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 }); @@ -2414,7 +2376,7 @@ class spell_mimiron_summon_assault_bot : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_mimiron_summon_assault_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_mimiron_summon_assault_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2432,8 +2394,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 }); @@ -2446,7 +2406,7 @@ class spell_mimiron_summon_assault_bot_target : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_summon_assault_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mimiron_summon_assault_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2464,8 +2424,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 }); @@ -2481,7 +2439,7 @@ class spell_mimiron_summon_fire_bot : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_mimiron_summon_fire_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_mimiron_summon_fire_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2499,8 +2457,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 }); @@ -2513,7 +2469,7 @@ class spell_mimiron_summon_fire_bot_target : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_summon_fire_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mimiron_summon_fire_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2531,8 +2487,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& targets) { if (targets.empty()) @@ -2556,8 +2510,8 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_summon_flames_spread_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_summon_flames_spread_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_mimiron_summon_flames_spread_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mimiron_summon_flames_spread_SpellScript::OnHit, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -2568,8 +2522,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 }); @@ -2585,7 +2537,7 @@ class spell_mimiron_summon_flames_spread : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mimiron_summon_flames_spread_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mimiron_summon_flames_spread_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2603,8 +2555,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 }); @@ -2633,8 +2583,8 @@ class spell_mimiron_summon_frost_bomb_target : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mimiron_summon_frost_bomb_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_mimiron_summon_frost_bomb_target_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_mimiron_summon_frost_bomb_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_mimiron_summon_frost_bomb_target_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2652,8 +2602,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 }); @@ -2669,7 +2617,7 @@ class spell_mimiron_summon_junk_bot : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_mimiron_summon_junk_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_mimiron_summon_junk_bot_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2687,8 +2635,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 }); @@ -2701,7 +2647,7 @@ class spell_mimiron_summon_junk_bot_target : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mimiron_summon_junk_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mimiron_summon_junk_bot_target_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2719,8 +2665,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(); @@ -2734,7 +2678,7 @@ class spell_mimiron_weld : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mimiron_weld_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mimiron_weld_AuraScript::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp index c31aaa2ae5..f9c7fc09fa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp @@ -1094,8 +1094,6 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader class spell_razorscale_devouring_flame_SpellScript : public SpellScript { - PrepareSpellScript(spell_razorscale_devouring_flame_SpellScript); - void HandleSummon(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1110,7 +1108,7 @@ class spell_razorscale_devouring_flame : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_razorscale_devouring_flame_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); + OnEffectHit.Register(&spell_razorscale_devouring_flame_SpellScript::HandleSummon, EFFECT_0, SPELL_EFFECT_SUMMON); } }; @@ -1127,8 +1125,6 @@ class spell_razorscale_flame_breath : public SpellScriptLoader class spell_razorscale_flame_breath_SpellScript : public SpellScript { - PrepareSpellScript(spell_razorscale_flame_breath_SpellScript); - void CheckDamage() { Creature* target = GetHitCreature(); @@ -1141,7 +1137,7 @@ class spell_razorscale_flame_breath : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_razorscale_flame_breath_SpellScript::CheckDamage); + OnHit.Register(&spell_razorscale_flame_breath_SpellScript::CheckDamage); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 6261580d99..04eed490aa 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -1687,8 +1687,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 @@ -1710,7 +1708,7 @@ class spell_thorim_blizzard_effect : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_thorim_blizzard_effect_AuraScript::CheckAreaTarget); + DoCheckAreaTarget.Register(&spell_thorim_blizzard_effect_AuraScript::CheckAreaTarget); } }; @@ -1728,8 +1726,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& unitList) { unitList.remove_if(PlayerOrPetCheck()); @@ -1737,7 +1733,7 @@ class spell_thorim_frostbolt_volley : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thorim_frostbolt_volley_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_thorim_frostbolt_volley_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -1755,8 +1751,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 }); @@ -1782,8 +1776,8 @@ class spell_thorim_charge_orb : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thorim_charge_orb_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - AfterHit += SpellHitFn(spell_thorim_charge_orb_SpellScript::HandleScript); + OnObjectAreaTargetSelect.Register(&spell_thorim_charge_orb_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + AfterHit.Register(&spell_thorim_charge_orb_SpellScript::HandleScript); } }; @@ -1801,8 +1795,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 }); @@ -1822,8 +1814,8 @@ class spell_thorim_lightning_charge : public SpellScriptLoader void Register() override { - BeforeCast += SpellCastFn(spell_thorim_lightning_charge_SpellScript::HandleFocus); - AfterCast += SpellCastFn(spell_thorim_lightning_charge_SpellScript::HandleCharge); + BeforeCast.Register(&spell_thorim_lightning_charge_SpellScript::HandleFocus); + AfterCast.Register(&spell_thorim_lightning_charge_SpellScript::HandleCharge); } }; @@ -1841,8 +1833,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; @@ -1856,7 +1846,7 @@ class spell_thorim_arena_leap : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_thorim_arena_leap_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST); + OnEffectLaunch.Register(&spell_thorim_arena_leap_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_JUMP_DEST); } }; @@ -1882,8 +1872,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 }); @@ -1920,9 +1908,9 @@ class spell_thorim_stormhammer : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_thorim_stormhammer_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); - AfterCast += SpellCastFn(spell_thorim_stormhammer_SpellScript::LoseHammer); - OnEffectHitTarget += SpellEffectFn(spell_thorim_stormhammer_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_thorim_stormhammer_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + AfterCast.Register(&spell_thorim_stormhammer_SpellScript::LoseHammer); + OnEffectHitTarget.Register(&spell_thorim_stormhammer_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1940,8 +1928,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 }); @@ -1963,8 +1949,8 @@ class spell_thorim_stormhammer_sif : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_thorim_stormhammer_sif_SpellScript::LoseHammer); - OnEffectHitTarget += SpellEffectFn(spell_thorim_stormhammer_sif_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + AfterCast.Register(&spell_thorim_stormhammer_sif_SpellScript::LoseHammer); + OnEffectHitTarget.Register(&spell_thorim_stormhammer_sif_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1982,8 +1968,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()) @@ -1992,7 +1976,7 @@ class spell_thorim_stormhammer_boomerang : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_thorim_stormhammer_boomerang_SpellScript::RecoverHammer, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_thorim_stormhammer_boomerang_SpellScript::RecoverHammer, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2010,8 +1994,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 }); @@ -2032,7 +2014,7 @@ class spell_thorim_runic_smash : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_thorim_runic_smash_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL); + OnEffectHitTarget.Register(&spell_thorim_runic_smash_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TRIGGER_SPELL); } }; @@ -2064,8 +2046,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*/) @@ -2097,7 +2077,7 @@ class spell_thorim_activate_lightning_orb_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_thorim_activate_lightning_orb_periodic_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_thorim_activate_lightning_orb_periodic_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2115,8 +2095,6 @@ class spell_iron_ring_guard_impale : public SpellScriptLoader class spell_iron_ring_guard_impale_AuraScript : public AuraScript { - PrepareAuraScript(spell_iron_ring_guard_impale_AuraScript); - void PeriodicTick(AuraEffect const* /*aurEff*/) { if (GetTarget()->HealthAbovePct(GetSpellInfo()->Effects[EFFECT_1].CalcValue())) @@ -2128,7 +2106,7 @@ class spell_iron_ring_guard_impale : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_iron_ring_guard_impale_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_iron_ring_guard_impale_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index e8fd52989f..a045e9b3f1 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -822,8 +822,6 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader class spell_xt002_searing_light_spawn_life_spark_AuraScript : public AuraScript { - PrepareAuraScript(spell_xt002_searing_light_spawn_life_spark_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_LIFE_SPARK }); @@ -839,7 +837,7 @@ class spell_xt002_searing_light_spawn_life_spark : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_searing_light_spawn_life_spark_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_xt002_searing_light_spawn_life_spark_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -856,8 +854,6 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader class spell_xt002_gravity_bomb_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_xt002_gravity_bomb_aura_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_VOID_ZONE }); @@ -888,8 +884,8 @@ class spell_xt002_gravity_bomb_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_xt002_gravity_bomb_aura_AuraScript::OnPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); - AfterEffectRemove += AuraEffectRemoveFn(spell_xt002_gravity_bomb_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_xt002_gravity_bomb_aura_AuraScript::OnPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DAMAGE); + AfterEffectRemove.Register(&spell_xt002_gravity_bomb_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -906,8 +902,6 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader class spell_xt002_gravity_bomb_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_xt002_gravity_bomb_damage_SpellScript); - void HandleScript(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); @@ -921,7 +915,7 @@ class spell_xt002_gravity_bomb_damage : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_xt002_gravity_bomb_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_xt002_gravity_bomb_damage_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -938,8 +932,6 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader class spell_xt002_heart_overload_periodic_SpellScript : public SpellScript { - PrepareSpellScript(spell_xt002_heart_overload_periodic_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ENERGY_ORB, SPELL_RECHARGE_BOOMBOT, SPELL_RECHARGE_PUMMELER, SPELL_RECHARGE_SCRAPBOT }); @@ -976,7 +968,7 @@ class spell_xt002_heart_overload_periodic : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_xt002_heart_overload_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_xt002_heart_overload_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -993,8 +985,6 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader class spell_xt002_tympanic_tantrum_SpellScript : public SpellScript { - PrepareSpellScript(spell_xt002_tympanic_tantrum_SpellScript); - void FilterTargets(std::list& targets) { targets.remove_if(PlayerOrPetCheck()); @@ -1007,9 +997,9 @@ class spell_xt002_tympanic_tantrum : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnHit += SpellHitFn(spell_xt002_tympanic_tantrum_SpellScript::RecalculateDamage); + OnObjectAreaTargetSelect.Register(&spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_xt002_tympanic_tantrum_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit.Register(&spell_xt002_tympanic_tantrum_SpellScript::RecalculateDamage); } }; @@ -1026,8 +1016,6 @@ class spell_xt002_submerged : public SpellScriptLoader class spell_xt002_submerged_SpellScript : public SpellScript { - PrepareSpellScript(spell_xt002_submerged_SpellScript); - void HandleScript(SpellEffIndex /*eff*/) { Creature* target = GetHitCreature(); @@ -1040,7 +1028,7 @@ class spell_xt002_submerged : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_xt002_submerged_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_xt002_submerged_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1057,8 +1045,6 @@ class spell_xt002_321_boombot_aura : public SpellScriptLoader class spell_xt002_321_boombot_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_xt002_321_boombot_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ACHIEVEMENT_CREDIT_NERF_SCRAPBOTS }); @@ -1082,8 +1068,8 @@ class spell_xt002_321_boombot_aura : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_xt002_321_boombot_aura_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_xt002_321_boombot_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_xt002_321_boombot_aura_AuraScript::CheckProc); + OnEffectProc.Register(&spell_xt002_321_boombot_aura_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; 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 f98cad80ea..e05bfceb16 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp @@ -1952,8 +1952,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()) @@ -1962,7 +1960,7 @@ class spell_yogg_saron_target_selectors : public SpellScriptLoader // 63744, void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_target_selectors_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_target_selectors_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1978,12 +1976,12 @@ class SanityReduction : public SpellScript SanityReduction() : SpellScript(), _stacks(0) { } SanityReduction(uint8 stacks) : SpellScript(), _stacks(stacks) { } - void RemoveSanity(SpellEffIndex /*effIndex*/) - { - if (Unit* target = GetHitUnit()) - if (Aura* sanity = target->GetAura(SPELL_SANITY)) - sanity->ModStackAmount(-int32(_stacks), AuraRemoveFlags::ByEnemySpell); - } + void RemoveSanity(SpellEffIndex /*effIndex*/) + { + if (Unit* target = GetHitUnit()) + if (Aura* sanity = target->GetAura(SPELL_SANITY)) + sanity->ModStackAmount(-int32(_stacks), AuraRemoveFlags::ByEnemySpell); + } protected: uint8 _stacks; @@ -2010,8 +2008,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; @@ -2026,9 +2022,9 @@ class spell_yogg_saron_psychosis : public SpellScriptLoader // 63795, 65301 void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_psychosis_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_psychosis_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&SanityReduction::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2043,12 +2039,9 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 public: spell_yogg_saron_malady_of_the_mind() : SpellScriptLoader("spell_yogg_saron_malady_of_the_mind") { } - class spell_yogg_saron_malady_of_the_mind_SpellScript : public SanityReduction + struct spell_yogg_saron_malady_of_the_mind_SpellScript : public SanityReduction { - public: - spell_yogg_saron_malady_of_the_mind_SpellScript() : SanityReduction(3) { } - - PrepareSpellScript(spell_yogg_saron_malady_of_the_mind_SpellScript); + spell_yogg_saron_malady_of_the_mind_SpellScript() : SanityReduction(3) { } void FilterTargets(std::list& targets) { @@ -2060,19 +2053,17 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 { if (m_scriptSpellId == SPELL_MALADY_OF_THE_MIND) { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_malady_of_the_mind_SpellScript::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_malady_of_the_mind_SpellScript::RemoveSanity, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&SanityReduction::RemoveSanity, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; 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 }); @@ -2088,7 +2079,7 @@ class spell_yogg_saron_malady_of_the_mind : public SpellScriptLoader // 63830 void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_malady_of_the_mind_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_FEAR, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_malady_of_the_mind_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_MOD_FEAR, AURA_EFFECT_HANDLE_REAL); } }; @@ -2110,8 +2101,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& targets) { targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_ILLUSION_ROOM)); @@ -2128,14 +2117,12 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_brain_link_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_brain_link_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; 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 }); @@ -2181,8 +2168,8 @@ class spell_yogg_saron_brain_link : public SpellScriptLoader // 63802 void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_brain_link_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - OnEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_brain_link_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_yogg_saron_brain_link_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove.Register(&spell_yogg_saron_brain_link_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2206,13 +2193,10 @@ 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); - } + void Register() override + { + OnEffectHitTarget.Register(&SanityReduction::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + } }; SpellScript* GetSpellScript() const override @@ -2228,8 +2212,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 }); @@ -2249,7 +2231,7 @@ class spell_yogg_saron_boil_ominously : public SpellScriptLoader // 63030 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_boil_ominously_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_boil_ominously_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2266,8 +2248,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()) @@ -2282,8 +2262,8 @@ class spell_yogg_saron_shadow_beacon : public SpellScriptLoader // 64465 void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_shadow_beacon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_shadow_beacon_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_yogg_saron_shadow_beacon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_shadow_beacon_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -2300,8 +2280,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()) @@ -2310,7 +2288,7 @@ class spell_yogg_saron_empowering_shadows_range_check : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_range_check_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_empowering_shadows_range_check_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2327,8 +2305,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 }); @@ -2342,7 +2318,7 @@ class spell_yogg_saron_empowering_shadows_missile : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_empowering_shadows_missile_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_empowering_shadows_missile_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2360,8 +2336,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 }); @@ -2374,7 +2348,7 @@ class spell_yogg_saron_constrictor_tentacle : public SpellScriptLoader // 64 void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_constrictor_tentacle_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_yogg_saron_constrictor_tentacle_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2391,8 +2365,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 }); @@ -2409,7 +2381,7 @@ class spell_yogg_saron_lunge : public SpellScriptLoader // 64131 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_lunge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_lunge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2426,8 +2398,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()) @@ -2437,7 +2407,7 @@ class spell_yogg_saron_squeeze : public SpellScriptLoader // 64125, 64126 void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_squeeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_squeeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -2454,8 +2424,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 const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -2466,7 +2434,7 @@ class spell_yogg_saron_diminsh_power : public SpellScriptLoader // 64148 void Register() override { - OnEffectProc += AuraEffectProcFn(spell_yogg_saron_diminsh_power_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_yogg_saron_diminsh_power_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -2484,8 +2452,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 }); @@ -2513,8 +2479,8 @@ class spell_yogg_saron_empowered : public SpellScriptLoader // 64161 void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_empowered_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_empowered_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_yogg_saron_empowered_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_yogg_saron_empowered_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -2531,8 +2497,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()) @@ -2541,7 +2505,7 @@ class spell_yogg_saron_match_health : public SpellScriptLoader // 64069 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_match_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_match_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2558,8 +2522,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()) @@ -2568,7 +2530,7 @@ class spell_yogg_saron_shattered_illusion : public SpellScriptLoader // 65238 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_shattered_illusion_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_shattered_illusion_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2585,8 +2547,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 }); @@ -2605,7 +2565,7 @@ class spell_yogg_saron_death_ray_warning_visual : public SpellScriptLoader / void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_death_ray_warning_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_death_ray_warning_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2622,8 +2582,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 }); @@ -2640,7 +2598,7 @@ class spell_yogg_saron_cancel_illusion_room_aura : public SpellScriptLoader / void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_cancel_illusion_room_aura_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_yogg_saron_cancel_illusion_room_aura_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2657,8 +2615,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); @@ -2666,7 +2622,7 @@ class spell_yogg_saron_nondescript : public SpellScriptLoader // 64010, 6401 void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_nondescript_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_nondescript_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -2683,8 +2639,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 }); @@ -2702,7 +2656,7 @@ class spell_yogg_saron_revealed_tentacle : public SpellScriptLoader // 64012 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_revealed_tentacle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_revealed_tentacle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2719,8 +2673,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 }); @@ -2739,7 +2691,7 @@ class spell_yogg_saron_grim_reprisal : public SpellScriptLoader // 63305 void Register() override { - OnEffectProc += AuraEffectProcFn(spell_yogg_saron_grim_reprisal_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_yogg_saron_grim_reprisal_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2756,8 +2708,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 }); @@ -2784,8 +2734,8 @@ class spell_yogg_saron_induce_madness : public SpellScriptLoader // 64059 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_induce_madness_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - AfterCast += SpellCastFn(spell_yogg_saron_induce_madness_SpellScript::ClearShatteredIllusion); + OnEffectHitTarget.Register(&spell_yogg_saron_induce_madness_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + AfterCast.Register(&spell_yogg_saron_induce_madness_SpellScript::ClearShatteredIllusion); } }; @@ -2801,10 +2751,7 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 spell_yogg_saron_sanity() : SpellScriptLoader("spell_yogg_saron_sanity") { } 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? + { // don't target players outside of room or handle it in SPELL_INSANE_PERIODIC? void ModSanityStacks() { @@ -2813,14 +2760,12 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 void Register() override { - BeforeCast += SpellCastFn(spell_yogg_saron_sanity_SpellScript::ModSanityStacks); + BeforeCast.Register(&spell_yogg_saron_sanity_SpellScript::ModSanityStacks); } }; 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 }); @@ -2851,8 +2796,8 @@ class spell_yogg_saron_sanity : public SpellScriptLoader // 63050 void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_yogg_saron_sanity_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_sanity_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_yogg_saron_sanity_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_yogg_saron_sanity_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2874,8 +2819,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 }); @@ -2898,8 +2841,8 @@ class spell_yogg_saron_insane : public SpellScriptLoader // 63120 void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_yogg_saron_insane_AuraScript::OnApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_yogg_saron_insane_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_yogg_saron_insane_AuraScript::OnApply, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_yogg_saron_insane_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_AOE_CHARM, AURA_EFFECT_HANDLE_REAL); } }; @@ -2916,8 +2859,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()) @@ -2926,7 +2867,7 @@ class spell_yogg_saron_insane_periodic : public SpellScriptLoader // 64555 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_insane_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_insane_periodic_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2957,8 +2898,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; @@ -2972,9 +2911,9 @@ class spell_yogg_saron_lunatic_gaze : public SpellScriptLoader // 64164, 64 void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_lunatic_gaze_SpellScript::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_yogg_saron_lunatic_gaze_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&SanityReduction::RemoveSanity, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2991,8 +2930,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()) @@ -3002,7 +2939,7 @@ class spell_yogg_saron_keeper_aura : public SpellScriptLoader // 62650, 6267 void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_keeper_aura_AuraScript::CanApply); + DoCheckAreaTarget.Register(&spell_yogg_saron_keeper_aura_AuraScript::CanApply); } }; @@ -3019,8 +2956,6 @@ class spell_yogg_saron_hate_to_zero : public SpellScriptLoader // 63984 class spell_yogg_saron_hate_to_zero_SpellScript : public SpellScript { - PrepareSpellScript(spell_yogg_saron_hate_to_zero_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -3030,7 +2965,7 @@ class spell_yogg_saron_hate_to_zero : public SpellScriptLoader // 63984 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_hate_to_zero_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_hate_to_zero_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3047,8 +2982,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()) @@ -3070,7 +3003,7 @@ class spell_yogg_saron_in_the_maws_of_the_old_god : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_yogg_saron_in_the_maws_of_the_old_god_SpellScript::CheckRequirement); } }; @@ -3087,8 +3020,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()) @@ -3097,7 +3028,7 @@ class spell_yogg_saron_titanic_storm : public SpellScriptLoader // 64172 void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_yogg_saron_titanic_storm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_yogg_saron_titanic_storm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3114,8 +3045,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 }); @@ -3142,8 +3071,8 @@ class spell_yogg_saron_hodirs_protective_gaze : public SpellScriptLoader // void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::CanApply); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_yogg_saron_hodirs_protective_gaze_AuraScript::OnAbsorb, EFFECT_0); + DoCheckAreaTarget.Register(&spell_yogg_saron_hodirs_protective_gaze_AuraScript::CanApply); + OnEffectAbsorb.Register(&spell_yogg_saron_hodirs_protective_gaze_AuraScript::OnAbsorb, EFFECT_0); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp index 61459de9d7..eb49e3f75e 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp @@ -1121,8 +1121,6 @@ class spell_ulduar_teleporter : public SpellScriptLoader class spell_ulduar_teleporter_SpellScript : public SpellScript { - PrepareSpellScript(spell_ulduar_teleporter_SpellScript); - SpellCastResult CheckRequirement() { if (GetExplTargetUnit()->GetTypeId() != TYPEID_PLAYER) @@ -1139,7 +1137,7 @@ class spell_ulduar_teleporter : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_ulduar_teleporter_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_ulduar_teleporter_SpellScript::CheckRequirement); } }; 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 eb390626fe..febd2887fa 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 @@ -422,8 +422,6 @@ class spell_ingvar_summon_banshee : public SpellScriptLoader class spell_ingvar_summon_banshee_SpellScript : public SpellScript { - PrepareSpellScript(spell_ingvar_summon_banshee_SpellScript); - void SetDest(SpellDestination& dest) { dest.RelocateOffset({ 0.0f, 0.0f, 30.0f, 0.0f }); @@ -431,7 +429,7 @@ class spell_ingvar_summon_banshee : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_ingvar_summon_banshee_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); + OnDestinationTargetSelect.Register(&spell_ingvar_summon_banshee_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); } }; @@ -449,8 +447,6 @@ class spell_ingvar_woe_strike : public SpellScriptLoader class spell_ingvar_woe_strike_AuraScript : public AuraScript { - PrepareAuraScript(spell_ingvar_woe_strike_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WOE_STRIKE_EFFECT }); @@ -473,8 +469,8 @@ class spell_ingvar_woe_strike : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_ingvar_woe_strike_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_ingvar_woe_strike_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_ingvar_woe_strike_AuraScript::CheckProc); + OnEffectProc.Register(&spell_ingvar_woe_strike_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp index 4a168d6b38..63514427dd 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp @@ -342,8 +342,6 @@ class spell_frost_tomb : public SpellScriptLoader class spell_frost_tomb_AuraScript : public AuraScript { - PrepareAuraScript(spell_frost_tomb_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::ByDeath)) @@ -355,7 +353,7 @@ class spell_frost_tomb : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_frost_tomb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_frost_tomb_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp index 068fddeafe..53d31c894e 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp @@ -129,8 +129,6 @@ class spell_ticking_time_bomb : public SpellScriptLoader class spell_ticking_time_bomb_AuraScript : public AuraScript { - PrepareAuraScript(spell_ticking_time_bomb_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TICKING_TIME_BOMB_EXPLODE }); @@ -144,7 +142,7 @@ class spell_ticking_time_bomb : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_ticking_time_bomb_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_ticking_time_bomb_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -166,8 +164,6 @@ class spell_fixate : public SpellScriptLoader class spell_fixate_SpellScript : public SpellScript { - PrepareSpellScript(spell_fixate_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIXATE_TRIGGER }); @@ -180,7 +176,7 @@ class spell_fixate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_fixate_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_fixate_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -203,8 +199,6 @@ class spell_uk_second_wind : public SpellScriptLoader class spell_uk_second_wind_AuraScript : public AuraScript { - PrepareAuraScript(spell_uk_second_wind_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SECOND_WIND_TRIGGER }); @@ -228,8 +222,8 @@ class spell_uk_second_wind : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_uk_second_wind_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_uk_second_wind_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_uk_second_wind_AuraScript::CheckProc); + OnEffectProc.Register(&spell_uk_second_wind_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 1e01d1d9ad..57bd126f2c 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -595,8 +595,6 @@ class spell_palehoof_crazed : public SpellScriptLoader class spell_palehoof_crazed_AuraScript : public AuraScript { - PrepareAuraScript(spell_palehoof_crazed_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAurasDueToSpell(SPELL_CRAZED_TAUNT); @@ -604,7 +602,7 @@ class spell_palehoof_crazed : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_palehoof_crazed_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_palehoof_crazed_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -620,8 +618,6 @@ class spell_palehoof_crazed_effect : public SpellScriptLoader class spell_palehoof_crazed_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_palehoof_crazed_effect_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CRAZED_TAUNT }); @@ -634,7 +630,7 @@ class spell_palehoof_crazed_effect : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_palehoof_crazed_effect_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_palehoof_crazed_effect_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -652,8 +648,6 @@ class spell_palehoof_awaken_subboss : public SpellScriptLoader class spell_palehoof_awaken_subboss_SpellScript : public SpellScript { - PrepareSpellScript(spell_palehoof_awaken_subboss_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ORB_CHANNEL }); @@ -669,7 +663,7 @@ class spell_palehoof_awaken_subboss : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_palehoof_awaken_subboss_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_palehoof_awaken_subboss_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -687,8 +681,6 @@ class spell_palehoof_awaken_gortok : public SpellScriptLoader class spell_palehoof_awaken_gortok_SpellScript : public SpellScript { - PrepareSpellScript(spell_palehoof_awaken_gortok_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -698,7 +690,7 @@ class spell_palehoof_awaken_gortok : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_palehoof_awaken_gortok_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_palehoof_awaken_gortok_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp index 48bb602b08..8d9e63e96f 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp @@ -634,8 +634,6 @@ class spell_freezing_cloud_area_right : public SpellScriptLoader class spell_freezing_cloud_area_right_SpellScript : public SpellScript { - PrepareSpellScript(spell_freezing_cloud_area_right_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FREEZING_CLOUD }); @@ -653,8 +651,8 @@ class spell_freezing_cloud_area_right : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_freezing_cloud_area_right_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_freezing_cloud_area_right_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_freezing_cloud_area_right_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_freezing_cloud_area_right_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -671,8 +669,6 @@ class spell_freezing_cloud_area_left : public SpellScriptLoader class spell_freezing_cloud_area_left_SpellScript : public SpellScript { - PrepareSpellScript(spell_freezing_cloud_area_left_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FREEZING_CLOUD }); @@ -690,8 +686,8 @@ class spell_freezing_cloud_area_left : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_freezing_cloud_area_left_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_freezing_cloud_area_left_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_freezing_cloud_area_left_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_freezing_cloud_area_left_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -708,8 +704,6 @@ class spell_freezing_cloud_damage : public SpellScriptLoader class spell_freezing_cloud_damage_AuraScript : public AuraScript { - PrepareAuraScript(spell_freezing_cloud_damage_AuraScript); - bool CanBeAppliedOn(Unit* target) { if (Aura* aur = target->GetAura(GetId())) @@ -721,7 +715,7 @@ class spell_freezing_cloud_damage : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_freezing_cloud_damage_AuraScript::CanBeAppliedOn); + DoCheckAreaTarget.Register(&spell_freezing_cloud_damage_AuraScript::CanBeAppliedOn); } }; @@ -738,8 +732,6 @@ class spell_skadi_reset_check : public SpellScriptLoader class spell_skadi_reset_check_SpellScript : public SpellScript { - PrepareSpellScript(spell_skadi_reset_check_SpellScript); - void CountTargets(std::list& targets) { targets.remove_if(Trinity::UnitAuraCheck(false, SPELL_UTGARDE_PINNACLE_GAUNTLET_EFFECT)); @@ -762,8 +754,8 @@ class spell_skadi_reset_check : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skadi_reset_check_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_skadi_reset_check_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_skadi_reset_check_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_skadi_reset_check_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } private: @@ -783,8 +775,6 @@ class spell_skadi_launch_harpoon : public SpellScriptLoader class spell_skadi_launch_harpoon_SpellScript : public SpellScript { - PrepareSpellScript(spell_skadi_launch_harpoon_SpellScript); - void FilterTargets(std::list& targets) { if (targets.size() >= 2) @@ -799,8 +789,8 @@ class spell_skadi_launch_harpoon : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_skadi_launch_harpoon_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); - OnHit += SpellHitFn(spell_skadi_launch_harpoon_SpellScript::HandleDamageCalc); + OnObjectAreaTargetSelect.Register(&spell_skadi_launch_harpoon_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); + OnHit.Register(&spell_skadi_launch_harpoon_SpellScript::HandleDamageCalc); } }; @@ -817,8 +807,6 @@ class spell_skadi_poisoned_spear : public SpellScriptLoader class spell_skadi_poisoned_spear_left_SpellScript : public SpellScript { - PrepareSpellScript(spell_skadi_poisoned_spear_left_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POISONED_SPEAR_PERIODIC }); @@ -831,7 +819,7 @@ class spell_skadi_poisoned_spear : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_skadi_poisoned_spear_left_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_skadi_poisoned_spear_left_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -848,8 +836,6 @@ class spell_summon_gauntlet_mobs_periodic : public SpellScriptLoader class spell_summon_gauntlet_mobs_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_summon_gauntlet_mobs_periodic_AuraScript); - void CastTheNextTwoSpells() { for (uint8 i = 0; i < 2; ++i) @@ -897,7 +883,7 @@ class spell_summon_gauntlet_mobs_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_summon_gauntlet_mobs_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_summon_gauntlet_mobs_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index c259954525..aea12c7027 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -506,8 +506,6 @@ class spell_paralyze_pinnacle : public SpellScriptLoader class spell_paralyze_pinnacle_SpellScript : public SpellScript { - PrepareSpellScript(spell_paralyze_pinnacle_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(RitualTargetCheck()); @@ -515,7 +513,7 @@ class spell_paralyze_pinnacle : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_paralyze_pinnacle_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_paralyze_pinnacle_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp index 45c1d31f2d..fb4e2e6cdd 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_archavon.cpp @@ -226,8 +226,6 @@ class spell_archavon_rock_shards : public SpellScriptLoader class spell_archavon_rock_shards_SpellScript : public SpellScript { - PrepareSpellScript(spell_archavon_rock_shards_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -255,7 +253,7 @@ class spell_archavon_rock_shards : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_archavon_rock_shards_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit.Register(&spell_archavon_rock_shards_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp index 59b7e19179..ef2db6beac 100644 --- a/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp +++ b/src/server/scripts/Northrend/VaultOfArchavon/boss_koralon.cpp @@ -191,8 +191,6 @@ class spell_koralon_meteor_fists : public SpellScriptLoader class spell_koralon_meteor_fists_AuraScript : public AuraScript { - PrepareAuraScript(spell_koralon_meteor_fists_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_METEOR_FISTS_DAMAGE }); @@ -206,7 +204,7 @@ class spell_koralon_meteor_fists : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_koralon_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_koralon_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -223,8 +221,6 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader class spell_koralon_meteor_fists_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_koralon_meteor_fists_damage_SpellScript); - public: spell_koralon_meteor_fists_damage_SpellScript() { @@ -245,8 +241,8 @@ class spell_koralon_meteor_fists_damage : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_koralon_meteor_fists_damage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_TARGET_ENEMY); - OnHit += SpellHitFn(spell_koralon_meteor_fists_damage_SpellScript::CalculateSplitDamage); + OnObjectAreaTargetSelect.Register(&spell_koralon_meteor_fists_damage_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_TARGET_ENEMY); + OnHit.Register(&spell_koralon_meteor_fists_damage_SpellScript::CalculateSplitDamage); } private: @@ -266,8 +262,6 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader class spell_flame_warder_meteor_fists_AuraScript : public AuraScript { - PrepareAuraScript(spell_flame_warder_meteor_fists_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FW_METEOR_FISTS_DAMAGE }); @@ -281,7 +275,7 @@ class spell_flame_warder_meteor_fists : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_flame_warder_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_flame_warder_meteor_fists_AuraScript::TriggerFists, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 91667001ee..972b776b49 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -151,8 +151,6 @@ class spell_cyanigosa_arcane_vacuum : public SpellScriptLoader class spell_cyanigosa_arcane_vacuum_SpellScript : public SpellScript { - PrepareSpellScript(spell_cyanigosa_arcane_vacuum_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PLAYER }); @@ -165,7 +163,7 @@ class spell_cyanigosa_arcane_vacuum : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_cyanigosa_arcane_vacuum_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_cyanigosa_arcane_vacuum_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp index 38998b7dce..8e15f518ce 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp @@ -305,8 +305,6 @@ class spell_ichoron_drained : public SpellScriptLoader class spell_ichoron_drained_AuraScript : public AuraScript { - PrepareAuraScript(spell_ichoron_drained_AuraScript); - bool Load() override { return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON; @@ -330,8 +328,8 @@ class spell_ichoron_drained : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_ichoron_drained_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_ichoron_drained_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_ichoron_drained_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ichoron_drained_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -349,8 +347,6 @@ class spell_ichoron_merge : public SpellScriptLoader class spell_ichoron_merge_SpellScript : public SpellScript { - PrepareSpellScript(spell_ichoron_merge_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHRINK }); @@ -369,7 +365,7 @@ class spell_ichoron_merge : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ichoron_merge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ichoron_merge_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -387,8 +383,6 @@ class spell_ichoron_protective_bubble : public SpellScriptLoader class spell_ichoron_protective_bubble_AuraScript : public AuraScript { - PrepareAuraScript(spell_ichoron_protective_bubble_AuraScript); - bool Load() override { return GetOwner()->GetEntry() == NPC_ICHORON || GetOwner()->GetEntry() == NPC_DUMMY_ICHORON; @@ -404,7 +398,7 @@ class spell_ichoron_protective_bubble : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_ichoron_protective_bubble_AuraScript::HandleShatter, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_ichoron_protective_bubble_AuraScript::HandleShatter, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; @@ -422,8 +416,6 @@ class spell_ichoron_splatter : public SpellScriptLoader class spell_ichoron_splatter_AuraScript : public AuraScript { - PrepareAuraScript(spell_ichoron_splatter_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -452,8 +444,8 @@ class spell_ichoron_splatter : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ichoron_splatter_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_ichoron_splatter_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_ichoron_splatter_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_ichoron_splatter_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp index ac31e463ae..acbf87c7f7 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_moragg.cpp @@ -105,8 +105,6 @@ class spell_moragg_ray : public SpellScriptLoader class spell_moragg_ray_AuraScript : public AuraScript { - PrepareAuraScript(spell_moragg_ray_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -123,7 +121,7 @@ class spell_moragg_ray : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_moragg_ray_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_moragg_ray_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -140,8 +138,6 @@ public: class spell_moragg_optic_link_AuraScript : public AuraScript { - PrepareAuraScript(spell_moragg_optic_link_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { if (Unit* caster = GetCaster()) @@ -176,8 +172,8 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_moragg_optic_link_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_moragg_optic_link_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_moragg_optic_link_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic.Register(&spell_moragg_optic_link_AuraScript::OnUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; diff --git a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp index f45764cca9..358b1e317e 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp @@ -259,8 +259,6 @@ class spell_xevozz_summon_players : public SpellScriptLoader class spell_xevozz_summon_players_SpellScript : public SpellScript { - PrepareSpellScript(spell_xevozz_summon_players_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGIC_PULL }); @@ -273,7 +271,7 @@ class spell_xevozz_summon_players : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_xevozz_summon_players_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_xevozz_summon_players_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp index fd298d489c..7fc085ca87 100644 --- a/src/server/scripts/Northrend/VioletHold/violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/violet_hold.cpp @@ -1324,8 +1324,6 @@ class spell_violet_hold_destroy_door_seal : public SpellScriptLoader class spell_violet_hold_destroy_door_seal_AuraScript : public AuraScript { - PrepareAuraScript(spell_violet_hold_destroy_door_seal_AuraScript); - bool Load() override { _instance = GetUnitOwner()->GetInstanceScript(); @@ -1341,7 +1339,7 @@ class spell_violet_hold_destroy_door_seal : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_violet_hold_destroy_door_seal_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_violet_hold_destroy_door_seal_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } private: @@ -1362,8 +1360,6 @@ class spell_violet_hold_portal_periodic : public SpellScriptLoader class spell_violet_hold_portal_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_violet_hold_portal_periodic_AuraScript); - void PeriodicTick(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -1373,7 +1369,7 @@ class spell_violet_hold_portal_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_violet_hold_portal_periodic_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_violet_hold_portal_periodic_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1391,8 +1387,6 @@ class spell_violet_hold_teleport_player : public SpellScriptLoader class spell_violet_hold_teleport_player_SpellScript : public SpellScript { - PrepareSpellScript(spell_violet_hold_teleport_player_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_PLAYER_EFFECT }); @@ -1406,7 +1400,7 @@ class spell_violet_hold_teleport_player : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_violet_hold_teleport_player_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_violet_hold_teleport_player_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 1d4c41e05d..307cddc1d4 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -710,8 +710,6 @@ public: class spell_red_dragonblood_AuraScript : public AuraScript { - PrepareAuraScript(spell_red_dragonblood_AuraScript); - void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (!GetTargetApplication()->GetRemoveMode().HasFlag(AuraRemoveFlags::Expired) || !GetCaster()) @@ -731,7 +729,7 @@ public: void Register() { - AfterEffectRemove += AuraEffectRemoveFn(spell_red_dragonblood_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_red_dragonblood_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2351,8 +2349,6 @@ public: class spell_windsoul_totem_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_windsoul_totem_aura_AuraScript); - void OnRemove(AuraEffect const*, AuraEffectHandleModes) { if (GetTarget()->isDead()) @@ -2362,7 +2358,7 @@ public: void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_windsoul_totem_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_windsoul_totem_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2387,8 +2383,6 @@ public: class spell_q11719_bloodspore_ruination_45997_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11719_bloodspore_ruination_45997_SpellScript); - void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -2398,7 +2392,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_q11719_bloodspore_ruination_45997_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_q11719_bloodspore_ruination_45997_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 65e04009e4..a958ef0c05 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -389,8 +389,6 @@ public: class spell_q12096_q12092_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12096_q12092_dummy_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { uint32 roll = rand32() % 2; @@ -419,7 +417,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12096_q12092_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -436,8 +434,6 @@ public: class spell_q12096_q12092_bark_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12096_q12092_bark_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { Creature* lothalor = GetHitCreature(); @@ -451,7 +447,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12096_q12092_bark_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/zone_grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index 23c4b7019f..98f7e4fcb9 100644 --- a/src/server/scripts/Northrend/zone_grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp @@ -795,8 +795,6 @@ class spell_shredder_delivery : public SpellScriptLoader class spell_shredder_delivery_SpellScript : public SpellScript { - PrepareSpellScript(spell_shredder_delivery_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -810,7 +808,7 @@ class spell_shredder_delivery : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_shredder_delivery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_shredder_delivery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -833,8 +831,6 @@ class spell_infected_worgen_bite : public SpellScriptLoader class spell_infected_worgen_bite_AuraScript : public AuraScript { - PrepareAuraScript(spell_infected_worgen_bite_AuraScript); - void HandleAfterEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -848,7 +844,7 @@ class spell_infected_worgen_bite : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_infected_worgen_bite_AuraScript::HandleAfterEffectApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply.Register(&spell_infected_worgen_bite_AuraScript::HandleAfterEffectApply, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); } }; @@ -953,9 +949,7 @@ public: class spell_vehicle_warhead_fuse_SpellScript : public SpellScript { - PrepareSpellScript(spell_vehicle_warhead_fuse_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARHEAD_Z_CHECK, SPELL_WARHEAD_SEEKING_LUMBERSHIP, SPELL_WARHEAD_FUSE }); } @@ -971,7 +965,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_vehicle_warhead_fuse_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_vehicle_warhead_fuse_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -995,9 +989,7 @@ public: class spell_warhead_detonate_SpellScript : public SpellScript { - PrepareSpellScript(spell_warhead_detonate_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARACHUTE, SPELL_TORPEDO_EXPLOSION }); } @@ -1023,7 +1015,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warhead_detonate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warhead_detonate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1041,8 +1033,6 @@ public: class spell_z_check_AuraScript : public AuraScript { - PrepareAuraScript(spell_z_check_AuraScript); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { _posZ = GetTarget()->GetPositionZ(); @@ -1061,8 +1051,8 @@ public: void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_z_check_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_z_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectApply.Register(&spell_z_check_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_z_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1080,8 +1070,6 @@ public: class spell_warhead_fuse_AuraScript : public AuraScript { - PrepareAuraScript(spell_warhead_fuse_AuraScript); - void HandleOnEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* rocketUnit = GetTarget()->GetVehicleBase()) @@ -1091,7 +1079,7 @@ public: void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_warhead_fuse_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_warhead_fuse_AuraScript::HandleOnEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index cd1354e3d0..708347ca6a 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -555,8 +555,6 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader class spell_mindless_abomination_explosion_fx_master_SpellScript : public SpellScript { - PrepareSpellScript(spell_mindless_abomination_explosion_fx_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RANDOM_CIRCUMFERENCE_POINT_POISON, SPELL_COSMETIC_BLOOD_EXPLOSION_GREEN_LARGE }); @@ -578,7 +576,7 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mindless_abomination_explosion_fx_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mindless_abomination_explosion_fx_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/zone_sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 4545f5fb00..b8abd48477 100644 --- a/src/server/scripts/Northrend/zone_sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp @@ -394,8 +394,6 @@ public: class spell_q12620_the_lifewarden_wrath_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12620_the_lifewarden_wrath_SpellScript); - void HandleSendEvent(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -438,7 +436,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_q12620_the_lifewarden_wrath_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_q12620_the_lifewarden_wrath_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); } }; @@ -482,9 +480,7 @@ public: class spell_q12589_shoot_rjr_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12589_shoot_rjr_SpellScript); - - SpellCastResult CheckCast() + SpellCastResult CheckCast() { if (Unit* target = GetExplTargetUnit()) if (target->GetEntry() == NPC_LUCKY_WILHELM) @@ -557,8 +553,8 @@ public: void Register() override { - OnCheckCast += SpellCheckCastFn(spell_q12589_shoot_rjr_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_q12589_shoot_rjr_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_q12589_shoot_rjr_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_q12589_shoot_rjr_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -737,8 +733,6 @@ public: class spell_shango_tracks_SpellScript : public SpellScript { - PrepareSpellScript(spell_shango_tracks_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -759,7 +753,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_shango_tracks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_shango_tracks_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index ba2402fae5..aa53cd5bf3 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -967,8 +967,6 @@ class spell_jokkum_scriptcast : public SpellScriptLoader class spell_jokkum_scriptcast_AuraScript : public AuraScript { - PrepareAuraScript(spell_jokkum_scriptcast_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_JOKKUM_SUMMON }); @@ -982,7 +980,7 @@ class spell_jokkum_scriptcast : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_jokkum_scriptcast_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_jokkum_scriptcast_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -998,8 +996,6 @@ class spell_veranus_summon : public SpellScriptLoader class spell_veranus_summon_AuraScript : public AuraScript { - PrepareAuraScript(spell_veranus_summon_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_VERANUS_AND_THORIM }); @@ -1013,7 +1009,7 @@ class spell_veranus_summon : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_veranus_summon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_veranus_summon_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1035,8 +1031,6 @@ class spell_close_rift : public SpellScriptLoader class spell_close_rift_AuraScript : public AuraScript { - PrepareAuraScript(spell_close_rift_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DESPAWN_RIFT }); @@ -1050,7 +1044,7 @@ class spell_close_rift : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_close_rift_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_close_rift_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } uint8 _counter = 0; @@ -1071,8 +1065,6 @@ class spell_eject_passenger_wild_wyrm : public SpellScriptLoader class spell_eject_passenger_wild_wyrm_SpellScript : public SpellScript { - PrepareSpellScript(spell_eject_passenger_wild_wyrm_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIGHT_WYRM }); @@ -1085,7 +1077,7 @@ class spell_eject_passenger_wild_wyrm : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_eject_passenger_wild_wyrm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_eject_passenger_wild_wyrm_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1103,8 +1095,6 @@ class spell_grip : public SpellScriptLoader class spell_grip_AuraScript : public AuraScript { - PrepareAuraScript(spell_grip_AuraScript); - void DummyTick(AuraEffect const* /*aurEff*/) { ++_tickNumber; @@ -1147,9 +1137,9 @@ class spell_grip : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_grip_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_grip_AuraScript::DummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_grip_AuraScript::HandleDrop, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_grip_AuraScript::HandleDrop, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } // tick number in the AuraEffect gets reset each time we stack the aura, so keep track of it locally @@ -1172,8 +1162,6 @@ class spell_grab_on : public SpellScriptLoader class spell_grab_on_SpellScript : public SpellScript { - PrepareSpellScript(spell_grab_on_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP, GetCaster()->GetGUID())) @@ -1182,7 +1170,7 @@ class spell_grab_on : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_grab_on_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_grab_on_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1203,8 +1191,6 @@ class spell_loosen_grip : public SpellScriptLoader template class spell_loosen_grip_SpellScript : public SpellScript { - PrepareSpellScript(spell_loosen_grip_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Aura* grip = GetCaster()->GetAura(SPELL_GRIP)) @@ -1213,7 +1199,7 @@ class spell_loosen_grip : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_loosen_grip_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_loosen_grip_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1231,8 +1217,6 @@ class spell_low_health_trigger : public SpellScriptLoader class spell_low_health_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_low_health_trigger_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -1245,7 +1229,7 @@ class spell_low_health_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_low_health_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_low_health_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1264,8 +1248,6 @@ class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScriptLoader class spell_jaws_of_death_claw_swipe_pct_damage_SpellScript : public SpellScript { - PrepareSpellScript(spell_jaws_of_death_claw_swipe_pct_damage_SpellScript); - void HandleDamage(SpellEffIndex /*effIndex*/) { SetEffectValue(static_cast(GetHitUnit()->CountPctFromMaxHealth(GetEffectValue()))); @@ -1273,7 +1255,7 @@ class spell_jaws_of_death_claw_swipe_pct_damage : public SpellScriptLoader void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_jaws_of_death_claw_swipe_pct_damage_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_jaws_of_death_claw_swipe_pct_damage_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1290,8 +1272,6 @@ class spell_claw_swipe_check : public SpellScriptLoader class spell_claw_swipe_check_AuraScript : public AuraScript { - PrepareAuraScript(spell_claw_swipe_check_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetAI()->DoAction(ACTION_CLAW_SWIPE_WARN); @@ -1316,8 +1296,8 @@ class spell_claw_swipe_check : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_claw_swipe_check_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectApplyFn(spell_claw_swipe_check_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_claw_swipe_check_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_claw_swipe_check_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1335,8 +1315,6 @@ class spell_fatal_strike : public SpellScriptLoader class spell_fatal_strike_SpellScript : public SpellScript { - PrepareSpellScript(spell_fatal_strike_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FATAL_STRIKE_DAMAGE }); @@ -1359,7 +1337,7 @@ class spell_fatal_strike : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_fatal_strike_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_fatal_strike_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1377,8 +1355,6 @@ class spell_falling_dragon_feign_death : public SpellScriptLoader class spell_falling_dragon_feign_death_AuraScript : public AuraScript { - PrepareAuraScript(spell_falling_dragon_feign_death_AuraScript); - void HandleApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29); @@ -1393,8 +1369,8 @@ class spell_falling_dragon_feign_death : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_falling_dragon_feign_death_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectApplyFn(spell_falling_dragon_feign_death_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_falling_dragon_feign_death_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_falling_dragon_feign_death_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1412,8 +1388,6 @@ class spell_player_mount_wyrm : public SpellScriptLoader class spell_player_mount_wyrm_AuraScript : public AuraScript { - PrepareAuraScript(spell_player_mount_wyrm_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FIGHT_WYRM }); @@ -1426,7 +1400,7 @@ class spell_player_mount_wyrm : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectApplyFn(spell_player_mount_wyrm_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_player_mount_wyrm_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Northrend/zone_wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 9df65867d7..3679523295 100644 --- a/src/server/scripts/Northrend/zone_wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp @@ -432,8 +432,6 @@ class spell_wintergrasp_force_building : public SpellScriptLoader class spell_wintergrasp_force_building_SpellScript : public SpellScript { - PrepareSpellScript(spell_wintergrasp_force_building_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -453,7 +451,7 @@ class spell_wintergrasp_force_building : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_force_building_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_wintergrasp_force_building_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -470,8 +468,6 @@ class spell_wintergrasp_grab_passenger : public SpellScriptLoader class spell_wintergrasp_grab_passenger_SpellScript : public SpellScript { - PrepareSpellScript(spell_wintergrasp_grab_passenger_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -480,7 +476,7 @@ class spell_wintergrasp_grab_passenger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_grab_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_wintergrasp_grab_passenger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -526,8 +522,6 @@ class spell_wintergrasp_defender_teleport : public SpellScriptLoader class spell_wintergrasp_defender_teleport_SpellScript : public SpellScript { - PrepareSpellScript(spell_wintergrasp_defender_teleport_SpellScript); - SpellCastResult CheckCast() { if (Battlefield* wg = sBattlefieldMgr->GetBattlefieldByBattleId(BATTLEFIELD_BATTLEID_WG)) @@ -540,7 +534,7 @@ class spell_wintergrasp_defender_teleport : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_wintergrasp_defender_teleport_SpellScript::CheckCast); + OnCheckCast.Register(&spell_wintergrasp_defender_teleport_SpellScript::CheckCast); } }; @@ -557,8 +551,6 @@ class spell_wintergrasp_defender_teleport_trigger : public SpellScriptLoader class spell_wintergrasp_defender_teleport_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_wintergrasp_defender_teleport_trigger_SpellScript); - void HandleDummy(SpellEffIndex /*effindex*/) { if (Unit* target = GetHitUnit()) @@ -570,7 +562,7 @@ class spell_wintergrasp_defender_teleport_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_wintergrasp_defender_teleport_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_wintergrasp_defender_teleport_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 621d0927ac..c88c0289b7 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -645,8 +645,6 @@ class spell_random_ingredient_aura : public SpellScriptLoader class spell_random_ingredient_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_random_ingredient_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -675,7 +673,7 @@ class spell_random_ingredient_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_random_ingredient_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_random_ingredient_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -696,8 +694,6 @@ class spell_random_ingredient : public SpellScriptLoader class spell_random_ingredient_SpellScript : public SpellScript { - PrepareSpellScript(spell_random_ingredient_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -755,7 +751,7 @@ class spell_random_ingredient : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_random_ingredient_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_random_ingredient_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -776,8 +772,6 @@ class spell_pot_check : public SpellScriptLoader class spell_pot_check_SpellScript : public SpellScript { - PrepareSpellScript(spell_pot_check_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -857,7 +851,7 @@ class spell_pot_check : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pot_check_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pot_check_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -877,8 +871,6 @@ class spell_fetch_ingredient_aura : public SpellScriptLoader class spell_fetch_ingredient_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_fetch_ingredient_aura_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -893,7 +885,7 @@ class spell_fetch_ingredient_aura : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_fetch_ingredient_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_fetch_ingredient_aura_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; 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 0258d968ed..b9e2c1261a 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 @@ -169,8 +169,6 @@ class spell_talon_king_ikiss_blink : public SpellScriptLoader class spell_talon_king_ikiss_blink_SpellScript : public SpellScript { - PrepareSpellScript(spell_talon_king_ikiss_blink_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLINK_TELEPORT }); @@ -194,8 +192,8 @@ class spell_talon_king_ikiss_blink : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_talon_king_ikiss_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_talon_king_ikiss_blink_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_talon_king_ikiss_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_talon_king_ikiss_blink_SpellScript::HandleDummyHitTarget, EFFECT_0, SPELL_EFFECT_DUMMY); } }; 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 bb78b34169..88cdc034f8 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 @@ -198,7 +198,6 @@ struct boss_blackheart_the_inciter_mc_dummy : public NullCreatureAI class spell_blackheart_incite_chaos : public SpellScript { - PrepareSpellScript(spell_blackheart_incite_chaos); bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_INCITE_CHAOS_B }); @@ -218,7 +217,7 @@ class spell_blackheart_incite_chaos : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_blackheart_incite_chaos::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_blackheart_incite_chaos::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; const uint32 spell_blackheart_incite_chaos::INCITE_SPELLS[spell_blackheart_incite_chaos::NUM_INCITE_SPELLS] = { 33677,33680,33681,33682,33683 }; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp index d28859aea0..d1294b7228 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp @@ -165,8 +165,6 @@ class spell_murmur_sonic_boom : public SpellScriptLoader class spell_murmur_sonic_boom_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SONIC_BOOM_EFFECT }); @@ -179,7 +177,7 @@ class spell_murmur_sonic_boom : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_murmur_sonic_boom_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_murmur_sonic_boom_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -197,8 +195,6 @@ class spell_murmur_sonic_boom_effect : public SpellScriptLoader class spell_murmur_sonic_boom_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_sonic_boom_effect_SpellScript); - void CalcDamage() { if (Unit* target = GetHitUnit()) @@ -207,7 +203,7 @@ class spell_murmur_sonic_boom_effect : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_murmur_sonic_boom_effect_SpellScript::CalcDamage); + OnHit.Register(&spell_murmur_sonic_boom_effect_SpellScript::CalcDamage); } }; @@ -240,8 +236,6 @@ class spell_murmur_thundering_storm : public SpellScriptLoader class spell_murmur_thundering_storm_SpellScript : public SpellScript { - PrepareSpellScript(spell_murmur_thundering_storm_SpellScript); - void FilterTarget(std::list& targets) { targets.remove_if(ThunderingStormCheck(GetCaster())); @@ -249,7 +243,7 @@ class spell_murmur_thundering_storm : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_murmur_thundering_storm_SpellScript::FilterTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_murmur_thundering_storm_SpellScript::FilterTarget, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp index add05ade6d..0bf14abc9f 100644 --- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp +++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.cpp @@ -33,8 +33,6 @@ class spell_mark_of_malice : public SpellScriptLoader class spell_mark_of_malice_AuraScript : public AuraScript { - PrepareAuraScript(spell_mark_of_malice_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_MALICE_TRIGGERED }); @@ -52,7 +50,7 @@ class spell_mark_of_malice : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mark_of_malice_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_mark_of_malice_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp index bc06af5ae2..fff749e42f 100644 --- a/src/server/scripts/Outland/BlackTemple/black_temple.cpp +++ b/src/server/scripts/Outland/BlackTemple/black_temple.cpp @@ -267,8 +267,6 @@ class spell_soul_fragment_anger : public SpellScriptLoader class spell_soul_fragment_anger_SpellScript : public SpellScript { - PrepareSpellScript(spell_soul_fragment_anger_SpellScript); - void HandleKill() { if (Creature* caster = GetCaster()->ToCreature()) @@ -277,7 +275,7 @@ class spell_soul_fragment_anger : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_soul_fragment_anger_SpellScript::HandleKill); + AfterCast.Register(&spell_soul_fragment_anger_SpellScript::HandleKill); } }; @@ -295,8 +293,6 @@ class spell_illidari_nightlord_shadow_inferno : public SpellScriptLoader class spell_illidari_nightlord_shadow_inferno_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_nightlord_shadow_inferno_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOW_INFERNO_DAMAGE }); @@ -311,7 +307,7 @@ class spell_illidari_nightlord_shadow_inferno : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidari_nightlord_shadow_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidari_nightlord_shadow_inferno_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp index 039f128be4..39846d0c7e 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp @@ -344,8 +344,6 @@ class spell_gurtogg_bloodboil_bloodboil : public SpellScriptLoader class spell_gurtogg_bloodboil_bloodboil_SpellScript : public SpellScript { - PrepareSpellScript(spell_gurtogg_bloodboil_bloodboil_SpellScript); - void FilterTargets(std::list& targets) { if (targets.size() <= 5) @@ -359,7 +357,7 @@ class spell_gurtogg_bloodboil_bloodboil : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gurtogg_bloodboil_bloodboil_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_gurtogg_bloodboil_bloodboil_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -377,8 +375,6 @@ public: class spell_gurtogg_bloodboil_insignificance_SpellScript : public SpellScript { - PrepareSpellScript(spell_gurtogg_bloodboil_insignificance_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FEL_RAGE_TARGET }); @@ -391,7 +387,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gurtogg_bloodboil_insignificance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_gurtogg_bloodboil_insignificance_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp index 9b0f756ec4..d7702f6e26 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp @@ -1853,8 +1853,6 @@ class spell_illidan_akama_teleport : public SpellScriptLoader class spell_illidan_akama_teleport_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_akama_teleport_SpellScript); - void SetDest(SpellDestination& dest) { if (Creature* caster = GetCaster()->ToCreature()) @@ -1866,7 +1864,7 @@ class spell_illidan_akama_teleport : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_illidan_akama_teleport_SpellScript::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); + OnDestinationTargetSelect.Register(&spell_illidan_akama_teleport_SpellScript::SetDest, EFFECT_0, TARGET_DEST_NEARBY_ENTRY); } }; @@ -1884,8 +1882,6 @@ class spell_illidan_akama_door_channel : public SpellScriptLoader class spell_illidan_akama_door_channel_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_akama_door_channel_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ARCANE_EXPLOSION }); @@ -1903,7 +1899,7 @@ class spell_illidan_akama_door_channel : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_akama_door_channel_AuraScript::OnRemoveDummy, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_illidan_akama_door_channel_AuraScript::OnRemoveDummy, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1921,8 +1917,6 @@ class spell_illidan_draw_soul : public SpellScriptLoader class spell_illidan_draw_soul_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_draw_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRAW_SOUL_HEAL }); @@ -1936,7 +1930,7 @@ class spell_illidan_draw_soul : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_draw_soul_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_illidan_draw_soul_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1955,8 +1949,6 @@ class spell_illidan_parasitic_shadowfiend : public SpellScriptLoader class spell_illidan_parasitic_shadowfiend_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_parasitic_shadowfiend_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_PARASITIC_SHADOWFIENDS }); @@ -1970,7 +1962,7 @@ class spell_illidan_parasitic_shadowfiend : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_parasitic_shadowfiend_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_illidan_parasitic_shadowfiend_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1989,8 +1981,6 @@ class spell_illidan_throw_warglaive : public SpellScriptLoader class spell_illidan_throw_warglaive_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_throw_warglaive_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -1999,7 +1989,7 @@ class spell_illidan_throw_warglaive : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_throw_warglaive_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_illidan_throw_warglaive_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2017,8 +2007,6 @@ class spell_illidan_tear_of_azzinoth_channel : public SpellScriptLoader class spell_illidan_tear_of_azzinoth_channel_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_tear_of_azzinoth_channel_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_UNCAGED_WRATH }); @@ -2040,7 +2028,7 @@ class spell_illidan_tear_of_azzinoth_channel : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_tear_of_azzinoth_channel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidan_tear_of_azzinoth_channel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2058,8 +2046,6 @@ class spell_illidan_flame_blast : public SpellScriptLoader class spell_illidan_flame_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_flame_blast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLAZE_SUMMON }); @@ -2074,7 +2060,7 @@ class spell_illidan_flame_blast : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_flame_blast_SpellScript::HandleBlaze, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_illidan_flame_blast_SpellScript::HandleBlaze, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -2091,8 +2077,6 @@ class spell_illidan_return_glaives : public SpellScriptLoader class spell_illidan_return_glaives_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_return_glaives_SpellScript); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->SendPlaySpellVisualKit(SPELL_GLAIVE_VISUAL_KIT,0,0); @@ -2102,7 +2086,7 @@ class spell_illidan_return_glaives : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_return_glaives_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_illidan_return_glaives_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2120,8 +2104,6 @@ class spell_illidan_agonizing_flames : public SpellScriptLoader class spell_illidan_agonizing_flames_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_agonizing_flames_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AGONIZING_FLAMES }); @@ -2144,8 +2126,8 @@ class spell_illidan_agonizing_flames : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_illidan_agonizing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_illidan_agonizing_flames_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_illidan_agonizing_flames_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_illidan_agonizing_flames_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2163,8 +2145,6 @@ class spell_illidan_demon_transform1 : public SpellScriptLoader class spell_illidan_demon_transform1_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_demon_transform1_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEMON_TRANSFORM_2 }); @@ -2179,7 +2159,7 @@ class spell_illidan_demon_transform1 : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform1_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidan_demon_transform1_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2197,8 +2177,6 @@ class spell_illidan_demon_transform2 : public SpellScriptLoader class spell_illidan_demon_transform2_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_demon_transform2_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEMON_FORM, SPELL_DEMON_TRANSFORM_3 }); @@ -2227,7 +2205,7 @@ class spell_illidan_demon_transform2 : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_demon_transform2_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidan_demon_transform2_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2245,8 +2223,6 @@ class spell_illidan_flame_burst : public SpellScriptLoader class spell_illidan_flame_burst_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_flame_burst_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_BURST_EFFECT }); @@ -2259,7 +2235,7 @@ class spell_illidan_flame_burst : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_flame_burst_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_illidan_flame_burst_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2277,8 +2253,6 @@ class spell_illidan_find_target : public SpellScriptLoader class spell_illidan_find_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_find_target_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYZE }); @@ -2308,8 +2282,8 @@ class spell_illidan_find_target : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_illidan_find_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_illidan_find_target_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_illidan_find_target_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_illidan_find_target_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2327,8 +2301,6 @@ class spell_illidan_eye_blast : public SpellScriptLoader class spell_illidan_eye_blast_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_eye_blast_AuraScript); - void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -2337,7 +2309,7 @@ class spell_illidan_eye_blast : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_illidan_eye_blast_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_illidan_eye_blast_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2355,8 +2327,6 @@ class spell_illidan_cage_trap : public SpellScriptLoader class spell_illidan_cage_trap_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_cage_trap_SpellScript); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Creature* target = GetHitCreature(); @@ -2376,7 +2346,7 @@ class spell_illidan_cage_trap : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_cage_trap_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_illidan_cage_trap_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2394,8 +2364,6 @@ class spell_illidan_caged : public SpellScriptLoader class spell_illidan_caged_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidan_caged_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CAGED_DEBUFF }); @@ -2411,7 +2379,7 @@ class spell_illidan_caged : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidan_caged_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidan_caged_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2429,8 +2397,6 @@ public: class spell_maiev_down_AuraScript : public AuraScript { - PrepareAuraScript(spell_maiev_down_AuraScript); - bool Load() override { return GetUnitOwner()->GetTypeId() == TYPEID_UNIT; @@ -2449,8 +2415,8 @@ public: void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_maiev_down_AuraScript::HandleEffectApply, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_maiev_down_AuraScript::HandleEffectRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_maiev_down_AuraScript::HandleEffectApply, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_maiev_down_AuraScript::HandleEffectRemove, EFFECT_1, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -2468,8 +2434,6 @@ class spell_illidan_cage_teleport : public SpellScriptLoader class spell_illidan_cage_teleport_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_cage_teleport_SpellScript); - void SetDest(SpellDestination& dest) { Position offset = { 0.0f, 0.0f, GetCaster()->GetPositionZ(), 0.0f }; @@ -2478,7 +2442,7 @@ class spell_illidan_cage_teleport : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_illidan_cage_teleport_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_RADIUS); + OnDestinationTargetSelect.Register(&spell_illidan_cage_teleport_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_RADIUS); } }; @@ -2496,8 +2460,6 @@ class spell_illidan_despawn_akama : public SpellScriptLoader class spell_illidan_despawn_akama_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidan_despawn_akama_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -2506,7 +2468,7 @@ class spell_illidan_despawn_akama : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidan_despawn_akama_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_illidan_despawn_akama_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp index fd59019068..ac943a552b 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_illidari_council.cpp @@ -626,8 +626,6 @@ class spell_illidari_council_empyreal_balance : public SpellScriptLoader class spell_illidari_council_empyreal_balance_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidari_council_empyreal_balance_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BALANCE_OF_POWER }); @@ -641,7 +639,7 @@ class spell_illidari_council_empyreal_balance : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidari_council_empyreal_balance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_illidari_council_empyreal_balance_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -659,8 +657,6 @@ class spell_illidari_council_empyreal_equivalency : public SpellScriptLoader class spell_illidari_council_empyreal_equivalency_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidari_council_empyreal_equivalency_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -673,7 +669,7 @@ class spell_illidari_council_empyreal_equivalency : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidari_council_empyreal_equivalency_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_illidari_council_empyreal_equivalency_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -691,8 +687,6 @@ class spell_illidari_council_balance_of_power : public SpellScriptLoader class spell_illidari_council_balance_of_power_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_council_balance_of_power_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHARED_RULE }); @@ -707,7 +701,7 @@ class spell_illidari_council_balance_of_power : public SpellScriptLoader void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_illidari_council_balance_of_power_AuraScript::Absorb, EFFECT_0); + OnEffectAbsorb.Register(&spell_illidari_council_balance_of_power_AuraScript::Absorb, EFFECT_0); } }; @@ -725,8 +719,6 @@ class spell_illidari_council_deadly_strike : public SpellScriptLoader class spell_illidari_council_deadly_strike_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_council_deadly_strike_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEADLY_POISON }); @@ -742,7 +734,7 @@ class spell_illidari_council_deadly_strike : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_illidari_council_deadly_strike_AuraScript::OnTrigger, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_illidari_council_deadly_strike_AuraScript::OnTrigger, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -760,8 +752,6 @@ class spell_illidari_council_deadly_poison : public SpellScriptLoader class spell_illidari_council_deadly_poison_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_council_deadly_poison_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ENVENOM }); @@ -775,7 +765,7 @@ class spell_illidari_council_deadly_poison : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_illidari_council_deadly_poison_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_illidari_council_deadly_poison_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -793,8 +783,6 @@ class spell_illidari_council_reflective_shield : public SpellScriptLoader class spell_illidari_council_reflective_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_council_reflective_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_REFLECTIVE_SHIELD_DAMAGE }); @@ -812,7 +800,7 @@ class spell_illidari_council_reflective_shield : public SpellScriptLoader void Register() override { - AfterEffectAbsorb += AuraEffectAbsorbFn(spell_illidari_council_reflective_shield_AuraScript::OnAbsorb, EFFECT_0); + AfterEffectAbsorb.Register(&spell_illidari_council_reflective_shield_AuraScript::OnAbsorb, EFFECT_0); } }; @@ -830,8 +818,6 @@ class spell_illidari_council_judgement : public SpellScriptLoader class spell_illidari_council_judgement_SpellScript : public SpellScript { - PrepareSpellScript(spell_illidari_council_judgement_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_JUDGEMENT_OF_BLOOD, SPELL_JUDGEMENT_OF_COMMAND, SPELL_JUDGEMENT_PRIMER }); @@ -854,8 +840,8 @@ class spell_illidari_council_judgement : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_illidari_council_judgement_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - AfterCast += SpellCastFn(spell_illidari_council_judgement_SpellScript::OnFinishCast); + OnEffectHitTarget.Register(&spell_illidari_council_judgement_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + AfterCast.Register(&spell_illidari_council_judgement_SpellScript::OnFinishCast); } }; @@ -874,8 +860,6 @@ class spell_illidari_council_seal : public SpellScriptLoader class spell_illidari_council_seal_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_council_seal_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEAL_OF_COMMAND, SPELL_SEAL_OF_BLOOD }); @@ -893,7 +877,7 @@ class spell_illidari_council_seal : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_illidari_council_seal_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_illidari_council_seal_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -911,8 +895,6 @@ class spell_illidari_dampen_magic : public SpellScriptLoader class spell_illidari_dampen_magic_AuraScript : public AuraScript { - PrepareAuraScript(spell_illidari_dampen_magic_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Creature* target = GetTarget()->ToCreature()) @@ -924,7 +906,7 @@ class spell_illidari_dampen_magic : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_illidari_dampen_magic_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_illidari_dampen_magic_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp index c49f9c62b8..4d5f436dde 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp @@ -214,8 +214,6 @@ class spell_mother_shahraz_fatal_attraction : public SpellScriptLoader class spell_mother_shahraz_fatal_attraction_SpellScript : public SpellScript { - PrepareSpellScript(spell_mother_shahraz_fatal_attraction_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SABER_LASH_IMMUNITY, SPELL_FATAL_ATTRACTION }); @@ -238,9 +236,9 @@ class spell_mother_shahraz_fatal_attraction : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mother_shahraz_fatal_attraction_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_mother_shahraz_fatal_attraction_SpellScript::SetDest, EFFECT_1, TARGET_DEST_CASTER_RANDOM); - OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction_SpellScript::HandleTeleport, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS); + OnObjectAreaTargetSelect.Register(&spell_mother_shahraz_fatal_attraction_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnDestinationTargetSelect.Register(&spell_mother_shahraz_fatal_attraction_SpellScript::SetDest, EFFECT_1, TARGET_DEST_CASTER_RANDOM); + OnEffectHitTarget.Register(&spell_mother_shahraz_fatal_attraction_SpellScript::HandleTeleport, EFFECT_1, SPELL_EFFECT_TELEPORT_UNITS); } }; @@ -258,8 +256,6 @@ class spell_mother_shahraz_fatal_attraction_link : public SpellScriptLoader class spell_mother_shahraz_fatal_attraction_link_SpellScript : public SpellScript { - PrepareSpellScript(spell_mother_shahraz_fatal_attraction_link_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_FATAL_ATTRACTION_DAMAGE }); @@ -272,7 +268,7 @@ class spell_mother_shahraz_fatal_attraction_link : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mother_shahraz_fatal_attraction_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mother_shahraz_fatal_attraction_link_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -290,8 +286,6 @@ class spell_mother_shahraz_saber_lash : public SpellScriptLoader class spell_mother_shahraz_saber_lash_AuraScript : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_saber_lash_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_1].TriggerSpell }); @@ -308,7 +302,7 @@ class spell_mother_shahraz_saber_lash : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_saber_lash_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mother_shahraz_saber_lash_AuraScript::OnTrigger, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -329,8 +323,6 @@ class spell_mother_shahraz_generic_periodic : public SpellScriptLoader class spell_mother_shahraz_generic_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_generic_periodic_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -347,7 +339,7 @@ class spell_mother_shahraz_generic_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_generic_periodic_AuraScript::OnTrigger, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mother_shahraz_generic_periodic_AuraScript::OnTrigger, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -365,8 +357,6 @@ class spell_mother_shahraz_random_periodic : public SpellScriptLoader class spell_mother_shahraz_random_periodic_AuraScript : public AuraScript { - PrepareAuraScript(spell_mother_shahraz_random_periodic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(RandomBeam); @@ -380,7 +370,7 @@ class spell_mother_shahraz_random_periodic : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mother_shahraz_random_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_mother_shahraz_random_periodic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; 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 00d74a08ff..b985f9dd01 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp @@ -724,8 +724,6 @@ class spell_reliquary_of_souls_aura_of_desire : public SpellScriptLoader class spell_reliquary_of_souls_aura_of_desire_AuraScript : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_aura_of_desire_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AURA_OF_DESIRE_DAMAGE }); @@ -751,8 +749,8 @@ class spell_reliquary_of_souls_aura_of_desire : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::OnProcSpell, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_reliquary_of_souls_aura_of_desire_AuraScript::UpdateAmount, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_reliquary_of_souls_aura_of_desire_AuraScript::OnProcSpell, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); + OnEffectUpdatePeriodic.Register(&spell_reliquary_of_souls_aura_of_desire_AuraScript::UpdateAmount, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -770,8 +768,6 @@ class spell_reliquary_of_souls_submerge : public SpellScriptLoader class spell_reliquary_of_souls_submerge_AuraScript : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_submerge_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_STAND_STATE, UNIT_STAND_STATE_SUBMERGED); @@ -785,8 +781,8 @@ class spell_reliquary_of_souls_submerge : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_reliquary_of_souls_submerge_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_submerge_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_reliquary_of_souls_submerge_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_reliquary_of_souls_submerge_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -804,8 +800,6 @@ class spell_reliquary_of_souls_spite : public SpellScriptLoader class spell_reliquary_of_souls_spite_AuraScript : public AuraScript { - PrepareAuraScript(spell_reliquary_of_souls_spite_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SPITE_DAMAGE }); @@ -819,7 +813,7 @@ class spell_reliquary_of_souls_spite : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_reliquary_of_souls_spite_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DAMAGE_IMMUNITY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_reliquary_of_souls_spite_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DAMAGE_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; @@ -837,8 +831,6 @@ class spell_reliquary_of_souls_frenzy : public SpellScriptLoader class spell_reliquary_of_souls_frenzy_SpellScript : public SpellScript { - PrepareSpellScript(spell_reliquary_of_souls_frenzy_SpellScript); - void HandleAfterCast() { if (Creature* caster = GetCaster()->ToCreature()) @@ -847,7 +839,7 @@ class spell_reliquary_of_souls_frenzy : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_reliquary_of_souls_frenzy_SpellScript::HandleAfterCast); + AfterCast.Register(&spell_reliquary_of_souls_frenzy_SpellScript::HandleAfterCast); } }; 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 aa011b0cea..e2331c1656 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -1200,8 +1200,6 @@ public: class spell_shade_soul_channel_serverside_AuraScript : public AuraScript { - PrepareAuraScript(spell_shade_soul_channel_serverside_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADE_SOUL_CHANNEL_2 }); @@ -1214,7 +1212,7 @@ public: void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_shade_soul_channel_serverside_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_shade_soul_channel_serverside_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1232,8 +1230,6 @@ public: class spell_shade_soul_channel_AuraScript : public AuraScript { - PrepareAuraScript(spell_shade_soul_channel_AuraScript); - void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { int32 const maxSlowEff = -99; @@ -1244,7 +1240,7 @@ public: void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_shade_soul_channel_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_shade_soul_channel_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp index a9b02fcffc..9af9795b84 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp @@ -391,8 +391,6 @@ class spell_teron_gorefiend_shadow_of_death : public SpellScriptLoader class spell_teron_gorefiend_shadow_of_death_AuraScript : public AuraScript { - PrepareAuraScript(spell_teron_gorefiend_shadow_of_death_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -429,8 +427,8 @@ class spell_teron_gorefiend_shadow_of_death : public SpellScriptLoader void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_teron_gorefiend_shadow_of_death_AuraScript::Absorb, EFFECT_0); - AfterEffectRemove += AuraEffectRemoveFn(spell_teron_gorefiend_shadow_of_death_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_OVERRIDE_CLASS_SCRIPTS, AURA_EFFECT_HANDLE_REAL); + OnEffectAbsorb.Register(&spell_teron_gorefiend_shadow_of_death_AuraScript::Absorb, EFFECT_0); + AfterEffectRemove.Register(&spell_teron_gorefiend_shadow_of_death_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_OVERRIDE_CLASS_SCRIPTS, AURA_EFFECT_HANDLE_REAL); } }; @@ -448,8 +446,6 @@ class spell_teron_gorefiend_spiritual_vengeance : public SpellScriptLoader class spell_teron_gorefiend_spiritual_vengeance_AuraScript : public AuraScript { - PrepareAuraScript(spell_teron_gorefiend_spiritual_vengeance_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->KillSelf(); @@ -457,8 +453,8 @@ class spell_teron_gorefiend_spiritual_vengeance : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_teron_gorefiend_spiritual_vengeance_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_POSSESS, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_teron_gorefiend_spiritual_vengeance_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY_SILENCE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_teron_gorefiend_spiritual_vengeance_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_POSSESS, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_teron_gorefiend_spiritual_vengeance_AuraScript::OnRemove, EFFECT_2, SPELL_AURA_MOD_PACIFY_SILENCE, AURA_EFFECT_HANDLE_REAL); } }; @@ -476,8 +472,6 @@ class spell_teron_gorefiend_shadow_of_death_remove : public SpellScriptLoader class spell_teron_gorefiend_shadow_of_death_remove_SpellScript : public SpellScript { - PrepareSpellScript(spell_teron_gorefiend_shadow_of_death_remove_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADOW_OF_DEATH, SPELL_POSSESS_SPIRIT_IMMUNE, SPELL_SPIRITUAL_VENGEANCE }); @@ -496,7 +490,7 @@ class spell_teron_gorefiend_shadow_of_death_remove : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_teron_gorefiend_shadow_of_death_remove_SpellScript::RemoveAuras); + OnHit.Register(&spell_teron_gorefiend_shadow_of_death_remove_SpellScript::RemoveAuras); } }; diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp index b9b38577e1..789bf29c96 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp @@ -209,8 +209,6 @@ class spell_najentus_needle_spine : public SpellScriptLoader class spell_najentus_needle_spine_SpellScript : public SpellScript { - PrepareSpellScript(spell_najentus_needle_spine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NEEDLE_SPINE }); @@ -228,8 +226,8 @@ class spell_najentus_needle_spine : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_najentus_needle_spine_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_najentus_needle_spine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_najentus_needle_spine_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_najentus_needle_spine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp index d288f032a4..c00daa26e1 100644 --- a/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp +++ b/src/server/scripts/Outland/CoilfangReservoir/TheSlavePens/boss_ahune.cpp @@ -694,8 +694,6 @@ public: class spell_ahune_synch_health_SpellScript : public SpellScript { - PrepareSpellScript(spell_ahune_synch_health_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SYNCH_HEALTH }); @@ -710,7 +708,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ahune_synch_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ahune_synch_health_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -728,8 +726,6 @@ public: class spell_summoning_rhyme_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_summoning_rhyme_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FORCE_WHISP_FLIGHT, SPELL_SUMMONING_RHYME_BONFIRE }); @@ -766,7 +762,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_summoning_rhyme_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_summoning_rhyme_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -784,8 +780,6 @@ public: class spell_summon_ice_spear_delayer_AuraScript : public AuraScript { - PrepareAuraScript(spell_summon_ice_spear_delayer_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ICE_SPEAR_GO, SPELL_ICE_SPEAR_KNOCKBACK }); @@ -817,7 +811,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_summon_ice_spear_delayer_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_summon_ice_spear_delayer_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -835,8 +829,6 @@ public: class spell_ice_spear_control_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_ice_spear_control_aura_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICE_SPEAR_TARGET_PICKER }); @@ -850,7 +842,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_ice_spear_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_ice_spear_control_aura_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -868,9 +860,7 @@ public: class spell_ice_spear_target_picker_SpellScript : public SpellScript { - PrepareSpellScript(spell_ice_spear_target_picker_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ICE_SPEAR_BUNNY }); } @@ -892,8 +882,8 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_ice_spear_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_ice_spear_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_ice_spear_target_picker_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_ice_spear_target_picker_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -911,8 +901,6 @@ public: class spell_slippery_floor_periodic_SpellScript : public SpellScript { - PrepareSpellScript(spell_slippery_floor_periodic_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SLIPPERY_FLOOR_SLIP }); @@ -930,7 +918,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_slippery_floor_periodic_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_slippery_floor_periodic_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -948,8 +936,6 @@ public: class spell_ahune_spanky_hands_AuraScript : public AuraScript { - PrepareAuraScript(spell_ahune_spanky_hands_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_COLD_SLAP }); @@ -963,7 +949,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_ahune_spanky_hands_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_ahune_spanky_hands_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -980,8 +966,6 @@ public: class spell_ahune_minion_despawner_SpellScript : public SpellScript { - PrepareSpellScript(spell_ahune_minion_despawner_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -990,7 +974,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ahune_minion_despawner_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_ahune_minion_despawner_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -1008,8 +992,6 @@ public: class spell_ice_bombardment_dest_picker_SpellScript : public SpellScript { - PrepareSpellScript(spell_ice_bombardment_dest_picker_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ICE_BOMBARDMENT }); @@ -1022,7 +1004,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_ice_bombardment_dest_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_ice_bombardment_dest_picker_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp index a61e9bad2c..e94678d907 100644 --- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp +++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp @@ -272,8 +272,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 }); @@ -290,7 +288,7 @@ class spell_gruul_shatter : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gruul_shatter_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -307,8 +305,6 @@ class spell_gruul_shatter_effect : public SpellScriptLoader class spell_gruul_shatter_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_gruul_shatter_effect_SpellScript); - void CalculateDamage() { if (!GetHitUnit()) @@ -325,7 +321,7 @@ class spell_gruul_shatter_effect : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_gruul_shatter_effect_SpellScript::CalculateDamage); + OnHit.Register(&spell_gruul_shatter_effect_SpellScript::CalculateDamage); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index 6a0525e2d9..1b2f2179b9 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -167,8 +167,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 ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -187,7 +185,7 @@ class spell_broggok_poison_cloud : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_broggok_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_broggok_poison_cloud_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp index 8fcdd135b9..71ef28de82 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -501,8 +501,6 @@ class spell_magtheridon_blaze_target : public SpellScriptLoader class spell_magtheridon_blaze_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_magtheridon_blaze_target_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BLAZE }); @@ -515,7 +513,7 @@ class spell_magtheridon_blaze_target : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_magtheridon_blaze_target_SpellScript::HandleAura); + OnHit.Register(&spell_magtheridon_blaze_target_SpellScript::HandleAura); } }; @@ -534,8 +532,6 @@ class spell_magtheridon_shadow_grasp : public SpellScriptLoader class spell_magtheridon_shadow_grasp_AuraScript : public AuraScript { - PrepareAuraScript(spell_magtheridon_shadow_grasp_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MIND_EXHAUSTION }); @@ -550,7 +546,7 @@ class spell_magtheridon_shadow_grasp : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_magtheridon_shadow_grasp_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -568,8 +564,6 @@ class spell_magtheridon_shadow_grasp_visual : public SpellScriptLoader class spell_magtheridon_shadow_grasp_visual_AuraScript : public AuraScript { - PrepareAuraScript(spell_magtheridon_shadow_grasp_visual_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHADOW_CAGE, SPELL_SHADOW_GRASP_VISUAL }); @@ -590,8 +584,8 @@ class spell_magtheridon_shadow_grasp_visual : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_magtheridon_shadow_grasp_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_magtheridon_shadow_grasp_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_magtheridon_shadow_grasp_visual_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_magtheridon_shadow_grasp_visual_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp index 4e04fdb075..7ce96782f0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.cpp @@ -188,8 +188,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) @@ -205,7 +203,7 @@ class spell_kargath_executioner : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_kargath_executioner_AuraScript::AreaCheck); + DoCheckAreaTarget.Register(&spell_kargath_executioner_AuraScript::AreaCheck); } }; @@ -222,8 +220,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(); @@ -240,7 +236,7 @@ class spell_remove_kargath_executioner : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_remove_kargath_executioner_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_remove_kargath_executioner_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp index 2e54146b7c..8c5d54ef6f 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp @@ -510,8 +510,6 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader class spell_astromancer_wrath_of_the_astromancer_AuraScript : public AuraScript { - PrepareAuraScript(spell_astromancer_wrath_of_the_astromancer_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WRATH_OF_THE_ASTROMANCER_DOT }); @@ -529,7 +527,7 @@ class spell_astromancer_wrath_of_the_astromancer : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_astromancer_wrath_of_the_astromancer_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 6d7a9e0ec1..8b45648aa1 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1451,8 +1451,6 @@ class spell_kael_gravity_lapse : public SpellScriptLoader class spell_kael_gravity_lapse_SpellScript : public SpellScript { - PrepareSpellScript(spell_kael_gravity_lapse_SpellScript); - public: spell_kael_gravity_lapse_SpellScript() { @@ -1474,7 +1472,7 @@ class spell_kael_gravity_lapse : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kael_gravity_lapse_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_kael_gravity_lapse_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } private: 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 8aba44db57..1d12bfdae3 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 @@ -167,8 +167,6 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader class spell_capacitus_polarity_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_charge_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -215,8 +213,8 @@ class spell_capacitus_polarity_charge : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHitTarget.Register(&spell_capacitus_polarity_charge_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnObjectAreaTargetSelect.Register(&spell_capacitus_polarity_charge_SpellScript::HandleTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -233,8 +231,6 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader class spell_capacitus_polarity_shift_SpellScript : public SpellScript { - PrepareSpellScript(spell_capacitus_polarity_shift_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POSITIVE_POLARITY, SPELL_NEGATIVE_POLARITY }); @@ -250,7 +246,7 @@ class spell_capacitus_polarity_shift : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_capacitus_polarity_shift_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; 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 0474aedc3b..51be9cdeba 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp @@ -168,8 +168,6 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader class spell_commander_sarannis_summon_reinforcements_SpellScript : public SpellScript { - PrepareSpellScript(spell_commander_sarannis_summon_reinforcements_SpellScript); - void HandleCast(SpellEffIndex /*effIndex*/) { GetCaster()->SummonCreature(NPC_SUMMONED_BLOODWARDER_MENDER, PosSummonReinforcements[0], TEMPSUMMON_CORPSE_DESPAWN); @@ -181,7 +179,7 @@ class spell_commander_sarannis_summon_reinforcements : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_commander_sarannis_summon_reinforcements_SpellScript::HandleCast, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp index 1373bcdfee..aa7feb972c 100644 --- a/src/server/scripts/Outland/boss_doomlord_kazzak.cpp +++ b/src/server/scripts/Outland/boss_doomlord_kazzak.cpp @@ -182,8 +182,6 @@ class spell_mark_of_kazzak : public SpellScriptLoader class spell_mark_of_kazzak_AuraScript : public AuraScript { - PrepareAuraScript(spell_mark_of_kazzak_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_KAZZAK_DAMAGE }); @@ -209,8 +207,8 @@ class spell_mark_of_kazzak : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + DoEffectCalcAmount.Register(&spell_mark_of_kazzak_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); + OnEffectPeriodic.Register(&spell_mark_of_kazzak_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_MANA_LEECH); } }; @@ -227,8 +225,6 @@ class spell_twisted_reflection : public SpellScriptLoader class spell_twisted_reflection_AuraScript : public AuraScript { - PrepareAuraScript(spell_twisted_reflection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TWISTED_REFLECTION_HEAL }); @@ -246,7 +242,7 @@ class spell_twisted_reflection : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_twisted_reflection_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_twisted_reflection_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index 8d6e2d29c9..8fb3a4f403 100644 --- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp @@ -1033,8 +1033,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()) @@ -1044,7 +1042,7 @@ class spell_oscillating_field : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_oscillating_field_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_oscillating_field_SpellScript::HandleEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 82312b6423..0be2e3b2b3 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -1605,8 +1605,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()) @@ -1616,7 +1614,7 @@ class spell_unlocking_zuluheds_chains : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); + AfterHit.Register(&spell_unlocking_zuluheds_chains_SpellScript::HandleAfterHit); } }; diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index 3db8dfa321..3cc03557bb 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -165,8 +165,6 @@ enum GhoulSpells class spell_pet_ghoul_dummy_ability : public SpellScript { - PrepareSpellScript(spell_pet_ghoul_dummy_ability); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -214,7 +212,7 @@ class spell_pet_ghoul_dummy_ability : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pet_ghoul_dummy_ability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pet_ghoul_dummy_ability::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index d6fb7b5e79..df45381704 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -154,8 +154,6 @@ class spell_pet_guard_dog : public SpellScriptLoader class spell_pet_guard_dog_AuraScript : public AuraScript { - PrepareAuraScript(spell_pet_guard_dog_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { // Growl shares family flags with other spells @@ -183,8 +181,8 @@ class spell_pet_guard_dog : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pet_guard_dog_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pet_guard_dog_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pet_guard_dog_AuraScript::CheckProc); + OnEffectProc.Register(&spell_pet_guard_dog_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -202,8 +200,6 @@ class spell_pet_silverback : public SpellScriptLoader class spell_pet_silverback_AuraScript : public AuraScript { - PrepareAuraScript(spell_pet_silverback_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { // Growl shares family flags with other spells @@ -227,8 +223,8 @@ class spell_pet_silverback : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pet_silverback_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pet_silverback_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pet_silverback_AuraScript::CheckProc); + OnEffectProc.Register(&spell_pet_silverback_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -246,8 +242,6 @@ class spell_pet_culling_the_herd : public SpellScriptLoader class spell_pet_culling_the_herd_AuraScript : public AuraScript { - PrepareAuraScript(spell_pet_culling_the_herd_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { // Claw, Bite and Smack share FamilyFlags with other spells @@ -271,7 +265,7 @@ class spell_pet_culling_the_herd : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pet_culling_the_herd_AuraScript::CheckProc); + DoCheckProc.Register(&spell_pet_culling_the_herd_AuraScript::CheckProc); } }; diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index ccf109d6c2..c8fdbd5731 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -110,8 +110,6 @@ enum DKSpellIcons // 48707 - Anti-Magic Shell (on self) class spell_dk_anti_magic_shell : public AuraScript { - PrepareAuraScript(spell_dk_anti_magic_shell); - bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); @@ -131,8 +129,8 @@ class spell_dk_anti_magic_shell : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_shell::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_shell::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_dk_anti_magic_shell::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_dk_anti_magic_shell::Absorb, EFFECT_0); } private: int32 absorbPct; @@ -142,8 +140,6 @@ private: // 50461 - Anti-Magic Zone class spell_dk_anti_magic_zone : public AuraScript { - PrepareAuraScript(spell_dk_anti_magic_zone); - bool Load() override { absorbPct = GetSpellInfo()->Effects[EFFECT_0].CalcValue(GetCaster()); @@ -170,8 +166,8 @@ class spell_dk_anti_magic_zone : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_anti_magic_zone::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_dk_anti_magic_zone::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_dk_anti_magic_zone::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_dk_anti_magic_zone::Absorb, EFFECT_0); } private: uint32 absorbPct = 0; @@ -180,8 +176,6 @@ private: // 48721 - Blood Boil class spell_dk_blood_boil : public SpellScript { - PrepareSpellScript(spell_dk_blood_boil); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_BLOOD_BOIL_TRIGGERED }); @@ -204,7 +198,7 @@ class spell_dk_blood_boil : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_dk_blood_boil::HandleAfterHit); + AfterHit.Register(&spell_dk_blood_boil::HandleAfterHit); } private: @@ -214,8 +208,6 @@ private: // 81277 - Blood Gorged class spell_dk_blood_gorged : public AuraScript { - PrepareAuraScript(spell_dk_blood_gorged); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_BLOOD_BURST }); @@ -234,15 +226,13 @@ class spell_dk_blood_gorged : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dk_blood_gorged::HandleBloodBurst, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply.Register(&spell_dk_blood_gorged::HandleBloodBurst, EFFECT_0, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; // -48979 - Butchery class spell_dk_butchery : public AuraScript { - PrepareAuraScript(spell_dk_butchery); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_BUTCHERY }); @@ -256,14 +246,12 @@ class spell_dk_butchery : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_butchery::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dk_butchery::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_dk_death_and_decay : public AuraScript { - PrepareAuraScript(spell_dk_death_and_decay); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_DEATH_AND_DECAY_DAMAGE }); @@ -277,15 +265,13 @@ class spell_dk_death_and_decay : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_death_and_decay::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_dk_death_and_decay::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; // 47541 - Death Coil class spell_dk_death_coil : public SpellScript { - PrepareSpellScript(spell_dk_death_coil); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -338,16 +324,14 @@ class spell_dk_death_coil : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dk_death_coil::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_dk_death_coil::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_dk_death_coil::CheckCast); + OnEffectHitTarget.Register(&spell_dk_death_coil::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 52751 - Death Gate class spell_dk_death_gate : public SpellScript { - PrepareSpellScript(spell_dk_death_gate); - SpellCastResult CheckClass() { if (GetCaster()->getClass() != CLASS_DEATH_KNIGHT) @@ -368,16 +352,14 @@ class spell_dk_death_gate : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dk_death_gate::CheckClass); - OnEffectHitTarget += SpellEffectFn(spell_dk_death_gate::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnCheckCast.Register(&spell_dk_death_gate::CheckClass); + OnEffectHitTarget.Register(&spell_dk_death_gate::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 49560 - Death Grip class spell_dk_death_grip : public SpellScript { - PrepareSpellScript(spell_dk_death_grip); - void HandleDummy(SpellEffIndex /*effIndex*/) { int32 damage = GetEffectValue(); @@ -391,7 +373,7 @@ class spell_dk_death_grip : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_dk_death_grip::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -399,8 +381,6 @@ class spell_dk_death_grip : public SpellScript // 48743 - Death Pact class spell_dk_death_pact : public SpellScript { - PrepareSpellScript(spell_dk_death_pact); - SpellCastResult CheckCast() { // Check if we have valid targets, otherwise skip spell casting here @@ -438,16 +418,14 @@ class spell_dk_death_pact : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dk_death_pact::CheckCast); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_death_pact::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); + OnCheckCast.Register(&spell_dk_death_pact::CheckCast); + OnObjectAreaTargetSelect.Register(&spell_dk_death_pact::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } }; // 49998 - Death Strike class spell_dk_death_strike : public SpellScript { - PrepareSpellScript(spell_dk_death_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -491,15 +469,13 @@ class spell_dk_death_strike : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_death_strike::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_dk_death_strike::HandleDummy, EFFECT_2, SPELL_EFFECT_DUMMY); } }; // 89832 - Death Strike (Save damage taken in last 5 sec) class spell_dk_death_strike_enabler : public AuraScript { - PrepareAuraScript(spell_dk_death_strike_enabler); - bool Load() override { for (uint8 i = 0; i < 5; ++i) @@ -550,11 +526,11 @@ class spell_dk_death_strike_enabler : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_death_strike_enabler::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dk_death_strike_enabler::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); - DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_dk_death_strike_enabler::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_dk_death_strike_enabler::Update, EFFECT_0, SPELL_AURA_DUMMY); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_death_strike_enabler::HandleCalcAmount, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dk_death_strike_enabler::CheckProc); + OnEffectProc.Register(&spell_dk_death_strike_enabler::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcPeriodic.Register(&spell_dk_death_strike_enabler::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectUpdatePeriodic.Register(&spell_dk_death_strike_enabler::Update, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcAmount.Register(&spell_dk_death_strike_enabler::HandleCalcAmount, EFFECT_0, SPELL_AURA_DUMMY); } private: uint32 _damagePerSecond[5]; @@ -563,8 +539,6 @@ private: // 47496 - Explode, Ghoul spell for Corpse Explosion class spell_dk_ghoul_explode : public SpellScript { - PrepareSpellScript(spell_dk_ghoul_explode); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_CORPSE_EXPLOSION_TRIGGERED }); @@ -581,15 +555,13 @@ class spell_dk_ghoul_explode : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_dk_ghoul_explode::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 48792 - Icebound Fortitude class spell_dk_icebound_fortitude : public AuraScript { - PrepareAuraScript(spell_dk_icebound_fortitude); - bool Load() override { Unit* caster = GetCaster(); @@ -619,15 +591,13 @@ class spell_dk_icebound_fortitude : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_icebound_fortitude::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); + DoEffectCalcAmount.Register(&spell_dk_icebound_fortitude::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; // 73975 - Necrotic Strike class spell_dk_necrotic_strike : public AuraScript { - PrepareAuraScript(spell_dk_necrotic_strike); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool & /*canBeRecalculated*/) { if (Unit* caster = GetCaster()) @@ -636,15 +606,13 @@ class spell_dk_necrotic_strike : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_necrotic_strike::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB); + DoEffectCalcAmount.Register(&spell_dk_necrotic_strike::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_HEAL_ABSORB); } }; // ID - 50842 Pestilence class spell_dk_pestilence : public SpellScript { - PrepareSpellScript(spell_dk_pestilence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -731,9 +699,9 @@ class spell_dk_pestilence : public SpellScript void Register() override { - BeforeCast += SpellCastFn(spell_dk_pestilence::HandleAuraApply); - OnEffectHitTarget += SpellEffectFn(spell_dk_pestilence::OnHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); - AfterCast += SpellCastFn(spell_dk_pestilence::HandleAuraRemoval); + BeforeCast.Register(&spell_dk_pestilence::HandleAuraApply); + OnEffectHitTarget.Register(&spell_dk_pestilence::OnHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + AfterCast.Register(&spell_dk_pestilence::HandleAuraRemoval); } private: @@ -745,8 +713,6 @@ private: // 48265 - Unholy Presence class spell_dk_presence : public AuraScript { - PrepareAuraScript(spell_dk_presence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -821,8 +787,8 @@ class spell_dk_presence : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dk_presence::HandlePresenceEffects, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dk_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dk_presence::HandlePresenceEffects, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dk_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); } }; @@ -831,8 +797,6 @@ class spell_dk_presence : public AuraScript // -50391 - Improved Unholy Presence class spell_dk_improved_presence : public AuraScript { - PrepareAuraScript(spell_dk_improved_presence); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -858,15 +822,13 @@ class spell_dk_improved_presence : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dk_improved_presence::HandleEffectRemove, EFFECT_0, SPELL_AURA_ANY, AURA_EFFECT_HANDLE_REAL); } }; // 46584 - Raise Dead class spell_dk_raise_dead : public SpellScript { - PrepareSpellScript(spell_dk_raise_dead); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -901,15 +863,13 @@ class spell_dk_raise_dead : public SpellScript void Register() override { - OnCast += SpellCastFn(spell_dk_raise_dead::HandleRaiseDead); + OnCast.Register(&spell_dk_raise_dead::HandleRaiseDead); } }; // 59754 Rune Tap - Party class spell_dk_rune_tap_party : public SpellScript { - PrepareSpellScript(spell_dk_rune_tap_party); - void CheckTargets(std::list& targets) { targets.remove(GetCaster()); @@ -917,15 +877,13 @@ class spell_dk_rune_tap_party : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dk_rune_tap_party::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); + OnObjectAreaTargetSelect.Register(&spell_dk_rune_tap_party::CheckTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; // 50421 - Scent of Blood class spell_dk_scent_of_blood : public AuraScript { - PrepareAuraScript(spell_dk_scent_of_blood); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_SCENT_OF_BLOOD }); @@ -940,15 +898,13 @@ class spell_dk_scent_of_blood : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_scent_of_blood::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_dk_scent_of_blood::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 55090 - Scourge Strike class spell_dk_scourge_strike : public SpellScript { - PrepareSpellScript(spell_dk_scourge_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -977,7 +933,7 @@ class spell_dk_scourge_strike : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_dk_scourge_strike::HandleAfterHit); + AfterHit.Register(&spell_dk_scourge_strike::HandleAfterHit); } private: float multiplier = 1.0f; @@ -986,8 +942,6 @@ private: // 55233 - Vampiric Blood class spell_dk_vampiric_blood : public AuraScript { - PrepareAuraScript(spell_dk_vampiric_blood); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { amount = GetUnitOwner()->CountPctFromMaxHealth(amount); @@ -995,7 +949,7 @@ class spell_dk_vampiric_blood : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_vampiric_blood::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); + DoEffectCalcAmount.Register(&spell_dk_vampiric_blood::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH); } }; @@ -1003,8 +957,6 @@ class spell_dk_vampiric_blood : public AuraScript // -52284 - Will of the Necropolis class spell_dk_will_of_the_necropolis : public AuraScript { - PrepareAuraScript(spell_dk_will_of_the_necropolis); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1029,16 +981,14 @@ class spell_dk_will_of_the_necropolis : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_will_of_the_necropolis::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dk_will_of_the_necropolis::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); + DoCheckProc.Register(&spell_dk_will_of_the_necropolis::CheckProc); + OnEffectProc.Register(&spell_dk_will_of_the_necropolis::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); } }; // 49576 - Death Grip Initial class spell_dk_death_grip_initial : public SpellScript { - PrepareSpellScript(spell_dk_death_grip_initial); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -1062,16 +1012,14 @@ class spell_dk_death_grip_initial : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dk_death_grip_initial::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_dk_death_grip_initial::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_dk_death_grip_initial::CheckCast); + OnEffectHitTarget.Register(&spell_dk_death_grip_initial::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // -48965 - Shadow Infusion class spell_dk_shadow_infusion : public AuraScript { - PrepareAuraScript(spell_dk_shadow_infusion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1109,16 +1057,14 @@ class spell_dk_shadow_infusion : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_shadow_infusion::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dk_shadow_infusion::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_dk_shadow_infusion::CheckProc); + OnEffectProc.Register(&spell_dk_shadow_infusion::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 63560 - Dark Transformation class spell_dk_dark_transformation : public SpellScript { - PrepareSpellScript(spell_dk_dark_transformation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1141,15 +1087,13 @@ class spell_dk_dark_transformation : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_dk_dark_transformation::HandleLaunch, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectLaunchTarget.Register(&spell_dk_dark_transformation::HandleLaunch, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; // 93426 - Dark Transformation class spell_dk_dark_transformation_aura : public AuraScript { - PrepareAuraScript(spell_dk_dark_transformation_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_SHADOW_INFUSION }); @@ -1166,7 +1110,7 @@ class spell_dk_dark_transformation_aura : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_dark_transformation_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_dk_dark_transformation_aura::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1174,8 +1118,6 @@ class spell_dk_dark_transformation_aura : public AuraScript // -51459 - Runic Corruption class spell_dk_runic_empowerment : public AuraScript { - PrepareAuraScript(spell_dk_runic_empowerment); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1247,16 +1189,14 @@ class spell_dk_runic_empowerment : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_runic_empowerment::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dk_runic_empowerment::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dk_runic_empowerment::CheckProc); + OnEffectProc.Register(&spell_dk_runic_empowerment::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 49184 - Howling Blast class spell_dk_howling_blast : public SpellScript { - PrepareSpellScript(spell_dk_howling_blast); - void HandleDamage(SpellEffIndex /*effIndex*/) { if (GetExplTargetUnit() && GetHitUnit()) @@ -1266,14 +1206,12 @@ class spell_dk_howling_blast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_howling_blast::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_dk_howling_blast::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_dk_threat_of_thassarian : public AuraScript { - PrepareAuraScript(spell_dk_threat_of_thassarian); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1337,15 +1275,13 @@ class spell_dk_threat_of_thassarian : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_threat_of_thassarian::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dk_threat_of_thassarian::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 56835 - Reaping (Passive) class spell_dk_reaping : public AuraScript { - PrepareAuraScript(spell_dk_reaping); - bool Load() override { return GetCaster()->IsPlayer(); @@ -1382,14 +1318,12 @@ class spell_dk_reaping : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_reaping::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectProc.Register(&spell_dk_reaping::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_dk_blood_rites : public AuraScript { - PrepareAuraScript(spell_dk_blood_rites); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -1411,14 +1345,12 @@ class spell_dk_blood_rites : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_blood_rites::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectProc.Register(&spell_dk_blood_rites::HandleProc, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; class spell_dk_crimson_scourge : public AuraScript { - PrepareAuraScript(spell_dk_crimson_scourge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_BLOOD_PLAGUE }); @@ -1435,14 +1367,12 @@ class spell_dk_crimson_scourge : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_crimson_scourge::CheckProc); + DoCheckProc.Register(&spell_dk_crimson_scourge::CheckProc); } }; class spell_dk_army_of_the_dead : public AuraScript { - PrepareAuraScript(spell_dk_army_of_the_dead); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { amount = 0; @@ -1456,15 +1386,13 @@ class spell_dk_army_of_the_dead : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); + DoEffectCalcAmount.Register(&spell_dk_army_of_the_dead::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN); } }; // -49588 Unholy Command class spell_dk_unholy_command : public AuraScript { - PrepareAuraScript(spell_dk_unholy_command); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_DEATH_GRIP_INITIAL }); @@ -1477,7 +1405,7 @@ class spell_dk_unholy_command : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_unholy_command::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER); + OnEffectProc.Register(&spell_dk_unholy_command::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER); } }; @@ -1485,8 +1413,6 @@ class spell_dk_unholy_command : public AuraScript // 55095 - Frost Fever class spell_dk_disease : public AuraScript { - PrepareAuraScript(spell_dk_disease); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1531,16 +1457,14 @@ class spell_dk_disease : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_disease::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - AfterDispel += AuraDispelFn(spell_dk_disease::HandleResilientInfection); + DoEffectCalcAmount.Register(&spell_dk_disease::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + AfterDispel.Register(&spell_dk_disease::HandleResilientInfection); } }; // -55666 - Desecration class spell_dk_desecration : public AuraScript { - PrepareAuraScript(spell_dk_desecration); - bool CheckProc(ProcEventInfo& eventInfo) { SpellInfo const* triggerSpell = sSpellMgr->GetSpellInfo(GetSpellInfo()->Effects[EFFECT_0].TriggerSpell); @@ -1555,15 +1479,13 @@ class spell_dk_desecration : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_desecration::CheckProc); + DoCheckProc.Register(&spell_dk_desecration::CheckProc); } }; // -96269 - Death's Advance class spell_dk_deaths_advance : public AuraScript { - PrepareAuraScript(spell_dk_deaths_advance); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { Player* player = GetTarget()->ToPlayer(); @@ -1585,14 +1507,12 @@ class spell_dk_deaths_advance : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dk_deaths_advance::CheckProc); + DoCheckProc.Register(&spell_dk_deaths_advance::CheckProc); } }; class spell_dk_deaths_advance_aura : public AuraScript { - PrepareAuraScript(spell_dk_deaths_advance_aura); - void HandleDummyTick(AuraEffect const* /*aurEff*/) { Player* player = GetTarget()->ToPlayer(); @@ -1615,15 +1535,13 @@ class spell_dk_deaths_advance_aura : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_deaths_advance_aura::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_dk_deaths_advance_aura::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; // -51099 - Ebon Plaguebringer class spell_dk_ebon_plaguebringer : public AuraScript { - PrepareAuraScript(spell_dk_ebon_plaguebringer); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_EBON_PLAGUE }); @@ -1644,14 +1562,12 @@ class spell_dk_ebon_plaguebringer : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_ebon_plaguebringer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dk_ebon_plaguebringer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_dk_ghoul_taunt : public SpellScript { - PrepareSpellScript(spell_dk_ghoul_taunt); - void HandleTaunt(SpellEffIndex /*effIndex*/) { if (GetHitCreature() && (GetHitCreature()->IsDungeonBoss() || GetHitCreature()->GetCreatureTemplate()->type_flags & CREATURE_TYPE_FLAG_BOSS_MOB)) @@ -1663,15 +1579,13 @@ class spell_dk_ghoul_taunt : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_taunt::HandleTaunt, EFFECT_0, SPELL_EFFECT_ATTACK_ME); + OnEffectHitTarget.Register(&spell_dk_ghoul_taunt::HandleTaunt, EFFECT_0, SPELL_EFFECT_ATTACK_ME); } }; // 49194 - Unholy Blight class spell_dk_unoly_blight : public AuraScript { - PrepareAuraScript(spell_dk_unoly_blight); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DK_UNHOLY_BLIGHT_PERIODIC }); @@ -1686,15 +1600,13 @@ class spell_dk_unoly_blight : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dk_unoly_blight::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dk_unoly_blight::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 85948 - Festering Strike class spell_dk_festering_strike : public SpellScript { - PrepareSpellScript(spell_dk_festering_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1734,15 +1646,13 @@ class spell_dk_festering_strike : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_festering_strike::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dk_festering_strike::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 51124 - Killing Machine class spell_dk_killing_machine : public SpellScript { - PrepareSpellScript(spell_dk_killing_machine); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1761,7 +1671,7 @@ class spell_dk_killing_machine : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dk_killing_machine::HandleT11Bonus, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_dk_killing_machine::HandleT11Bonus, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 89745bc875..3ac823118c 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -136,8 +136,6 @@ enum MiscSpells // 50334 - Berserk class spell_dru_berserk : public AuraScript { - PrepareAuraScript(spell_dru_berserk); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // Remove cooldown on Mangle (bear) @@ -150,15 +148,13 @@ class spell_dru_berserk : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_berserk::HandleEffectApply, EFFECT_1, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_berserk::HandleEffectApply, EFFECT_1, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; // 1850 - Dash class spell_dru_dash : public SpellScript { - PrepareSpellScript(spell_dru_dash); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -178,14 +174,12 @@ class spell_dru_dash : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_dash::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_dru_dash::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_dru_dash_AuraScript : public AuraScript { - PrepareAuraScript(spell_dru_dash_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { // do not set speed if not in cat form @@ -195,7 +189,7 @@ class spell_dru_dash_AuraScript : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED); + DoEffectCalcAmount.Register(&spell_dru_dash_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_SPEED); } }; @@ -203,8 +197,6 @@ class spell_dru_dash_AuraScript : public AuraScript // 48518 - Eclipse (Lunar) class spell_dru_eclipse : public AuraScript { - PrepareAuraScript(spell_dru_eclipse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -270,16 +262,14 @@ class spell_dru_eclipse : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_eclipse::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_eclipse::ApplyEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_eclipse::RemoveEffect, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } }; // 2912, 5176, 78674 - Starfire, Wrath, and Starsurge class spell_dru_eclipse_energize : public SpellScript { - PrepareSpellScript(spell_dru_eclipse_energize); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -393,17 +383,15 @@ class spell_dru_eclipse_energize : public SpellScript void Register() override { if (m_scriptSpellId == SPELL_DRUID_MOONFIRE || m_scriptSpellId == SPELL_DRUID_SUNFIRE) - OnEffectLaunch += SpellEffectFn(spell_dru_eclipse_energize::HandleEnergize, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunch.Register(&spell_dru_eclipse_energize::HandleEnergize, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); else - OnEffectLaunch += SpellEffectFn(spell_dru_eclipse_energize::HandleEnergize, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunch.Register(&spell_dru_eclipse_energize::HandleEnergize, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 79577 - Eclipse Mastery Passive Driver class spell_dru_eclipse_mastery_driver_passive : public AuraScript { - PrepareAuraScript(spell_dru_eclipse_mastery_driver_passive); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -420,15 +408,13 @@ class spell_dru_eclipse_mastery_driver_passive : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_eclipse_mastery_driver_passive::CheckProc); + DoCheckProc.Register(&spell_dru_eclipse_mastery_driver_passive::CheckProc); } }; // 5229 - Enrage class spell_dru_enrage : public AuraScript { - PrepareAuraScript(spell_dru_enrage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -478,16 +464,14 @@ class spell_dru_enrage : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_enrage::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_enrage::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_enrage::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_enrage::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE, AURA_EFFECT_HANDLE_REAL); } }; // 54846 - Glyph of Starfire class spell_dru_glyph_of_starfire : public SpellScript { - PrepareSpellScript(spell_dru_glyph_of_starfire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_INCREASED_MOONFIRE_DURATION }); @@ -518,15 +502,13 @@ class spell_dru_glyph_of_starfire : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_glyph_of_starfire::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dru_glyph_of_starfire::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 54845 - Glyph of Starfire class spell_dru_glyph_of_starfire_proc : public AuraScript { - PrepareAuraScript(spell_dru_glyph_of_starfire_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_GLYPH_OF_STARFIRE }); @@ -553,8 +535,8 @@ class spell_dru_glyph_of_starfire_proc : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_glyph_of_starfire_proc::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dru_glyph_of_starfire_proc::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dru_glyph_of_starfire_proc::CheckProc); + OnEffectProc.Register(&spell_dru_glyph_of_starfire_proc::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } private: ObjectGuid _lastMoonFireTargetGuid; @@ -564,8 +546,6 @@ private: // 60779 - Idol of Lush Moss class spell_dru_idol_lifebloom : public AuraScript { - PrepareAuraScript(spell_dru_idol_lifebloom); - void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod) { if (!spellMod) @@ -581,15 +561,13 @@ class spell_dru_idol_lifebloom : public AuraScript void Register() override { - DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_dru_idol_lifebloom::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcSpellMod.Register(&spell_dru_idol_lifebloom::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; // 29166 - Innervate class spell_dru_innervate : public AuraScript { - PrepareAuraScript(spell_dru_innervate); - void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) { Unit* target = GetUnitOwner(); @@ -627,15 +605,13 @@ class spell_dru_innervate : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_innervate::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); + DoEffectCalcAmount.Register(&spell_dru_innervate::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; // 5570 - Insect Swarm class spell_dru_insect_swarm : public AuraScript { - PrepareAuraScript(spell_dru_insect_swarm); - void CalculateAmount(AuraEffect const* aurEff, int32 & amount, bool & /*canBeRecalculated*/) { if (Unit* caster = GetCaster()) @@ -645,7 +621,7 @@ class spell_dru_insect_swarm : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_insect_swarm::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + DoEffectCalcAmount.Register(&spell_dru_insect_swarm::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -653,8 +629,6 @@ class spell_dru_insect_swarm : public AuraScript // 94447 - Lifebloom class spell_dru_lifebloom : public AuraScript { - PrepareAuraScript(spell_dru_lifebloom); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -716,16 +690,14 @@ class spell_dru_lifebloom : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_lifebloom::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterDispel += AuraDispelFn(spell_dru_lifebloom::HandleDispel); + AfterEffectRemove.Register(&spell_dru_lifebloom::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterDispel.Register(&spell_dru_lifebloom::HandleDispel); } }; // -48496 - Living Seed class spell_dru_living_seed : public AuraScript { - PrepareAuraScript(spell_dru_living_seed); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_PROC }); @@ -740,15 +712,13 @@ class spell_dru_living_seed : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_living_seed::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dru_living_seed::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 48504 - Living Seed (Proc) class spell_dru_living_seed_proc : public AuraScript { - PrepareAuraScript(spell_dru_living_seed_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_LIVING_SEED_HEAL }); @@ -762,7 +732,7 @@ class spell_dru_living_seed_proc : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_living_seed_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dru_living_seed_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -770,8 +740,6 @@ class spell_dru_living_seed_proc : public AuraScript // Updated 4.3.4 class spell_dru_rip : public AuraScript { - PrepareAuraScript(spell_dru_rip); - bool Load() override { Unit* caster = GetCaster(); @@ -803,15 +771,13 @@ class spell_dru_rip : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_rip::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + DoEffectCalcAmount.Register(&spell_dru_rip::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; // 62606 - Savage Defense class spell_dru_savage_defense : public AuraScript { - PrepareAuraScript(spell_dru_savage_defense); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -827,15 +793,13 @@ class spell_dru_savage_defense : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_savage_defense::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_dru_savage_defense::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 52610 - Savage Roar class spell_dru_savage_roar : public SpellScript { - PrepareSpellScript(spell_dru_savage_roar); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -847,14 +811,12 @@ class spell_dru_savage_roar : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dru_savage_roar::CheckCast); + OnCheckCast.Register(&spell_dru_savage_roar::CheckCast); } }; class spell_dru_savage_roar_AuraScript : public AuraScript { - PrepareAuraScript(spell_dru_savage_roar_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_SAVAGE_ROAR }); @@ -873,16 +835,14 @@ class spell_dru_savage_roar_AuraScript : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_savage_roar_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_savage_roar_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 50286 - Starfall (Dummy) class spell_dru_starfall_dummy : public SpellScript { - PrepareSpellScript(spell_dru_starfall_dummy); - void FilterTargets(std::list& targets) { Trinity::Containers::RandomResize(targets, 2); @@ -908,16 +868,14 @@ class spell_dru_starfall_dummy : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_starfall_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_dru_starfall_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_dru_starfall_dummy::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_dru_starfall_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // -78892 - Stampede class spell_dru_stampede : public AuraScript { - PrepareAuraScript(spell_dru_stampede); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -951,16 +909,14 @@ class spell_dru_stampede : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectProc += AuraEffectProcFn(spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dru_stampede::HandleEffectCatProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_dru_stampede::HandleEffectBearProc, EFFECT_1, SPELL_AURA_DUMMY); } }; // 61336 - Survival Instincts class spell_dru_survival_instincts : public SpellScript { - PrepareSpellScript(spell_dru_survival_instincts); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -972,14 +928,12 @@ class spell_dru_survival_instincts : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dru_survival_instincts::CheckCast); + OnCheckCast.Register(&spell_dru_survival_instincts::CheckCast); } }; class spell_dru_survival_instincts_AuraScript : public AuraScript { - PrepareAuraScript(spell_dru_survival_instincts_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_SURVIVAL_INSTINCTS }); @@ -997,16 +951,14 @@ class spell_dru_survival_instincts_AuraScript : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply.Register(&spell_dru_survival_instincts_AuraScript::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectRemove.Register(&spell_dru_survival_instincts_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } }; // 40121 - Swift Flight Form (Passive) class spell_dru_swift_flight_passive : public AuraScript { - PrepareAuraScript(spell_dru_swift_flight_passive); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1021,15 +973,13 @@ class spell_dru_swift_flight_passive : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); + DoEffectCalcAmount.Register(&spell_dru_swift_flight_passive::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); } }; // 33943 - Flight Form (Shapeshift) class spell_dru_flight_form : public SpellScript { - PrepareSpellScript(spell_dru_flight_form); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -1041,15 +991,13 @@ class spell_dru_flight_form : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_dru_flight_form::CheckCast); + OnCheckCast.Register(&spell_dru_flight_form::CheckCast); } }; // 40120 - Swift Flight Form (Shapeshift) class spell_dru_swift_flight_form : public AuraScript { - PrepareAuraScript(spell_dru_swift_flight_form); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1069,15 +1017,13 @@ class spell_dru_swift_flight_form : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dru_swift_flight_form::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT); + DoEffectCalcAmount.Register(&spell_dru_swift_flight_form::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT); } }; // 5217 - Tiger's Fury class spell_dru_tiger_s_fury : public SpellScript { - PrepareSpellScript(spell_dru_tiger_s_fury); - void OnHit() { if (AuraEffect const* aurEff = GetHitUnit()->GetAuraEffectOfRankedSpell(SPELL_DRUID_KING_OF_THE_JUNGLE, EFFECT_1)) @@ -1086,15 +1032,13 @@ class spell_dru_tiger_s_fury : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_dru_tiger_s_fury::OnHit); + AfterHit.Register(&spell_dru_tiger_s_fury::OnHit); } }; // 61391 - Typhoon class spell_dru_typhoon : public SpellScript { - PrepareSpellScript(spell_dru_typhoon); - void HandleKnockBack(SpellEffIndex effIndex) { // Glyph of Typhoon @@ -1104,15 +1048,13 @@ class spell_dru_typhoon : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_typhoon::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); + OnEffectHitTarget.Register(&spell_dru_typhoon::HandleKnockBack, EFFECT_0, SPELL_EFFECT_KNOCK_BACK); } }; // 70691 - Item T10 Restoration 4P Bonus class spell_dru_t10_restoration_4p_bonus : public SpellScript { - PrepareSpellScript(spell_dru_t10_restoration_4p_bonus); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1148,7 +1090,7 @@ class spell_dru_t10_restoration_4p_bonus : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_t10_restoration_4p_bonus::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_dru_t10_restoration_4p_bonus::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; @@ -1172,8 +1114,6 @@ class RaidCheck // 48438 - Wild Growth class spell_dru_wild_growth : public SpellScript { - PrepareSpellScript(spell_dru_wild_growth); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_TREE_OF_LIFE }); @@ -1205,8 +1145,8 @@ class spell_dru_wild_growth : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_wild_growth::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_dru_wild_growth::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_dru_wild_growth::SetTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } private: @@ -1216,8 +1156,6 @@ private: // 78675 - Solar Beam class spell_dru_solar_beam : public AuraScript { - PrepareAuraScript(spell_dru_solar_beam); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_SOLAR_BEAM_SILENCE }); @@ -1231,15 +1169,13 @@ class spell_dru_solar_beam : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_dru_solar_beam::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); } }; // -34151 - Efflorescence (Proc Aura) class spell_dru_effloresence : public AuraScript { - PrepareAuraScript(spell_dru_effloresence); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { PreventDefaultAction(); @@ -1255,15 +1191,13 @@ class spell_dru_effloresence : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_effloresence::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_dru_effloresence::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 81262 - Efflorescence (Area Effect) class spell_dru_effloresence_aoe : public AuraScript { - PrepareAuraScript(spell_dru_effloresence_aoe); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_EFFLORESCENCE_HEAL }); @@ -1278,15 +1212,13 @@ class spell_dru_effloresence_aoe : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_effloresence_aoe::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_dru_effloresence_aoe::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; // 81269 - Efflorescence (Heal) class spell_dru_effloresence_heal : public SpellScript { - PrepareSpellScript(spell_dru_effloresence_heal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_EFFLORESCENCE_AOE }); @@ -1312,16 +1244,14 @@ class spell_dru_effloresence_heal : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_dru_effloresence_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_dru_effloresence_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnObjectAreaTargetSelect.Register(&spell_dru_effloresence_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnEffectHitTarget.Register(&spell_dru_effloresence_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; // 774 - Rejuvenation class spell_dru_rejuvenation : public AuraScript { - PrepareAuraScript(spell_dru_rejuvenation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_NATURES_BOUNTY }); @@ -1360,16 +1290,14 @@ class spell_dru_rejuvenation : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_rejuvenation::AfterApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_rejuvenation::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } }; // 33891 - Tree of Life class spell_dru_tree_of_life : public AuraScript { - PrepareAuraScript(spell_dru_tree_of_life); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1403,16 +1331,14 @@ class spell_dru_tree_of_life : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_dru_tree_of_life::AfterApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_tree_of_life::AfterRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL); } }; // 77495 - Harmony class spell_dru_harmony : public AuraScript { - PrepareAuraScript(spell_dru_harmony); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_HARMONY }); @@ -1427,15 +1353,13 @@ class spell_dru_harmony : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_harmony::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); + OnEffectProc.Register(&spell_dru_harmony::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); } }; // 17007 - Leader of the Pack class spell_dru_leader_of_the_pack : public AuraScript { - PrepareAuraScript(spell_dru_leader_of_the_pack); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1475,15 +1399,13 @@ class spell_dru_leader_of_the_pack : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_leader_of_the_pack::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dru_leader_of_the_pack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dru_leader_of_the_pack::CheckProc); + OnEffectProc.Register(&spell_dru_leader_of_the_pack::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_dru_wild_mushroom : public SpellScript { - PrepareSpellScript(spell_dru_wild_mushroom); - void HandleSummon() { Unit* caster = GetCaster(); @@ -1519,14 +1441,12 @@ class spell_dru_wild_mushroom : public SpellScript void Register() override { - AfterCast += SpellCastFn(spell_dru_wild_mushroom::HandleSummon); + AfterCast.Register(&spell_dru_wild_mushroom::HandleSummon); } }; class spell_dru_wild_mushroom_detonate : public SpellScript { - PrepareSpellScript(spell_dru_wild_mushroom_detonate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1576,15 +1496,13 @@ class spell_dru_wild_mushroom_detonate : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_wild_mushroom_detonate::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_dru_wild_mushroom_detonate::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 16913 - Moonfire (Passive) class spell_dru_moonfire : public AuraScript { - PrepareAuraScript(spell_dru_moonfire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1613,14 +1531,12 @@ class spell_dru_moonfire : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_moonfire::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_moonfire::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; class spell_dru_furor : public AuraScript { - PrepareAuraScript(spell_dru_furor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1651,16 +1567,14 @@ class spell_dru_furor : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_furor::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dru_furor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dru_furor::CheckProc); + OnEffectProc.Register(&spell_dru_furor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 22568 - Ferocious Bite class spell_dru_ferocious_bite : public SpellScript { - PrepareSpellScript(spell_dru_ferocious_bite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_GLYPH_OF_FEROCIOUS_BITE }); @@ -1706,15 +1620,13 @@ class spell_dru_ferocious_bite : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_dru_ferocious_bite::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_dru_ferocious_bite::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // -33879 - Empowered Touch class spell_dru_empowered_touch : public AuraScript { - PrepareAuraScript(spell_dru_empowered_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_EMPOWERED_TOUCH_SCRIPT }); @@ -1734,16 +1646,14 @@ class spell_dru_empowered_touch : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_empowered_touch::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dru_empowered_touch::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dru_empowered_touch::CheckProc); + OnEffectProc.Register(&spell_dru_empowered_touch::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; // 88433 - Empowered Touch class spell_dru_empowered_touch_script : public SpellScript { - PrepareSpellScript(spell_dru_empowered_touch_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_LIFEBLOOM }); @@ -1758,15 +1668,13 @@ class spell_dru_empowered_touch_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_empowered_touch_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dru_empowered_touch_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 93400 - Shooting Stars class spell_dru_shooting_stars : public SpellScript { - PrepareSpellScript(spell_dru_shooting_stars); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_STARSURGE }); @@ -1779,15 +1687,13 @@ class spell_dru_shooting_stars : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_shooting_stars::HandleCooldownReset, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_dru_shooting_stars::HandleCooldownReset, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; // 80313 - Pulverize class spell_dru_pulverize : public SpellScript { - PrepareSpellScript(spell_dru_pulverize); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1823,15 +1729,13 @@ class spell_dru_pulverize : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_dru_pulverize::ChangeDamage, EFFECT_2, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + OnEffectLaunchTarget.Register(&spell_dru_pulverize::ChangeDamage, EFFECT_2, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); } }; // 22842 - Frenzied Regeneration class spell_dru_frenzied_regeneration : public AuraScript { - PrepareAuraScript(spell_dru_frenzied_regeneration); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_FRENZIED_REGENERATION_HEAL }); @@ -1864,16 +1768,14 @@ class spell_dru_frenzied_regeneration : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_dru_frenzied_regeneration::HandleRegeneration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectApply += AuraEffectApplyFn(spell_dru_frenzied_regeneration::HandleHealthAfterApply, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH_2, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_dru_frenzied_regeneration::HandleRegeneration, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_dru_frenzied_regeneration::HandleHealthAfterApply, EFFECT_1, SPELL_AURA_MOD_INCREASE_HEALTH_2, AURA_EFFECT_HANDLE_REAL); } }; class spell_dru_stampeding_roar : public SpellScript { - PrepareSpellScript(spell_dru_stampeding_roar); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1896,14 +1798,12 @@ class spell_dru_stampeding_roar : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_stampeding_roar::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_dru_stampeding_roar::HandleFeralSwiftness, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_dru_feral_swiftness_clear : public SpellScript { - PrepareSpellScript(spell_dru_feral_swiftness_clear); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { GetHitUnit()->RemoveAppliedAuras([](AuraApplication const* aurApp)->bool @@ -1916,15 +1816,13 @@ class spell_dru_feral_swiftness_clear : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_feral_swiftness_clear::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dru_feral_swiftness_clear::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // -80318 - Blood in the Water class spell_dru_blood_in_the_water : public AuraScript { - PrepareAuraScript(spell_dru_blood_in_the_water); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1956,16 +1854,14 @@ class spell_dru_blood_in_the_water : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_dru_blood_in_the_water::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_dru_blood_in_the_water::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_dru_blood_in_the_water::CheckProc); + OnEffectProc.Register(&spell_dru_blood_in_the_water::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 80863 - Blood in the Water class spell_dru_blood_in_the_water_script : public SpellScript { - PrepareSpellScript(spell_dru_blood_in_the_water_script); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_DRUID_RIP }); @@ -1980,15 +1876,13 @@ class spell_dru_blood_in_the_water_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dru_blood_in_the_water_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_dru_blood_in_the_water_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 90164 - Astral Alignment class spell_dru_astral_alignment : public AuraScript { - PrepareAuraScript(spell_dru_astral_alignment); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -1997,15 +1891,13 @@ class spell_dru_astral_alignment : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_astral_alignment::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); + OnEffectProc.Register(&spell_dru_astral_alignment::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); } }; // 100977 - Harmony class spell_dru_harmony_triggered : public AuraScript { - PrepareAuraScript(spell_dru_harmony_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_BLOOM }); @@ -2018,15 +1910,13 @@ class spell_dru_harmony_triggered : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_dru_harmony_triggered::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_dru_harmony_triggered::RemoveEffect, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; // 90165 - Item - Druid T11 Feral 4P Bonus class spell_dru_item_t11_feral_4p_bonus : public AuraScript { - PrepareAuraScript(spell_dru_item_t11_feral_4p_bonus); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DRUID_STRENGTH_OF_THE_PANTHER }); @@ -2040,7 +1930,7 @@ class spell_dru_item_t11_feral_4p_bonus : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_dru_item_t11_feral_4p_bonus::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); + OnEffectProc.Register(&spell_dru_item_t11_feral_4p_bonus::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); } }; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 58c827b1c2..dfa73cf24b 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -50,8 +50,6 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader class spell_gen_absorb0_hitlimit1_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_absorb0_hitlimit1_AuraScript); - public: spell_gen_absorb0_hitlimit1_AuraScript() { @@ -75,7 +73,7 @@ class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader void Register() override { - OnEffectAbsorb += AuraEffectAbsorbFn(spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); + OnEffectAbsorb.Register(&spell_gen_absorb0_hitlimit1_AuraScript::Absorb, EFFECT_0); } }; @@ -102,8 +100,6 @@ class spell_gen_adaptive_warding : public SpellScriptLoader class spell_gen_adaptive_warding_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_adaptive_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -167,8 +163,8 @@ class spell_gen_adaptive_warding : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_adaptive_warding_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_adaptive_warding_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_gen_adaptive_warding_AuraScript::CheckProc); + OnEffectProc.Register(&spell_gen_adaptive_warding_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -192,8 +188,6 @@ class spell_gen_alchemist_stone : public SpellScriptLoader class spell_gen_alchemist_stone_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_alchemist_stone_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ ALCHEMIST_STONE_HEAL, ALCHEMIST_STONE_MANA }); @@ -225,8 +219,8 @@ class spell_gen_alchemist_stone : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_alchemist_stone_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_alchemist_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_gen_alchemist_stone_AuraScript::CheckProc); + OnEffectProc.Register(&spell_gen_alchemist_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -243,8 +237,6 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader class spell_gen_allow_cast_from_item_only_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_allow_cast_from_item_only_SpellScript); - SpellCastResult CheckRequirement() { if (!GetCastItem()) @@ -254,7 +246,7 @@ class spell_gen_allow_cast_from_item_only : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_gen_allow_cast_from_item_only_SpellScript::CheckRequirement); } }; @@ -277,8 +269,6 @@ class spell_gen_animal_blood : public SpellScriptLoader class spell_gen_animal_blood_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_animal_blood_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SPAWN_BLOOD_POOL }); @@ -300,8 +290,8 @@ class spell_gen_animal_blood : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_animal_blood_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_animal_blood_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_animal_blood_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -319,8 +309,6 @@ class spell_gen_aura_of_anger : public SpellScriptLoader class spell_gen_aura_of_anger_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_aura_of_anger_AuraScript); - void HandleEffectPeriodicUpdate(AuraEffect* aurEff) { if (AuraEffect* aurEff1 = aurEff->GetBase()->GetEffect(EFFECT_1)) @@ -330,7 +318,7 @@ class spell_gen_aura_of_anger : public SpellScriptLoader void Register() override { - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic.Register(&spell_gen_aura_of_anger_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -357,8 +345,6 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader class spell_gen_aura_service_uniform_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_aura_service_uniform_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SERVICE_UNIFORM }); @@ -386,8 +372,8 @@ class spell_gen_aura_service_uniform : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_aura_service_uniform_AuraScript::OnApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_aura_service_uniform_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; @@ -404,8 +390,6 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader class spell_gen_av_drekthar_presence_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_av_drekthar_presence_AuraScript); - bool CheckAreaTarget(Unit* target) { switch (target->GetEntry()) @@ -430,7 +414,7 @@ class spell_gen_av_drekthar_presence : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); + DoCheckAreaTarget.Register(&spell_gen_av_drekthar_presence_AuraScript::CheckAreaTarget); } }; @@ -452,8 +436,6 @@ class spell_gen_bandage : public SpellScriptLoader class spell_gen_bandage_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_bandage_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RECENTLY_BANDAGED }); @@ -477,8 +459,8 @@ class spell_gen_bandage : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_bandage_SpellScript::CheckCast); - AfterHit += SpellHitFn(spell_gen_bandage_SpellScript::HandleScript); + OnCheckCast.Register(&spell_gen_bandage_SpellScript::CheckCast); + AfterHit.Register(&spell_gen_bandage_SpellScript::HandleScript); } }; @@ -502,8 +484,6 @@ class spell_gen_blood_reserve : public SpellScriptLoader class spell_gen_blood_reserve_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_blood_reserve_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_BLOOD_RESERVE_HEAL }); @@ -530,8 +510,8 @@ class spell_gen_blood_reserve : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_blood_reserve_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_blood_reserve_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_gen_blood_reserve_AuraScript::CheckProc); + OnEffectProc.Register(&spell_gen_blood_reserve_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -554,8 +534,6 @@ class spell_gen_blade_warding : public SpellScriptLoader class spell_gen_blade_warding_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_blade_warding_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_BLADE_WARDING_TRIGGERED }); @@ -579,7 +557,7 @@ class spell_gen_blade_warding : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_gen_blade_warding_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_gen_blade_warding_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -603,8 +581,6 @@ class spell_gen_bonked : public SpellScriptLoader class spell_gen_bonked_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_bonked_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -626,7 +602,7 @@ class spell_gen_bonked : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_bonked_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -676,8 +652,6 @@ class spell_gen_break_shield: public SpellScriptLoader class spell_gen_break_shield_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_break_shield_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { Unit* target = GetHitUnit(); @@ -735,7 +709,7 @@ class spell_gen_break_shield: public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_break_shield_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -753,8 +727,6 @@ class spell_gen_burn_brutallus : public SpellScriptLoader class spell_gen_burn_brutallus_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_burn_brutallus_AuraScript); - void HandleEffectPeriodicUpdate(AuraEffect* aurEff) { if (aurEff->GetTickNumber() % 11 == 0) @@ -763,7 +735,7 @@ class spell_gen_burn_brutallus : public SpellScriptLoader void Register() override { - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectUpdatePeriodic.Register(&spell_gen_burn_brutallus_AuraScript::HandleEffectPeriodicUpdate, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -781,8 +753,6 @@ class spell_gen_burning_depths_necrolyte_image : public SpellScriptLoader class spell_gen_burning_depths_necrolyte_image_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_burning_depths_necrolyte_image_AuraScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_2].CalcValue()) }); @@ -801,8 +771,8 @@ class spell_gen_burning_depths_necrolyte_image : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_gen_burning_depths_necrolyte_image_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_burning_depths_necrolyte_image_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_burning_depths_necrolyte_image_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_burning_depths_necrolyte_image_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; @@ -824,8 +794,6 @@ class spell_gen_cannibalize : public SpellScriptLoader class spell_gen_cannibalize_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_cannibalize_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CANNIBALIZE_TRIGGERED }); @@ -854,8 +822,8 @@ class spell_gen_cannibalize : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_gen_cannibalize_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnCheckCast += SpellCheckCastFn(spell_gen_cannibalize_SpellScript::CheckIfCorpseNear); + OnEffectHit.Register(&spell_gen_cannibalize_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_gen_cannibalize_SpellScript::CheckIfCorpseNear); } }; @@ -877,8 +845,6 @@ class spell_gen_chaos_blast : public SpellScriptLoader class spell_gen_chaos_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_chaos_blast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAOS_BLAST }); @@ -893,7 +859,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_chaos_blast_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -913,8 +879,6 @@ enum Clone // 8129 - Mana Burn class spell_gen_clear_fear_poly : public SpellScript { - PrepareSpellScript(spell_gen_clear_fear_poly); - void HandleAfterHit() { if (Unit* unitTarget = GetHitUnit()) @@ -923,7 +887,7 @@ class spell_gen_clear_fear_poly : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_gen_clear_fear_poly::HandleAfterHit); + AfterHit.Register(&spell_gen_clear_fear_poly::HandleAfterHit); } }; @@ -934,8 +898,6 @@ class spell_gen_clone : public SpellScriptLoader class spell_gen_clone_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_clone_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -947,15 +909,15 @@ class spell_gen_clone : public SpellScriptLoader switch (m_scriptSpellId) { case SPELL_CLONE_ME: - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); break; case SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE: - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_DUMMY); break; default: - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); break; } } @@ -986,8 +948,6 @@ class spell_gen_clone_weapon : public SpellScriptLoader class spell_gen_clone_weapon_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_clone_weapon_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -996,7 +956,7 @@ class spell_gen_clone_weapon : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_clone_weapon_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1013,8 +973,6 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader class spell_gen_clone_weapon_auraScript : public AuraScript { - PrepareAuraScript(spell_gen_clone_weapon_auraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1109,8 +1067,8 @@ class spell_gen_clone_weapon_aura : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gen_clone_weapon_auraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_clone_weapon_auraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply.Register(&spell_gen_clone_weapon_auraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove.Register(&spell_gen_clone_weapon_auraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } uint32 prevItem = 0; @@ -1129,8 +1087,6 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader class spell_gen_count_pct_from_max_hp_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_count_pct_from_max_hp_SpellScript); - public: spell_gen_count_pct_from_max_hp_SpellScript(int32 damagePct) : SpellScript(), _damagePct(damagePct) { } @@ -1144,7 +1100,7 @@ class spell_gen_count_pct_from_max_hp : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); + OnHit.Register(&spell_gen_count_pct_from_max_hp_SpellScript::RecalculateDamage); } private: @@ -1174,8 +1130,6 @@ class spell_gen_create_lance : public SpellScriptLoader class spell_gen_create_lance_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_create_lance_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1200,7 +1154,7 @@ class spell_gen_create_lance : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_create_lance_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1217,8 +1171,6 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader class spell_gen_creature_permanent_feign_death_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_creature_permanent_feign_death_AuraScript); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1241,8 +1193,8 @@ class spell_gen_creature_permanent_feign_death : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gen_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_creature_permanent_feign_death_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_gen_creature_permanent_feign_death_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_gen_creature_permanent_feign_death_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1270,8 +1222,6 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader class spell_gen_dalaran_disguise_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_dalaran_disguise_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { switch (spellInfo->Id) @@ -1321,7 +1271,7 @@ class spell_gen_dalaran_disguise : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_dalaran_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1344,8 +1294,6 @@ class spell_gen_decay_over_time : public SpellScriptLoader private: class spell_gen_decay_over_time_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_decay_over_time_SpellScript); - void ModAuraStack() { if (Aura* aur = GetHitAura()) @@ -1354,7 +1302,7 @@ class spell_gen_decay_over_time : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_gen_decay_over_time_SpellScript::ModAuraStack); + AfterHit.Register(&spell_gen_decay_over_time_SpellScript::ModAuraStack); } }; @@ -1362,8 +1310,6 @@ class spell_gen_decay_over_time : public SpellScriptLoader class spell_gen_decay_over_time_AuraScript : public AuraScript { protected: - PrepareAuraScript(spell_gen_decay_over_time_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { return (eventInfo.GetSpellInfo() == GetSpellInfo()); @@ -1377,8 +1323,8 @@ class spell_gen_decay_over_time : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_decay_over_time_AuraScript::CheckProc); - OnProc += AuraProcFn(spell_gen_decay_over_time_AuraScript::Decay); + DoCheckProc.Register(&spell_gen_decay_over_time_AuraScript::CheckProc); + OnProc.Register(&spell_gen_decay_over_time_AuraScript::Decay); } ~spell_gen_decay_over_time_AuraScript() = default; @@ -1401,8 +1347,6 @@ class spell_gen_decay_over_time_fungal_decay : public spell_gen_decay_over_time class spell_gen_decay_over_time_fungal_decay_AuraScript : public spell_gen_decay_over_time_AuraScript { - PrepareAuraScript(spell_gen_decay_over_time_fungal_decay_AuraScript); - void ModDuration(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // only on actual reapply, not on stack decay @@ -1416,7 +1360,7 @@ class spell_gen_decay_over_time_fungal_decay : public spell_gen_decay_over_time void Register() override { spell_gen_decay_over_time_AuraScript::Register(); - OnEffectApply += AuraEffectApplyFn(spell_gen_decay_over_time_fungal_decay_AuraScript::ModDuration, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply.Register(&spell_gen_decay_over_time_fungal_decay_AuraScript::ModDuration, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1432,14 +1376,9 @@ class spell_gen_decay_over_time_tail_sting : public spell_gen_decay_over_time public: spell_gen_decay_over_time_tail_sting() : spell_gen_decay_over_time("spell_gen_decay_over_time_tail_sting") { } - class spell_gen_decay_over_time_tail_sting_AuraScript : public spell_gen_decay_over_time_AuraScript - { - PrepareAuraScript(spell_gen_decay_over_time_tail_sting_AuraScript); - }; - AuraScript* GetAuraScript() const override { - return new spell_gen_decay_over_time_tail_sting_AuraScript(); + return new spell_gen_decay_over_time_AuraScript(); } }; @@ -1457,8 +1396,6 @@ class spell_gen_defend : public SpellScriptLoader class spell_gen_defend_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_defend_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1505,19 +1442,19 @@ class spell_gen_defend : public SpellScriptLoader // Defend spells cast by NPCs (add visuals) if (spell->Effects[EFFECT_0].ApplyAuraName == SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN) { - AfterEffectApply += AuraEffectApplyFn(spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply.Register(&spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove.Register(&spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } // Remove Defend spell from player when he dismounts if (spell->Effects[EFFECT_2].ApplyAuraName == SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN) - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveDummyFromDriver, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_gen_defend_AuraScript::RemoveDummyFromDriver, EFFECT_2, SPELL_AURA_MOD_DAMAGE_PERCENT_TAKEN, AURA_EFFECT_HANDLE_REAL); // Defend spells cast by players (add/remove visuals) if (spell->Effects[EFFECT_1].ApplyAuraName == SPELL_AURA_DUMMY) { - AfterEffectApply += AuraEffectApplyFn(spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + AfterEffectApply.Register(&spell_gen_defend_AuraScript::RefreshVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove.Register(&spell_gen_defend_AuraScript::RemoveVisualShields, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); } } }; @@ -1535,8 +1472,6 @@ class spell_gen_despawn_self : public SpellScriptLoader class spell_gen_despawn_self_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_despawn_self_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1550,7 +1485,7 @@ class spell_gen_despawn_self : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); + OnEffectHitTarget.Register(&spell_gen_despawn_self_SpellScript::HandleDummy, EFFECT_ALL, SPELL_EFFECT_ANY); } }; @@ -1573,8 +1508,6 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader class spell_gen_divine_storm_cd_reset_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_divine_storm_cd_reset_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1594,7 +1527,7 @@ class spell_gen_divine_storm_cd_reset : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_divine_storm_cd_reset_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1611,8 +1544,6 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader class spell_gen_ds_flush_knockback_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_ds_flush_knockback_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { // Here the target is the water spout and determines the position where the player is knocked from @@ -1631,7 +1562,7 @@ class spell_gen_ds_flush_knockback : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_ds_flush_knockback_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1648,8 +1579,6 @@ class spell_gen_dungeon_credit : public SpellScriptLoader class spell_gen_dungeon_credit_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_dungeon_credit_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -1669,7 +1598,7 @@ class spell_gen_dungeon_credit : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_gen_dungeon_credit_SpellScript::CreditEncounter); + AfterHit.Register(&spell_gen_dungeon_credit_SpellScript::CreditEncounter); } bool _handled = false; @@ -1701,8 +1630,6 @@ class spell_gen_elune_candle : public SpellScriptLoader class spell_gen_elune_candle_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_elune_candle_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1745,7 +1672,7 @@ class spell_gen_elune_candle : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_elune_candle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1772,8 +1699,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()); @@ -1798,16 +1723,14 @@ class spell_ethereal_pet_aura : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_ethereal_pet_aura::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_ethereal_pet_aura::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_ethereal_pet_aura::CheckProc); + OnEffectProc.Register(&spell_ethereal_pet_aura::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 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 }); @@ -1821,15 +1744,13 @@ class spell_ethereal_pet_onsummon : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ethereal_pet_onsummon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ethereal_pet_onsummon::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 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 }); @@ -1842,15 +1763,13 @@ class spell_ethereal_pet_aura_remove : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_ethereal_pet_aura_remove::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_ethereal_pet_aura_remove::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 50101 - Steal Essence Visual class spell_steal_essence_visual : public AuraScript { - PrepareAuraScript(spell_steal_essence_visual); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1863,7 +1782,7 @@ class spell_steal_essence_visual : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_steal_essence_visual::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_steal_essence_visual::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1881,8 +1800,6 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader class spell_gen_gadgetzan_transporter_backfire_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_gadgetzan_transporter_backfire_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1907,7 +1824,7 @@ class spell_gen_gadgetzan_transporter_backfire : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_gadgetzan_transporter_backfire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1925,8 +1842,6 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader class spell_gen_gift_of_naaru_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_gift_of_naaru_AuraScript); - void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) { Unit* target = GetOwner()->ToUnit(); @@ -1942,7 +1857,7 @@ class spell_gen_gift_of_naaru : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_gen_gift_of_naaru_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; @@ -1965,8 +1880,6 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader class spell_gen_gnomish_transporter_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_gnomish_transporter_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1983,7 +1896,7 @@ class spell_gen_gnomish_transporter : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_gnomish_transporter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2008,8 +1921,6 @@ class spell_gen_interrupt : public SpellScriptLoader class spell_gen_interrupt_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_interrupt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_THROW_INTERRUPT }); @@ -2023,7 +1934,7 @@ class spell_gen_interrupt : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_gen_interrupt_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_gen_interrupt_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2040,8 +1951,6 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader class spell_gen_increase_stats_buff_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_increase_stats_buff_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitUnit()->IsInRaidWith(GetCaster())) @@ -2052,7 +1961,7 @@ class spell_gen_increase_stats_buff : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_increase_stats_buff_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_increase_stats_buff_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2078,8 +1987,6 @@ class spell_gen_lifebloom : public SpellScriptLoader class spell_gen_lifebloom_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_lifebloom_AuraScript); - public: spell_gen_lifebloom_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } @@ -2100,7 +2007,7 @@ class spell_gen_lifebloom : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_lifebloom_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); } private: @@ -2173,8 +2080,6 @@ class spell_gen_mounted_charge: public SpellScriptLoader class spell_gen_mounted_charge_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_mounted_charge_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { Unit* target = GetHitUnit(); @@ -2264,10 +2169,10 @@ class spell_gen_mounted_charge: public SpellScriptLoader SpellInfo const* spell = sSpellMgr->AssertSpellInfo(m_scriptSpellId); if (spell->HasEffect(SPELL_EFFECT_SCRIPT_EFFECT)) - OnEffectHitTarget += SpellEffectFn(spell_gen_mounted_charge_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_mounted_charge_SpellScript::HandleScriptEffect, EFFECT_FIRST_FOUND, SPELL_EFFECT_SCRIPT_EFFECT); if (spell->Effects[EFFECT_0].Effect == SPELL_EFFECT_CHARGE) - OnEffectHitTarget += SpellEffectFn(spell_gen_mounted_charge_SpellScript::HandleChargeEffect, EFFECT_0, SPELL_EFFECT_CHARGE); + OnEffectHitTarget.Register(&spell_gen_mounted_charge_SpellScript::HandleChargeEffect, EFFECT_0, SPELL_EFFECT_CHARGE); } }; @@ -2291,8 +2196,6 @@ class spell_gen_moss_covered_feet : public SpellScriptLoader class spell_gen_moss_covered_feet_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_moss_covered_feet_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FALL_DOWN }); @@ -2306,7 +2209,7 @@ class spell_gen_moss_covered_feet : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_gen_moss_covered_feet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_gen_moss_covered_feet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2329,8 +2232,6 @@ class spell_gen_netherbloom : public SpellScriptLoader class spell_gen_netherbloom_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_netherbloom_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < 5; ++i) @@ -2365,7 +2266,7 @@ class spell_gen_netherbloom : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_netherbloom_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2388,8 +2289,6 @@ class spell_gen_nightmare_vine : public SpellScriptLoader class spell_gen_nightmare_vine_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_nightmare_vine_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_NIGHTMARE_POLLEN }); @@ -2409,7 +2308,7 @@ class spell_gen_nightmare_vine : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_nightmare_vine_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2437,8 +2336,6 @@ class spell_gen_obsidian_armor : public SpellScriptLoader class spell_gen_obsidian_armor_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_obsidian_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2497,8 +2394,8 @@ class spell_gen_obsidian_armor : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_obsidian_armor_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_obsidian_armor_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_gen_obsidian_armor_AuraScript::CheckProc); + OnEffectProc.Register(&spell_gen_obsidian_armor_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2515,8 +2412,6 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader class spell_gen_oracle_wolvar_reputation_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_oracle_wolvar_reputation_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2542,7 +2437,7 @@ class spell_gen_oracle_wolvar_reputation : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_gen_oracle_wolvar_reputation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2566,8 +2461,6 @@ class spell_gen_orc_disguise : public SpellScriptLoader class spell_gen_orc_disguise_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_orc_disguise_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2593,7 +2486,7 @@ class spell_gen_orc_disguise : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_orc_disguise_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2616,8 +2509,6 @@ class spell_gen_paralytic_poison : public SpellScriptLoader class spell_gen_paralytic_poison_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_paralytic_poison_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PARALYSIS }); @@ -2633,7 +2524,7 @@ class spell_gen_paralytic_poison : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_paralytic_poison_AuraScript::HandleStun, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_paralytic_poison_AuraScript::HandleStun, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -2650,8 +2541,6 @@ class spell_gen_proc_below_pct_damaged : public SpellScriptLoader class spell_gen_proc_below_pct_damaged_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_proc_below_pct_damaged_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -2668,7 +2557,7 @@ class spell_gen_proc_below_pct_damaged : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_proc_below_pct_damaged_AuraScript::CheckProc); + DoCheckProc.Register(&spell_gen_proc_below_pct_damaged_AuraScript::CheckProc); } }; @@ -2685,8 +2574,6 @@ class spell_gen_proc_charge_drop_only : public SpellScriptLoader class spell_gen_proc_charge_drop_only_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_proc_charge_drop_only_AuraScript); - void HandleChargeDrop(ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -2694,7 +2581,7 @@ class spell_gen_proc_charge_drop_only : public SpellScriptLoader void Register() override { - OnProc += AuraProcFn(spell_gen_proc_charge_drop_only_AuraScript::HandleChargeDrop); + OnProc.Register(&spell_gen_proc_charge_drop_only_AuraScript::HandleChargeDrop); } }; @@ -2718,8 +2605,6 @@ class spell_gen_parachute : public SpellScriptLoader class spell_gen_parachute_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_parachute_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2741,7 +2626,7 @@ class spell_gen_parachute : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_parachute_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -2765,8 +2650,6 @@ class spell_gen_pet_summoned : public SpellScriptLoader class spell_gen_pet_summoned_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_pet_summoned_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2805,7 +2688,7 @@ class spell_gen_pet_summoned : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_pet_summoned_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2822,8 +2705,6 @@ class spell_gen_profession_research : public SpellScriptLoader class spell_gen_profession_research_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_profession_research_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2854,8 +2735,8 @@ class spell_gen_profession_research : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_profession_research_SpellScript::CheckRequirement); - OnEffectHitTarget += SpellEffectFn(spell_gen_profession_research_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnCheckCast.Register(&spell_gen_profession_research_SpellScript::CheckRequirement); + OnEffectHitTarget.Register(&spell_gen_profession_research_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2872,8 +2753,6 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader class spell_gen_remove_flight_auras_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_remove_flight_auras_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -2885,7 +2764,7 @@ class spell_gen_remove_flight_auras : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_remove_flight_auras_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2920,8 +2799,6 @@ class spell_gen_replenishment : public SpellScriptLoader class spell_gen_replenishment_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_replenishment_SpellScript); - void RemoveInvalidTargets(std::list& targets) { // In arenas Replenishment may only affect the caster @@ -2948,7 +2825,7 @@ class spell_gen_replenishment : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_replenishment_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); + OnObjectAreaTargetSelect.Register(&spell_gen_replenishment_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); } }; @@ -2959,8 +2836,6 @@ class spell_gen_replenishment : public SpellScriptLoader class spell_gen_replenishment_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_replenishment_AuraScript); - bool Load() override { return GetUnitOwner()->GetPowerType() == POWER_MANA; @@ -2981,7 +2856,7 @@ class spell_gen_replenishment : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); + DoEffectCalcAmount.Register(&spell_gen_replenishment_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_ENERGIZE); } }; @@ -3006,8 +2881,6 @@ class spell_gen_running_wild : public SpellScriptLoader class spell_gen_running_wild_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_running_wild_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { if (!sCreatureDisplayInfoStore.LookupEntry(RUNNING_WILD_MODEL_MALE)) @@ -3031,14 +2904,12 @@ class spell_gen_running_wild : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gen_running_wild_AuraScript::HandleMount, EFFECT_1, SPELL_AURA_MOUNTED, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_gen_running_wild_AuraScript::HandleMount, EFFECT_1, SPELL_AURA_MOUNTED, AURA_EFFECT_HANDLE_REAL); } }; class spell_gen_running_wild_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_running_wild_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_ALTERED_FORM }); @@ -3075,8 +2946,6 @@ class spell_gen_two_forms : public SpellScriptLoader class spell_gen_two_forms_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_two_forms_SpellScript); - SpellCastResult CheckCast() { if (GetCaster()->IsInCombat()) @@ -3107,8 +2976,8 @@ class spell_gen_two_forms : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_two_forms_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_gen_two_forms_SpellScript::HandleTransform, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_gen_two_forms_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_gen_two_forms_SpellScript::HandleTransform, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3125,8 +2994,6 @@ class spell_gen_darkflight : public SpellScriptLoader class spell_gen_darkflight_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_darkflight_SpellScript); - void TriggerTransform() { GetCaster()->CastSpell(GetCaster(), SPELL_ALTERED_FORM, TRIGGERED_FULL_MASK); @@ -3134,7 +3001,7 @@ class spell_gen_darkflight : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_gen_darkflight_SpellScript::TriggerTransform); + AfterCast.Register(&spell_gen_darkflight_SpellScript::TriggerTransform); } }; @@ -3155,8 +3022,6 @@ class spell_gen_seaforium_blast : public SpellScriptLoader class spell_gen_seaforium_blast_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_seaforium_blast_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PLANT_CHARGES_CREDIT_ACHIEVEMENT }); @@ -3179,7 +3044,7 @@ class spell_gen_seaforium_blast : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); + OnEffectHitTarget.Register(&spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; @@ -3205,8 +3070,6 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader class spell_gen_spectator_cheer_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_spectator_cheer_trigger_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { GetCaster()->HandleEmoteCommand(EmoteArray[urand(0, 2)]); @@ -3214,7 +3077,7 @@ class spell_gen_spectator_cheer_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_spectator_cheer_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3231,8 +3094,6 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader class spell_gen_spirit_healer_res_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_spirit_healer_res_SpellScript); - bool Load() override { return GetOriginalCaster() && GetOriginalCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3251,7 +3112,7 @@ class spell_gen_spirit_healer_res : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_spirit_healer_res_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3274,8 +3135,6 @@ class spell_gen_summon_elemental : public SpellScriptLoader class spell_gen_summon_elemental_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_summon_elemental_AuraScript); - public: spell_gen_summon_elemental_AuraScript(uint32 spellId) : AuraScript(), _spellId(spellId) { } @@ -3301,8 +3160,8 @@ class spell_gen_summon_elemental : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_summon_elemental_AuraScript::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_summon_elemental_AuraScript::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } private: @@ -3330,8 +3189,6 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader class spell_gen_summon_tournament_mount_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_summon_tournament_mount_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LANCE_EQUIPPED }); @@ -3353,7 +3210,7 @@ class spell_gen_summon_tournament_mount : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); + OnCheckCast.Register(&spell_gen_summon_tournament_mount_SpellScript::CheckIfLanceEquiped); } }; @@ -3371,8 +3228,6 @@ class spell_gen_throw_shield : public SpellScriptLoader class spell_gen_throw_shield_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_throw_shield_SpellScript); - void HandleScriptEffect(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -3381,7 +3236,7 @@ class spell_gen_throw_shield : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_throw_shield_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_throw_shield_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3404,8 +3259,6 @@ class spell_gen_tournament_duel : public SpellScriptLoader class spell_gen_tournament_duel_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_tournament_duel_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3434,7 +3287,7 @@ class spell_gen_tournament_duel : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_tournament_duel_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3451,8 +3304,6 @@ class spell_gen_tournament_pennant : public SpellScriptLoader class spell_gen_tournament_pennant_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_tournament_pennant_AuraScript); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3467,7 +3318,7 @@ class spell_gen_tournament_pennant : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply.Register(&spell_gen_tournament_pennant_AuraScript::HandleApplyEffect, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -3489,8 +3340,6 @@ class spell_gen_turkey_marker : public SpellScriptLoader class spell_gen_turkey_marker_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_turkey_marker_AuraScript); - void OnApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { // store stack apply times, so we can pop them while they expire @@ -3514,8 +3363,8 @@ class spell_gen_turkey_marker : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_gen_turkey_marker_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_turkey_marker_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_gen_turkey_marker_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic.Register(&spell_gen_turkey_marker_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } std::list _applyTimes; @@ -3543,8 +3392,6 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader class spell_gen_upper_deck_create_foam_sword_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_upper_deck_create_foam_sword_SpellScript); - void HandleScript(SpellEffIndex effIndex) { if (Player* player = GetHitPlayer()) @@ -3563,7 +3410,7 @@ class spell_gen_upper_deck_create_foam_sword : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_upper_deck_create_foam_sword_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3587,8 +3434,6 @@ class spell_gen_vampiric_touch : public SpellScriptLoader class spell_gen_vampiric_touch_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_vampiric_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VAMPIRIC_TOUCH_HEAL }); @@ -3608,7 +3453,7 @@ class spell_gen_vampiric_touch : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_gen_vampiric_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_gen_vampiric_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -3620,8 +3465,6 @@ class spell_gen_vampiric_touch : public SpellScriptLoader class spell_gen_vehicle_scaling_trigger : public SpellScript { - PrepareSpellScript(spell_gen_vehicle_scaling_trigger); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_0].BasePoints) }); @@ -3635,7 +3478,7 @@ class spell_gen_vehicle_scaling_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_vehicle_scaling_trigger::HandleEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_vehicle_scaling_trigger::HandleEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3649,8 +3492,6 @@ enum VehicleScaling class spell_gen_vehicle_scaling : public AuraScript { - PrepareAuraScript(spell_gen_vehicle_scaling); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3696,15 +3537,15 @@ class spell_gen_vehicle_scaling : public AuraScript { case SPELL_GEAR_SCALING_CATA_N: case SPELL_GEAR_SCALING_CATA_HC: - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_DONE_PERCENT); + DoEffectCalcAmount.Register(&spell_gen_vehicle_scaling::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_DONE_PERCENT); break; default: - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); + DoEffectCalcAmount.Register(&spell_gen_vehicle_scaling::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_HEALING_PCT); break; } - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_vehicle_scaling::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT); + DoEffectCalcAmount.Register(&spell_gen_vehicle_scaling::CalculateAmount, EFFECT_1, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); + DoEffectCalcAmount.Register(&spell_gen_vehicle_scaling::CalculateAmount, EFFECT_2, SPELL_AURA_MOD_INCREASE_HEALTH_PERCENT); } }; @@ -3721,8 +3562,6 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader class spell_gen_vendor_bark_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_vendor_bark_trigger_SpellScript); - void HandleDummy(SpellEffIndex /* effIndex */) { if (Creature* vendor = GetCaster()->ToCreature()) @@ -3732,7 +3571,7 @@ class spell_gen_vendor_bark_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_vendor_bark_trigger_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3750,8 +3589,6 @@ class spell_gen_wg_water : public SpellScriptLoader class spell_gen_wg_water_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_wg_water_SpellScript); - SpellCastResult CheckCast() { if (!GetSpellInfo()->CheckTargetCreatureType(GetCaster())) @@ -3761,7 +3598,7 @@ class spell_gen_wg_water : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_wg_water_SpellScript::CheckCast); + OnCheckCast.Register(&spell_gen_wg_water_SpellScript::CheckCast); } }; @@ -3783,8 +3620,6 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader class spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_YOGG_SARON_WHISPER_DUMMY }); @@ -3798,7 +3633,7 @@ class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -3815,8 +3650,6 @@ class spell_gen_eject_all_passengers : public SpellScriptLoader class spell_gen_eject_all_passengers_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_eject_all_passengers_SpellScript); - void RemoveVehicleAuras() { if (Vehicle* vehicle = GetHitUnit()->GetVehicleKit()) @@ -3825,7 +3658,7 @@ class spell_gen_eject_all_passengers : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_gen_eject_all_passengers_SpellScript::RemoveVehicleAuras); + AfterHit.Register(&spell_gen_eject_all_passengers_SpellScript::RemoveVehicleAuras); } }; @@ -3848,8 +3681,6 @@ class spell_gen_eject_passenger : public SpellScriptLoader class spell_gen_eject_passenger_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_eject_passenger_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { if (spellInfo->Effects[EFFECT_0].CalcValue() < 1) @@ -3892,7 +3723,7 @@ class spell_gen_eject_passenger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_eject_passenger_SpellScript::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_eject_passenger_SpellScript::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -3914,8 +3745,6 @@ class spell_gen_gm_freeze : public SpellScriptLoader class spell_gen_gm_freeze_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_gm_freeze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GM_FREEZE }); @@ -3962,8 +3791,8 @@ class spell_gen_gm_freeze : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_gen_gm_freeze_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_gen_gm_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_gen_gm_freeze_AuraScript::OnApply, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_gen_gm_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -3980,9 +3809,7 @@ public: class spell_gen_stand_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_stand_SpellScript); - - void HandleScript(SpellEffIndex /*eff*/) + void HandleScript(SpellEffIndex /*eff*/) { Creature* target = GetHitCreature(); if (!target) @@ -3994,7 +3821,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_stand_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -4099,8 +3926,6 @@ public: class spell_gen_mixology_bonus_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_mixology_bonus_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MIXOLOGY }); @@ -4293,7 +4118,7 @@ public: void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_gen_mixology_bonus_AuraScript::CalculateAmount, EFFECT_ALL, SPELL_AURA_ANY); + DoEffectCalcAmount.Register(&spell_gen_mixology_bonus_AuraScript::CalculateAmount, EFFECT_ALL, SPELL_AURA_ANY); } }; @@ -4315,9 +4140,7 @@ public: class spell_gen_landmine_knockback_achievement_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_landmine_knockback_achievement_SpellScript); - - void HandleScript(SpellEffIndex /*effIndex*/) + void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) { @@ -4331,7 +4154,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_landmine_knockback_achievement_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_landmine_knockback_achievement_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -4349,8 +4172,6 @@ class spell_gen_clear_debuffs : public SpellScriptLoader class spell_gen_clear_debuffs_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_clear_debuffs_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) @@ -4365,7 +4186,7 @@ class spell_gen_clear_debuffs : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_clear_debuffs_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -4388,8 +4209,6 @@ class spell_gen_pony_mount_check : public SpellScriptLoader class spell_gen_pony_mount_check_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_pony_mount_check_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { Unit* caster = GetCaster(); @@ -4413,7 +4232,7 @@ class spell_gen_pony_mount_check : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_pony_mount_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_pony_mount_check_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -4465,8 +4284,6 @@ class spell_gen_armor_specialization : public SpellScriptLoader class spell_gen_armor_specialization_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_armor_specialization_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4573,7 +4390,7 @@ class spell_gen_armor_specialization : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_armor_specialization_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_armor_specialization_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4598,8 +4415,6 @@ class spell_gen_pvp_trinket : public SpellScriptLoader class spell_gen_pvp_trinket_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_pvp_trinket_SpellScript); - void HandlePvPTrinketVisual() { if (Unit* caster = GetCaster()) @@ -4613,7 +4428,7 @@ class spell_gen_pvp_trinket : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_gen_pvp_trinket_SpellScript::HandlePvPTrinketVisual); + AfterHit.Register(&spell_gen_pvp_trinket_SpellScript::HandlePvPTrinketVisual); } }; @@ -4635,8 +4450,6 @@ class spell_gen_blink : public SpellScriptLoader class spell_gen_blink_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_blink_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BLINK_TARGET }); @@ -4671,8 +4484,8 @@ class spell_gen_blink : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_gen_blink_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_gen_blink_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_gen_blink_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4689,9 +4502,7 @@ public: class spell_gen_toxic_blow_dart_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_toxic_blow_dart_SpellScript); - - void FilterTargets(std::list& targets) + void FilterTargets(std::list& targets) { if (targets.empty()) return; @@ -4701,7 +4512,7 @@ public: void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_toxic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_gen_toxic_blow_dart_SpellScript::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY); } }; @@ -4726,8 +4537,6 @@ class spell_gen_projectile_goods : public SpellScriptLoader class spell_gen_projectile_goods_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_projectile_goods_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4762,7 +4571,7 @@ class spell_gen_projectile_goods : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_projectile_goods_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_projectile_goods_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -4780,8 +4589,6 @@ enum Vengeance // 93098 - 93099 - 84839 - 84840 - Vengeance class spell_gen_vengeance : public AuraScript { - PrepareAuraScript(spell_gen_vengeance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VENGEANCE_TRIGGERED }); @@ -4809,8 +4616,8 @@ class spell_gen_vengeance : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_vengeance::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_vengeance::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_gen_vengeance::CheckProc); + OnEffectProc.Register(&spell_gen_vengeance::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -4825,8 +4632,6 @@ typedef std::vector DamageInfoContainer; // 76691 - Vengeance class spell_gen_vengeance_triggered : public AuraScript { - PrepareAuraScript(spell_gen_vengeance_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_VENGEANCE_TRIGGERED }); @@ -4872,9 +4677,9 @@ class spell_gen_vengeance_triggered : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_gen_vengeance_triggered::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_gen_vengeance_triggered::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_ATTACK_POWER); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_vengeance_triggered::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); + DoCheckProc.Register(&spell_gen_vengeance_triggered::CheckProc); + OnEffectProc.Register(&spell_gen_vengeance_triggered::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_ATTACK_POWER); + OnEffectPeriodic.Register(&spell_gen_vengeance_triggered::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); } private: DamageInfoContainer _damageInfo; @@ -4917,8 +4722,6 @@ class spell_gen_gilneas_prison_periodic_dummy : public SpellScriptLoader class spell_gen_gilneas_prison_periodic_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_gilneas_prison_periodic_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4956,7 +4759,7 @@ class spell_gen_gilneas_prison_periodic_dummy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_gilneas_prison_periodic_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_gilneas_prison_periodic_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4979,8 +4782,6 @@ class spell_gen_throw_torch : public SpellScriptLoader class spell_gen_throw_torch_SpellScript : public SpellScript { - PrepareSpellScript(spell_gen_throw_torch_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( { SPELL_THROW_TORCH }); @@ -4995,7 +4796,7 @@ class spell_gen_throw_torch : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_gen_throw_torch_SpellScript::HandleEffect); + BeforeHit.Register(&spell_gen_throw_torch_SpellScript::HandleEffect); } }; @@ -5007,8 +4808,6 @@ class spell_gen_throw_torch : public SpellScriptLoader class spell_gen_revserse_cast_mirror_image : public SpellScript { - PrepareSpellScript(spell_gen_revserse_cast_mirror_image); - void HandleScript(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -5017,14 +4816,12 @@ class spell_gen_revserse_cast_mirror_image : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_revserse_cast_mirror_image::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_revserse_cast_mirror_image::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_gen_mirror_image_aura : public SpellScript { - PrepareSpellScript(spell_gen_mirror_image_aura); - void HandleScript(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -5033,16 +4830,14 @@ class spell_gen_mirror_image_aura : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_mirror_image_aura::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_gen_mirror_image_aura::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_mirror_image_aura::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_mirror_image_aura::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_gen_reverse_cast_ride_vehicle : public SpellScript { - PrepareSpellScript(spell_gen_reverse_cast_ride_vehicle); - void HandleScript(SpellEffIndex effIndex) { if (Unit* caster = GetCaster()) @@ -5051,7 +4846,7 @@ class spell_gen_reverse_cast_ride_vehicle : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_reverse_cast_ride_vehicle::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_gen_reverse_cast_ride_vehicle::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -5073,8 +4868,6 @@ private: class spell_gen_launch_quest : public SpellScript { - PrepareSpellScript(spell_gen_launch_quest); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_UNIT; @@ -5089,15 +4882,13 @@ class spell_gen_launch_quest : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_launch_quest::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_gen_launch_quest::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; // 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(); @@ -5111,14 +4902,12 @@ class spell_gen_charmed_unit_spell_cooldown : public SpellScript void Register() override { - OnCast += SpellCastFn(spell_gen_charmed_unit_spell_cooldown::HandleCast); + OnCast.Register(&spell_gen_charmed_unit_spell_cooldown::HandleCast); } }; class spell_gen_flurry_of_claws : public AuraScript { - PrepareAuraScript(spell_gen_flurry_of_claws); - void HandlePeriodic(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -5129,7 +4918,7 @@ class spell_gen_flurry_of_claws : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_flurry_of_claws::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_flurry_of_claws::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -5141,8 +4930,6 @@ enum Sunflower // 93971 - Sunflower (DND) class spell_gen_sunflower_dnd : public AuraScript { - PrepareAuraScript(spell_gen_sunflower_dnd); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SINGING_SUNFLOWER_DND }); @@ -5155,7 +4942,7 @@ class spell_gen_sunflower_dnd : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_sunflower_dnd::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_sunflower_dnd::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -5177,8 +4964,6 @@ enum GuildBattleStandard // 89481 - Guild Battle Standard class spell_gen_guild_battle_standard : public AuraScript { - PrepareAuraScript(spell_gen_guild_battle_standard); - bool Load() override { return GetCaster()->IsCreature(); @@ -5235,7 +5020,7 @@ class spell_gen_guild_battle_standard : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_guild_battle_standard::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_gen_guild_battle_standard::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -5243,8 +5028,6 @@ class spell_gen_guild_battle_standard : public AuraScript // 90708 - Guild Battle Standard class spell_gen_guild_battle_standard_buff : public SpellScript { - PrepareSpellScript(spell_gen_guild_battle_standard_buff); - bool Load() override { return GetCaster()->IsSummon(); @@ -5261,7 +5044,7 @@ class spell_gen_guild_battle_standard_buff : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_gen_guild_battle_standard_buff::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_gen_guild_battle_standard_buff::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -5274,8 +5057,6 @@ enum MobileBanking // 83958 - Mobile Banking class spell_gen_mobile_banking : public SpellScript { - PrepareSpellScript(spell_gen_mobile_banking); - bool Load() override { return GetCaster()->IsPlayer(); @@ -5307,8 +5088,8 @@ class spell_gen_mobile_banking : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_gen_mobile_banking::CheckRequirement); - OnEffectHitTarget += SpellEffectFn(spell_gen_mobile_banking::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnCheckCast.Register(&spell_gen_mobile_banking::CheckRequirement); + OnEffectHitTarget.Register(&spell_gen_mobile_banking::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -5316,8 +5097,6 @@ class spell_gen_mobile_banking : public SpellScript // 92712 - Big Cauldron of Battle class spell_gen_cauldron_of_battle : public SpellScript { - PrepareSpellScript(spell_gen_cauldron_of_battle); - bool Load() override { return GetCaster()->IsPlayer(); @@ -5352,8 +5131,8 @@ class spell_gen_cauldron_of_battle : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_cauldron_of_battle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_gen_cauldron_of_battle::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_cauldron_of_battle::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_cauldron_of_battle::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -5371,8 +5150,6 @@ enum FlaskOfBattle // 92679 - Flask of Battle class spell_gen_flask_of_battle : public SpellScript { - PrepareSpellScript(spell_gen_flask_of_battle); - bool Load() override { return GetCaster()->IsPlayer(); @@ -5465,7 +5242,7 @@ class spell_gen_flask_of_battle : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_gen_flask_of_battle::HandleBuffEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_gen_flask_of_battle::HandleBuffEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -5478,8 +5255,6 @@ enum TheQuickAndTheDead // 8326 - Ghost class spell_gen_ghost : public AuraScript { - PrepareAuraScript(spell_gen_ghost); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -5505,15 +5280,13 @@ class spell_gen_ghost : public AuraScript void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_gen_ghost::AfterApply, EFFECT_0, SPELL_AURA_GHOST, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_gen_ghost::AfterRemove, EFFECT_0, SPELL_AURA_GHOST, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_ghost::AfterApply, EFFECT_0, SPELL_AURA_GHOST, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_gen_ghost::AfterRemove, EFFECT_0, SPELL_AURA_GHOST, AURA_EFFECT_HANDLE_REAL); } }; class spell_gen_zero_energy_zero_regen : public AuraScript { - PrepareAuraScript(spell_gen_zero_energy_zero_regen); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetPower(POWER_ENERGY, 0); @@ -5521,7 +5294,7 @@ class spell_gen_zero_energy_zero_regen : public AuraScript void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_gen_zero_energy_zero_regen::AfterApply, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_gen_zero_energy_zero_regen::AfterApply, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT, AURA_EFFECT_HANDLE_REAL); } }; diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 47fde45418..6253557b58 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -51,8 +51,6 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader class spell_love_is_in_the_air_romantic_picnic_AuraScript : public AuraScript { - PrepareAuraScript(spell_love_is_in_the_air_romantic_picnic_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -104,8 +102,8 @@ class spell_love_is_in_the_air_romantic_picnic : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_love_is_in_the_air_romantic_picnic_AuraScript::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_love_is_in_the_air_romantic_picnic_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -133,8 +131,6 @@ class spell_hallow_end_candy : public SpellScriptLoader class spell_hallow_end_candy_SpellScript : public SpellScript { - PrepareSpellScript(spell_hallow_end_candy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(spells); @@ -147,7 +143,7 @@ class spell_hallow_end_candy : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_hallow_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_hallow_end_candy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } private: @@ -176,8 +172,6 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader class spell_hallow_end_candy_pirate_AuraScript : public AuraScript { - PrepareAuraScript(spell_hallow_end_candy_pirate_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -201,8 +195,8 @@ class spell_hallow_end_candy_pirate : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hallow_end_candy_pirate_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_hallow_end_candy_pirate_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_hallow_end_candy_pirate_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_hallow_end_candy_pirate_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_MOD_INCREASE_SWIM_SPEED, AURA_EFFECT_HANDLE_REAL); } }; @@ -234,8 +228,6 @@ class spell_hallow_end_trick : public SpellScriptLoader class spell_hallow_end_trick_SpellScript : public SpellScript { - PrepareSpellScript(spell_hallow_end_trick_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -287,7 +279,7 @@ class spell_hallow_end_trick : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hallow_end_trick_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -315,8 +307,6 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader class spell_hallow_end_trick_or_treat_SpellScript : public SpellScript { - PrepareSpellScript(spell_hallow_end_trick_or_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TRICK, SPELL_TREAT, SPELL_TRICKED_OR_TREATED }); @@ -334,7 +324,7 @@ class spell_hallow_end_trick_or_treat : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hallow_end_trick_or_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -351,8 +341,6 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader class spell_hallow_end_tricky_treat_SpellScript : public SpellScript { - PrepareSpellScript(spell_hallow_end_tricky_treat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -372,7 +360,7 @@ class spell_hallow_end_tricky_treat : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hallow_end_tricky_treat_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -403,8 +391,6 @@ public: class spell_hallow_end_wand_SpellScript : public SpellScript { - PrepareSpellScript(spell_hallow_end_wand_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo( @@ -453,7 +439,7 @@ public: void Register() override { - AfterHit += SpellHitFn(spell_hallow_end_wand_SpellScript::HandleScriptEffect); + AfterHit.Register(&spell_hallow_end_wand_SpellScript::HandleScriptEffect); } }; @@ -482,7 +468,6 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader class spell_pilgrims_bounty_buff_food_AuraScript : public AuraScript { - PrepareAuraScript(spell_pilgrims_bounty_buff_food_AuraScript); private: uint32 const _triggeredSpellId; @@ -504,7 +489,7 @@ class spell_pilgrims_bounty_buff_food : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_pilgrims_bounty_buff_food_AuraScript::HandleTriggerSpell, EFFECT_2, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } bool _handled; @@ -538,8 +523,6 @@ class spell_pilgrims_bounty_feast_on : public SpellScriptLoader class spell_pilgrims_bounty_feast_on_SpellScript : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_feast_on_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -584,7 +567,7 @@ class spell_pilgrims_bounty_feast_on : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_feast_on_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pilgrims_bounty_feast_on_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -611,8 +594,6 @@ class spell_pilgrims_bounty_turkey_tracker : public SpellScriptLoader class spell_pilgrims_bounty_turkey_tracker_SpellScript : public SpellScript { - PrepareSpellScript(spell_pilgrims_bounty_turkey_tracker_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_KILL_COUNTER_VISUAL, SPELL_KILL_COUNTER_VISUAL_MAX }); @@ -656,7 +637,7 @@ class spell_pilgrims_bounty_turkey_tracker : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_turkey_tracker_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pilgrims_bounty_turkey_tracker_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -685,8 +666,6 @@ class spell_pilgrims_bounty_well_fed : public SpellScriptLoader spell_pilgrims_bounty_well_fed_SpellScript(uint32 triggeredSpellId) : SpellScript(), _triggeredSpellId(triggeredSpellId) { } private: - PrepareSpellScript(spell_pilgrims_bounty_well_fed_SpellScript); - uint32 _triggeredSpellId; bool Validate(SpellInfo const* /*spell*/) override @@ -727,7 +706,7 @@ class spell_pilgrims_bounty_well_fed : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_well_fed_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pilgrims_bounty_well_fed_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -801,9 +780,6 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader uint32 _triggeredSpellId2; uint32 _triggeredSpellId3; uint32 _triggeredSpellId4; - - PrepareSpellScript(spell_pilgrims_bounty_on_plate_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -882,7 +858,7 @@ class spell_pilgrims_bounty_on_plate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pilgrims_bounty_on_plate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pilgrims_bounty_on_plate_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -911,8 +887,6 @@ class spell_pilgrims_bounty_a_serving_of : public SpellScriptLoader class spell_pilgrims_bounty_a_serving_of_AuraScript : public AuraScript { - PrepareAuraScript(spell_pilgrims_bounty_a_serving_of_AuraScript); - private: uint32 _triggeredSpellId; @@ -954,8 +928,8 @@ class spell_pilgrims_bounty_a_serving_of : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_pilgrims_bounty_a_serving_of_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_pilgrims_bounty_a_serving_of_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_pilgrims_bounty_a_serving_of_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_pilgrims_bounty_a_serving_of_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -979,8 +953,6 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader class spell_winter_veil_mistletoe_SpellScript : public SpellScript { - PrepareSpellScript(spell_winter_veil_mistletoe_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1002,7 +974,7 @@ class spell_winter_veil_mistletoe : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_winter_veil_mistletoe_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1036,8 +1008,6 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader class spell_winter_veil_px_238_winter_wondervolt_SpellScript : public SpellScript { - PrepareSpellScript(spell_winter_veil_px_238_winter_wondervolt_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo(WonderboltTransformSpells); @@ -1059,7 +1029,7 @@ class spell_winter_veil_px_238_winter_wondervolt : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_winter_veil_px_238_winter_wondervolt_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1097,8 +1067,6 @@ class spell_brewfest_giddyup : public SpellScriptLoader class spell_brewfest_giddyup_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_giddyup_AuraScript); - void OnChange(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1145,9 +1113,9 @@ class spell_brewfest_giddyup : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); - OnEffectRemove += AuraEffectRemoveFn(spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_giddyup_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectApply.Register(&spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + OnEffectRemove.Register(&spell_brewfest_giddyup_AuraScript::OnChange, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK); + OnEffectPeriodic.Register(&spell_brewfest_giddyup_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1168,8 +1136,6 @@ class spell_brewfest_ram : public SpellScriptLoader class spell_brewfest_ram_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_ram_AuraScript); - void OnPeriodic(AuraEffect const* aurEff) { Unit* target = GetTarget(); @@ -1206,7 +1172,7 @@ class spell_brewfest_ram : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_brewfest_ram_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_brewfest_ram_AuraScript::OnPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1224,8 +1190,6 @@ class spell_brewfest_ram_fatigue : public SpellScriptLoader class spell_brewfest_ram_fatigue_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_ram_fatigue_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1244,7 +1208,7 @@ class spell_brewfest_ram_fatigue : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_brewfest_ram_fatigue_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_brewfest_ram_fatigue_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1262,8 +1226,6 @@ class spell_brewfest_apple_trap : public SpellScriptLoader class spell_brewfest_apple_trap_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_apple_trap_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->RemoveAura(SPELL_RAM_FATIGUE); @@ -1271,7 +1233,7 @@ class spell_brewfest_apple_trap : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_brewfest_apple_trap_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_brewfest_apple_trap_AuraScript::OnApply, EFFECT_0, SPELL_AURA_FORCE_REACTION, AURA_EFFECT_HANDLE_REAL); } }; @@ -1289,8 +1251,6 @@ class spell_brewfest_exhausted_ram : public SpellScriptLoader class spell_brewfest_exhausted_ram_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_exhausted_ram_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1299,7 +1259,7 @@ class spell_brewfest_exhausted_ram : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectApplyFn(spell_brewfest_exhausted_ram_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_brewfest_exhausted_ram_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_DECREASE_SPEED, AURA_EFFECT_HANDLE_REAL); } }; @@ -1317,8 +1277,6 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript { - PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1329,7 +1287,7 @@ class spell_brewfest_relay_race_intro_force_player_to_throw : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); + OnEffectHitTarget.Register(&spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); } }; @@ -1346,9 +1304,7 @@ public: class spell_brewfest_relay_race_turn_in_SpellScript : public SpellScript { - PrepareSpellScript(spell_brewfest_relay_race_turn_in_SpellScript); - - void HandleDummy(SpellEffIndex effIndex) + void HandleDummy(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1361,7 +1317,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_turn_in_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_brewfest_relay_race_turn_in_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1379,8 +1335,6 @@ class spell_brewfest_dismount_ram : public SpellScriptLoader class spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript : public SpellScript { - PrepareSpellScript(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->RemoveAura(SPELL_RENTAL_RACING_RAM); @@ -1388,7 +1342,7 @@ class spell_brewfest_dismount_ram : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_brewfest_relay_race_intro_force_player_to_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1444,8 +1398,6 @@ class spell_brewfest_barker_bunny : public SpellScriptLoader class spell_brewfest_barker_bunny_AuraScript : public AuraScript { - PrepareAuraScript(spell_brewfest_barker_bunny_AuraScript); - bool Load() override { return GetUnitOwner()->GetTypeId() == TYPEID_PLAYER; @@ -1479,7 +1431,7 @@ class spell_brewfest_barker_bunny : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_brewfest_barker_bunny_AuraScript::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_brewfest_barker_bunny_AuraScript::OnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1506,8 +1458,6 @@ class spell_midsummer_braziers_hit : public SpellScriptLoader class spell_midsummer_braziers_hit_AuraScript : public AuraScript { - PrepareAuraScript(spell_midsummer_braziers_hit_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1537,7 +1487,7 @@ class spell_midsummer_braziers_hit : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_midsummer_braziers_hit_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAPPLY)); + AfterEffectApply.Register(&spell_midsummer_braziers_hit_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAPPLY); } }; @@ -1563,8 +1513,6 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader class spell_gen_ribbon_pole_dancer_check_AuraScript : public AuraScript { - PrepareAuraScript(spell_gen_ribbon_pole_dancer_check_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1605,7 +1553,7 @@ class spell_gen_ribbon_pole_dancer_check : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_ribbon_pole_dancer_check_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_gen_ribbon_pole_dancer_check_AuraScript::PeriodicTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1645,8 +1593,6 @@ uint32 enterDeathMatchSpells[] = class spell_darkmoon_island_deathmatch : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_deathmatch); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1677,7 +1623,7 @@ class spell_darkmoon_island_deathmatch : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_deathmatch::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_darkmoon_island_deathmatch::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1690,8 +1636,6 @@ enum RingToss class spell_darkmoon_island_ring_toss : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_ring_toss); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1740,8 +1684,8 @@ class spell_darkmoon_island_ring_toss : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_ring_toss::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - AfterCast += SpellCastFn(spell_darkmoon_island_ring_toss::HandleAfterCast); + OnEffectHitTarget.Register(&spell_darkmoon_island_ring_toss::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + AfterCast.Register(&spell_darkmoon_island_ring_toss::HandleAfterCast); } private: @@ -1769,8 +1713,6 @@ enum WhackAGnoll class spell_darkmoon_island_whack_summon_aura : public AuraScript { - PrepareAuraScript(spell_darkmoon_island_whack_summon_aura); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_GNOLL_AURA_OKAY_TO_HIT }); @@ -1783,7 +1725,7 @@ class spell_darkmoon_island_whack_summon_aura : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_darkmoon_island_whack_summon_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_darkmoon_island_whack_summon_aura::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1810,8 +1752,6 @@ class GnollHolderTargetSelector class spell_darkmoon_island_gnoll_aura_okay_to_hit : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_gnoll_aura_okay_to_hit); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1849,15 +1789,13 @@ class spell_darkmoon_island_gnoll_aura_okay_to_hit : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_gnoll_aura_okay_to_hit::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_gnoll_aura_okay_to_hit::HandleSummon, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_gnoll_aura_okay_to_hit::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_darkmoon_island_gnoll_aura_okay_to_hit::HandleSummon, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_darkmoon_island_whack_dummy : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_whack_dummy); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1876,14 +1814,12 @@ class spell_darkmoon_island_whack_dummy : public SpellScript void Register() override { - AfterCast += SpellCastFn(spell_darkmoon_island_whack_dummy::HandleDummy); + AfterCast.Register(&spell_darkmoon_island_whack_dummy::HandleDummy); } }; class spell_darkmoon_island_whack : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_whack); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1894,14 +1830,12 @@ class spell_darkmoon_island_whack : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENTRY); } }; class spell_darkmoon_island_whack_a_gnoll : public AuraScript { - PrepareAuraScript(spell_darkmoon_island_whack_a_gnoll); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1929,14 +1863,12 @@ class spell_darkmoon_island_whack_a_gnoll : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_darkmoon_island_whack_a_gnoll::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_darkmoon_island_whack_a_gnoll::OnRemove, EFFECT_0, SPELL_AURA_OVERRIDE_SPELLS, AURA_EFFECT_HANDLE_REAL); } }; class spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed : public SpellScript { - PrepareSpellScript(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1953,10 +1885,10 @@ class spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed : public Spe void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); - OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_0, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_1, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENTRY); + OnEffectHitTarget.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed::DespawnUnits, EFFECT_1, SPELL_EFFECT_DUMMY); } }; diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 68c9ad8c9b..873cde8181 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -111,8 +111,6 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader class spell_hun_ancient_hysteria_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_ancient_hysteria_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -140,8 +138,8 @@ class spell_hun_ancient_hysteria : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_ancient_hysteria_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); - AfterHit += SpellHitFn(spell_hun_ancient_hysteria_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_hun_ancient_hysteria_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); + AfterHit.Register(&spell_hun_ancient_hysteria_SpellScript::ApplyDebuff); } }; @@ -159,8 +157,6 @@ class spell_hun_chimera_shot : public SpellScriptLoader class spell_hun_chimera_shot_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_chimera_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_CHIMERA_SHOT_HEAL, SPELL_HUNTER_SERPENT_STING }); @@ -181,7 +177,7 @@ class spell_hun_chimera_shot : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_chimera_shot_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -199,8 +195,6 @@ class spell_hun_cobra_shot : public SpellScriptLoader class spell_hun_cobra_shot_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_cobra_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -249,8 +243,8 @@ class spell_hun_cobra_shot : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleLaunch, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunch.Register(&spell_hun_cobra_shot_SpellScript::HandleLaunch, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_cobra_shot_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -268,8 +262,6 @@ class spell_hun_disengage : public SpellScriptLoader class spell_hun_disengage_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_disengage_SpellScript); - SpellCastResult CheckCast() { Unit* caster = GetCaster(); @@ -281,7 +273,7 @@ class spell_hun_disengage : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_hun_disengage_SpellScript::CheckCast); + OnCheckCast.Register(&spell_hun_disengage_SpellScript::CheckCast); } }; @@ -299,8 +291,6 @@ class spell_hun_fire : public SpellScriptLoader class spell_hun_fire_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_fire_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_AIMED_SHOT_INSTANT }); @@ -327,8 +317,8 @@ class spell_hun_fire : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_fire_AuraScript::CheckProc); - DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_fire_AuraScript::CheckProc); + DoEffectCalcSpellMod.Register(&spell_hun_fire_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -346,8 +336,6 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader class spell_hun_improved_mend_pet_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_improved_mend_pet_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_MEND_PET }); @@ -366,8 +354,8 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_improved_mend_pet_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_improved_mend_pet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_improved_mend_pet_AuraScript::CheckProc); + OnEffectProc.Register(&spell_hun_improved_mend_pet_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -380,8 +368,6 @@ class spell_hun_improved_mend_pet : public SpellScriptLoader // 53412 - Invigoration class spell_hun_invigoration : public SpellScript { - PrepareSpellScript(spell_hun_invigoration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_INVIGORATION_TRIGGERED }); @@ -396,7 +382,7 @@ class spell_hun_invigoration : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_invigoration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_invigoration::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -408,8 +394,6 @@ class spell_hun_last_stand_pet : public SpellScriptLoader class spell_hun_last_stand_pet_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_last_stand_pet_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_PET_LAST_STAND_TRIGGERED }); @@ -424,7 +408,7 @@ class spell_hun_last_stand_pet : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_hun_last_stand_pet_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -442,8 +426,6 @@ class spell_hun_lock_and_load : public SpellScriptLoader class spell_hun_lock_and_load_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_lock_and_load_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -485,10 +467,10 @@ class spell_hun_lock_and_load : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_lock_and_load_AuraScript::CheckProc); + DoCheckProc.Register(&spell_hun_lock_and_load_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); - OnEffectProc += AuraEffectProcFn(spell_hun_lock_and_load_AuraScript::HandleProcs, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_lock_and_load_AuraScript::HandleProcs, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_hun_lock_and_load_AuraScript::HandleProcs, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -506,8 +488,6 @@ class spell_hun_masters_call : public SpellScriptLoader class spell_hun_masters_call_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_masters_call_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ SPELL_HUNTER_MASTERS_CALL_TRIGGERED, uint32(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -536,8 +516,8 @@ class spell_hun_masters_call : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_masters_call_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_hun_masters_call_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -555,8 +535,6 @@ class spell_hun_misdirection : public SpellScriptLoader class spell_hun_misdirection_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_misdirection_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_MISDIRECTION_PROC }); @@ -576,8 +554,8 @@ class spell_hun_misdirection : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectProc += AuraEffectProcFn(spell_hun_misdirection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + AfterEffectRemove.Register(&spell_hun_misdirection_AuraScript::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectProc.Register(&spell_hun_misdirection_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -595,8 +573,6 @@ class spell_hun_misdirection_proc : public SpellScriptLoader class spell_hun_misdirection_proc_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_misdirection_proc_AuraScript); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetThreatManager().UnregisterRedirectThreat(SPELL_HUNTER_MISDIRECTION); @@ -604,7 +580,7 @@ class spell_hun_misdirection_proc : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_hun_misdirection_proc_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -622,8 +598,6 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader class spell_hun_pet_carrion_feeder_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_pet_carrion_feeder_SpellScript); - bool Load() override { if (!GetCaster()->IsPet()) @@ -660,8 +634,8 @@ class spell_hun_pet_carrion_feeder : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnCheckCast += SpellCheckCastFn(spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear); + OnEffectHit.Register(&spell_hun_pet_carrion_feeder_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_hun_pet_carrion_feeder_SpellScript::CheckIfCorpseNear); } }; @@ -679,8 +653,6 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader class spell_hun_pet_heart_of_the_phoenix_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_pet_heart_of_the_phoenix_SpellScript); - bool Load() override { if (!GetCaster()->IsPet()) @@ -706,7 +678,7 @@ class spell_hun_pet_heart_of_the_phoenix : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_pet_heart_of_the_phoenix_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -724,8 +696,6 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader class spell_hun_rapid_recuperation_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_rapid_recuperation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_RAPID_RECUPERATION }); @@ -751,8 +721,8 @@ class spell_hun_rapid_recuperation : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleAbilityCast, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); - OnEffectProc += AuraEffectProcFn(spell_hun_rapid_recuperation_AuraScript::HandleFocusRegen, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_rapid_recuperation_AuraScript::HandleAbilityCast, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_hun_rapid_recuperation_AuraScript::HandleFocusRegen, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -770,8 +740,6 @@ class spell_hun_readiness : public SpellScriptLoader class spell_hun_readiness_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_readiness_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -797,7 +765,7 @@ class spell_hun_readiness : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_hun_readiness_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -815,8 +783,6 @@ class spell_hun_ready_set_aim : public SpellScriptLoader class spell_hun_ready_set_aim_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_ready_set_aim_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_FIRE }); @@ -833,7 +799,7 @@ class spell_hun_ready_set_aim : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_hun_ready_set_aim_AuraScript::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -851,8 +817,6 @@ class spell_hun_scatter_shot : public SpellScriptLoader class spell_hun_scatter_shot_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_scatter_shot_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -869,7 +833,7 @@ class spell_hun_scatter_shot : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_hun_scatter_shot_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -887,8 +851,6 @@ class spell_hun_sniper_training : public SpellScriptLoader class spell_hun_sniper_training_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_sniper_training_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_SNIPER_TRAINING_R1, SPELL_HUNTER_SNIPER_TRAINING_BUFF_R1 }); @@ -926,8 +888,8 @@ class spell_hun_sniper_training : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_hun_sniper_training_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectUpdatePeriodic.Register(&spell_hun_sniper_training_AuraScript::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -945,8 +907,6 @@ class spell_hun_steady_shot : public SpellScriptLoader class spell_hun_steady_shot_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_steady_shot_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -989,7 +949,7 @@ class spell_hun_steady_shot : public SpellScriptLoader void Register() override { - OnEffectLaunch += SpellEffectFn(spell_hun_steady_shot_SpellScript::HandleLaunch, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + OnEffectLaunch.Register(&spell_hun_steady_shot_SpellScript::HandleLaunch, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); } }; @@ -1007,8 +967,6 @@ class spell_hun_improved_steady_shot : public SpellScriptLoader class spell_hun_improved_steady_shot_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_improved_steady_shot_AuraScript); - bool Load() override { _steadyShotCounter = 0; @@ -1038,7 +996,7 @@ class spell_hun_improved_steady_shot : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_hun_improved_steady_shot_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_improved_steady_shot_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } private: @@ -1068,8 +1026,6 @@ class spell_hun_tame_beast : public SpellScriptLoader class spell_hun_tame_beast_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_tame_beast_SpellScript); - SpellCastResult SendTameFailResult(PetTameFailureReason reason) { Player* player = GetCaster()->ToPlayer(); @@ -1122,7 +1078,7 @@ class spell_hun_tame_beast : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_hun_tame_beast_SpellScript::CheckCast); + OnCheckCast.Register(&spell_hun_tame_beast_SpellScript::CheckCast); } }; @@ -1140,8 +1096,6 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader class spell_hun_target_only_pet_and_owner_SpellScript : public SpellScript { - PrepareSpellScript(spell_hun_target_only_pet_and_owner_SpellScript); - void FilterTargets(std::list& targets) { targets.clear(); @@ -1152,8 +1106,8 @@ class spell_hun_target_only_pet_and_owner : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY); + OnObjectAreaTargetSelect.Register(&spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); + OnObjectAreaTargetSelect.Register(&spell_hun_target_only_pet_and_owner_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_PARTY); } }; @@ -1171,8 +1125,6 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader class spell_hun_thrill_of_the_hunt_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_thrill_of_the_hunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_THRILL_OF_THE_HUNT }); @@ -1189,7 +1141,7 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_thrill_of_the_hunt_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1202,8 +1154,6 @@ class spell_hun_thrill_of_the_hunt : public SpellScriptLoader // -56333 - T.N.T. class spell_hun_tnt : public AuraScript { - PrepareAuraScript(spell_hun_tnt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_LOCK_AND_LOAD }); @@ -1222,8 +1172,8 @@ class spell_hun_tnt : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_tnt::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_tnt::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_tnt::CheckProc); + OnEffectProc.Register(&spell_hun_tnt::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1235,8 +1185,6 @@ class spell_hun_wild_quiver : public SpellScriptLoader class spell_hun_wild_quiver_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_wild_quiver_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_WILD_QUIVER_DAMAGE }); @@ -1257,8 +1205,8 @@ class spell_hun_wild_quiver : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_wild_quiver_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_wild_quiver_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_wild_quiver_AuraScript::CheckProc); + OnEffectProc.Register(&spell_hun_wild_quiver_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1271,8 +1219,6 @@ class spell_hun_wild_quiver : public SpellScriptLoader // 1978 - Serpent Sting class spell_hun_serpent_sting : public AuraScript { - PrepareAuraScript(spell_hun_serpent_sting); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_SERPENT_STING_DAMAGE }); @@ -1293,7 +1239,7 @@ class spell_hun_serpent_sting : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hun_serpent_sting::HandleImprovedSerpentSting, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_hun_serpent_sting::HandleImprovedSerpentSting, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1305,8 +1251,6 @@ class spell_hun_piercing_shots : public SpellScriptLoader class spell_hun_piercing_shots_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_piercing_shots_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1352,8 +1296,8 @@ class spell_hun_piercing_shots : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_piercing_shots_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_piercing_shots_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_hun_piercing_shots_AuraScript::CheckProc); + OnEffectProc.Register(&spell_hun_piercing_shots_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1371,8 +1315,6 @@ class spell_hun_master_marksman : public SpellScriptLoader class spell_hun_master_marksman_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_master_marksman_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_STEADY_SHOT }); @@ -1385,7 +1327,7 @@ class spell_hun_master_marksman : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_master_marksman_AuraScript::CheckProc); + DoCheckProc.Register(&spell_hun_master_marksman_AuraScript::CheckProc); } }; @@ -1403,8 +1345,6 @@ class spell_hun_bombardment : public SpellScriptLoader class spell_hun_bombardment_AuraScript : public AuraScript { - PrepareAuraScript(spell_hun_bombardment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_MULTISHOT }); @@ -1417,7 +1357,7 @@ class spell_hun_bombardment : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_bombardment_AuraScript::CheckProc); + DoCheckProc.Register(&spell_hun_bombardment_AuraScript::CheckProc); } }; @@ -1429,8 +1369,6 @@ class spell_hun_bombardment : public SpellScriptLoader class spell_hun_trap_launcher : public AuraScript { - PrepareAuraScript(spell_hun_trap_launcher); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_IMPROVED_STEADY_SHOT_TRIGGERED }); @@ -1448,16 +1386,14 @@ class spell_hun_trap_launcher : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hun_trap_launcher::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_trap_launcher::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_hun_trap_launcher::AfterApply, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_hun_trap_launcher::AfterRemove, EFFECT_0, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS_TRIGGERED, AURA_EFFECT_HANDLE_REAL); } }; // 63067 - Glyph of Kill Shot class spell_hun_glyph_of_kill_shot : public AuraScript { - PrepareAuraScript(spell_hun_glyph_of_kill_shot); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_GLYPH_OF_KILL_SHOT_COOLDOWN }); @@ -1485,16 +1421,14 @@ class spell_hun_glyph_of_kill_shot : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_glyph_of_kill_shot::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_glyph_of_kill_shot::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_glyph_of_kill_shot::CheckProc); + OnEffectProc.Register(&spell_hun_glyph_of_kill_shot::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 51753 - Camouflage class spell_hun_camouflage : public SpellScript { - PrepareSpellScript(spell_hun_camouflage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_CAMOUFLAGE_DURATION }); @@ -1514,15 +1448,13 @@ class spell_hun_camouflage : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_camouflage::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_hun_camouflage::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 51755 - Camouflage class spell_hun_camouflage_duration : public AuraScript { - PrepareAuraScript(spell_hun_camouflage_duration); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1545,16 +1477,14 @@ class spell_hun_camouflage_duration : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hun_camouflage_duration::AfterApply, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_camouflage_duration::AfterRemove, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_hun_camouflage_duration::AfterApply, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_hun_camouflage_duration::AfterRemove, EFFECT_0, SPELL_AURA_INTERFERE_TARGETTING, AURA_EFFECT_HANDLE_REAL); } }; // 80325 - Camouflage class spell_hun_camouflage_triggered : public AuraScript { - PrepareAuraScript(spell_hun_camouflage_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1581,15 +1511,13 @@ class spell_hun_camouflage_triggered : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_camouflage_triggered::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STEALTH, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_hun_camouflage_triggered::AfterRemove, EFFECT_0, SPELL_AURA_MOD_STEALTH, AURA_EFFECT_HANDLE_REAL); } }; // -53241 - Marked for Death class spell_hun_marked_for_death : public AuraScript { - PrepareAuraScript(spell_hun_marked_for_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HUNTER_MARKED_FOR_DEATH_TRIGGERED }); @@ -1608,16 +1536,14 @@ class spell_hun_marked_for_death : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_marked_for_death::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_marked_for_death::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_marked_for_death::CheckProc); + OnEffectProc.Register(&spell_hun_marked_for_death::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 82692 - Focus Fire class spell_hun_focus_fire : public AuraScript { - PrepareAuraScript(spell_hun_focus_fire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1659,16 +1585,14 @@ class spell_hun_focus_fire : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_focus_fire::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RANGED_HASTE); - AfterEffectApply += AuraEffectApplyFn(spell_hun_focus_fire::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + DoEffectCalcAmount.Register(&spell_hun_focus_fire::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RANGED_HASTE); + AfterEffectApply.Register(&spell_hun_focus_fire::AfterApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; // 19615 - Frenzy Effect class spell_hun_frenzy_effect : public AuraScript { - PrepareAuraScript(spell_hun_frenzy_effect); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1694,16 +1618,14 @@ class spell_hun_frenzy_effect : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_hun_frenzy_effect::AfterApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_hun_frenzy_effect::AfterRemove, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_hun_frenzy_effect::AfterApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_hun_frenzy_effect::AfterRemove, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL); } }; // 34026 - Kill Command class spell_hun_kill_command: public SpellScript { - PrepareSpellScript(spell_hun_kill_command); - void HandleScriptEffect(SpellEffIndex effIndex) { Unit* caster = GetCaster(); @@ -1718,15 +1640,13 @@ class spell_hun_kill_command: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_kill_command::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_hun_kill_command::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 82726 - Fervor class spell_hun_fervor : public SpellScript { - PrepareSpellScript(spell_hun_fervor); - bool Load() override { return GetCaster()->IsPlayer(); @@ -1750,7 +1670,7 @@ class spell_hun_fervor : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_hun_fervor::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE); + OnEffectHitTarget.Register(&spell_hun_fervor::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE); } }; @@ -1763,8 +1683,6 @@ std::array const KillingStreakTriggerSpells = // -82748 - Killing Streak class spell_hun_killing_streak : public AuraScript { - PrepareAuraScript(spell_hun_killing_streak); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1794,7 +1712,7 @@ class spell_hun_killing_streak : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_hun_killing_streak::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_killing_streak::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } private: @@ -1804,8 +1722,6 @@ private: // -82898 - Crouching Tiger, Hidden Chimera class spell_hun_crouching_tiger_hidden_chimera : public AuraScript { - PrepareAuraScript(spell_hun_crouching_tiger_hidden_chimera); - bool Load() override { return GetCaster()->IsPlayer(); @@ -1845,9 +1761,9 @@ class spell_hun_crouching_tiger_hidden_chimera : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_hun_crouching_tiger_hidden_chimera::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_hun_crouching_tiger_hidden_chimera::HandleDisengageProc, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectProc += AuraEffectProcFn(spell_hun_crouching_tiger_hidden_chimera::HandleDeterrenceProc, EFFECT_1, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_hun_crouching_tiger_hidden_chimera::CheckProc); + OnEffectProc.Register(&spell_hun_crouching_tiger_hidden_chimera::HandleDisengageProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_hun_crouching_tiger_hidden_chimera::HandleDeterrenceProc, EFFECT_1, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index 8893984acf..b3ac0309db 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -46,7 +46,6 @@ class spell_item_trigger_spell : public SpellScriptLoader class spell_item_trigger_spell_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_trigger_spell_SpellScript); private: uint32 _triggeredSpellId; @@ -67,7 +66,7 @@ class spell_item_trigger_spell : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_trigger_spell_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -90,8 +89,6 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader class spell_item_aegis_of_preservation_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_aegis_of_preservation_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_AEGIS_HEAL }); @@ -105,7 +102,7 @@ class spell_item_aegis_of_preservation : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_aegis_of_preservation_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_aegis_of_preservation_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -138,8 +135,6 @@ class spell_item_alchemists_stone : public SpellScriptLoader class spell_item_alchemists_stone_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_alchemists_stone_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -179,7 +174,7 @@ class spell_item_alchemists_stone : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_alchemists_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_alchemists_stone_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -210,8 +205,6 @@ class spell_item_anger_capacitor : public SpellScriptLoader template class spell_item_anger_capacitor_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_anger_capacitor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -244,7 +237,7 @@ class spell_item_anger_capacitor : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_anger_capacitor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_anger_capacitor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -262,8 +255,6 @@ class spell_item_arcane_shroud : public SpellScriptLoader class spell_item_arcane_shroud_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_arcane_shroud_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { int32 diff = GetUnitOwner()->getLevel() - 60; @@ -273,7 +264,7 @@ class spell_item_arcane_shroud : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); + DoEffectCalcAmount.Register(&spell_item_arcane_shroud_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; @@ -310,8 +301,6 @@ class spell_item_aura_of_madness : public SpellScriptLoader class spell_item_aura_of_madness_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_aura_of_madness_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -369,7 +358,7 @@ class spell_item_aura_of_madness : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_aura_of_madness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_aura_of_madness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -387,8 +376,6 @@ class spell_item_dementia : public SpellScriptLoader class spell_item_dementia_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_dementia_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -406,7 +393,7 @@ class spell_item_dementia : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_item_dementia_AuraScript::HandlePeriodicDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_item_dementia_AuraScript::HandlePeriodicDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -429,8 +416,6 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader class spell_item_blessing_of_ancient_kings_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_blessing_of_ancient_kings_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PROTECTION_OF_ANCIENT_KINGS }); @@ -464,8 +449,8 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_blessing_of_ancient_kings_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_blessing_of_ancient_kings_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_blessing_of_ancient_kings_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_blessing_of_ancient_kings_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -478,8 +463,6 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader // 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; @@ -487,7 +470,7 @@ class spell_item_valanyr_hammer_of_ancient_kings : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_valanyr_hammer_of_ancient_kings::CheckProc); + DoCheckProc.Register(&spell_item_valanyr_hammer_of_ancient_kings::CheckProc); } }; @@ -504,8 +487,6 @@ class spell_item_deadly_precision : public SpellScriptLoader class spell_item_deadly_precision_charm_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_deadly_precision_charm_AuraScript); - void HandleStackDrop(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -514,7 +495,7 @@ class spell_item_deadly_precision : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_deadly_precision_charm_AuraScript::HandleStackDrop, EFFECT_0, SPELL_AURA_MOD_RATING); + OnEffectProc.Register(&spell_item_deadly_precision_charm_AuraScript::HandleStackDrop, EFFECT_0, SPELL_AURA_MOD_RATING); } }; @@ -532,8 +513,6 @@ class spell_item_deadly_precision_dummy : public SpellScriptLoader class spell_item_deadly_precision_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_deadly_precision_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DEADLY_PRECISION }); @@ -547,7 +526,7 @@ class spell_item_deadly_precision_dummy : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_deadly_precision_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHit.Register(&spell_item_deadly_precision_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -586,8 +565,6 @@ class spell_item_deathbringers_will : public SpellScriptLoader template class spell_item_deathbringers_will_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_deathbringers_will_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -642,7 +619,7 @@ class spell_item_deathbringers_will : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_deathbringers_will_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_deathbringers_will_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -660,8 +637,6 @@ class spell_item_decahedral_dwarven_dice : public SpellScriptLoader class spell_item_decahedral_dwarven_dice_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_decahedral_dwarven_dice_SpellScript); - enum { TEXT_DECAHEDRAL_DWARVEN_DICE = 26147 @@ -691,7 +666,7 @@ class spell_item_decahedral_dwarven_dice : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_decahedral_dwarven_dice_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_item_decahedral_dwarven_dice_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -716,10 +691,8 @@ class spell_item_defibrillate : public SpellScriptLoader spell_item_defibrillate(char const* name, uint8 chance, uint32 failSpell = 0) : SpellScriptLoader(name), _chance(chance), _failSpell(failSpell) { } class spell_item_defibrillate_SpellScript : public SpellScript - { - PrepareSpellScript(spell_item_defibrillate_SpellScript); - - public: + { + public: spell_item_defibrillate_SpellScript(uint8 chance, uint32 failSpell) : SpellScript(), _chance(chance), _failSpell(failSpell) { } bool Validate(SpellInfo const* /*spellInfo*/) override @@ -739,7 +712,7 @@ class spell_item_defibrillate : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); + OnEffectHitTarget.Register(&spell_item_defibrillate_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_RESURRECT); } private: @@ -770,8 +743,6 @@ class spell_item_desperate_defense : public SpellScriptLoader class spell_item_desperate_defense_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_desperate_defense_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DESPERATE_RAGE }); @@ -785,7 +756,7 @@ class spell_item_desperate_defense : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_desperate_defense_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_desperate_defense_AuraScript::HandleProc, EFFECT_2, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -813,8 +784,6 @@ class spell_item_deviate_fish : public SpellScriptLoader class spell_item_deviate_fish_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_deviate_fish_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -834,7 +803,7 @@ class spell_item_deviate_fish : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_deviate_fish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -857,8 +826,6 @@ class spell_item_echoes_of_light : public SpellScriptLoader class spell_item_echoes_of_light_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_echoes_of_light_SpellScript); - void FilterTargets(std::list& targets) { if (targets.size() < 2) @@ -873,7 +840,7 @@ class spell_item_echoes_of_light : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_item_echoes_of_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_item_echoes_of_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; @@ -896,8 +863,6 @@ class spell_item_fate_rune_of_unsurpassed_vigor : public SpellScriptLoader class spell_item_fate_rune_of_unsurpassed_vigor_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_fate_rune_of_unsurpassed_vigor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_UNSURPASSED_VIGOR }); @@ -911,7 +876,7 @@ class spell_item_fate_rune_of_unsurpassed_vigor : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_fate_rune_of_unsurpassed_vigor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_fate_rune_of_unsurpassed_vigor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -937,8 +902,6 @@ class spell_item_flask_of_the_north : public SpellScriptLoader class spell_item_flask_of_the_north_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_flask_of_the_north_SpellScript); - 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 }); @@ -979,7 +942,7 @@ class spell_item_flask_of_the_north : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_flask_of_the_north_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1003,8 +966,6 @@ class spell_item_frozen_shadoweave : public SpellScriptLoader class spell_item_frozen_shadoweave_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_frozen_shadoweave_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHADOWMEND }); @@ -1024,7 +985,7 @@ class spell_item_frozen_shadoweave : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_frozen_shadoweave_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_frozen_shadoweave_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1049,8 +1010,6 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader class spell_item_gnomish_death_ray_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_gnomish_death_ray_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GNOMISH_DEATH_RAY_SELF, SPELL_GNOMISH_DEATH_RAY_TARGET }); @@ -1070,7 +1029,7 @@ class spell_item_gnomish_death_ray : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_gnomish_death_ray_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1094,8 +1053,6 @@ class spell_item_harm_prevention_belt : public SpellScriptLoader class spell_item_harm_prevention_belt_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_harm_prevention_belt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FORCEFIELD_COLLAPSE }); @@ -1108,7 +1065,7 @@ class spell_item_harm_prevention_belt : public SpellScriptLoader void Register() override { - OnProc += AuraProcFn(spell_item_harm_prevention_belt_AuraScript::HandleProc); + OnProc.Register(&spell_item_harm_prevention_belt_AuraScript::HandleProc); } }; @@ -1132,8 +1089,6 @@ class spell_item_healing_touch_refund : public SpellScriptLoader class spell_item_healing_touch_refund_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_healing_touch_refund_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEALING_TOUCH_MANA }); @@ -1147,7 +1102,7 @@ class spell_item_healing_touch_refund : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_healing_touch_refund_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_healing_touch_refund_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1184,8 +1139,6 @@ class spell_item_heartpierce : public SpellScriptLoader template class spell_item_heartpierce_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_heartpierce_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1227,7 +1180,7 @@ class spell_item_heartpierce : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_heartpierce_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_heartpierce_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1245,8 +1198,6 @@ class spell_item_crystal_spire_of_karabor : public SpellScriptLoader class spell_item_crystal_spire_of_karabor_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_crystal_spire_of_karabor_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { int32 pct = GetSpellInfo()->Effects[EFFECT_0].BasePoints; @@ -1260,7 +1211,7 @@ class spell_item_crystal_spire_of_karabor : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_crystal_spire_of_karabor_AuraScript::CheckProc); + DoCheckProc.Register(&spell_item_crystal_spire_of_karabor_AuraScript::CheckProc); } }; @@ -1288,8 +1239,6 @@ class spell_item_make_a_wish : public SpellScriptLoader class spell_item_make_a_wish_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_make_a_wish_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1323,7 +1272,7 @@ class spell_item_make_a_wish : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_make_a_wish_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1348,8 +1297,6 @@ class spell_item_mark_of_conquest : public SpellScriptLoader class spell_item_mark_of_conquest_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_mark_of_conquest_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MARK_OF_CONQUEST_ENERGIZE }); @@ -1368,7 +1315,7 @@ class spell_item_mark_of_conquest : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_mark_of_conquest_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_mark_of_conquest_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1387,8 +1334,6 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader class spell_item_mingos_fortune_generator_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_mingos_fortune_generator_SpellScript); - void HandleDummy(SpellEffIndex effIndex) { // Selecting one from Bloodstained Fortune item @@ -1424,7 +1369,7 @@ class spell_item_mingos_fortune_generator : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_mingos_fortune_generator_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1447,8 +1392,6 @@ class spell_item_necrotic_touch : public SpellScriptLoader class spell_item_necrotic_touch_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_necrotic_touch_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ITEM_NECROTIC_TOUCH_PROC }); @@ -1472,8 +1415,8 @@ class spell_item_necrotic_touch : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_necrotic_touch_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_necrotic_touch_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_necrotic_touch_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1499,8 +1442,6 @@ class spell_item_net_o_matic : public SpellScriptLoader class spell_item_net_o_matic_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_net_o_matic_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1528,7 +1469,7 @@ class spell_item_net_o_matic : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_net_o_matic_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1554,8 +1495,6 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader class spell_item_noggenfogger_elixir_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_noggenfogger_elixir_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1586,7 +1525,7 @@ class spell_item_noggenfogger_elixir : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_noggenfogger_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1604,8 +1543,6 @@ class spell_item_pendant_of_the_violet_eye : public SpellScriptLoader class spell_item_pendant_of_the_violet_eye_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_pendant_of_the_violet_eye_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { if (SpellInfo const* spellInfo = eventInfo.GetSpellInfo()) @@ -1616,7 +1553,7 @@ class spell_item_pendant_of_the_violet_eye : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_pendant_of_the_violet_eye_AuraScript::CheckProc); + DoCheckProc.Register(&spell_item_pendant_of_the_violet_eye_AuraScript::CheckProc); } }; @@ -1639,8 +1576,6 @@ class spell_item_persistent_shield : public SpellScriptLoader class spell_item_persistent_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_persistent_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PERSISTENT_SHIELD_TRIGGERED }); @@ -1667,8 +1602,8 @@ class spell_item_persistent_shield : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_persistent_shield_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_persistent_shield_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_item_persistent_shield_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_persistent_shield_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1693,8 +1628,6 @@ class spell_item_pet_healing : public SpellScriptLoader class spell_item_pet_healing_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_pet_healing_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEALTH_LINK }); @@ -1714,7 +1647,7 @@ class spell_item_pet_healing : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_pet_healing_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_pet_healing_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1732,8 +1665,6 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader class spell_item_piccolo_of_the_flaming_fire_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_piccolo_of_the_flaming_fire_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -1743,7 +1674,7 @@ class spell_item_piccolo_of_the_flaming_fire : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_item_piccolo_of_the_flaming_fire_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1761,8 +1692,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 }); @@ -1787,10 +1716,10 @@ class spell_item_power_circle : public AuraScript void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_item_power_circle::CheckCaster); + DoCheckAreaTarget.Register(&spell_item_power_circle::CheckCaster); - AfterEffectApply += AuraEffectApplyFn(spell_item_power_circle::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_item_power_circle::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_item_power_circle::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_item_power_circle::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1811,8 +1740,6 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader class spell_item_savory_deviate_delight_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_savory_deviate_delight_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1845,7 +1772,7 @@ class spell_item_savory_deviate_delight : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_savory_deviate_delight_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1875,8 +1802,6 @@ class spell_item_scroll_of_recall : public SpellScriptLoader class spell_item_scroll_of_recall_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_scroll_of_recall_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1918,7 +1843,7 @@ class spell_item_scroll_of_recall : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); + OnEffectHitTarget.Register(&spell_item_scroll_of_recall_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); } }; @@ -1942,8 +1867,6 @@ class spell_item_unsated_craving : public SpellScriptLoader class spell_item_unsated_craving_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_unsated_craving_AuraScript); - bool CheckProc(ProcEventInfo& procInfo) { Unit* caster = procInfo.GetActor(); @@ -1959,7 +1882,7 @@ class spell_item_unsated_craving : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_unsated_craving_AuraScript::CheckProc); + DoCheckProc.Register(&spell_item_unsated_craving_AuraScript::CheckProc); } }; @@ -1976,8 +1899,6 @@ class spell_item_shadows_fate : public SpellScriptLoader class spell_item_shadows_fate_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_shadows_fate_AuraScript); - void HandleProc(ProcEventInfo& procInfo) { PreventDefaultAction(); @@ -1992,7 +1913,7 @@ class spell_item_shadows_fate : public SpellScriptLoader void Register() override { - OnProc += AuraProcFn(spell_item_shadows_fate_AuraScript::HandleProc); + OnProc.Register(&spell_item_shadows_fate_AuraScript::HandleProc); } }; @@ -2019,8 +1940,6 @@ class spell_item_shadowmourne : public SpellScriptLoader class spell_item_shadowmourne_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_shadowmourne_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2056,8 +1975,8 @@ class spell_item_shadowmourne : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_shadowmourne_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_shadowmourne_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_shadowmourne_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_shadowmourne_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2075,8 +1994,6 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader class spell_item_shadowmourne_soul_fragment_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_shadowmourne_soul_fragment_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2117,8 +2034,8 @@ class spell_item_shadowmourne_soul_fragment : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_STAT, AuraEffectHandleModes(AURA_EFFECT_HANDLE_REAL | AURA_EFFECT_HANDLE_REAPPLY)); - AfterEffectRemove += AuraEffectRemoveFn(spell_item_shadowmourne_soul_fragment_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_item_shadowmourne_soul_fragment_AuraScript::OnStackChange, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_item_shadowmourne_soul_fragment_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STAT, AURA_EFFECT_HANDLE_REAL); } }; @@ -2147,8 +2064,6 @@ class spell_item_six_demon_bag : public SpellScriptLoader class spell_item_six_demon_bag_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_six_demon_bag_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2195,7 +2110,7 @@ class spell_item_six_demon_bag : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_six_demon_bag_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2218,8 +2133,6 @@ class spell_item_swift_hand_justice_dummy : public SpellScriptLoader class spell_item_swift_hand_justice_dummy_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_swift_hand_justice_dummy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SWIFT_HAND_OF_JUSTICE_HEAL }); @@ -2236,7 +2149,7 @@ class spell_item_swift_hand_justice_dummy : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_swift_hand_justice_dummy_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_swift_hand_justice_dummy_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2260,8 +2173,6 @@ class spell_item_totem_of_flowing_water : public SpellScriptLoader class spell_item_totem_of_flowing_water_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_totem_of_flowing_water_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_LESSER_HEALING_WAVE_MANA }); @@ -2275,7 +2186,7 @@ class spell_item_totem_of_flowing_water : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_totem_of_flowing_water_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_totem_of_flowing_water_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -2294,8 +2205,6 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader class spell_item_the_eye_of_diminution_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_the_eye_of_diminution_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { int32 diff = GetUnitOwner()->getLevel() - 60; @@ -2305,7 +2214,7 @@ class spell_item_the_eye_of_diminution : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); + DoEffectCalcAmount.Register(&spell_item_the_eye_of_diminution_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_THREAT); } }; @@ -2331,8 +2240,6 @@ class spell_item_underbelly_elixir : public SpellScriptLoader class spell_item_underbelly_elixir_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_underbelly_elixir_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2361,7 +2268,7 @@ class spell_item_underbelly_elixir : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_underbelly_elixir_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2379,8 +2286,6 @@ class spell_item_worn_troll_dice : public SpellScriptLoader class spell_item_worn_troll_dice_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_worn_troll_dice_SpellScript); - enum { TEXT_WORN_TROLL_DICE = 26152 @@ -2412,7 +2317,7 @@ class spell_item_worn_troll_dice : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_worn_troll_dice_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_item_worn_troll_dice_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2436,8 +2341,6 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader class spell_item_red_rider_air_rifle_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_red_rider_air_rifle_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -2467,7 +2370,7 @@ class spell_item_red_rider_air_rifle : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_item_red_rider_air_rifle_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2504,8 +2407,6 @@ class spell_item_create_heart_candy : public SpellScriptLoader class spell_item_create_heart_candy_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_create_heart_candy_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -2518,7 +2419,7 @@ class spell_item_create_heart_candy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_item_create_heart_candy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2535,8 +2436,6 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader class spell_item_book_of_glyph_mastery_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_book_of_glyph_mastery_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2565,8 +2464,8 @@ class spell_item_book_of_glyph_mastery : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_book_of_glyph_mastery_SpellScript::CheckRequirement); - OnEffectHitTarget += SpellEffectFn(spell_item_book_of_glyph_mastery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnCheckCast.Register(&spell_item_book_of_glyph_mastery_SpellScript::CheckRequirement); + OnEffectHitTarget.Register(&spell_item_book_of_glyph_mastery_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2589,8 +2488,6 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader class spell_item_gift_of_the_harvester_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_gift_of_the_harvester_SpellScript); - SpellCastResult CheckRequirement() { std::list ghouls; @@ -2606,7 +2503,7 @@ class spell_item_gift_of_the_harvester : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_item_gift_of_the_harvester_SpellScript::CheckRequirement); } }; @@ -2630,8 +2527,6 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader class spell_item_map_of_the_geyser_fields_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_map_of_the_geyser_fields_SpellScript); - SpellCastResult CheckSinkholes() { Unit* caster = GetCaster(); @@ -2646,7 +2541,7 @@ class spell_item_map_of_the_geyser_fields : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); + OnCheckCast.Register(&spell_item_map_of_the_geyser_fields_SpellScript::CheckSinkholes); } }; @@ -2670,8 +2565,6 @@ class spell_item_vanquished_clutches : public SpellScriptLoader class spell_item_vanquished_clutches_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_vanquished_clutches_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2691,7 +2584,7 @@ class spell_item_vanquished_clutches : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_vanquished_clutches_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2724,8 +2617,6 @@ class spell_item_ashbringer : public SpellScriptLoader class spell_item_ashbringer_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_ashbringer_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2746,7 +2637,7 @@ class spell_item_ashbringer : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_item_ashbringer_SpellScript::OnDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2773,8 +2664,6 @@ class spell_magic_eater_food : public SpellScriptLoader class spell_magic_eater_food_AuraScript : public AuraScript { - PrepareAuraScript(spell_magic_eater_food_AuraScript); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -2804,7 +2693,7 @@ class spell_magic_eater_food : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_magic_eater_food_AuraScript::HandleTriggerSpell, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2821,8 +2710,6 @@ class spell_item_shimmering_vessel : public SpellScriptLoader class spell_item_shimmering_vessel_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_shimmering_vessel_SpellScript); - void HandleDummy(SpellEffIndex /* effIndex */) { if (Creature* target = GetHitCreature()) @@ -2831,7 +2718,7 @@ class spell_item_shimmering_vessel : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_shimmering_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2854,8 +2741,6 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader class spell_item_purify_helboar_meat_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_purify_helboar_meat_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -2878,7 +2763,7 @@ class spell_item_purify_helboar_meat : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_purify_helboar_meat_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2900,8 +2785,6 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader class spell_item_crystal_prison_dummy_dnd_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_crystal_prison_dummy_dnd_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetGameObjectTemplate(OBJECT_IMPRISONED_DOOMGUARD)) @@ -2921,7 +2804,7 @@ class spell_item_crystal_prison_dummy_dnd : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_crystal_prison_dummy_dnd_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2947,8 +2830,6 @@ class spell_item_reindeer_transformation : public SpellScriptLoader class spell_item_reindeer_transformation_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_reindeer_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -2992,7 +2873,7 @@ class spell_item_reindeer_transformation : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_reindeer_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3015,8 +2896,6 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader class spell_item_nigh_invulnerability_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_nigh_invulnerability_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NIGH_INVULNERABILITY, SPELL_COMPLETE_VULNERABILITY }); @@ -3036,7 +2915,7 @@ class spell_item_nigh_invulnerability : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_nigh_invulnerability_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3059,8 +2938,6 @@ class spell_item_poultryizer : public SpellScriptLoader class spell_item_poultryizer_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_poultryizer_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_POULTRYIZER_SUCCESS, SPELL_POULTRYIZER_BACKFIRE }); @@ -3074,7 +2951,7 @@ class spell_item_poultryizer : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_poultryizer_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3097,8 +2974,6 @@ class spell_item_socrethars_stone : public SpellScriptLoader class spell_item_socrethars_stone_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_socrethars_stone_SpellScript); - bool Load() override { return (GetCaster()->GetAreaId() == 3900 || GetCaster()->GetAreaId() == 3742); @@ -3126,7 +3001,7 @@ class spell_item_socrethars_stone : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_socrethars_stone_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3150,8 +3025,6 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader class spell_item_demon_broiled_surprise_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_demon_broiled_surprise_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_CREATE_DEMON_BROILED_SURPRISE }) && @@ -3184,8 +3057,8 @@ class spell_item_demon_broiled_surprise : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_demon_broiled_surprise_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); - OnCheckCast += SpellCheckCastFn(spell_item_demon_broiled_surprise_SpellScript::CheckRequirement); + OnEffectHitTarget.Register(&spell_item_demon_broiled_surprise_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_item_demon_broiled_surprise_SpellScript::CheckRequirement); } }; @@ -3207,8 +3080,6 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader class spell_item_complete_raptor_capture_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_complete_raptor_capture_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RAPTOR_CAPTURE_CREDIT }); @@ -3228,7 +3099,7 @@ class spell_item_complete_raptor_capture : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_complete_raptor_capture_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3251,8 +3122,6 @@ class spell_item_impale_leviroth : public SpellScriptLoader class spell_item_impale_leviroth_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_impale_leviroth_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { if (!sObjectMgr->GetCreatureTemplate(NPC_LEVIROTH)) @@ -3272,7 +3141,7 @@ class spell_item_impale_leviroth : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_impale_leviroth_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3299,8 +3168,6 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader class spell_item_brewfest_mount_transformation_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_brewfest_mount_transformation_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -3343,7 +3210,7 @@ class spell_item_brewfest_mount_transformation : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_brewfest_mount_transformation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3367,8 +3234,6 @@ class spell_item_nitro_boosts : public SpellScriptLoader class spell_item_nitro_boosts_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_nitro_boosts_SpellScript); - bool Load() override { if (!GetCastItem()) @@ -3393,7 +3258,7 @@ class spell_item_nitro_boosts : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_nitro_boosts_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_nitro_boosts_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3410,8 +3275,6 @@ class spell_item_nitro_boosts_backfire : public SpellScriptLoader class spell_item_nitro_boosts_backfire_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_nitro_boosts_backfire_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_NITRO_BOOSTS_PARACHUTE }); @@ -3438,8 +3301,8 @@ class spell_item_nitro_boosts_backfire : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_item_nitro_boosts_backfire_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_item_nitro_boosts_backfire_AuraScript::HandlePeriodicDummy, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectApply.Register(&spell_item_nitro_boosts_backfire_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_item_nitro_boosts_backfire_AuraScript::HandlePeriodicDummy, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } float lastZ = INVALID_HEIGHT; @@ -3464,8 +3327,6 @@ class spell_item_teach_language : public SpellScriptLoader class spell_item_teach_language_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_teach_language_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3486,7 +3347,7 @@ class spell_item_teach_language : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_teach_language_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3508,8 +3369,6 @@ class spell_item_rocket_boots : public SpellScriptLoader class spell_item_rocket_boots_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_rocket_boots_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3539,8 +3398,8 @@ class spell_item_rocket_boots : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_rocket_boots_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_item_rocket_boots_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_item_rocket_boots_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3563,8 +3422,6 @@ class spell_item_pygmy_oil : public SpellScriptLoader class spell_item_pygmy_oil_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_pygmy_oil_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_PYGMY_OIL_PYGMY_AURA, SPELL_PYGMY_OIL_SMALLER_AURA }); @@ -3590,7 +3447,7 @@ class spell_item_pygmy_oil : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_pygmy_oil_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3607,8 +3464,6 @@ class spell_item_unusual_compass : public SpellScriptLoader class spell_item_unusual_compass_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_unusual_compass_SpellScript); - void HandleDummy(SpellEffIndex /* effIndex */) { Unit* caster = GetCaster(); @@ -3617,7 +3472,7 @@ class spell_item_unusual_compass : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_unusual_compass_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3642,8 +3497,6 @@ class spell_item_chicken_cover : public SpellScriptLoader class spell_item_chicken_cover_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_chicken_cover_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -3671,7 +3524,7 @@ class spell_item_chicken_cover : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_chicken_cover_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3688,8 +3541,6 @@ class spell_item_muisek_vessel : public SpellScriptLoader class spell_item_muisek_vessel_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_muisek_vessel_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -3699,7 +3550,7 @@ class spell_item_muisek_vessel : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_muisek_vessel_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3720,9 +3571,7 @@ public: class spell_item_greatmothers_soulcatcher_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_greatmothers_soulcatcher_SpellScript); - - void HandleDummy(SpellEffIndex /*effIndex*/) + void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitUnit()) GetCaster()->CastSpell(GetCaster(), SPELL_FORCE_CAST_SUMMON_GNOME_SOUL); @@ -3730,7 +3579,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_greatmothers_soulcatcher_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -3763,8 +3612,6 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader template 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( @@ -3789,7 +3636,7 @@ class spell_item_shard_of_the_scale : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_shard_of_the_scale_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_shard_of_the_scale_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -3814,8 +3661,6 @@ public: class spell_item_soul_preserver_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_soul_preserver_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -3854,7 +3699,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_soul_preserver_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_soul_preserver_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -3902,8 +3747,6 @@ class spell_item_sunwell_neck : public SpellScriptLoader template class spell_item_sunwell_neck_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_sunwell_neck_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ Aldors, Scryers }) && @@ -3934,8 +3777,8 @@ class spell_item_sunwell_neck : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_sunwell_neck_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_sunwell_neck_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_sunwell_neck_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_sunwell_neck_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -3952,9 +3795,7 @@ public: class spell_item_toy_train_set_pulse_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_toy_train_set_pulse_SpellScript); - - void HandleDummy(SpellEffIndex /*index*/) + void HandleDummy(SpellEffIndex /*index*/) { if (Player* target = GetHitUnit()->ToPlayer()) { @@ -3971,8 +3812,8 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_toy_train_set_pulse_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_item_toy_train_set_pulse_SpellScript::HandleTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnEffectHitTarget.Register(&spell_item_toy_train_set_pulse_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_item_toy_train_set_pulse_SpellScript::HandleTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -3997,8 +3838,6 @@ class spell_item_taunt_flag_targeting : public SpellScriptLoader class spell_item_taunt_flag_targeting_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_taunt_flag_targeting_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TAUNT_FLAG }) && @@ -4032,8 +3871,8 @@ class spell_item_taunt_flag_targeting : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_item_taunt_flag_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_CORPSE_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_item_taunt_flag_targeting_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_item_taunt_flag_targeting_SpellScript::FilterTargets, EFFECT_0, TARGET_CORPSE_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_item_taunt_flag_targeting_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4060,8 +3899,6 @@ class spell_item_mind_control_cap : public SpellScriptLoader class spell_item_mind_control_cap_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_mind_control_cap_SpellScript); - bool Load() override { if (!GetCastItem()) @@ -4088,7 +3925,7 @@ class spell_item_mind_control_cap : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_mind_control_cap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_mind_control_cap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4113,8 +3950,6 @@ class spell_item_universal_remote : public SpellScriptLoader class spell_item_universal_remote_SpellScript : public SpellScript { - PrepareSpellScript(spell_item_universal_remote_SpellScript); - bool Load() override { if (!GetCastItem()) @@ -4143,7 +3978,7 @@ class spell_item_universal_remote : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_universal_remote_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_universal_remote_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4171,11 +4006,9 @@ class spell_item_zandalarian_charm : public SpellScriptLoader class spell_item_zandalarian_charm_AuraScript : public AuraScript { + 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 }); @@ -4198,8 +4031,8 @@ class spell_item_zandalarian_charm : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_zandalarian_charm_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_zandalarian_charm_AuraScript::HandleStackDrop, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_zandalarian_charm_AuraScript::CheckProc); + OnEffectProc.Register(&spell_item_zandalarian_charm_AuraScript::HandleStackDrop, EFFECT_0, SPELL_AURA_DUMMY); } uint32 _spellId; @@ -4222,9 +4055,7 @@ public: class mad_alchemists_potion_SpellScript : public SpellScript { - PrepareSpellScript(mad_alchemists_potion_SpellScript); - - void SecondaryEffect() + void SecondaryEffect() { std::vector availableElixirs = { @@ -4286,7 +4117,7 @@ public: void Register() override { - AfterCast += SpellCastFn(mad_alchemists_potion_SpellScript::SecondaryEffect); + AfterCast.Register(&mad_alchemists_potion_SpellScript::SecondaryEffect); } }; @@ -4305,9 +4136,7 @@ public: class crazy_alchemists_potion_SpellScript : public SpellScript { - PrepareSpellScript(crazy_alchemists_potion_SpellScript); - - void SecondaryEffect() + void SecondaryEffect() { std::vector availableElixirs = { @@ -4338,7 +4167,7 @@ public: void Register() override { - AfterCast += SpellCastFn(crazy_alchemists_potion_SpellScript::SecondaryEffect); + AfterCast.Register(&crazy_alchemists_potion_SpellScript::SecondaryEffect); } }; @@ -4366,8 +4195,6 @@ public: class spell_item_death_choice_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_death_choice_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4412,7 +4239,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_death_choice_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_death_choice_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -4448,8 +4275,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) { @@ -4482,7 +4307,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_trinket_stack_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_trinket_stack_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } private: @@ -4516,8 +4341,6 @@ public: class spell_item_darkmoon_card_greatness_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_darkmoon_card_greatness_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4571,7 +4394,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_darkmoon_card_greatness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_darkmoon_card_greatness_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -4594,8 +4417,6 @@ public: class spell_item_charm_witch_doctor_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_charm_witch_doctor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHARM_WITCH_DOCTOR_PROC }); @@ -4617,7 +4438,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_charm_witch_doctor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_charm_witch_doctor_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -4641,8 +4462,6 @@ public: class spell_item_mana_drain_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_mana_drain_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4668,7 +4487,7 @@ public: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_mana_drain_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_item_mana_drain_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -4690,8 +4509,6 @@ enum EggShell // 91296, 91308 - Egg Shell class spell_item_egg_shell : public AuraScript { - PrepareAuraScript(spell_item_egg_shell); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4717,15 +4534,13 @@ class spell_item_egg_shell : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_item_egg_shell::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_item_egg_shell::HandleEffectRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_item_egg_shell::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_item_egg_shell::HandleEffectRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; class spell_item_song_of_sorrow : public AuraScript { - PrepareAuraScript(spell_item_song_of_sorrow); - bool CheckProc(ProcEventInfo& eventInfo) { DamageInfo* damageInfo = eventInfo.GetDamageInfo(); @@ -4743,14 +4558,12 @@ class spell_item_song_of_sorrow : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_song_of_sorrow::CheckProc); + DoCheckProc.Register(&spell_item_song_of_sorrow::CheckProc); } }; class spell_item_crescendo_of_suffering : public AuraScript { - PrepareAuraScript(spell_item_crescendo_of_suffering); - void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetSpellHistory()->AddCooldown(GetSpellInfo()->Id, 0, 10s); @@ -4758,7 +4571,7 @@ class spell_item_crescendo_of_suffering : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_item_crescendo_of_suffering::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_item_crescendo_of_suffering::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE, AURA_EFFECT_HANDLE_REAL); } }; @@ -4776,9 +4589,6 @@ class spell_item_consume_charges : public SpellScriptLoader { friend class spell_item_consume_charges; spell_item_consume_charges_SpellScript(uint32 SpellId) : SpellScript(), _spellId(SpellId) { } - - PrepareSpellScript(spell_item_consume_charges_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ _spellId }); @@ -4801,8 +4611,8 @@ class spell_item_consume_charges : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_consume_charges_SpellScript::CheckCast); - AfterCast += SpellCastFn(spell_item_consume_charges_SpellScript::HandleStackConsumption); + OnCheckCast.Register(&spell_item_consume_charges_SpellScript::CheckCast); + AfterCast.Register(&spell_item_consume_charges_SpellScript::HandleStackConsumption); } uint32 _spellId; @@ -4826,8 +4636,6 @@ enum HeartsJudgement class spell_item_hearts_judgement : public SpellScript { - PrepareSpellScript(spell_item_hearts_judgement); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4855,7 +4663,7 @@ class spell_item_hearts_judgement : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_hearts_judgement::CheckCast); + OnCheckCast.Register(&spell_item_hearts_judgement::CheckCast); } private: uint32 _auraId = 0; @@ -4863,8 +4671,6 @@ private: class spell_item_hearts_judgement_AuraScript : public AuraScript { - PrepareAuraScript(spell_item_hearts_judgement_AuraScript); - bool Load() override { _auraId = GetSpellInfo()->Id == SPELL_HEARTS_JUDGEMENT_HEROIC ? SPELL_HEARTS_REVELATION_HEROIC : SPELL_HEARTS_REVELATION; @@ -4886,7 +4692,7 @@ class spell_item_hearts_judgement_AuraScript : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_item_hearts_judgement_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RATING); + DoEffectCalcAmount.Register(&spell_item_hearts_judgement_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_RATING); } private: uint32 _auraId; @@ -4904,8 +4710,6 @@ enum ApparatusOfKhazgoroth // 97127 - Blessing of Khaz'goroth class spell_item_blessing_of_khazgoroth : public SpellScript { - PrepareSpellScript(spell_item_blessing_of_khazgoroth); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -4955,7 +4759,7 @@ class spell_item_blessing_of_khazgoroth : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_blessing_of_khazgoroth::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_item_blessing_of_khazgoroth::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -4968,8 +4772,6 @@ enum ScalesOfLife // 97117 - Weight of a Feather class spell_item_weight_of_a_feather : public AuraScript { - PrepareAuraScript(spell_item_weight_of_a_feather); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WEIGHT_OF_A_FEATHER }); @@ -4999,16 +4801,14 @@ class spell_item_weight_of_a_feather : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_item_weight_of_a_feather::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_item_weight_of_a_feather::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_item_weight_of_a_feather::CheckProc); + OnEffectProc.Register(&spell_item_weight_of_a_feather::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 96880 - Tipping of the Scales class spell_item_tipping_of_the_scales : public SpellScript { - PrepareSpellScript(spell_item_tipping_of_the_scales); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WEIGHT_OF_A_FEATHER }); @@ -5033,8 +4833,8 @@ class spell_item_tipping_of_the_scales : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_item_tipping_of_the_scales::CheckCast); - OnEffectLaunchTarget += SpellEffectFn(spell_item_tipping_of_the_scales::HandleHealValue, EFFECT_0, SPELL_EFFECT_HEAL); + OnCheckCast.Register(&spell_item_tipping_of_the_scales::CheckCast); + OnEffectLaunchTarget.Register(&spell_item_tipping_of_the_scales::HandleHealValue, EFFECT_0, SPELL_EFFECT_HEAL); } }; @@ -5051,8 +4851,6 @@ enum JarOfAncientRemedies // 92331 Blind Spot class spell_item_blind_spot : public SpellScript { - PrepareSpellScript(spell_item_blind_spot); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -5080,7 +4878,7 @@ class spell_item_blind_spot : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_item_blind_spot::HandleHitEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE); + OnEffectHitTarget.Register(&spell_item_blind_spot::HandleHitEffect, EFFECT_0, SPELL_EFFECT_ENERGIZE); } }; @@ -5095,8 +4893,6 @@ enum VariablePulseLightningCapacitor // 97119 - Variable Pulse Lightning Capacitor class spell_item_variable_pulse_lightning_capacitor : public AuraScript { - PrepareAuraScript(spell_item_variable_pulse_lightning_capacitor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -5140,7 +4936,7 @@ class spell_item_variable_pulse_lightning_capacitor : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_item_variable_pulse_lightning_capacitor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_item_variable_pulse_lightning_capacitor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index 033120021a..d0bd7a7308 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -157,8 +157,6 @@ enum MiscSpells // -31571 - Arcane Potency class spell_mage_arcane_potency : public AuraScript { - PrepareAuraScript(spell_mage_arcane_potency); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -188,7 +186,7 @@ class spell_mage_arcane_potency : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_arcane_potency::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_mage_arcane_potency::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -205,8 +203,6 @@ class spell_mage_blast_wave : public SpellScriptLoader class spell_mage_blast_wave_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_blast_wave_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FLAMESTRIKE }); @@ -235,8 +231,8 @@ class spell_mage_blast_wave : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_blast_wave_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - AfterCast += SpellCastFn(spell_mage_blast_wave_SpellScript::HandleImprovedFlamestrike); + OnObjectAreaTargetSelect.Register(&spell_mage_blast_wave_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + AfterCast.Register(&spell_mage_blast_wave_SpellScript::HandleImprovedFlamestrike); } uint32 _targetCount = 0; @@ -256,8 +252,6 @@ class spell_mage_blazing_speed : public SpellScriptLoader class spell_mage_blazing_speed_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_blazing_speed_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_BLAZING_SPEED }); @@ -271,7 +265,7 @@ class spell_mage_blazing_speed : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_blazing_speed_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_mage_blazing_speed_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -290,8 +284,6 @@ class spell_mage_blizzard : public SpellScriptLoader class spell_mage_blizzard_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_blizzard_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -315,7 +307,7 @@ class spell_mage_blizzard : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_blizzard_SpellScript::AddChillEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_mage_blizzard_SpellScript::AddChillEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -333,8 +325,6 @@ class spell_mage_cold_snap : public SpellScriptLoader class spell_mage_cold_snap_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_cold_snap_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -352,7 +342,7 @@ class spell_mage_cold_snap : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_mage_cold_snap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -371,8 +361,6 @@ class spell_mage_cone_of_cold : public SpellScriptLoader class spell_mage_cone_of_cold_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_cone_of_cold_SpellScript); - void HandleConeOfColdScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -387,7 +375,7 @@ class spell_mage_cone_of_cold : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mage_cone_of_cold_SpellScript::HandleConeOfColdScript, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -426,8 +414,6 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader class spell_mage_conjure_refreshment_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_conjure_refreshment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { for (uint8 i = 0; i < MAX_CONJURE_REFRESHMENT_SPELLS; ++i) @@ -458,7 +444,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mage_conjure_refreshment_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -471,8 +457,6 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader // -31661 - Dragon's Breath class spell_mage_dragon_breath : public AuraScript { - PrepareAuraScript(spell_mage_dragon_breath); - bool CheckProc(ProcEventInfo& eventInfo) { // Dont proc with Living Bomb explosion @@ -484,7 +468,7 @@ class spell_mage_dragon_breath : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_dragon_breath::CheckProc); + DoCheckProc.Register(&spell_mage_dragon_breath::CheckProc); } }; @@ -496,8 +480,6 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader class spell_mage_fire_frost_ward_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_fire_frost_ward_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FROST_WARDING_TRIGGERED, SPELL_MAGE_FROST_WARDING_R1 }); @@ -537,8 +519,8 @@ class spell_mage_fire_frost_ward : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_mage_fire_frost_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_mage_fire_frost_ward_AuraScript::Absorb, EFFECT_0); } }; @@ -556,8 +538,6 @@ class spell_mage_focus_magic : public SpellScriptLoader class spell_mage_focus_magic_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_focus_magic_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FOCUS_MAGIC_PROC }); @@ -577,8 +557,8 @@ class spell_mage_focus_magic : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_focus_magic_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); + DoCheckProc.Register(&spell_mage_focus_magic_AuraScript::CheckProc); + OnEffectProc.Register(&spell_mage_focus_magic_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); } Unit* _procTarget = nullptr; @@ -594,8 +574,6 @@ class spell_mage_focus_magic : public SpellScriptLoader /// Updated 4.3.4 class spell_mage_frostbolt : public SpellScript { - PrepareSpellScript(spell_mage_frostbolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -661,8 +639,8 @@ class spell_mage_frostbolt : public SpellScript void Register() override { - OnSpellStart += SpellCastFn(spell_mage_frostbolt::HandleEarlyFrost); - OnEffectHitTarget += SpellEffectFn(spell_mage_frostbolt::RecalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnSpellStart.Register(&spell_mage_frostbolt::HandleEarlyFrost); + OnEffectHitTarget.Register(&spell_mage_frostbolt::RecalculateDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } private: @@ -678,8 +656,6 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader class spell_mage_glyph_of_ice_block_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_glyph_of_ice_block_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FROST_NOVA }); @@ -699,8 +675,8 @@ class spell_mage_glyph_of_ice_block : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_glyph_of_ice_block_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_ice_block_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_glyph_of_ice_block_AuraScript::CheckProc); + OnEffectProc.Register(&spell_mage_glyph_of_ice_block_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -718,8 +694,6 @@ class spell_mage_glyph_of_icy_veins : public SpellScriptLoader class spell_mage_glyph_of_icy_veins_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_glyph_of_icy_veins_AuraScript); - void HandleEffectProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -730,7 +704,7 @@ class spell_mage_glyph_of_icy_veins : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_icy_veins_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_mage_glyph_of_icy_veins_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -748,8 +722,6 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader class spell_mage_glyph_of_polymorph_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_glyph_of_polymorph_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH }); @@ -767,7 +739,7 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_glyph_of_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_mage_glyph_of_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -780,8 +752,6 @@ class spell_mage_glyph_of_polymorph : public SpellScriptLoader // 44457 - Living Bomb class spell_mage_living_bomb : public AuraScript { - PrepareAuraScript(spell_mage_living_bomb); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ uint32(spellInfo->Effects[EFFECT_1].CalcValue()) }); @@ -798,7 +768,7 @@ class spell_mage_living_bomb : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_living_bomb::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mage_living_bomb::AfterRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -811,8 +781,6 @@ class spell_mage_ice_barrier : public SpellScriptLoader class spell_mage_ice_barrier_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_ice_barrier_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = false; @@ -833,9 +801,9 @@ class spell_mage_ice_barrier : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + DoEffectCalcAmount.Register(&spell_mage_ice_barrier_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + AfterEffectRemove.Register(&spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mage_ice_barrier_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB, AURA_EFFECT_HANDLE_REAL); } }; @@ -848,8 +816,6 @@ class spell_mage_ice_barrier : public SpellScriptLoader // -11119 - Ignite class spell_mage_ignite : public AuraScript { - PrepareAuraScript(spell_mage_ignite); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -894,8 +860,8 @@ class spell_mage_ignite : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_ignite::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_ignite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_ignite::CheckProc); + OnEffectProc.Register(&spell_mage_ignite::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 543 - Mage Ward @@ -907,8 +873,6 @@ class spell_mage_mage_ward : public SpellScriptLoader class spell_mage_mage_ward_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_mage_ward_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = false; @@ -931,8 +895,8 @@ class spell_mage_mage_ward : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_mage_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - AfterEffectAbsorb += AuraEffectAbsorbFn(spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_mage_mage_ward_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + AfterEffectAbsorb.Register(&spell_mage_mage_ward_AuraScript::HandleAbsorb, EFFECT_0); } }; @@ -951,8 +915,6 @@ class spell_mage_mana_shield : public SpellScriptLoader class spell_mage_mana_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_mana_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -991,9 +953,9 @@ class spell_mage_mana_shield : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_mana_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MANA_SHIELD); - AfterEffectManaShield += AuraEffectManaShieldFn(spell_mage_mana_shield_AuraScript::HandleAbsorb, EFFECT_0); - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_mana_shield_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MANA_SHIELD, AURA_EFFECT_HANDLE_REAL); + DoEffectCalcAmount.Register(&spell_mage_mana_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MANA_SHIELD); + AfterEffectManaShield.Register(&spell_mage_mana_shield_AuraScript::HandleAbsorb, EFFECT_0); + AfterEffectRemove.Register(&spell_mage_mana_shield_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_MANA_SHIELD, AURA_EFFECT_HANDLE_REAL); } }; @@ -1006,8 +968,6 @@ class spell_mage_mana_shield : public SpellScriptLoader // -29074 - Master of Elements class spell_mage_master_of_elements : public AuraScript { - PrepareAuraScript(spell_mage_master_of_elements); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_MASTER_OF_ELEMENTS_ENERGIZE }); @@ -1032,16 +992,14 @@ class spell_mage_master_of_elements : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_master_of_elements::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_master_of_elements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_master_of_elements::CheckProc); + OnEffectProc.Register(&spell_mage_master_of_elements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -86181 - Nether Vortex class spell_mage_nether_vortex : public AuraScript { - PrepareAuraScript(spell_mage_nether_vortex); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_SLOW }); @@ -1064,16 +1022,14 @@ class spell_mage_nether_vortex : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_nether_vortex::DoCheck); - OnEffectProc += AuraEffectProcFn(spell_mage_nether_vortex::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_nether_vortex::DoCheck); + OnEffectProc.Register(&spell_mage_nether_vortex::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -11175 - Permafrost class spell_mage_permafrost : public AuraScript { - PrepareAuraScript(spell_mage_permafrost); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1100,8 +1056,8 @@ class spell_mage_permafrost : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_permafrost::DoCheck); - OnEffectProc += AuraEffectProcFn(spell_mage_permafrost::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_permafrost::DoCheck); + OnEffectProc.Register(&spell_mage_permafrost::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1113,8 +1069,6 @@ class spell_mage_polymorph : public SpellScriptLoader class spell_mage_polymorph_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_polymorph_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1153,8 +1107,8 @@ class spell_mage_polymorph : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_polymorph_AuraScript::DoCheck); - OnEffectProc += AuraEffectProcFn(spell_mage_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_CONFUSE); + DoCheckProc.Register(&spell_mage_polymorph_AuraScript::DoCheck); + OnEffectProc.Register(&spell_mage_polymorph_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_MOD_CONFUSE); } private: @@ -1181,8 +1135,6 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader class spell_mage_polymorph_cast_visual_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_polymorph_cast_visual_SpellScript); - static const uint32 PolymorhForms[6]; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -1201,7 +1153,7 @@ class spell_mage_polymorph_cast_visual : public SpellScriptLoader void Register() override { // add dummy effect spell handler to Polymorph visual - OnEffectHitTarget += SpellEffectFn(spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mage_polymorph_cast_visual_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1229,10 +1181,8 @@ class spell_mage_replenish_mana : public SpellScriptLoader spell_mage_replenish_mana() : SpellScriptLoader("spell_mage_replenish_mana") { } class spell_mage_replenish_mana_SpellScript : public SpellScript - { - PrepareSpellScript(spell_mage_replenish_mana_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + { + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_IMPROVED_MANA_GEM_TRIGGERED }); } @@ -1248,7 +1198,7 @@ class spell_mage_replenish_mana : public SpellScriptLoader void Register() override { - AfterCast += SpellCastFn(spell_mage_replenish_mana_SpellScript::HandleImprovedManaGem); + AfterCast.Register(&spell_mage_replenish_mana_SpellScript::HandleImprovedManaGem); } }; @@ -1267,8 +1217,6 @@ class spell_mage_ring_of_frost : public SpellScriptLoader class spell_mage_ring_of_frost_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_ring_of_frost_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1321,8 +1269,8 @@ class spell_mage_ring_of_frost : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - OnEffectApply += AuraEffectApplyFn(spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic.Register(&spell_mage_ring_of_frost_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectApply.Register(&spell_mage_ring_of_frost_AuraScript::Apply, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1341,8 +1289,6 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader class spell_mage_ring_of_frost_freeze_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_ring_of_frost_freeze_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_SUMMON, SPELL_MAGE_RING_OF_FROST_FREEZE }); @@ -1361,7 +1307,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_mage_ring_of_frost_freeze_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; @@ -1372,8 +1318,6 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader class spell_mage_ring_of_frost_freeze_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_ring_of_frost_freeze_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_RING_OF_FROST_DUMMY }); @@ -1388,7 +1332,7 @@ class spell_mage_ring_of_frost_freeze : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mage_ring_of_frost_freeze_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; @@ -1406,8 +1350,6 @@ class spell_mage_time_warp : public SpellScriptLoader class spell_mage_time_warp_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_time_warp_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1435,8 +1377,8 @@ class spell_mage_time_warp : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_time_warp_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); - AfterHit += SpellHitFn(spell_mage_time_warp_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_mage_time_warp_SpellScript::RemoveInvalidTargets, EFFECT_ALL, TARGET_UNIT_CASTER_AREA_RAID); + AfterHit.Register(&spell_mage_time_warp_SpellScript::ApplyDebuff); } }; @@ -1454,10 +1396,8 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader spell_mage_water_elemental_freeze() : SpellScriptLoader("spell_mage_water_elemental_freeze") { } class spell_mage_water_elemental_freeze_SpellScript : public SpellScript - { - PrepareSpellScript(spell_mage_water_elemental_freeze_SpellScript); - - bool Validate(SpellInfo const* /*spellInfo*/) override + { + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FINGERS_OF_FROST }); } @@ -1485,8 +1425,8 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_water_elemental_freeze_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - AfterCast += SpellCastFn(spell_mage_water_elemental_freeze_SpellScript::HandleImprovedFreeze); + OnObjectAreaTargetSelect.Register(&spell_mage_water_elemental_freeze_SpellScript::CountTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + AfterCast.Register(&spell_mage_water_elemental_freeze_SpellScript::HandleImprovedFreeze); } private: @@ -1502,8 +1442,6 @@ class spell_mage_water_elemental_freeze : public SpellScriptLoader // 79683 Arcane Missiles! class spell_mage_arcane_missiles_trigger : public AuraScript { - PrepareAuraScript(spell_mage_arcane_missiles_trigger); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1531,17 +1469,15 @@ class spell_mage_arcane_missiles_trigger : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_arcane_missiles_trigger::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); - AfterEffectApply += AuraEffectApplyFn(spell_mage_arcane_missiles_trigger::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_arcane_missiles_trigger::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectProc.Register(&spell_mage_arcane_missiles_trigger::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + AfterEffectApply.Register(&spell_mage_arcane_missiles_trigger::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mage_arcane_missiles_trigger::OnRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 79684 Offensive State (DND) class spell_mage_offensive_state_dnd : public AuraScript { - PrepareAuraScript(spell_mage_offensive_state_dnd); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1585,7 +1521,7 @@ class spell_mage_offensive_state_dnd : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_offensive_state_dnd::CheckProc); + DoCheckProc.Register(&spell_mage_offensive_state_dnd::CheckProc); } }; @@ -1596,8 +1532,6 @@ public: class spell_mage_early_frost_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_early_frost_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_EARLY_FROST_VISUAL }); @@ -1611,7 +1545,7 @@ public: void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_mage_early_frost_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_mage_early_frost_AuraScript::AfterRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; @@ -1629,8 +1563,6 @@ class spell_mage_flame_orb: public SpellScriptLoader class spell_mage_flame_orb_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_flame_orb_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1668,7 +1600,7 @@ class spell_mage_flame_orb: public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_flame_orb_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mage_flame_orb_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } private: @@ -1689,8 +1621,6 @@ class spell_mage_flame_orb_aoe_dummy: public SpellScriptLoader class spell_mage_flame_orb_aoe_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_mage_flame_orb_aoe_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1751,8 +1681,8 @@ class spell_mage_flame_orb_aoe_dummy: public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_flame_orb_aoe_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_mage_flame_orb_aoe_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_mage_flame_orb_aoe_dummy_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_mage_flame_orb_aoe_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } private: @@ -1773,8 +1703,6 @@ class spell_mage_hot_streak : public SpellScriptLoader class spell_mage_hot_streak_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_hot_streak_AuraScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1824,8 +1752,8 @@ class spell_mage_hot_streak : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_hot_streak_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_hot_streak_AuraScript::CheckProc); + OnEffectProc.Register(&spell_mage_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1843,8 +1771,6 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader class spell_mage_improved_hot_streak_AuraScript : public AuraScript { - PrepareAuraScript(spell_mage_improved_hot_streak_AuraScript); - uint8 criticalStrikesCounter; bool Load() override @@ -1897,8 +1823,8 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_mage_improved_hot_streak_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_mage_improved_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_mage_improved_hot_streak_AuraScript::CheckProc); + OnEffectProc.Register(&spell_mage_improved_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1911,8 +1837,6 @@ class spell_mage_improved_hot_streak : public SpellScriptLoader // 55342 - Mirror Image class spell_mage_mirror_image : public SpellScript { - PrepareSpellScript(spell_mage_mirror_image); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1943,14 +1867,12 @@ class spell_mage_mirror_image : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_mirror_image::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_mage_mirror_image::HandleDummyEffect, EFFECT_1, SPELL_EFFECT_DUMMY); } }; class spell_mage_mirror_image_AurasScript : public AuraScript { - PrepareAuraScript(spell_mage_mirror_image_AurasScript); - void HandleEffectPeriodic(AuraEffect const* aurEff) { if (aurEff->GetTickNumber() == 1) @@ -1959,7 +1881,7 @@ class spell_mage_mirror_image_AurasScript : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_mirror_image_AurasScript::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_mage_mirror_image_AurasScript::HandleEffectPeriodic, EFFECT_2, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1983,8 +1905,6 @@ class SummonerCheck class spell_mage_initialize_images : public SpellScript { - PrepareSpellScript(spell_mage_initialize_images); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -1995,14 +1915,12 @@ class spell_mage_initialize_images : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_mage_initialize_images::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); + OnObjectAreaTargetSelect.Register(&spell_mage_initialize_images::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY); } }; class spell_mage_deep_freeze : public SpellScript { - PrepareSpellScript(spell_mage_deep_freeze); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_DEEP_FREEZE_DAMAGE }); @@ -2022,14 +1940,12 @@ class spell_mage_deep_freeze : public SpellScript void Register() override { - OnEffectLaunch += SpellEffectFn(spell_mage_deep_freeze::HandleDamage, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectLaunch.Register(&spell_mage_deep_freeze::HandleDamage, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_mage_fingers_of_frost_charges : public AuraScript { - PrepareAuraScript(spell_mage_fingers_of_frost_charges); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -2038,15 +1954,13 @@ class spell_mage_fingers_of_frost_charges : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_fingers_of_frost_charges::HandleProc, EFFECT_0, SPELL_AURA_ABILITY_IGNORE_AURASTATE); + OnEffectProc.Register(&spell_mage_fingers_of_frost_charges::HandleProc, EFFECT_0, SPELL_AURA_ABILITY_IGNORE_AURASTATE); } }; // -34293 - Pyromaniac class spell_mage_pyromaniac : public AuraScript { - PrepareAuraScript(spell_mage_pyromaniac); - bool Load() override { _buffActive = false; @@ -2102,9 +2016,9 @@ class spell_mage_pyromaniac : public AuraScript void Register() override { - DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_mage_pyromaniac::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectProc += AuraEffectProcFn(spell_mage_pyromaniac::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_mage_pyromaniac::HandlePeriodic, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcPeriodic.Register(&spell_mage_pyromaniac::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_mage_pyromaniac::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic.Register(&spell_mage_pyromaniac::HandlePeriodic, EFFECT_0, SPELL_AURA_DUMMY); } private: GuidSet _dotTargetGuids; @@ -2139,8 +2053,6 @@ private: // -11103 - Impact class spell_mage_impact : public AuraScript { - PrepareAuraScript(spell_mage_impact); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MAGE_FIRE_BLAST }); @@ -2153,15 +2065,13 @@ class spell_mage_impact : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_mage_impact::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_mage_impact::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 12355 - Impact class spell_mage_impact_triggered : public SpellScript { - PrepareSpellScript(spell_mage_impact_triggered); - void RegisterFireDots(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -2204,8 +2114,8 @@ class spell_mage_impact_triggered : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_mage_impact_triggered::RegisterFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); - OnEffectHitTarget += SpellEffectFn(spell_mage_impact_triggered::SpeadFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectLaunchTarget.Register(&spell_mage_impact_triggered::RegisterFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mage_impact_triggered::SpeadFireDots, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } private: std::vector _fireDotEffects; @@ -2214,8 +2124,6 @@ private: // 11129 - Combustion class spell_mage_combustion : public SpellScript { - PrepareSpellScript(spell_mage_combustion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2263,7 +2171,7 @@ class spell_mage_combustion : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_combustion::HandleDotEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_mage_combustion::HandleDotEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } private: @@ -2273,8 +2181,6 @@ private: // 44614 - Frostfire Bolt class spell_mage_frostfire_bolt : public SpellScript { - PrepareSpellScript(spell_mage_frostfire_bolt); - void HandleGlyphSlow(SpellEffIndex effIndex) { Unit* caster = GetCaster(); @@ -2304,8 +2210,8 @@ class spell_mage_frostfire_bolt : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_mage_frostfire_bolt::HandleGlyphSlow, EFFECT_0, SPELL_EFFECT_APPLY_AURA); - OnEffectHitTarget += SpellEffectFn(spell_mage_frostfire_bolt::HandleGlyphDot, EFFECT_2, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mage_frostfire_bolt::HandleGlyphSlow, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_mage_frostfire_bolt::HandleGlyphDot, EFFECT_2, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 3d2d39c0c8..6342b958a9 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -126,8 +126,6 @@ enum PaladinCreatures class spell_pal_ardent_defender : public AuraScript { - PrepareAuraScript(spell_pal_ardent_defender); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ARDENT_DEFENDER_HEAL }); @@ -151,8 +149,8 @@ class spell_pal_ardent_defender : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_ardent_defender::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_pal_ardent_defender::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_pal_ardent_defender::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_pal_ardent_defender::Absorb, EFFECT_0); } }; @@ -164,8 +162,6 @@ class spell_pal_aura_mastery : public SpellScriptLoader class spell_pal_aura_mastery_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_aura_mastery_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_AURA_MASTERY_IMMUNE }); @@ -183,8 +179,8 @@ class spell_pal_aura_mastery : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_pal_aura_mastery_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_pal_aura_mastery_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_pal_aura_mastery_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_pal_aura_mastery_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; @@ -202,8 +198,6 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader class spell_pal_aura_mastery_immune_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_aura_mastery_immune_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_CONCENTRACTION_AURA }); @@ -216,7 +210,7 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_aura_mastery_immune_AuraScript::CheckAreaTarget); + DoCheckAreaTarget.Register(&spell_pal_aura_mastery_immune_AuraScript::CheckAreaTarget); } }; @@ -229,8 +223,6 @@ class spell_pal_aura_mastery_immune : public SpellScriptLoader // 31884 - Avenging Wrath class spell_pal_avenging_wrath : public AuraScript { - PrepareAuraScript(spell_pal_avenging_wrath); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -254,8 +246,8 @@ class spell_pal_avenging_wrath : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_pal_avenging_wrath::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_pal_avenging_wrath::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_pal_avenging_wrath::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_pal_avenging_wrath::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } }; @@ -267,8 +259,6 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader class spell_pal_blessing_of_faith_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_blessing_of_faith_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -309,7 +299,7 @@ class spell_pal_blessing_of_faith : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pal_blessing_of_faith_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -327,8 +317,6 @@ class spell_pal_consecration : public SpellScriptLoader class spell_pal_consecration_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_consecration_AuraScript); - bool Load() override { // Store the position of the initial Consecration cast for triggering the damage @@ -357,7 +345,7 @@ class spell_pal_consecration : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_pal_consecration_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_pal_consecration_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -375,8 +363,6 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader class spell_pal_divine_sacrifice_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_divine_sacrifice_AuraScript); - uint32 groupSize, minHpPct; int32 remainingAmount; @@ -413,7 +399,7 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader void Register() override { - OnEffectSplit += AuraEffectSplitFn(spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0); + OnEffectSplit.Register(&spell_pal_divine_sacrifice_AuraScript::Split, EFFECT_0); } }; @@ -426,8 +412,6 @@ class spell_pal_divine_sacrifice : public SpellScriptLoader // 53385 - Divine Storm class spell_pal_divine_storm : public SpellScript { - PrepareSpellScript(spell_pal_divine_storm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_DUMMY }); @@ -455,9 +439,9 @@ class spell_pal_divine_storm : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_pal_divine_storm::TriggerHeal); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm::HandleEnergize, EFFECT_0, SPELL_EFFECT_ENERGIZE); + AfterHit.Register(&spell_pal_divine_storm::TriggerHeal); + OnObjectAreaTargetSelect.Register(&spell_pal_divine_storm::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_pal_divine_storm::HandleEnergize, EFFECT_0, SPELL_EFFECT_ENERGIZE); } private: @@ -467,8 +451,6 @@ private: // 54171 - Divine Storm (Dummy) class spell_pal_divine_storm_dummy : public SpellScript { - PrepareSpellScript(spell_pal_divine_storm_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_STORM_HEAL }); @@ -490,8 +472,8 @@ class spell_pal_divine_storm_dummy : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_divine_storm_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_divine_storm_dummy::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); + OnEffectHitTarget.Register(&spell_pal_divine_storm_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_pal_divine_storm_dummy::CountTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); } private: @@ -506,8 +488,6 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader class spell_pal_exorcism_and_holy_wrath_damage_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_exorcism_and_holy_wrath_damage_AuraScript); - void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod) { if (!spellMod) @@ -524,7 +504,7 @@ class spell_pal_exorcism_and_holy_wrath_damage : public SpellScriptLoader void Register() override { - DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcSpellMod.Register(&spell_pal_exorcism_and_holy_wrath_damage_AuraScript::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -542,8 +522,6 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader class spell_pal_eye_for_an_eye_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_eye_for_an_eye_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_EYE_FOR_AN_EYE_DAMAGE }); @@ -558,7 +536,7 @@ class spell_pal_eye_for_an_eye : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_eye_for_an_eye_AuraScript::HandleEffectProc, EFFECT_0, m_scriptSpellId == SPELL_PALADIN_EYE_FOR_AN_EYE_RANK_1 ? SPELL_AURA_DUMMY : SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pal_eye_for_an_eye_AuraScript::HandleEffectProc, EFFECT_0, m_scriptSpellId == SPELL_PALADIN_EYE_FOR_AN_EYE_RANK_1 ? SPELL_AURA_DUMMY : SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -576,8 +554,6 @@ class spell_pal_grand_crusader : public SpellScriptLoader class spell_pal_grand_crusader_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_grand_crusader_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_AVENGERS_SHIELD }); @@ -595,8 +571,8 @@ class spell_pal_grand_crusader : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_grand_crusader_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_grand_crusader_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_pal_grand_crusader_AuraScript::CheckProc); + OnEffectProc.Register(&spell_pal_grand_crusader_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -614,8 +590,6 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader class spell_pal_glyph_of_holy_light_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_glyph_of_holy_light_SpellScript); - void FilterTargets(std::list& targets) { uint32 const maxTargets = GetSpellInfo()->MaxAffectedTargets; @@ -629,7 +603,7 @@ class spell_pal_glyph_of_holy_light : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_glyph_of_holy_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_pal_glyph_of_holy_light_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; @@ -647,8 +621,6 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader class spell_pal_hand_of_sacrifice_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_hand_of_sacrifice_AuraScript); - public: spell_pal_hand_of_sacrifice_AuraScript() { @@ -680,7 +652,7 @@ class spell_pal_hand_of_sacrifice : public SpellScriptLoader void Register() override { - OnEffectSplit += AuraEffectSplitFn(spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0); + OnEffectSplit.Register(&spell_pal_hand_of_sacrifice_AuraScript::Split, EFFECT_0); } }; @@ -698,8 +670,6 @@ class spell_pal_holy_shock : public SpellScriptLoader class spell_pal_holy_shock_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_holy_shock_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { SpellInfo const* firstRankSpellInfo = sSpellMgr->GetSpellInfo(SPELL_PALADIN_HOLY_SHOCK_R1); @@ -751,8 +721,8 @@ class spell_pal_holy_shock : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_pal_holy_shock_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_pal_holy_shock_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_pal_holy_shock_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -772,8 +742,6 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader class spell_pal_improved_aura_effect_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_improved_aura_effect_AuraScript); - bool CheckAreaTarget(Unit* target) { Unit::AuraApplicationMap& appliedAuras = target->GetAppliedAuras(); @@ -794,7 +762,7 @@ class spell_pal_improved_aura_effect : public SpellScriptLoader void Register() override { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget); + DoCheckAreaTarget.Register(&spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget); } }; @@ -812,8 +780,6 @@ class spell_pal_item_healing_discount : public SpellScriptLoader class spell_pal_item_healing_discount_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_item_healing_discount_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ITEM_HEALING_TRANCE }); @@ -827,7 +793,7 @@ class spell_pal_item_healing_discount : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_item_healing_discount_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pal_item_healing_discount_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -841,8 +807,6 @@ class spell_pal_item_healing_discount : public SpellScriptLoader /// Updated 4.3.4 class spell_pal_judgement : public SpellScript { - PrepareSpellScript(spell_pal_judgement); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -896,15 +860,13 @@ class spell_pal_judgement : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_judgement::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pal_judgement::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 633 - Lay on Hands class spell_pal_lay_on_hands : public SpellScript { - PrepareSpellScript(spell_pal_lay_on_hands); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -944,8 +906,8 @@ class spell_pal_lay_on_hands : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_pal_lay_on_hands::HandleExtraEffects, EFFECT_0, SPELL_EFFECT_HEAL_MAX_HEALTH); + OnCheckCast.Register(&spell_pal_lay_on_hands::CheckCast); + OnEffectHitTarget.Register(&spell_pal_lay_on_hands::HandleExtraEffects, EFFECT_0, SPELL_EFFECT_HEAL_MAX_HEALTH); } }; @@ -957,8 +919,6 @@ class spell_pal_righteous_defense : public SpellScriptLoader class spell_pal_righteous_defense_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_righteous_defense_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_RIGHTEOUS_DEFENSE_TAUNT }); @@ -995,13 +955,13 @@ class spell_pal_righteous_defense : public SpellScriptLoader void Register() override { - OnCheckCast += SpellCheckCastFn(spell_pal_righteous_defense_SpellScript::CheckCast); + OnCheckCast.Register(&spell_pal_righteous_defense_SpellScript::CheckCast); //! WORKAROUND //! target select will be executed in hitphase of effect 0 //! so we must handle trigger spell also in hit phase (default execution in launch phase) //! see issue #3718 - OnEffectLaunchTarget += SpellEffectFn(spell_pal_righteous_defense_SpellScript::HandleTriggerSpellLaunch, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); - OnEffectHitTarget += SpellEffectFn(spell_pal_righteous_defense_SpellScript::HandleTriggerSpellHit, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); + OnEffectLaunchTarget.Register(&spell_pal_righteous_defense_SpellScript::HandleTriggerSpellLaunch, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); + OnEffectHitTarget.Register(&spell_pal_righteous_defense_SpellScript::HandleTriggerSpellHit, EFFECT_1, SPELL_EFFECT_TRIGGER_SPELL); } }; @@ -1020,8 +980,6 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader class spell_pal_shield_of_the_righteous_SpellScript : public SpellScript { - PrepareSpellScript(spell_pal_shield_of_the_righteous_SpellScript); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) @@ -1049,7 +1007,7 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_shield_of_the_righteous_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pal_shield_of_the_righteous_SpellScript::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1063,8 +1021,6 @@ class spell_pal_shield_of_the_righteous : public SpellScriptLoader /// Updated 4.3.4 class spell_pal_templar_s_verdict : public SpellScript { - PrepareSpellScript(spell_pal_templar_s_verdict); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC }); @@ -1109,7 +1065,7 @@ class spell_pal_templar_s_verdict : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_pal_templar_s_verdict::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); + OnEffectLaunchTarget.Register(&spell_pal_templar_s_verdict::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); } }; @@ -1117,8 +1073,6 @@ class spell_pal_templar_s_verdict : public SpellScript /// Updated 4.3.4 class spell_pal_seal_of_righteousness : public AuraScript { - PrepareAuraScript(spell_pal_seal_of_righteousness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1150,16 +1104,14 @@ class spell_pal_seal_of_righteousness : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_seal_of_righteousness::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_righteousness::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_seal_of_righteousness::CheckProc); + OnEffectProc.Register(&spell_pal_seal_of_righteousness::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 76669 - Illuminated Healing class spell_pal_illuminated_healing : public AuraScript { - PrepareAuraScript(spell_pal_illuminated_healing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_ILLUMINATED_HEALING }); @@ -1189,7 +1141,7 @@ class spell_pal_illuminated_healing : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_illuminated_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pal_illuminated_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1201,8 +1153,6 @@ class spell_pal_hand_of_light : public SpellScriptLoader class spell_pal_hand_of_light_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_hand_of_light_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1237,8 +1187,8 @@ class spell_pal_hand_of_light : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_hand_of_light_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_hand_of_light_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_pal_hand_of_light_AuraScript::CheckProc); + OnEffectProc.Register(&spell_pal_hand_of_light_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1252,8 +1202,6 @@ class spell_pal_hand_of_light : public SpellScriptLoader // 89901 - Judgements of the Bold (Passive) class spell_pal_judgements : public AuraScript { - PrepareAuraScript(spell_pal_judgements); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1284,15 +1232,13 @@ class spell_pal_judgements : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_judgements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pal_judgements::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 879 - Exorcism class spell_pal_exorcism : public SpellScript { - PrepareSpellScript(spell_pal_exorcism); - void HandleDamage(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1318,15 +1264,13 @@ class spell_pal_exorcism : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_pal_exorcism::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - AfterHit += SpellHitFn(spell_pal_exorcism::ApplyDotBonus); + OnEffectLaunchTarget.Register(&spell_pal_exorcism::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + AfterHit.Register(&spell_pal_exorcism::ApplyDotBonus); } }; class spell_pal_exorcism_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_exorcism_AuraScript); - void HandleGlyph(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -1336,15 +1280,13 @@ class spell_pal_exorcism_AuraScript : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_pal_exorcism_AuraScript::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_pal_exorcism_AuraScript::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; // 31801 - Seal of Truth class spell_pal_seal_of_truth : public AuraScript { - PrepareAuraScript(spell_pal_seal_of_truth); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1371,15 +1313,13 @@ class spell_pal_seal_of_truth : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_seal_of_truth::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pal_seal_of_truth::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -87168 - Long Arm of the Law class spell_pal_long_arm_of_the_law : public AuraScript { - PrepareAuraScript(spell_pal_long_arm_of_the_law); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_LONG_ARM_OF_THE_LAW }); @@ -1403,16 +1343,14 @@ class spell_pal_long_arm_of_the_law : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_long_arm_of_the_law::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_long_arm_of_the_law::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_long_arm_of_the_law::CheckProc); + OnEffectProc.Register(&spell_pal_long_arm_of_the_law::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 31876 - Communion class spell_pal_communion : public AuraScript { - PrepareAuraScript(spell_pal_communion); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GENERIC_REPLENISHMENT }); @@ -1426,15 +1364,13 @@ class spell_pal_communion : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_communion::HandleProc, EFFECT_1, SPELL_AURA_ADD_FLAT_MODIFIER); + OnEffectProc.Register(&spell_pal_communion::HandleProc, EFFECT_1, SPELL_AURA_ADD_FLAT_MODIFIER); } }; // 85285 - Sacred Shield class spell_pal_sacred_shield : public AuraScript { - PrepareAuraScript(spell_pal_sacred_shield); - bool CheckProc(ProcEventInfo& eventInfo) { if (DamageInfo* damage = eventInfo.GetDamageInfo()) @@ -1455,16 +1391,14 @@ class spell_pal_sacred_shield : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_sacred_shield::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_sacred_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_pal_sacred_shield::CheckProc); + OnEffectProc.Register(&spell_pal_sacred_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 85673 - Word of Glory class spell_pal_word_of_glory: public SpellScript { - PrepareSpellScript(spell_pal_word_of_glory); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) @@ -1521,15 +1455,13 @@ class spell_pal_word_of_glory: public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_pal_word_of_glory::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); - AfterCast += SpellCastFn(spell_pal_word_of_glory::HandleEternalGlory); + OnEffectLaunchTarget.Register(&spell_pal_word_of_glory::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + AfterCast.Register(&spell_pal_word_of_glory::HandleEternalGlory); } }; class spell_pal_word_of_glory_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_word_of_glory_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC }); @@ -1557,16 +1489,14 @@ class spell_pal_word_of_glory_AuraScript : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_pal_word_of_glory_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pal_word_of_glory_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); + OnEffectApply.Register(&spell_pal_word_of_glory_AuraScript::HandleApply, EFFECT_1, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL); + DoEffectCalcAmount.Register(&spell_pal_word_of_glory_AuraScript::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); } }; // -85803 - Selfless Healer class spell_pal_selfless_healer : public AuraScript { - PrepareAuraScript(spell_pal_selfless_healer); - bool CheckProc(ProcEventInfo& eventInfo) { if (HealInfo* heal = eventInfo.GetHealInfo()) @@ -1586,16 +1516,14 @@ class spell_pal_selfless_healer : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_selfless_healer::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_selfless_healer::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_selfless_healer::CheckProc); + OnEffectProc.Register(&spell_pal_selfless_healer::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; // -85117 - Divine Purpose class spell_pal_divine_purpose : public AuraScript { - PrepareAuraScript(spell_pal_divine_purpose); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_DIVINE_PURPOSE_PROC }); @@ -1621,15 +1549,13 @@ class spell_pal_divine_purpose : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_divine_purpose::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_divine_purpose::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_divine_purpose::CheckProc); + OnEffectProc.Register(&spell_pal_divine_purpose::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_pal_inquisition : public SpellScript { - PrepareSpellScript(spell_pal_inquisition); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1662,14 +1588,12 @@ class spell_pal_inquisition : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_pal_inquisition::ChangeDuration); + AfterHit.Register(&spell_pal_inquisition::ChangeDuration); } }; class spell_pal_guardian_of_ancient_kings : public SpellScript { - PrepareSpellScript(spell_pal_guardian_of_ancient_kings); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1708,14 +1632,12 @@ class spell_pal_guardian_of_ancient_kings : public SpellScript void Register() override { - AfterCast += SpellCastFn(spell_pal_guardian_of_ancient_kings::HandleDummyEffect); + AfterCast.Register(&spell_pal_guardian_of_ancient_kings::HandleDummyEffect); } }; class spell_pal_ancient_healer : public AuraScript { - PrepareAuraScript(spell_pal_ancient_healer); - bool Load() override { _procCount = 0; @@ -1758,8 +1680,8 @@ class spell_pal_ancient_healer : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_ancient_healer::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_ancient_healer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_ancient_healer::CheckProc); + OnEffectProc.Register(&spell_pal_ancient_healer::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } private: @@ -1768,8 +1690,6 @@ private: class spell_pal_ancient_crusader : public AuraScript { - PrepareAuraScript(spell_pal_ancient_crusader); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1808,15 +1728,13 @@ class spell_pal_ancient_crusader : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pal_ancient_crusader::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_pal_ancient_crusader::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectProc.Register(&spell_pal_ancient_crusader::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + AfterEffectRemove.Register(&spell_pal_ancient_crusader::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; class spell_pal_ancient_fury : public SpellScript { - PrepareSpellScript(spell_pal_ancient_fury); - bool Load() override { _targetCount = 0; @@ -1843,8 +1761,8 @@ class spell_pal_ancient_fury : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_ancient_fury::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnHit += SpellHitFn(spell_pal_ancient_fury::CalculateDamage); + OnObjectAreaTargetSelect.Register(&spell_pal_ancient_fury::CountTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnHit.Register(&spell_pal_ancient_fury::CalculateDamage); } private: @@ -1854,8 +1772,6 @@ private: // 85222 - Light of Dawn class spell_pal_light_of_dawn: public SpellScript { - PrepareSpellScript(spell_pal_light_of_dawn); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) @@ -1897,17 +1813,15 @@ class spell_pal_light_of_dawn: public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_light_of_dawn::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); - OnEffectLaunchTarget += SpellEffectFn(spell_pal_light_of_dawn::BlockHeal, EFFECT_1, SPELL_EFFECT_HEAL); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_light_of_dawn::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ALLY); + OnEffectHitTarget.Register(&spell_pal_light_of_dawn::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnEffectLaunchTarget.Register(&spell_pal_light_of_dawn::BlockHeal, EFFECT_1, SPELL_EFFECT_HEAL); + OnObjectAreaTargetSelect.Register(&spell_pal_light_of_dawn::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ALLY); } }; // 82327 - Holy Radiance class spell_pal_holy_radiance: public SpellScript { - PrepareSpellScript(spell_pal_holy_radiance); - bool Load() override { if (GetCaster()->GetTypeId() != TYPEID_PLAYER) @@ -1937,15 +1851,13 @@ private: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_holy_radiance::HandleHeal, EFFECT_1, SPELL_EFFECT_HEAL); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pal_holy_radiance::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); + OnEffectHitTarget.Register(&spell_pal_holy_radiance::HandleHeal, EFFECT_1, SPELL_EFFECT_HEAL); + OnObjectAreaTargetSelect.Register(&spell_pal_holy_radiance::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ALLY); } }; class spell_pal_holy_radiance_AuraScript : public AuraScript { - PrepareAuraScript(spell_pal_holy_radiance_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PALADIN_HOLY_RADIANCE_TRIGGERED }); @@ -1962,15 +1874,13 @@ private: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_pal_holy_radiance_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_pal_holy_radiance_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; // 53651 - Light's Beacon class spell_pal_lights_beacon : public AuraScript { - PrepareAuraScript(spell_pal_lights_beacon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2006,16 +1916,14 @@ class spell_pal_lights_beacon : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pal_lights_beacon::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pal_lights_beacon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pal_lights_beacon::CheckProc); + OnEffectProc.Register(&spell_pal_lights_beacon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 1022 - Hand of Protection class spell_pal_hand_of_protection : public SpellScript { - PrepareSpellScript(spell_pal_hand_of_protection); - void HandleForbearance(SpellEffIndex /*effIndex*/) { // Serverside spell, so it's not sent in spell cast packets which gives us freedom of choice here @@ -2026,15 +1934,13 @@ class spell_pal_hand_of_protection : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_hand_of_protection::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_pal_hand_of_protection::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; // 642 - Divine Shield class spell_pal_divine_shield : public SpellScript { - PrepareSpellScript(spell_pal_divine_shield); - void HandleForbearance(SpellEffIndex /*effIndex*/) { // Serverside spell, so it's not sent in spell cast packets which gives us freedom of choice here @@ -2045,7 +1951,7 @@ class spell_pal_divine_shield : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pal_divine_shield::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_pal_divine_shield::HandleForbearance, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 4b8b19c7c1..38661282e6 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -90,8 +90,6 @@ enum WarlockSpellIconId class spell_warl_pet_scaling_01 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_01); - void CalculateStaminaAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -165,16 +163,14 @@ class spell_warl_pet_scaling_01 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); } }; class spell_warl_pet_scaling_02 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_02); - void CalculateIntellectAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -234,16 +230,14 @@ class spell_warl_pet_scaling_02 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateIntellectAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateArmorAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_02::CalculateFireResistanceAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateIntellectAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateArmorAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_02::CalculateFireResistanceAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE); } }; class spell_warl_pet_scaling_03 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_03); - void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { // Formular: owner resistance of targeted school * 0.4 @@ -257,14 +251,12 @@ class spell_warl_pet_scaling_03 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_03::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_03::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE); } }; class spell_warl_pet_scaling_04 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_04); - void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { // Formular: owner resistance of targeted school * 0.4 @@ -292,15 +284,13 @@ class spell_warl_pet_scaling_04 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_04::CalculatePowerRegen, EFFECT_1, SPELL_AURA_MOD_POWER_REGEN); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_04::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_04::CalculatePowerRegen, EFFECT_1, SPELL_AURA_MOD_POWER_REGEN); } }; class spell_warl_pet_scaling_05 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_05); - void CalculateMeleeHitChanceBonusAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -348,16 +338,14 @@ class spell_warl_pet_scaling_05 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_05::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_05::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE); } }; class spell_warl_pet_scaling_06 : public AuraScript { - PrepareAuraScript(spell_warl_pet_scaling_06); - void CalculateCritChanceBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -377,15 +365,13 @@ class spell_warl_pet_scaling_06 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); + DoEffectCalcAmount.Register(&spell_warl_pet_scaling_06::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; class spell_warl_pet_passive : public AuraScript { - PrepareAuraScript(spell_warl_pet_passive); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -435,8 +421,8 @@ class spell_warl_pet_passive : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_pet_passive::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); + DoEffectCalcAmount.Register(&spell_warl_pet_passive::CalculateAmountCritSpell, EFFECT_0, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); + DoEffectCalcAmount.Register(&spell_warl_pet_passive::CalculateAmountCritMelee, EFFECT_1, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; @@ -447,8 +433,6 @@ public: class spell_sha_pet_scaling_04_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_pet_scaling_04_AuraScript); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -490,8 +474,8 @@ public: void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_sha_pet_scaling_04_AuraScript::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_sha_pet_scaling_04_AuraScript::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; @@ -503,8 +487,6 @@ public: class spell_hun_pet_scaling_01 : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_01); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -554,16 +536,14 @@ class spell_hun_pet_scaling_01 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); } }; class spell_hun_pet_scaling_02 : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_02); - void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { // Formular: owner resistance of targeted school * 0.4 @@ -577,14 +557,12 @@ class spell_hun_pet_scaling_02 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_02::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_02::CalculateResistanceAmount, EFFECT_ALL, SPELL_AURA_MOD_RESISTANCE); } }; class spell_hun_pet_scaling_03 : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_03); - void CalculateResistanceAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { // Formular: owner resistance of targeted school * 0.4 @@ -616,16 +594,14 @@ class spell_hun_pet_scaling_03 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_03::CalculateArmorAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_0, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateResistanceAmount, EFFECT_1, SPELL_AURA_MOD_RESISTANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_03::CalculateArmorAmount, EFFECT_2, SPELL_AURA_MOD_RESISTANCE); } }; class spell_hun_pet_scaling_04 : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_04); - void CalculateMeleeHitChanceBonusAmount(AuraEffect const* /* aurEff */, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -673,16 +649,14 @@ class spell_hun_pet_scaling_04 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_04::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateMeleeHitChanceBonusAmount, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateSpellHitChanceBonusAmount, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_04::CalculateExpertiseBonusAmount, EFFECT_2, SPELL_AURA_MOD_EXPERTISE); } }; class spell_hun_pet_scaling_05 : public AuraScript { - PrepareAuraScript(spell_hun_pet_scaling_05); - void CalculateCritChanceBonus(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = true; @@ -702,15 +676,13 @@ class spell_hun_pet_scaling_05 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); + DoEffectCalcAmount.Register(&spell_hun_pet_scaling_05::CalculateMeleeHasteAmount, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; class spell_hun_pet_passive_crit : public AuraScript { - PrepareAuraScript(spell_hun_pet_passive_crit); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -764,15 +736,13 @@ class spell_hun_pet_passive_crit : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_hun_pet_passive_crit::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); + DoEffectCalcAmount.Register(&spell_hun_pet_passive_crit::CalculateAmountCritSpell, EFFECT_1, SPELL_AURA_MOD_SPELL_CRIT_CHANCE); + DoEffectCalcAmount.Register(&spell_hun_pet_passive_crit::CalculateAmountCritMelee, EFFECT_0, SPELL_AURA_MOD_WEAPON_CRIT_PERCENT); } }; class spell_dk_avoidance_passive : public AuraScript { - PrepareAuraScript(spell_dk_avoidance_passive); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -799,14 +769,12 @@ class spell_dk_avoidance_passive : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_avoidance_passive::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE); + DoEffectCalcAmount.Register(&spell_dk_avoidance_passive::CalculateAvoidanceAmount, EFFECT_0, SPELL_AURA_MOD_CREATURE_AOE_DAMAGE_AVOIDANCE); } }; class spell_dk_pet_scaling_01 : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_01); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -856,16 +824,14 @@ class spell_dk_pet_scaling_01 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_STAT); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateStrengthAmount, EFFECT_1, SPELL_AURA_MOD_STAT); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateStaminaAmount, EFFECT_0, SPELL_AURA_MOD_STAT); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateStrengthAmount, EFFECT_1, SPELL_AURA_MOD_STAT); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); } }; class spell_dk_pet_scaling_02 : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_02); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -889,14 +855,12 @@ class spell_dk_pet_scaling_02 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; class spell_dk_pet_scaling_03 : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_03); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -938,15 +902,13 @@ class spell_dk_pet_scaling_03 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_03::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_03::CalculateAmountMeleeHit, EFFECT_0, SPELL_AURA_MOD_HIT_CHANCE); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_03::CalculateAmountSpellHit, EFFECT_1, SPELL_AURA_MOD_SPELL_HIT_CHANCE); } }; class spell_dk_pet_scaling_05 : public AuraScript { - PrepareAuraScript(spell_dk_pet_scaling_05); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -974,15 +936,13 @@ class spell_dk_pet_scaling_05 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_05::CalculateAmountCritPct, EFFECT_0, SPELL_AURA_MOD_CRIT_PCT); + DoEffectCalcAmount.Register(&spell_dk_pet_scaling_05::CalculateAmountResistance, EFFECT_2, SPELL_AURA_MOD_TARGET_RESISTANCE); } }; class spell_dk_rune_weapon_scaling_02 : public AuraScript { - PrepareAuraScript(spell_dk_rune_weapon_scaling_02); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1021,15 +981,13 @@ class spell_dk_rune_weapon_scaling_02 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_dk_rune_weapon_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); + DoEffectCalcAmount.Register(&spell_dk_rune_weapon_scaling_02::CalculateDamageDoneAmount, EFFECT_0, SPELL_AURA_MOD_DAMAGE_DONE); + DoEffectCalcAmount.Register(&spell_dk_rune_weapon_scaling_02::CalculateAmountMeleeHaste, EFFECT_1, SPELL_AURA_MELEE_SLOW); } }; class spell_mage_water_elemental_scaling_01 : public AuraScript { - PrepareAuraScript(spell_mage_water_elemental_scaling_01); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1081,16 +1039,14 @@ class spell_mage_water_elemental_scaling_01 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); + DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateHealthAmount, EFFECT_0, SPELL_AURA_MOD_MAX_HEALTH); + DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateAttackPowerAmount, EFFECT_1, SPELL_AURA_MOD_ATTACK_POWER); + DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_01::CalculateDamageDoneAmount, EFFECT_2, SPELL_AURA_MOD_DAMAGE_DONE); } }; class spell_mage_water_elemental_scaling_02 : public AuraScript { - PrepareAuraScript(spell_mage_water_elemental_scaling_02); - bool Load() override { if (!GetCaster() || !GetCaster()->GetOwner() || GetCaster()->GetOwner()->GetTypeId() != TYPEID_PLAYER) @@ -1116,7 +1072,7 @@ class spell_mage_water_elemental_scaling_02 : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_mage_water_elemental_scaling_02::CalculateManaAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY); + DoEffectCalcAmount.Register(&spell_mage_water_elemental_scaling_02::CalculateManaAmount, EFFECT_0, SPELL_AURA_MOD_INCREASE_ENERGY); } }; diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 9889116d3c..0cc9bb558a 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -157,8 +157,6 @@ class RaidCheck class spell_pri_body_and_soul : public AuraScript { - PrepareAuraScript(spell_pri_body_and_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -191,16 +189,14 @@ class spell_pri_body_and_soul : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul::HandleEffectSpeedProc, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectProc += AuraEffectProcFn(spell_pri_body_and_soul::HandleEffectDispelProc, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pri_body_and_soul::HandleEffectSpeedProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pri_body_and_soul::HandleEffectDispelProc, EFFECT_1, SPELL_AURA_DUMMY); } }; // 34861 - Circle of Healing class spell_pri_circle_of_healing : public SpellScript { - PrepareSpellScript(spell_pri_circle_of_healing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_GLYPH_OF_CIRCLE_OF_HEALING }); @@ -221,15 +217,13 @@ class spell_pri_circle_of_healing : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_circle_of_healing::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_pri_circle_of_healing::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; // 527 - Dispel magic class spell_pri_dispel_magic : public SpellScript { - PrepareSpellScript(spell_pri_dispel_magic); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -267,16 +261,14 @@ class spell_pri_dispel_magic : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_pri_dispel_magic::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_pri_dispel_magic::AfterEffectHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_pri_dispel_magic::CheckCast); + OnEffectHitTarget.Register(&spell_pri_dispel_magic::AfterEffectHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // -47509 - Divine Aegis class spell_pri_divine_aegis : public AuraScript { - PrepareAuraScript(spell_pri_divine_aegis); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_AEGIS }); @@ -307,16 +299,14 @@ class spell_pri_divine_aegis : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_divine_aegis::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_divine_aegis::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_divine_aegis::CheckProc); + OnEffectProc.Register(&spell_pri_divine_aegis::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 64844 - Divine Hymn class spell_pri_divine_hymn : public SpellScript { - PrepareSpellScript(spell_pri_divine_hymn); - void FilterTargets(std::list& targets) { targets.remove_if(RaidCheck(GetCaster())); @@ -332,15 +322,13 @@ class spell_pri_divine_hymn : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_divine_hymn::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_pri_divine_hymn::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; // 55680 - Glyph of Prayer of Healing class spell_pri_glyph_of_prayer_of_healing : public AuraScript { - PrepareAuraScript(spell_pri_glyph_of_prayer_of_healing); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_GLYPH_OF_PRAYER_OF_HEALING_HEAL }); @@ -357,14 +345,12 @@ class spell_pri_glyph_of_prayer_of_healing : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_glyph_of_prayer_of_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pri_glyph_of_prayer_of_healing::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_pri_improved_power_word_shield : public AuraScript { - PrepareAuraScript(spell_pri_improved_power_word_shield); - void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod) { if (!spellMod) @@ -381,15 +367,13 @@ class spell_pri_improved_power_word_shield : public AuraScript void Register() override { - DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_pri_improved_power_word_shield::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcSpellMod.Register(&spell_pri_improved_power_word_shield::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; // 37594 - Greater Heal Refund class spell_pri_item_greater_heal_refund : public AuraScript { - PrepareAuraScript(spell_pri_item_greater_heal_refund); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_ITEM_EFFICIENCY }); @@ -403,15 +387,13 @@ class spell_pri_item_greater_heal_refund : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_item_greater_heal_refund::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pri_item_greater_heal_refund::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 47788 - Guardian Spirit class spell_pri_guardian_spirit : public AuraScript { - PrepareAuraScript(spell_pri_guardian_spirit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_GUARDIAN_SPIRIT_HEAL }); @@ -446,8 +428,8 @@ class spell_pri_guardian_spirit : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_guardian_spirit::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_guardian_spirit::Absorb, EFFECT_1); + DoEffectCalcAmount.Register(&spell_pri_guardian_spirit::CalculateAmount, EFFECT_1, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_pri_guardian_spirit::Absorb, EFFECT_1); } private: @@ -457,8 +439,6 @@ private: // 64904 - Hymn of Hope class spell_pri_hymn_of_hope : public SpellScript { - PrepareSpellScript(spell_pri_hymn_of_hope); - void FilterTargets(std::list& targets) { targets.remove_if(PowerCheck(POWER_MANA)); @@ -475,15 +455,13 @@ class spell_pri_hymn_of_hope : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_hymn_of_hope::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_pri_hymn_of_hope::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ALLY); } }; // 92833 - Leap of Faith class spell_pri_leap_of_faith_effect_trigger : public SpellScript { - PrepareSpellScript(spell_pri_leap_of_faith_effect_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_LEAP_OF_FAITH_EFFECT }); @@ -501,15 +479,13 @@ class spell_pri_leap_of_faith_effect_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_leap_of_faith_effect_trigger::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_pri_leap_of_faith_effect_trigger::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 7001 - Lightwell Renew class spell_pri_lightwell_renew : public AuraScript { - PrepareAuraScript(spell_pri_lightwell_renew); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { if (Unit* caster = GetCaster()) @@ -522,15 +498,13 @@ class spell_pri_lightwell_renew : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_lightwell_renew::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_pri_lightwell_renew::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; // 28305 - Mana Leech (Passive) (Priest Pet Aura) class spell_pri_mana_leech : public AuraScript { - PrepareAuraScript(spell_pri_mana_leech); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_MANA_LEECH_PROC }); @@ -550,8 +524,8 @@ class spell_pri_mana_leech : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_mana_leech::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_mana_leech::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_mana_leech::CheckProc); + OnEffectProc.Register(&spell_pri_mana_leech::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } Unit* _procTarget = nullptr; @@ -560,8 +534,6 @@ class spell_pri_mana_leech : public AuraScript // 49821 - Mind Sear class spell_pri_mind_sear : public SpellScript { - PrepareSpellScript(spell_pri_mind_sear); - void FilterTargets(std::list& unitList) { unitList.remove_if(Trinity::ObjectGUIDCheck(GetCaster()->GetChannelObjectGuid())); @@ -569,15 +541,13 @@ class spell_pri_mind_sear : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_mind_sear::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_pri_mind_sear::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); } }; // 47948 - Pain and Suffering (Proc) class spell_pri_pain_and_suffering_proc : public SpellScript { - PrepareSpellScript(spell_pri_pain_and_suffering_proc); - void HandleEffectScriptEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -591,15 +561,13 @@ class spell_pri_pain_and_suffering_proc : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_pain_and_suffering_proc::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pri_pain_and_suffering_proc::HandleEffectScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 47540 - Penance class spell_pri_penance : public SpellScript { - PrepareSpellScript(spell_pri_penance); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -655,16 +623,14 @@ class spell_pri_penance : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_penance::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnCheckCast += SpellCheckCastFn(spell_pri_penance::CheckCast); + OnEffectHitTarget.Register(&spell_pri_penance::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_pri_penance::CheckCast); } }; // -47569 - Phantasm class spell_pri_phantasm : public AuraScript { - PrepareAuraScript(spell_pri_phantasm); - bool CheckProc(ProcEventInfo& /*eventInfo*/) { return roll_chance_i(GetEffect(EFFECT_0)->GetAmount()); @@ -678,16 +644,14 @@ class spell_pri_phantasm : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_phantasm::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_phantasm::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_phantasm::CheckProc); + OnEffectProc.Register(&spell_pri_phantasm::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 17 - Power Word: Shield class spell_pri_power_word_shield : public SpellScript { - PrepareSpellScript(spell_pri_power_word_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_WEAKENED_SOUL }); @@ -701,14 +665,12 @@ class spell_pri_power_word_shield : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_power_word_shield::HandleWeakenedSoul, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_pri_power_word_shield::HandleWeakenedSoul, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; class spell_pri_power_word_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_pri_power_word_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -778,16 +740,14 @@ class spell_pri_power_word_shield_AuraScript : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - AfterEffectAbsorb += AuraEffectAbsorbFn(spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0); + DoEffectCalcAmount.Register(&spell_pri_power_word_shield_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + AfterEffectAbsorb.Register(&spell_pri_power_word_shield_AuraScript::ReflectDamage, EFFECT_0); } }; // 33110 - Prayer of Mending Heal class spell_pri_prayer_of_mending_heal : public SpellScript { - PrepareSpellScript(spell_pri_prayer_of_mending_heal); - void HandleHeal(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetOriginalCaster()) @@ -803,15 +763,13 @@ class spell_pri_prayer_of_mending_heal : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_prayer_of_mending_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnEffectHitTarget.Register(&spell_pri_prayer_of_mending_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; // 139 - Renew class spell_pri_renew : public AuraScript { - PrepareAuraScript(spell_pri_renew); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_DIVINE_TOUCH }); @@ -839,15 +797,13 @@ class spell_pri_renew : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_pri_renew::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectApply.Register(&spell_pri_renew::HandleApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; // 32379 - Shadow Word: Death class spell_pri_shadow_word_death : public SpellScript { - PrepareSpellScript(spell_pri_shadow_word_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH }); @@ -889,16 +845,14 @@ class spell_pri_shadow_word_death : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_pri_shadow_word_death::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_pri_shadow_word_death::HandleSelfDamagingEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_pri_shadow_word_death::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pri_shadow_word_death::HandleSelfDamagingEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 15473 - Shadowform class spell_pri_shadowform : public AuraScript { - PrepareAuraScript(spell_pri_shadowform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -921,16 +875,14 @@ class spell_pri_shadowform : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_pri_shadowform::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadowform::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_pri_shadowform::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_pri_shadowform::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; // 15286 - Vampiric Embrace class spell_pri_vampiric_embrace : public AuraScript { - PrepareAuraScript(spell_pri_vampiric_embrace); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_VAMPIRIC_EMBRACE_HEAL }); @@ -953,16 +905,14 @@ class spell_pri_vampiric_embrace : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_embrace::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_embrace::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_vampiric_embrace::CheckProc); + OnEffectProc.Register(&spell_pri_vampiric_embrace::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 15290 - Vampiric Embrace (heal) class spell_pri_vampiric_embrace_target : public SpellScript { - PrepareSpellScript(spell_pri_vampiric_embrace_target); - void FilterTargets(std::list& unitList) { unitList.remove(GetCaster()); @@ -970,15 +920,13 @@ class spell_pri_vampiric_embrace_target : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_vampiric_embrace_target::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); + OnObjectAreaTargetSelect.Register(&spell_pri_vampiric_embrace_target::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_PARTY); } }; // 34914 - Vampiric Touch class spell_pri_vampiric_touch : public AuraScript { - PrepareAuraScript(spell_pri_vampiric_touch); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1012,16 +960,14 @@ class spell_pri_vampiric_touch : public AuraScript void Register() override { - AfterDispel += AuraDispelFn(spell_pri_vampiric_touch::HandleDispel); - DoCheckProc += AuraCheckProcFn(spell_pri_vampiric_touch::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_vampiric_touch::HandleEffectProc, EFFECT_2, SPELL_AURA_DUMMY); + AfterDispel.Register(&spell_pri_vampiric_touch::HandleDispel); + DoCheckProc.Register(&spell_pri_vampiric_touch::CheckProc); + OnEffectProc.Register(&spell_pri_vampiric_touch::HandleEffectProc, EFFECT_2, SPELL_AURA_DUMMY); } }; class spell_pri_echo_of_light : public AuraScript { - PrepareAuraScript(spell_pri_echo_of_light); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1054,16 +1000,14 @@ class spell_pri_echo_of_light : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_echo_of_light::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_echo_of_light::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_echo_of_light::CheckProc); + OnEffectProc.Register(&spell_pri_echo_of_light::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 95740 - Shadow Orbs (Passive) class spell_pri_shadow_orbs : public AuraScript { - PrepareAuraScript(spell_pri_shadow_orbs); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( @@ -1096,16 +1040,14 @@ class spell_pri_shadow_orbs : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_shadow_orbs::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orbs::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_pri_shadow_orbs::CheckProc); + OnEffectProc.Register(&spell_pri_shadow_orbs::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 77486 - Shadow Orb Power (Passive) class spell_pri_shadow_orb_power : public AuraScript { - PrepareAuraScript(spell_pri_shadow_orb_power); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_0].TriggerSpell }); @@ -1120,15 +1062,13 @@ class spell_pri_shadow_orb_power : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orb_power::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pri_shadow_orb_power::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 77487 - Shadow Orb class spell_pri_shadow_orb : public AuraScript { - PrepareAuraScript(spell_pri_shadow_orb); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1162,17 +1102,15 @@ class spell_pri_shadow_orb : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_pri_shadow_orb::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_shadow_orb::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectProc += AuraEffectProcFn(spell_pri_shadow_orb::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + AfterEffectApply.Register(&spell_pri_shadow_orb::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_pri_shadow_orb::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectProc.Register(&spell_pri_shadow_orb::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 14751 - Chakra class spell_pri_chakra : public AuraScript { - PrepareAuraScript(spell_pri_chakra); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1236,16 +1174,14 @@ class spell_pri_chakra : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_pri_chakra::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectProc += AuraEffectProcFn(spell_pri_chakra::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER); + AfterEffectApply.Register(&spell_pri_chakra::HandleEffectApply, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectProc.Register(&spell_pri_chakra::HandleProc, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER); } }; // 81206 - Chakra: Sanctuary class spell_pri_chakra_sanctuary : public AuraScript { - PrepareAuraScript(spell_pri_chakra_sanctuary); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1264,7 +1200,7 @@ class spell_pri_chakra_sanctuary : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_sanctuary::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_pri_chakra_sanctuary::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -1272,8 +1208,6 @@ class spell_pri_chakra_sanctuary : public AuraScript // 81209 - Chakra: Chastise class spell_pri_chakra_flow_removal: public AuraScript { - PrepareAuraScript(spell_pri_chakra_flow_removal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1292,17 +1226,15 @@ class spell_pri_chakra_flow_removal: public AuraScript void Register() override { if (m_scriptSpellId == SPELL_PRIEST_CHAKRA_SERENITY) - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_ADD_FLAT_MODIFIER, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); else if (m_scriptSpellId == SPELL_PRIEST_CHAKRA_CHASTISE) - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_pri_chakra_flow_removal::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; // 81585 - Chakra: Serenity class spell_pri_chakra_serenity_script : public SpellScript { - PrepareSpellScript(spell_pri_chakra_serenity_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_RENEW }); @@ -1316,15 +1248,13 @@ class spell_pri_chakra_serenity_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_chakra_serenity_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pri_chakra_serenity_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 88685 - Holy Word: Sanctuary class spell_pri_holy_word_sanctuary : public AuraScript { - PrepareAuraScript(spell_pri_holy_word_sanctuary); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_HOLY_WORD_SANCTUARY }); @@ -1338,15 +1268,13 @@ class spell_pri_holy_word_sanctuary : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_pri_holy_word_sanctuary::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_pri_holy_word_sanctuary::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; // 88686 - Holy Word: Sanctuary class spell_pri_holy_word_sanctuary_triggered : public SpellScript { - PrepareSpellScript(spell_pri_holy_word_sanctuary_triggered); - void HandleHeal(SpellEffIndex /*effIndex*/) { if (GetHitHeal() && _targets > 6) @@ -1360,8 +1288,8 @@ class spell_pri_holy_word_sanctuary_triggered : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_holy_word_sanctuary_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_pri_holy_word_sanctuary_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnObjectAreaTargetSelect.Register(&spell_pri_holy_word_sanctuary_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnEffectHitTarget.Register(&spell_pri_holy_word_sanctuary_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } private: @@ -1371,8 +1299,6 @@ private: // -81659 - Evangelism class spell_pri_evangelism : public AuraScript { - PrepareAuraScript(spell_pri_evangelism); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1411,15 +1337,13 @@ class spell_pri_evangelism : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_evangelism::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pri_evangelism::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 81660, 81661 - Evangelism (Triggered Effect) / 87117, 87118 - Dark Evangelism (Triggered Effect) class spell_pri_evangelism_triggered : public AuraScript { - PrepareAuraScript(spell_pri_evangelism_triggered); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1439,15 +1363,13 @@ class spell_pri_evangelism_triggered : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_pri_evangelism_triggered::AfterRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_pri_evangelism_triggered::AfterRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; // 87151 - Archangel class spell_pri_archangel : public SpellScript { - PrepareSpellScript(spell_pri_archangel); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1506,14 +1428,12 @@ class spell_pri_archangel : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_archangel::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pri_archangel::HandleHit, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; class spell_power_word_barrier : public AuraScript { - PrepareAuraScript(spell_power_word_barrier); - bool Load() override { TempSummon* summon = GetCaster()->ToTempSummon(); @@ -1537,7 +1457,7 @@ class spell_power_word_barrier : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_power_word_barrier::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_power_word_barrier::HandleGlyph, EFFECT_1, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } private: @@ -1547,8 +1467,6 @@ private: // -89488 - Strength of Soul class spell_pri_strength_of_soul : public AuraScript { - PrepareAuraScript(spell_pri_strength_of_soul); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1582,14 +1500,12 @@ class spell_pri_strength_of_soul : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_strength_of_soul::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pri_strength_of_soul::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; class spell_pri_strength_of_soul_script : public SpellScript { - PrepareSpellScript(spell_pri_strength_of_soul_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_WEAKENED_SOUL }); @@ -1603,15 +1519,13 @@ class spell_pri_strength_of_soul_script : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_strength_of_soul_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_pri_strength_of_soul_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // -14523 - Atonement class spell_pri_atonement : public AuraScript { - PrepareAuraScript(spell_pri_atonement); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1645,15 +1559,13 @@ class spell_pri_atonement : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_atonement::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_pri_atonement::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // Atonement (Healing) class spell_pri_atonement_heal : public SpellScript { - PrepareSpellScript(spell_pri_atonement_heal); - void FilterTargets(std::list& targets) { targets.remove_if(RaidCheck(GetCaster())); @@ -1667,14 +1579,12 @@ class spell_pri_atonement_heal : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_pri_atonement_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_pri_atonement_heal::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); } }; class spell_pri_spirit_of_redemption : public AuraScript { - PrepareAuraScript(spell_pri_spirit_of_redemption); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SPIRIT_OF_REDEMPTION_TRIGGERED }); @@ -1699,16 +1609,14 @@ class spell_pri_spirit_of_redemption : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_pri_spirit_of_redemption::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_pri_spirit_of_redemption::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_pri_spirit_of_redemption::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_pri_spirit_of_redemption::Absorb, EFFECT_0); } }; // 8092 - Mind Blast class spell_pri_mind_blast : public SpellScript { - PrepareSpellScript(spell_pri_mind_blast); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1746,16 +1654,14 @@ class spell_pri_mind_blast : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_mind_blast::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_pri_mind_blast::HandleImprovedMindBlast, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pri_mind_blast::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pri_mind_blast::HandleImprovedMindBlast, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 73510 - Mind Spike class spell_pri_mind_spike : public SpellScript { - PrepareSpellScript(spell_pri_mind_spike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_EMPOWERED_SHADOW }); @@ -1778,15 +1684,13 @@ class spell_pri_mind_spike : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_pri_mind_spike::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_pri_mind_spike::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // -88994 - Masochism class spell_pri_masochism : public AuraScript { - PrepareAuraScript(spell_pri_masochism); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_PRIEST_SHADOW_WORD_DEATH }); @@ -1811,14 +1715,12 @@ class spell_pri_masochism : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_pri_masochism::CheckProc); + DoCheckProc.Register(&spell_pri_masochism::CheckProc); } }; class spell_pri_harnessed_shadows : public AuraScript { - PrepareAuraScript(spell_pri_harnessed_shadows); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->Effects[EFFECT_1].TriggerSpell }); @@ -1837,7 +1739,7 @@ class spell_pri_harnessed_shadows : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_pri_harnessed_shadows::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_pri_harnessed_shadows::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index f295ac6351..5d39c4c706 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; @@ -64,7 +63,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_generic_quest_update_entry_SpellScript::HandleDummy, _effIndex, _spellEffect); + OnEffectHitTarget.Register(&spell_generic_quest_update_entry_SpellScript::HandleDummy, _effIndex, _spellEffect); } }; @@ -100,8 +99,6 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader class spell_q2203_thaumaturgy_channel_AuraScript : public AuraScript { - PrepareAuraScript(spell_q2203_thaumaturgy_channel_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_THAUMATURGY_CHANNEL }); @@ -116,7 +113,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_q2203_thaumaturgy_channel_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -141,8 +138,6 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader class spell_q5206_test_fetid_skull_SpellScript : public SpellScript { - PrepareSpellScript(spell_q5206_test_fetid_skull_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -162,7 +157,7 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q5206_test_fetid_skull_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -191,8 +186,6 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader class spell_q6124_6129_apply_salve_SpellScript : public SpellScript { - PrepareSpellScript(spell_q6124_6129_apply_salve_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -227,7 +220,7 @@ class spell_q6124_6129_apply_salve : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q6124_6129_apply_salve_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -272,8 +265,6 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade class spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript : public AuraScript { - PrepareAuraScript(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -283,13 +274,13 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - GetTarget()->SetImmuneToPC(false); + GetTarget()->SetImmuneToPC(false); } void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_q11396_11399_force_shield_arcane_purple_x3_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -308,8 +299,6 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader class spell_q11396_11399_scourging_crystal_controller_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3, SPELL_SCOURGING_CRYSTAL_CONTROLLER }); @@ -326,7 +315,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11396_11399_scourging_crystal_controller_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -344,8 +333,6 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript class spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3 }); @@ -360,7 +347,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11396_11399_scourging_crystal_controller_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -405,8 +392,6 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader class spell_q11587_arcane_prisoner_rescue_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11587_arcane_prisoner_rescue_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_SUMMON_ARCANE_PRISONER_MALE, SPELL_SUMMON_ARCANE_PRISONER_FEMALE, SPELL_ARCANE_PRISONER_KILL_CREDIT }); @@ -427,7 +412,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11587_arcane_prisoner_rescue_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -461,8 +446,6 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader class spell_q11730_ultrasonic_screwdriver_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11730_ultrasonic_screwdriver_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER && GetCastItem(); @@ -506,7 +489,7 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11730_ultrasonic_screwdriver_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -537,8 +520,6 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader class spell_q12459_seeds_of_natures_wrath_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12459_seeds_of_natures_wrath_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* creatureTarget = GetHitCreature()) @@ -557,7 +538,7 @@ class spell_q12459_seeds_of_natures_wrath : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12459_seeds_of_natures_wrath_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -584,8 +565,6 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader class spell_q12634_despawn_fruit_tosser_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12634_despawn_fruit_tosser_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo( @@ -613,7 +592,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q12634_despawn_fruit_tosser_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -632,8 +611,6 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader class spell_q12683_take_sputum_sample_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12683_take_sputum_sample_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { uint32 reqAuraId = GetSpellInfo()->Effects[EFFECT_1].CalcValue(); @@ -648,7 +625,7 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q12683_take_sputum_sample_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -677,8 +654,6 @@ class spell_q12851_going_bearback : public SpellScriptLoader class spell_q12851_going_bearback_AuraScript : public AuraScript { - PrepareAuraScript(spell_q12851_going_bearback_AuraScript); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) @@ -709,7 +684,7 @@ class spell_q12851_going_bearback : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_q12851_going_bearback_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -735,8 +710,6 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader class spell_q12937_relief_for_the_fallen_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12937_relief_for_the_fallen_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -760,7 +733,7 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12937_relief_for_the_fallen_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -784,8 +757,6 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader class spell_q10041_q10040_who_are_they_SpellScript : public SpellScript { - PrepareSpellScript(spell_q10041_q10040_who_are_they_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SPELL_MALE_DISGUISE, SPELL_FEMALE_DISGUISE, SPELL_GENERIC_DISGUISE }); @@ -803,7 +774,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q10041_q10040_who_are_they_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -826,8 +797,6 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader class spell_symbol_of_life_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_symbol_of_life_dummy_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -845,7 +814,7 @@ class spell_symbol_of_life_dummy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_symbol_of_life_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -869,8 +838,6 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader class spell_q12659_ahunaes_knife_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12659_ahunaes_knife_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -888,7 +855,7 @@ class spell_q12659_ahunaes_knife : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12659_ahunaes_knife_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -913,8 +880,6 @@ class spell_q9874_liquid_fire : public SpellScriptLoader class spell_q9874_liquid_fire_SpellScript : public SpellScript { - PrepareSpellScript(spell_q9874_liquid_fire_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -934,7 +899,7 @@ class spell_q9874_liquid_fire : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q9874_liquid_fire_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -958,8 +923,6 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader class spell_q12805_lifeblood_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12805_lifeblood_dummy_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -978,7 +941,7 @@ class spell_q12805_lifeblood_dummy : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12805_lifeblood_dummy_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1005,8 +968,6 @@ enum BattleStandard class spell_q13280_13283_plant_battle_standard : public SpellScript { - PrepareSpellScript(spell_q13280_13283_plant_battle_standard); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1027,14 +988,12 @@ class spell_q13280_13283_plant_battle_standard : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13280_13283_plant_battle_standard::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q13280_13283_plant_battle_standard::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_q13280_13283_jump_jets : public SpellScript { - PrepareSpellScript(spell_q13280_13283_jump_jets); - void HandleCast() { Unit* caster = GetCaster(); @@ -1045,7 +1004,7 @@ class spell_q13280_13283_jump_jets : public SpellScript void Register() override { - OnCast += SpellCastFn(spell_q13280_13283_jump_jets::HandleCast); + OnCast.Register(&spell_q13280_13283_jump_jets::HandleCast); } }; @@ -1064,8 +1023,6 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader class spell_q14112_14145_chum_the_water_SpellScript : public SpellScript { - PrepareSpellScript(spell_q14112_14145_chum_the_water_SpellScript); - bool Validate(SpellInfo const* /*spellEntry*/) override { return ValidateSpellInfo({ SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK }); @@ -1079,7 +1036,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q14112_14145_chum_the_water_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1104,8 +1061,6 @@ class spell_q9452_cast_net: public SpellScriptLoader class spell_q9452_cast_net_SpellScript : public SpellScript { - PrepareSpellScript(spell_q9452_cast_net_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -1130,8 +1085,8 @@ class spell_q9452_cast_net: public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnEffectHitTarget += SpellEffectFn(spell_q9452_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); + OnEffectHit.Register(&spell_q9452_cast_net_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q9452_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); } }; @@ -1154,8 +1109,6 @@ class spell_q14076_14092_pound_drum : public SpellScriptLoader class spell_q14076_14092_pound_drum_SpellScript : public SpellScript { - PrepareSpellScript(spell_q14076_14092_pound_drum_SpellScript); - void HandleSummon() { Unit* caster = GetCaster(); @@ -1173,8 +1126,8 @@ class spell_q14076_14092_pound_drum : public SpellScriptLoader void Register() override { - OnCast += SpellCastFn(spell_q14076_14092_pound_drum_SpellScript::HandleSummon); - OnEffectHitTarget += SpellEffectFn(spell_q14076_14092_pound_drum_SpellScript::HandleActiveObject, EFFECT_0, SPELL_EFFECT_ACTIVATE_OBJECT); + OnCast.Register(&spell_q14076_14092_pound_drum_SpellScript::HandleSummon); + OnEffectHitTarget.Register(&spell_q14076_14092_pound_drum_SpellScript::HandleActiveObject, EFFECT_0, SPELL_EFFECT_ACTIVATE_OBJECT); } }; @@ -1191,8 +1144,6 @@ class spell_q12279_cast_net : public SpellScriptLoader class spell_q12279_cast_net_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12279_cast_net_SpellScript); - void HandleActiveObject(SpellEffIndex /*effIndex*/) { GetHitGObj()->SetLootState(GO_JUST_DEACTIVATED); @@ -1200,7 +1151,7 @@ class spell_q12279_cast_net : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12279_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); + OnEffectHitTarget.Register(&spell_q12279_cast_net_SpellScript::HandleActiveObject, EFFECT_1, SPELL_EFFECT_ACTIVATE_OBJECT); } }; @@ -1225,8 +1176,6 @@ public: class spell_q12987_read_pronouncement_AuraScript : public AuraScript { - PrepareAuraScript(spell_q12987_read_pronouncement_AuraScript); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { // player must cast kill credit and do emote text, according to sniff @@ -1243,7 +1192,7 @@ public: void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_q12987_read_pronouncement_AuraScript::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1269,8 +1218,6 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader class spell_q12277_wintergarde_mine_explosion_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12277_wintergarde_mine_explosion_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* unitTarget = GetHitCreature()) @@ -1300,7 +1247,7 @@ class spell_q12277_wintergarde_mine_explosion : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12277_wintergarde_mine_explosion_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1322,8 +1269,6 @@ public: class spell_q12066_bunny_kill_credit_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12066_bunny_kill_credit_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) @@ -1332,7 +1277,7 @@ public: void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12066_bunny_kill_credit_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1360,8 +1305,6 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader class spell_q12735_song_of_cleansing_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12735_song_of_cleansing_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1383,7 +1326,7 @@ class spell_q12735_song_of_cleansing : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12735_song_of_cleansing_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1405,8 +1348,6 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader class spell_q12372_cast_from_gossip_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12372_cast_from_gossip_trigger_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetCaster(), SPELL_SUMMON_WYRMREST_DEFENDER, true); @@ -1414,7 +1355,7 @@ class spell_q12372_cast_from_gossip_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12372_cast_from_gossip_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1441,8 +1382,6 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad class spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (GetHitCreature()) @@ -1455,7 +1394,7 @@ class spell_q12372_destabilize_azure_dragonshrine_dummy : public SpellScriptLoad void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12372_destabilize_azure_dragonshrine_dummy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1473,8 +1412,6 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader class spell_q12372_azure_on_death_force_whisper_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12372_azure_on_death_force_whisper_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Creature* defender = GetHitCreature()) @@ -1483,7 +1420,7 @@ class spell_q12372_azure_on_death_force_whisper : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12372_azure_on_death_force_whisper_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1512,8 +1449,6 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader class spell_q11010_q11102_q11023_aggro_check_aura_AuraScript : public AuraScript { - PrepareAuraScript(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript); - void HandleTriggerSpell(AuraEffect const* /*aurEff*/) { if (Unit* target = GetTarget()) @@ -1523,7 +1458,7 @@ class spell_q11010_q11102_q11023_aggro_check_aura : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_q11010_q11102_q11023_aggro_check_aura_AuraScript::HandleTriggerSpell, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1541,8 +1476,6 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader class spell_q11010_q11102_q11023_aggro_check_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_aggro_check_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Player* playerTarget = GetHitPlayer()) @@ -1553,7 +1486,7 @@ class spell_q11010_q11102_q11023_aggro_check : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11010_q11102_q11023_aggro_check_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1571,8 +1504,6 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader class spell_q11010_q11102_q11023_aggro_burst_AuraScript : public AuraScript { - PrepareAuraScript(spell_q11010_q11102_q11023_aggro_burst_AuraScript); - void HandleEffectPeriodic(AuraEffect const* /*aurEff*/) { if (Unit* target = GetTarget()) @@ -1582,7 +1513,7 @@ class spell_q11010_q11102_q11023_aggro_burst : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_q11010_q11102_q11023_aggro_burst_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1600,8 +1531,6 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader class spell_q11010_q11102_q11023_choose_loc_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_choose_loc_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -1620,7 +1549,7 @@ class spell_q11010_q11102_q11023_choose_loc : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q11010_q11102_q11023_choose_loc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1639,8 +1568,6 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad class spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript); - SpellCastResult CheckRequirement() { Unit* caster = GetCaster(); @@ -1652,7 +1579,7 @@ class spell_q11010_q11102_q11023_q11008_check_fly_mount : public SpellScriptLoad void Register() override { - OnCheckCast += SpellCheckCastFn(spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); + OnCheckCast.Register(&spell_q11010_q11102_q11023_q11008_check_fly_mount_SpellScript::CheckRequirement); } }; @@ -1674,8 +1601,6 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader class spell_q12527_zuldrak_rat_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12527_zuldrak_rat_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_GORGED_LURKING_BASILISK }); @@ -1693,7 +1618,7 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12527_zuldrak_rat_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1711,8 +1636,6 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -1722,7 +1645,7 @@ class spell_q12661_q12669_q12676_q12677_q12713_summon_stefan : public SpellScrip void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); + OnDestinationTargetSelect.Register(&spell_q12661_q12669_q12676_q12677_q12713_summon_stefan_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); } }; @@ -1744,8 +1667,6 @@ class spell_q12730_quenching_mist : public SpellScriptLoader class spell_q12730_quenching_mist_AuraScript : public AuraScript { - PrepareAuraScript(spell_q12730_quenching_mist_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLICKERING_FLAMES }); @@ -1758,7 +1679,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + OnEffectPeriodic.Register(&spell_q12730_quenching_mist_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; @@ -1785,8 +1706,6 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE }); @@ -1803,7 +1722,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1821,8 +1740,6 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -1832,7 +1749,7 @@ class spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon : public S void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); + OnDestinationTargetSelect.Register(&spell_q13291_q13292_q13239_q13261_armored_decoy_summon_skytalon_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER_BACK); } }; @@ -1850,8 +1767,6 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader class spell_q12847_summon_soul_moveto_bunny_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12847_summon_soul_moveto_bunny_SpellScript); - void SetDest(SpellDestination& dest) { // Adjust effect summon position @@ -1861,7 +1776,7 @@ class spell_q12847_summon_soul_moveto_bunny : public SpellScriptLoader void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12847_summon_soul_moveto_bunny_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect.Register(&spell_q12847_summon_soul_moveto_bunny_SpellScript::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; @@ -1885,8 +1800,6 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader class spell_q13011_bear_flank_master_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13011_bear_flank_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1918,7 +1831,7 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13011_bear_flank_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q13011_bear_flank_master_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1935,8 +1848,6 @@ class spell_q13086_cannons_target : public SpellScriptLoader class spell_q13086_cannons_target_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13086_cannons_target_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ static_cast(spellInfo->Effects[EFFECT_0].CalcValue()) }); @@ -1950,7 +1861,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q13086_cannons_target_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q13086_cannons_target_SpellScript::HandleEffectDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1981,8 +1892,6 @@ class spell_q13264_thats_abominable : public SpellScriptLoader class spell_q13264_thats_abominable_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13264_thats_abominable_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2035,8 +1944,8 @@ class spell_q13264_thats_abominable : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13264_thats_abominable_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); - OnEffectHitTarget += SpellEffectFn(spell_q13264_thats_abominable_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q13264_thats_abominable_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); + OnEffectHitTarget.Register(&spell_q13264_thats_abominable_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2070,8 +1979,6 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader class spell_q12690_burst_at_the_seams_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12690_burst_at_the_seams_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2123,8 +2030,8 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); - OnEffectHitTarget += SpellEffectFn(spell_q12690_burst_at_the_seams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12690_burst_at_the_seams_SpellScript::HandleKnockBack, EFFECT_1, SPELL_EFFECT_KNOCK_BACK); + OnEffectHitTarget.Register(&spell_q12690_burst_at_the_seams_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2147,8 +2054,6 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader class spell_q12308_escape_from_silverbrook_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12308_escape_from_silverbrook_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_WORGEN }); @@ -2161,7 +2066,7 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q12308_escape_from_silverbrook_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_q12308_escape_from_silverbrook_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2179,8 +2084,6 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa class spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript); - void ModDest(SpellDestination& dest) { float dist = GetSpellInfo()->Effects[EFFECT_0].CalcRadius(GetCaster()); @@ -2192,7 +2095,7 @@ class spell_q12308_escape_from_silverbrook_summon_worgen : public SpellScriptLoa void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript::ModDest, EFFECT_0, TARGET_DEST_CASTER_SUMMON); + OnDestinationTargetSelect.Register(&spell_q12308_escape_from_silverbrook_summon_worgen_SpellScript::ModDest, EFFECT_0, TARGET_DEST_CASTER_SUMMON); } }; @@ -2223,8 +2126,6 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader class spell_q12641_death_comes_from_on_high_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12641_death_comes_from_on_high_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2263,7 +2164,7 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12641_death_comes_from_on_high_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q12641_death_comes_from_on_high_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2286,8 +2187,6 @@ class spell_q12641_recall_eye_of_acherus : public SpellScriptLoader class spell_q12641_recall_eye_of_acherus_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12641_recall_eye_of_acherus_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Player* player = GetCaster()->GetCharmerOrOwner()->ToPlayer()) @@ -2300,7 +2199,7 @@ class spell_q12641_recall_eye_of_acherus : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12641_recall_eye_of_acherus_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12641_recall_eye_of_acherus_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2318,8 +2217,6 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader class spell_q12619_emblazon_runeblade_AuraScript : public AuraScript { - PrepareAuraScript(spell_q12619_emblazon_runeblade_AuraScript); - void HandleEffectPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); @@ -2329,7 +2226,7 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_q12619_emblazon_runeblade_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_q12619_emblazon_runeblade_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -2347,8 +2244,6 @@ class spell_q12619_emblazon_runeblade_effect : public SpellScriptLoader class spell_q12619_emblazon_runeblade_effect_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12619_emblazon_runeblade_effect_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { GetCaster()->CastSpell(GetCaster(), uint32(GetEffectValue()), false); @@ -2356,7 +2251,7 @@ class spell_q12619_emblazon_runeblade_effect : public SpellScriptLoader void Register() override { - OnEffectHit += SpellEffectFn(spell_q12619_emblazon_runeblade_effect_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit.Register(&spell_q12619_emblazon_runeblade_effect_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2379,8 +2274,6 @@ class spell_q12919_gymers_grab : public SpellScriptLoader class spell_q12919_gymers_grab_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12919_gymers_grab_SpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_RIDE_GYMER }); @@ -2397,7 +2290,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_grab_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12919_gymers_grab_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2419,8 +2312,6 @@ class spell_q12919_gymers_throw : public SpellScriptLoader class spell_q12919_gymers_throw_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12919_gymers_throw_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -2434,7 +2325,7 @@ class spell_q12919_gymers_throw : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12919_gymers_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12919_gymers_throw_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2456,8 +2347,6 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader class spell_q13400_illidan_kill_master_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13400_illidan_kill_master_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ILLIDAN_KILL_CREDIT }); @@ -2473,7 +2362,7 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13400_illidan_kill_master_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q13400_illidan_kill_master_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -2496,8 +2385,6 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader class spell_q14100_q14111_make_player_destroy_totems_SpellScript : public SpellScript { - PrepareSpellScript(spell_q14100_q14111_make_player_destroy_totems_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_TOTEM_OF_THE_EARTHEN_RING }); @@ -2511,7 +2398,7 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q14100_q14111_make_player_destroy_totems_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q14100_q14111_make_player_destroy_totems_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2535,8 +2422,6 @@ class spell_q10929_fumping : SpellScriptLoader class spell_q10929_fumpingAuraScript : public AuraScript { - PrepareAuraScript(spell_q10929_fumpingAuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SAND_GNOME, SPELL_SUMMON_BONE_SLICER }); @@ -2553,7 +2438,7 @@ class spell_q10929_fumping : SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_q10929_fumpingAuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_q10929_fumpingAuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -2577,9 +2462,7 @@ 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 + bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RENEWED_LIFE }); } @@ -2597,7 +2480,7 @@ public: void Register() override { - OnCast += SpellCastFn(spell_q28813_get_our_boys_back_dummy_SpellScript::HandleDummyEffect); + OnCast.Register(&spell_q28813_get_our_boys_back_dummy_SpellScript::HandleDummyEffect); } }; @@ -2614,8 +2497,6 @@ public: class spell_q28813_set_health_random_SpellScript : public SpellScript { - PrepareSpellScript(spell_q28813_set_health_random_SpellScript); - void HandleDummyEffect() { Unit* caster = GetCaster(); @@ -2624,7 +2505,7 @@ public: void Register() override { - OnCast += SpellCastFn(spell_q28813_set_health_random_SpellScript::HandleDummyEffect); + OnCast.Register(&spell_q28813_set_health_random_SpellScript::HandleDummyEffect); } }; @@ -2643,8 +2524,6 @@ class spell_q13665_q13790_bested_trigger : public SpellScriptLoader class spell_q13665_q13790_bested_trigger_SpellScript : public SpellScript { - PrepareSpellScript(spell_q13665_q13790_bested_trigger_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit()->GetCharmerOrOwnerOrSelf(); @@ -2653,7 +2532,7 @@ class spell_q13665_q13790_bested_trigger : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q13665_q13790_bested_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q13665_q13790_bested_trigger_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2670,8 +2549,6 @@ class spell_q12414_hand_over_reins : public SpellScriptLoader class spell_q12414_hand_over_reins_SpellScript : public SpellScript { - PrepareSpellScript(spell_q12414_hand_over_reins_SpellScript); - void HandleScript(SpellEffIndex /*effIndex*/) { Creature* caster = GetCaster()->ToCreature(); @@ -2683,7 +2560,7 @@ class spell_q12414_hand_over_reins : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12414_hand_over_reins_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_q12414_hand_over_reins_SpellScript::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -2714,9 +2591,7 @@ public: class spell_q11306_mixing_blood_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11306_mixing_blood_SpellScript); - - void HandleEffect(SpellEffIndex /*effIndex*/) + void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) if (Creature* trigger = caster->FindNearestCreature(CREATURE_GENERIC_TRIGGER_LAB, 100.0f)) @@ -2725,7 +2600,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_q11306_mixing_blood_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_q11306_mixing_blood_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; @@ -2742,8 +2617,6 @@ class spell_q11306_mixing_vrykul_blood : public SpellScriptLoader class spell_q11306_mixing_vrykul_blood_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11306_mixing_vrykul_blood_SpellScript); - void HandleDummy(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -2767,7 +2640,7 @@ class spell_q11306_mixing_vrykul_blood : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q11306_mixing_vrykul_blood_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_q11306_mixing_vrykul_blood_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -2784,9 +2657,7 @@ public: class spell_q11306_failed_mix_43376_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11306_failed_mix_43376_SpellScript); - - void HandleEffect(SpellEffIndex /*effIndex*/) + void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) if (Creature* trigger = caster->FindNearestCreature(CREATURE_GENERIC_TRIGGER_LAB, 100.0f)) @@ -2795,7 +2666,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_q11306_failed_mix_43376_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_q11306_failed_mix_43376_SpellScript::HandleEffect, EFFECT_1, SPELL_EFFECT_SEND_EVENT); } }; @@ -2812,9 +2683,7 @@ public: class spell_q11306_failed_mix_43378_SpellScript : public SpellScript { - PrepareSpellScript(spell_q11306_failed_mix_43378_SpellScript); - - void HandleEffect(SpellEffIndex /*effIndex*/) + void HandleEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) if (Creature* trigger = caster->FindNearestCreature(CREATURE_GENERIC_TRIGGER_LAB, 100.0f)) @@ -2823,7 +2692,7 @@ public: void Register() override { - OnEffectHit += SpellEffectFn(spell_q11306_failed_mix_43378_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SEND_EVENT); + OnEffectHit.Register(&spell_q11306_failed_mix_43378_SpellScript::HandleEffect, EFFECT_2, SPELL_EFFECT_SEND_EVENT); } }; @@ -2840,9 +2709,7 @@ public: class spell_q14098_knocking_67869_SpellScript : public SpellScript { - PrepareSpellScript(spell_q14098_knocking_67869_SpellScript); - - bool Validate(SpellInfo const* spellInfo) override + bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo( { @@ -2859,7 +2726,7 @@ public: void Register() override { - OnCast += SpellCastFn(spell_q14098_knocking_67869_SpellScript::HandleEffect); + OnCast.Register(&spell_q14098_knocking_67869_SpellScript::HandleEffect); } }; diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index 3bdf718c43..7a0fef1ef1 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -91,8 +91,6 @@ class spell_rog_blade_flurry : public SpellScriptLoader class spell_rog_blade_flurry_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_blade_flurry_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_BLADE_FLURRY_EXTRA_ATTACK }); @@ -110,9 +108,9 @@ class spell_rog_blade_flurry : public SpellScriptLoader void Register() override { if (m_scriptSpellId == SPELL_ROGUE_BLADE_FLURRY) - OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT); + OnEffectProc.Register(&spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_POWER_REGEN_PERCENT); else - OnEffectProc += AuraEffectProcFn(spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE); + OnEffectProc.Register(&spell_rog_blade_flurry_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE); } }; @@ -130,8 +128,6 @@ class spell_rog_cheat_death : public SpellScriptLoader class spell_rog_cheat_death_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_cheat_death_AuraScript); - uint32 absorbChance = 0; bool Validate(SpellInfo const* /*spellInfo*/) override @@ -172,8 +168,8 @@ class spell_rog_cheat_death : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_rog_cheat_death_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_rog_cheat_death_AuraScript::Absorb, EFFECT_0); } }; @@ -191,8 +187,6 @@ class spell_rog_crippling_poison : public SpellScriptLoader class spell_rog_crippling_poison_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_crippling_poison_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_CRIPPLING_POISON }); @@ -206,7 +200,7 @@ class spell_rog_crippling_poison : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_rog_crippling_poison_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -224,8 +218,6 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader class spell_rog_cut_to_the_chase_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_cut_to_the_chase_AuraScript); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { PreventDefaultAction(); @@ -235,7 +227,7 @@ class spell_rog_cut_to_the_chase : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_rog_cut_to_the_chase_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -253,8 +245,6 @@ class spell_rog_deadly_poison : public SpellScriptLoader class spell_rog_deadly_poison_SpellScript : public SpellScript { - PrepareSpellScript(spell_rog_deadly_poison_SpellScript); - bool Load() override { // at this point CastItem must already be initialized @@ -328,8 +318,8 @@ class spell_rog_deadly_poison : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleBeforeHit); - AfterHit += SpellHitFn(spell_rog_deadly_poison_SpellScript::HandleAfterHit); + BeforeHit.Register(&spell_rog_deadly_poison_SpellScript::HandleBeforeHit); + AfterHit.Register(&spell_rog_deadly_poison_SpellScript::HandleAfterHit); } uint8 _stackAmount = 0; @@ -351,8 +341,6 @@ class spell_rog_killing_spree : public SpellScriptLoader class spell_rog_killing_spree_SpellScript : public SpellScript { - PrepareSpellScript(spell_rog_killing_spree_SpellScript); - void FilterTargets(std::list& targets) { if (targets.empty() || GetCaster()->GetVehicleBase()) @@ -368,8 +356,8 @@ class spell_rog_killing_spree : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_rog_killing_spree_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_rog_killing_spree_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_rog_killing_spree_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_rog_killing_spree_SpellScript::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -380,8 +368,6 @@ class spell_rog_killing_spree : public SpellScriptLoader class spell_rog_killing_spree_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_killing_spree_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -420,9 +406,9 @@ class spell_rog_killing_spree : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_rog_killing_spree_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_killing_spree_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - AfterEffectRemove += AuraEffectRemoveFn(spell_rog_killing_spree_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_rog_killing_spree_AuraScript::HandleApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_rog_killing_spree_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + AfterEffectRemove.Register(&spell_rog_killing_spree_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } public: @@ -450,8 +436,6 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader class spell_rog_master_of_subtlety_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_master_of_subtlety_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_MASTER_OF_SUBTLETY_DAMAGE_PERCENT }); @@ -467,7 +451,7 @@ class spell_rog_master_of_subtlety : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_master_of_subtlety_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_rog_master_of_subtlety_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -485,8 +469,6 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader class spell_rog_nerves_of_steel_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_nerves_of_steel_AuraScript); - public: spell_rog_nerves_of_steel_AuraScript() { @@ -517,8 +499,8 @@ class spell_rog_nerves_of_steel : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&spell_rog_nerves_of_steel_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&spell_rog_nerves_of_steel_AuraScript::Absorb, EFFECT_0); } }; @@ -536,8 +518,6 @@ class spell_rog_overkill : public SpellScriptLoader class spell_rog_overkill_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_overkill_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_OVERKILL_POWER_REGEN }); @@ -553,7 +533,7 @@ class spell_rog_overkill : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_overkill_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_rog_overkill_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -571,8 +551,6 @@ class spell_rog_preparation : public SpellScriptLoader class spell_rog_preparation_SpellScript : public SpellScript { - PrepareSpellScript(spell_rog_preparation_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -602,7 +580,7 @@ class spell_rog_preparation : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_rog_preparation_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -620,8 +598,6 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader class spell_rog_prey_on_the_weak_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_prey_on_the_weak_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_PREY_ON_THE_WEAK }); @@ -645,7 +621,7 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_rog_prey_on_the_weak_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -658,8 +634,6 @@ class spell_rog_prey_on_the_weak : public SpellScriptLoader // 73651 - Recuperate class spell_rog_recuperate : public AuraScript { - PrepareAuraScript(spell_rog_recuperate); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -693,9 +667,9 @@ class spell_rog_recuperate : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_rog_recuperate::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_recuperate::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); - AfterEffectApply += AuraEffectApplyFn(spell_rog_recuperate::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic.Register(&spell_rog_recuperate::OnPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_rog_recuperate::CalculateBonus, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + AfterEffectApply.Register(&spell_rog_recuperate::HandleEffectApply, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } public: int32 Duration = 0; @@ -704,8 +678,6 @@ public: // -1943 - Rupture class spell_rog_rupture : public AuraScript { - PrepareAuraScript(spell_rog_rupture); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_REVEALING_STRIKE }); @@ -756,11 +728,10 @@ class spell_rog_rupture : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_rog_rupture::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); - AfterEffectApply += AuraEffectApplyFn(spell_rog_rupture::ResetDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); - AfterEffectApply += AuraEffectApplyFn(spell_rog_rupture::StoreOriginalDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + DoEffectCalcAmount.Register(&spell_rog_rupture::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + AfterEffectApply.Register(&spell_rog_rupture::ResetDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAPPLY); + AfterEffectApply.Register(&spell_rog_rupture::StoreOriginalDuration, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } - public: // For Glyph of Backstab use uint32 BonusDuration = 0; @@ -775,8 +746,6 @@ class spell_rog_glyph_of_backstab_triggered : public SpellScriptLoader class spell_rog_glyph_of_backstab_triggered_SpellScript : public SpellScript { - PrepareSpellScript(spell_rog_glyph_of_backstab_triggered_SpellScript); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -811,7 +780,7 @@ class spell_rog_glyph_of_backstab_triggered : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rog_glyph_of_backstab_triggered_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_rog_glyph_of_backstab_triggered_SpellScript::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -829,8 +798,6 @@ class spell_rog_shiv : public SpellScriptLoader class spell_rog_shiv_SpellScript : public SpellScript { - PrepareSpellScript(spell_rog_shiv_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -850,7 +817,7 @@ class spell_rog_shiv : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_rog_shiv_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -868,8 +835,6 @@ class spell_rog_stealth : public SpellScriptLoader class spell_rog_stealth_AuraScript : public AuraScript { - PrepareAuraScript(spell_rog_stealth_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -914,8 +879,8 @@ class spell_rog_stealth : public SpellScriptLoader void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - AfterEffectRemove += AuraEffectRemoveFn(spell_rog_stealth_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_rog_stealth_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectRemove.Register(&spell_rog_stealth_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_MOD_SHAPESHIFT, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -928,8 +893,6 @@ class spell_rog_stealth : public SpellScriptLoader // 57934 - Tricks of the Trade class spell_rog_tricks_of_the_trade_aura : public AuraScript { - PrepareAuraScript(spell_rog_tricks_of_the_trade_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -961,8 +924,8 @@ class spell_rog_tricks_of_the_trade_aura : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_aura::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - OnEffectProc += AuraEffectProcFn(spell_rog_tricks_of_the_trade_aura::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + AfterEffectRemove.Register(&spell_rog_tricks_of_the_trade_aura::OnRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectProc.Register(&spell_rog_tricks_of_the_trade_aura::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } ObjectGuid _redirectTarget; @@ -972,8 +935,6 @@ public: class spell_rog_tricks_of_the_trade : public SpellScript { - PrepareSpellScript(spell_rog_tricks_of_the_trade); - void DoAfterHit() { if (Aura* aura = GetHitAura()) @@ -988,15 +949,13 @@ class spell_rog_tricks_of_the_trade : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_rog_tricks_of_the_trade::DoAfterHit); + AfterHit.Register(&spell_rog_tricks_of_the_trade::DoAfterHit); } }; // 59628 - Tricks of the Trade (Proc) class spell_rog_tricks_of_the_trade_proc : public AuraScript { - PrepareAuraScript(spell_rog_tricks_of_the_trade_proc); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->GetThreatManager().UnregisterRedirectThreat(SPELL_ROGUE_TRICKS_OF_THE_TRADE); @@ -1004,15 +963,13 @@ class spell_rog_tricks_of_the_trade_proc : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_rog_tricks_of_the_trade_proc::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_rog_tricks_of_the_trade_proc::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // -51698 - Honor Among Thieves class spell_rog_honor_among_thieves : public AuraScript { - PrepareAuraScript(spell_rog_honor_among_thieves); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_HONOR_AMONG_THIEVES_TRIGGERED }); @@ -1033,15 +990,13 @@ class spell_rog_honor_among_thieves : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_honor_among_thieves::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_rog_honor_among_thieves::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 76806 - Main Gauche class spell_rog_main_gauche : public AuraScript { - PrepareAuraScript(spell_rog_main_gauche); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_MAIN_GAUCHE }); @@ -1076,15 +1031,13 @@ class spell_rog_main_gauche : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_rog_main_gauche::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_rog_main_gauche::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_rog_main_gauche::CheckProc); + OnEffectProc.Register(&spell_rog_main_gauche::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_rog_glyph_of_hemorrhage : public AuraScript { - PrepareAuraScript(spell_rog_glyph_of_hemorrhage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_GLYPH_HEMORRHAGE_TRIGGERED }); @@ -1108,15 +1061,13 @@ class spell_rog_glyph_of_hemorrhage : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_glyph_of_hemorrhage::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_rog_glyph_of_hemorrhage::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 2098 - Eviscerate class spell_rog_eviscerate : public SpellScript { - PrepareSpellScript(spell_rog_eviscerate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1181,16 +1132,14 @@ class spell_rog_eviscerate : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_rog_eviscerate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_rog_eviscerate::HandleSerratedBlades, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_rog_eviscerate::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_rog_eviscerate::HandleSerratedBlades, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 32645 - Envenom class spell_rog_envenom : public SpellScript { - PrepareSpellScript(spell_rog_envenom); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_REVEALING_STRIKE }); @@ -1269,15 +1218,13 @@ class spell_rog_envenom : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_rog_envenom::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_rog_envenom::ChangeDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 5171 - Slice and Dice class spell_rog_slice_and_dice : public AuraScript { - PrepareAuraScript(spell_rog_slice_and_dice); - void HandleEffectApply(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) { Duration = aurEff->GetBase()->GetDuration(); @@ -1285,7 +1232,7 @@ class spell_rog_slice_and_dice : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_rog_slice_and_dice::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + AfterEffectApply.Register(&spell_rog_slice_and_dice::HandleEffectApply, EFFECT_0, SPELL_AURA_MOD_MELEE_HASTE_3, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } public: int32 Duration = 0; @@ -1294,8 +1241,6 @@ public: // -79121 - Deadly Momentum class spell_rog_deadly_momentum : public AuraScript { - PrepareAuraScript(spell_rog_deadly_momentum); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { Unit* target = GetTarget(); @@ -1313,15 +1258,13 @@ class spell_rog_deadly_momentum : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_deadly_momentum::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); + OnEffectProc.Register(&spell_rog_deadly_momentum::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); } }; // 6770 - Sap class spell_rog_sap: public AuraScript { - PrepareAuraScript(spell_rog_sap); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_BLACKJACK_R1 }); @@ -1339,15 +1282,13 @@ class spell_rog_sap: public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_rog_sap::HandleBlackJack, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_rog_sap::HandleBlackJack, EFFECT_0, SPELL_AURA_MOD_STUN, AURA_EFFECT_HANDLE_REAL); } }; // -14168 - Improved Expose Armor class spell_rog_improved_expose_armor : public AuraScript { - PrepareAuraScript(spell_rog_improved_expose_armor); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1380,16 +1321,14 @@ class spell_rog_improved_expose_armor : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_rog_improved_expose_armor::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_rog_improved_expose_armor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_rog_improved_expose_armor::CheckProc); + OnEffectProc.Register(&spell_rog_improved_expose_armor::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -14158 - Murderous Intent class spell_rog_murderous_intent : public AuraScript { - PrepareAuraScript(spell_rog_murderous_intent); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_ROGUE_MURDEROUS_INTENT }); @@ -1408,16 +1347,14 @@ class spell_rog_murderous_intent : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_rog_murderous_intent::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_rog_murderous_intent::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_rog_murderous_intent::CheckProc); + OnEffectProc.Register(&spell_rog_murderous_intent::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -35541 - Combat Potency class spell_rog_combat_potency : public AuraScript { - PrepareAuraScript(spell_rog_combat_potency); - bool CheckProc(ProcEventInfo& eventInfo) { if (eventInfo.GetSpellInfo()) @@ -1430,15 +1367,13 @@ class spell_rog_combat_potency : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_rog_combat_potency::CheckProc); + DoCheckProc.Register(&spell_rog_combat_potency::CheckProc); } }; // -79095 - Restless Blades class spell_rog_restless_blades : public AuraScript { - PrepareAuraScript(spell_rog_restless_blades); - bool Load() override { return GetUnitOwner()->IsPlayer(); @@ -1469,15 +1404,13 @@ class spell_rog_restless_blades : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_rog_restless_blades::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_rog_restless_blades::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -84652 - Bandit's Guile class spell_rog_bandits_guile : public AuraScript { - PrepareAuraScript(spell_rog_bandits_guile); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1533,8 +1466,8 @@ class spell_rog_bandits_guile : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_rog_bandits_guile::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_rog_bandits_guile::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_rog_bandits_guile::CheckProc); + OnEffectProc.Register(&spell_rog_bandits_guile::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } private: ObjectGuid _recentTargetGUID; diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 38899d1a2b..6abd752047 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -141,8 +141,6 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader class spell_sha_ancestral_awakening_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_ancestral_awakening_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES }); @@ -158,7 +156,7 @@ class spell_sha_ancestral_awakening : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_ancestral_awakening_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -177,8 +175,6 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader class spell_sha_ancestral_awakening_proc_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_ancestral_awakening_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_AWAKENING_PROC }); @@ -203,8 +199,8 @@ class spell_sha_ancestral_awakening_proc : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_ancestral_awakening_proc_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); - OnEffectHitTarget += SpellEffectFn(spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnObjectAreaTargetSelect.Register(&spell_sha_ancestral_awakening_proc_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); + OnEffectHitTarget.Register(&spell_sha_ancestral_awakening_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -223,8 +219,6 @@ class spell_sha_bloodlust : public SpellScriptLoader class spell_sha_bloodlust_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_bloodlust_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -250,10 +244,10 @@ class spell_sha_bloodlust : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID); - AfterHit += SpellHitFn(spell_sha_bloodlust_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); + OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); + OnObjectAreaTargetSelect.Register(&spell_sha_bloodlust_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID); + AfterHit.Register(&spell_sha_bloodlust_SpellScript::ApplyDebuff); } }; @@ -272,8 +266,6 @@ class spell_sha_chain_heal : public SpellScriptLoader class spell_sha_chain_heal_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_chain_heal_SpellScript); - public: spell_sha_chain_heal_SpellScript() { @@ -307,7 +299,7 @@ class spell_sha_chain_heal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnEffectHitTarget.Register(&spell_sha_chain_heal_SpellScript::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } bool firstHeal; @@ -324,8 +316,6 @@ class spell_sha_chain_heal : public SpellScriptLoader // 974 - Earth Shield class spell_sha_earth_shield : public AuraScript { - PrepareAuraScript(spell_sha_earth_shield); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTH_SHIELD_HEAL }); @@ -350,7 +340,7 @@ class spell_sha_earth_shield : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_earth_shield::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_earth_shield::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -363,8 +353,6 @@ class spell_sha_earthbind_totem : public SpellScriptLoader class spell_sha_earthbind_totem_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_earthbind_totem_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TOTEM_EARTHBIND_TOTEM, SPELL_SHAMAN_TOTEM_EARTHEN_POWER }); @@ -397,8 +385,8 @@ class spell_sha_earthbind_totem : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); - OnEffectApply += AuraEffectApplyFn(spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_sha_earthbind_totem_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectApply.Register(&spell_sha_earthbind_totem_AuraScript::Apply, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } }; @@ -433,8 +421,6 @@ class spell_sha_earthen_power : public SpellScriptLoader class spell_sha_earthen_power_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_earthen_power_SpellScript); - void FilterTargets(std::list& unitList) { unitList.remove_if(EarthenPowerTargetSelector()); @@ -442,7 +428,7 @@ class spell_sha_earthen_power : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); + OnObjectAreaTargetSelect.Register(&spell_sha_earthen_power_SpellScript::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ALLY); } }; @@ -460,8 +446,6 @@ class spell_sha_feedback : public SpellScriptLoader class spell_sha_feedback_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_feedback_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY }); @@ -476,7 +460,7 @@ class spell_sha_feedback : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_feedback_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -490,8 +474,6 @@ class spell_sha_feedback : public SpellScriptLoader /// Updated 4.3.4 class spell_sha_fire_nova : public SpellScript { - PrepareSpellScript(spell_sha_fire_nova); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY }); @@ -507,15 +489,13 @@ class spell_sha_fire_nova : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_fire_nova::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_sha_fire_nova::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 8349 - Fire Nova class spell_sha_fire_nova_damage : public SpellScript { - PrepareSpellScript(spell_sha_fire_nova_damage); - void FilterTargets(std::list& targets) { if (targets.empty()) @@ -531,8 +511,8 @@ class spell_sha_fire_nova_damage : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_fire_nova_damage::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_fire_nova_damage::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_sha_fire_nova_damage::FilterTargets, EFFECT_1, TARGET_UNIT_DEST_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_sha_fire_nova_damage::FilterTargets, EFFECT_2, TARGET_UNIT_DEST_AREA_ENEMY); } }; @@ -545,8 +525,6 @@ class spell_sha_flame_shock : public SpellScriptLoader class spell_sha_flame_shock_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_flame_shock_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_FLOWS_R1, SPELL_SHAMAN_LAVA_FLOWS_TRIGGERED_R1 }); @@ -571,7 +549,7 @@ class spell_sha_flame_shock : public SpellScriptLoader void Register() override { - AfterDispel += AuraDispelFn(spell_sha_flame_shock_AuraScript::HandleDispel); + AfterDispel.Register(&spell_sha_flame_shock_AuraScript::HandleDispel); } }; @@ -590,8 +568,6 @@ class spell_sha_focused_insight : public SpellScriptLoader class spell_sha_focused_insight_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_focused_insight_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FOCUSED_INSIGHT }); @@ -614,8 +590,8 @@ class spell_sha_focused_insight : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_focused_insight_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_focused_insight_AuraScript::CheckProc); + OnEffectProc.Register(&spell_sha_focused_insight_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -633,8 +609,6 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader class spell_sha_glyph_of_healing_wave_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_glyph_of_healing_wave_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_GLYPH_OF_HEALING_WAVE }); @@ -656,8 +630,8 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_glyph_of_healing_wave_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_glyph_of_healing_wave_AuraScript::CheckProc); + OnEffectProc.Register(&spell_sha_glyph_of_healing_wave_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -671,8 +645,6 @@ class spell_sha_glyph_of_healing_wave : public SpellScriptLoader /// Updated 4.3.4 class spell_sha_healing_stream_totem : public SpellScript { - PrepareSpellScript(spell_sha_healing_stream_totem); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TOTEM_HEALING_STREAM_HEAL }); @@ -697,7 +669,7 @@ class spell_sha_healing_stream_totem : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_healing_stream_totem::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_sha_healing_stream_totem::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -710,8 +682,6 @@ class spell_sha_heroism : public SpellScriptLoader class spell_sha_heroism_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_heroism_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -737,10 +707,10 @@ class spell_sha_heroism : public SpellScriptLoader void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID); - AfterHit += SpellHitFn(spell_sha_heroism_SpellScript::ApplyDebuff); + OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_0, TARGET_UNIT_CASTER_AREA_RAID); + OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_1, TARGET_UNIT_CASTER_AREA_RAID); + OnObjectAreaTargetSelect.Register(&spell_sha_heroism_SpellScript::RemoveInvalidTargets, EFFECT_2, TARGET_UNIT_CASTER_AREA_RAID); + AfterHit.Register(&spell_sha_heroism_SpellScript::ApplyDebuff); } }; @@ -758,8 +728,6 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader class spell_sha_item_lightning_shield_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_item_lightning_shield_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD }); @@ -773,7 +741,7 @@ class spell_sha_item_lightning_shield : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_sha_item_lightning_shield_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -791,8 +759,6 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader class spell_sha_item_lightning_shield_trigger_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_item_lightning_shield_trigger_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_MANA_SURGE }); @@ -806,7 +772,7 @@ class spell_sha_item_lightning_shield_trigger : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_sha_item_lightning_shield_trigger_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -824,8 +790,6 @@ class spell_sha_item_mana_surge : public SpellScriptLoader class spell_sha_item_mana_surge_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_item_mana_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ITEM_LIGHTNING_SHIELD_DAMAGE }); @@ -842,7 +806,7 @@ class spell_sha_item_mana_surge : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_sha_item_mana_surge_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -860,8 +824,6 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader class spell_sha_item_t10_elemental_2p_bonus_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_item_t10_elemental_2p_bonus_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ELEMENTAL_MASTERY }); @@ -876,7 +838,7 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_item_t10_elemental_2p_bonus_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_item_t10_elemental_2p_bonus_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -890,8 +852,6 @@ class spell_sha_item_t10_elemental_2p_bonus : public SpellScriptLoader /// Updated 4.3.4 class spell_sha_lava_lash : public SpellScript { - PrepareSpellScript(spell_sha_lava_lash); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -938,14 +898,12 @@ class spell_sha_lava_lash : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_sha_lava_lash::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); + OnEffectLaunchTarget.Register(&spell_sha_lava_lash::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); } }; class spell_sha_lava_lash_script : public SpellScript { - PrepareSpellScript(spell_sha_lava_lash_script); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FLAME_SHOCK }); @@ -987,8 +945,8 @@ class spell_sha_lava_lash_script : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_lava_lash_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_sha_lava_lash_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnObjectAreaTargetSelect.Register(&spell_sha_lava_lash_script::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_sha_lava_lash_script::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -999,8 +957,6 @@ class spell_sha_lava_surge : public SpellScriptLoader class spell_sha_lava_surge_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_lava_surge_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_SURGE }); @@ -1014,7 +970,7 @@ class spell_sha_lava_surge : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_lava_surge_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1031,8 +987,6 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader class spell_sha_lava_surge_proc_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_lava_surge_proc_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LAVA_BURST }); @@ -1050,7 +1004,7 @@ class spell_sha_lava_surge_proc : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_sha_lava_surge_proc_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1070,8 +1024,6 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader class spell_sha_mana_tide_totem_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_mana_tide_totem_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { // @TODO: Exclude the "short term" buffs from the stat value @@ -1082,7 +1034,7 @@ class spell_sha_mana_tide_totem : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT); + DoEffectCalcAmount.Register(&spell_sha_mana_tide_totem_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_MOD_STAT); } }; @@ -1100,8 +1052,6 @@ class spell_sha_nature_guardian : public SpellScriptLoader class spell_sha_nature_guardian_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_nature_guardian_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_NATURE_GUARDIAN }); @@ -1133,8 +1083,8 @@ class spell_sha_nature_guardian : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_nature_guardian_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_sha_nature_guardian_AuraScript::CheckProc); + OnEffectProc.Register(&spell_sha_nature_guardian_AuraScript::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1147,8 +1097,6 @@ class spell_sha_nature_guardian : public SpellScriptLoader // -88756 - Rolling Thunder class spell_sha_rolling_thunder : public AuraScript { - PrepareAuraScript(spell_sha_rolling_thunder); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1182,8 +1130,8 @@ class spell_sha_rolling_thunder : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_rolling_thunder::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_rolling_thunder::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + DoCheckProc.Register(&spell_sha_rolling_thunder::CheckProc); + OnEffectProc.Register(&spell_sha_rolling_thunder::HandleEffectProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -1195,8 +1143,6 @@ class spell_sha_telluric_currents : public SpellScriptLoader class spell_sha_telluric_currents_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_telluric_currents_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TELLURIC_CURRENTS }); @@ -1212,7 +1158,7 @@ class spell_sha_telluric_currents : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_telluric_currents_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1225,8 +1171,6 @@ class spell_sha_telluric_currents : public SpellScriptLoader // 51490 - Thunderstorm class spell_sha_thunderstorm : public SpellScript { - PrepareSpellScript(spell_sha_thunderstorm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_THUNDERSTORM_SLOW }); @@ -1250,7 +1194,7 @@ class spell_sha_thunderstorm : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_thunderstorm::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); + OnEffectHitTarget.Register(&spell_sha_thunderstorm::HandleKnockBack, EFFECT_2, SPELL_EFFECT_KNOCK_BACK); } }; @@ -1262,8 +1206,6 @@ class spell_sha_tidal_waves : public SpellScriptLoader class spell_sha_tidal_waves_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_tidal_waves_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TIDAL_WAVES }); @@ -1280,7 +1222,7 @@ class spell_sha_tidal_waves : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_tidal_waves_AuraScript::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1298,8 +1240,6 @@ public: class spell_sha_totemic_mastery_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_totemic_mastery_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_TOTEMIC_MASTERY }); @@ -1318,7 +1258,7 @@ public: void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_totemic_mastery_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); + OnEffectPeriodic.Register(&spell_sha_totemic_mastery_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_TRIGGER_SPELL); } }; @@ -1331,8 +1271,6 @@ public: // 77222 - Elemental Overload class spell_sha_elemental_overload : public AuraScript { - PrepareAuraScript(spell_sha_elemental_overload); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1385,8 +1323,8 @@ class spell_sha_elemental_overload : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_elemental_overload::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_elemental_overload::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_elemental_overload::CheckProc); + OnEffectProc.Register(&spell_sha_elemental_overload::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1398,8 +1336,6 @@ class spell_sha_ancestral_resolve : public SpellScriptLoader class sspell_sha_ancestral_resolve_AuraScript : public AuraScript { - PrepareAuraScript(sspell_sha_ancestral_resolve_AuraScript); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/) { amount = -1; @@ -1418,8 +1354,8 @@ class spell_sha_ancestral_resolve : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(sspell_sha_ancestral_resolve_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); - OnEffectAbsorb += AuraEffectAbsorbFn(sspell_sha_ancestral_resolve_AuraScript::Absorb, EFFECT_0); + DoEffectCalcAmount.Register(&sspell_sha_ancestral_resolve_AuraScript::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + OnEffectAbsorb.Register(&sspell_sha_ancestral_resolve_AuraScript::Absorb, EFFECT_0); } }; @@ -1437,8 +1373,6 @@ class spell_sha_resurgence : public SpellScriptLoader class spell_sha_resurgence_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_resurgence_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1487,8 +1421,8 @@ class spell_sha_resurgence : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_resurgence_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_resurgence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_resurgence_AuraScript::CheckProc); + OnEffectProc.Register(&spell_sha_resurgence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1506,8 +1440,6 @@ class spell_sha_ancestral_healing : public SpellScriptLoader class spell_sha_ancestral_healing_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_ancestral_healing_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_ANCESTRAL_VIGOR }); @@ -1537,8 +1469,8 @@ class spell_sha_ancestral_healing : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_healing_AuraScript::HandleAncestralFortitude, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); - OnEffectProc += AuraEffectProcFn(spell_sha_ancestral_healing_AuraScript::HandleAncestralVigor, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_ancestral_healing_AuraScript::HandleAncestralFortitude, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_sha_ancestral_healing_AuraScript::HandleAncestralVigor, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -1556,8 +1488,6 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader class spell_sha_cleanse_spirit_SpellScript : public SpellScript { - PrepareSpellScript(spell_sha_cleanse_spirit_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1600,7 +1530,7 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader void Register() override { - OnEffectSuccessfulDispel += SpellEffectFn(spell_sha_cleanse_spirit_SpellScript::HandleDispel, EFFECT_0, SPELL_EFFECT_DISPEL); + OnEffectSuccessfulDispel.Register(&spell_sha_cleanse_spirit_SpellScript::HandleDispel, EFFECT_0, SPELL_EFFECT_DISPEL); } }; @@ -1613,8 +1543,6 @@ class spell_sha_cleanse_spirit : public SpellScriptLoader // 8042 - Earth Shock class spell_sha_earth_shock : public SpellScript { - PrepareSpellScript(spell_sha_earth_shock); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1656,7 +1584,7 @@ class spell_sha_earth_shock : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_sha_earth_shock::HandleFulmination, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_sha_earth_shock::HandleFulmination, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1668,8 +1596,6 @@ class spell_sha_healing_rain : public SpellScriptLoader class spell_sha_healing_rain_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_healing_rain_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_HEALING_RAIN_TRIGGERED }); @@ -1683,7 +1609,7 @@ class spell_sha_healing_rain : public SpellScriptLoader void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_healing_rain_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_sha_healing_rain_AuraScript::HandleEffectPeriodic, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -1696,8 +1622,6 @@ class spell_sha_healing_rain : public SpellScriptLoader // 73921 - Healing Rain Triggered class spell_sha_healing_rain_triggered : public SpellScript { - PrepareSpellScript(spell_sha_healing_rain_triggered); - void FilterTargets(std::list& unitList) { _targets = unitList.size(); @@ -1711,8 +1635,8 @@ class spell_sha_healing_rain_triggered : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_sha_healing_rain_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); - OnEffectHitTarget += SpellEffectFn(spell_sha_healing_rain_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnObjectAreaTargetSelect.Register(&spell_sha_healing_rain_triggered::FilterTargets, EFFECT_0, TARGET_UNIT_DEST_AREA_ALLY); + OnEffectHitTarget.Register(&spell_sha_healing_rain_triggered::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } private: uint8 _targets = 0; @@ -1725,8 +1649,6 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader class spell_sha_earthliving_weapon_AuraScript : public AuraScript { - PrepareAuraScript(spell_sha_earthliving_weapon_AuraScript); - bool CheckProc(ProcEventInfo& eventInfo) { // Blessing of the Eternals @@ -1741,7 +1663,7 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_earthliving_weapon_AuraScript::CheckProc); + DoCheckProc.Register(&spell_sha_earthliving_weapon_AuraScript::CheckProc); } }; @@ -1754,8 +1676,6 @@ class spell_sha_earthliving_weapon : public SpellScriptLoader // 10400 - Flametongue Weapon (Passive) class spell_sha_flametongue_weapon : public AuraScript { - PrepareAuraScript(spell_sha_flametongue_weapon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1821,16 +1741,14 @@ class spell_sha_flametongue_weapon : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_flametongue_weapon::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_flametongue_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_flametongue_weapon::CheckProc); + OnEffectProc.Register(&spell_sha_flametongue_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 33757 - Windfury Weapon (Passive) class spell_sha_windfury_weapon : public AuraScript { - PrepareAuraScript(spell_sha_windfury_weapon); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1888,15 +1806,13 @@ class spell_sha_windfury_weapon : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_windfury_weapon::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_windfury_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_windfury_weapon::CheckProc); + OnEffectProc.Register(&spell_sha_windfury_weapon::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_sha_unleash_elements : public SpellScript { - PrepareSpellScript(spell_sha_unleash_elements); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1965,15 +1881,13 @@ class spell_sha_unleash_elements : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_unleash_elements::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_sha_unleash_elements::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // -51525 - Static Shock class spell_sha_static_shock : public AuraScript { - PrepareAuraScript(spell_sha_static_shock); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_LIGHTNING_SHIELD_DAMAGE }); @@ -1996,16 +1910,14 @@ class spell_sha_static_shock : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_sha_static_shock::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_sha_static_shock::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_sha_static_shock::CheckProc); + OnEffectProc.Register(&spell_sha_static_shock::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // -63373 - Frozen Power class spell_sha_frozen_power : public AuraScript { - PrepareAuraScript(spell_sha_frozen_power); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_FREEZE }); @@ -2031,15 +1943,13 @@ class spell_sha_frozen_power : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_sha_frozen_power::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_sha_frozen_power::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; // 61882 - Earthquake class spell_sha_earthquake : public AuraScript { - PrepareAuraScript(spell_sha_earthquake); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTHQUAKE_DAMAGE }); @@ -2053,15 +1963,13 @@ class spell_sha_earthquake : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_sha_earthquake::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_sha_earthquake::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY); } }; // 77478 - Earthquake class spell_sha_earthquake_damage : public SpellScript { - PrepareSpellScript(spell_sha_earthquake_damage); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_EARTHQUAKE_STUN }); @@ -2076,15 +1984,13 @@ class spell_sha_earthquake_damage : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_earthquake_damage::HandleKnockdown, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_sha_earthquake_damage::HandleKnockdown, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 324 - Lightning Shield class spell_sha_lightning_shield : public AuraScript { - PrepareAuraScript(spell_sha_lightning_shield); - void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/) { if (GetTarget()->GetDummyAuraEffect(SPELLFAMILY_SHAMAN, SHAMAN_ICON_ID_GLYPH_OF_LIGHTNING_SHIELD, EFFECT_0)) @@ -2094,14 +2000,12 @@ class spell_sha_lightning_shield : public AuraScript void Register() override { - AfterEffectProc += AuraEffectProcFn(spell_sha_lightning_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + AfterEffectProc.Register(&spell_sha_lightning_shield::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; class spell_sha_searing_bolt : public SpellScript { - PrepareSpellScript(spell_sha_searing_bolt); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAMAN_SEARING_FLAMES_DAMAGE }); @@ -2121,7 +2025,7 @@ class spell_sha_searing_bolt : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_sha_searing_bolt::HandleSearingFlames, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_sha_searing_bolt::HandleSearingFlames, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 7ec37288f9..cca7a59033 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -133,8 +133,6 @@ enum MiscSpells // -85113 - Aftermath class spell_warl_aftermath : public AuraScript { - PrepareAuraScript(spell_warl_aftermath); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -156,7 +154,7 @@ class spell_warl_aftermath : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_aftermath::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_warl_aftermath::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -168,8 +166,6 @@ class spell_warl_banish : public SpellScriptLoader class spell_warl_banish_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_banish_SpellScript); - public: spell_warl_banish_SpellScript() { @@ -202,8 +198,8 @@ class spell_warl_banish : public SpellScriptLoader void Register() override { - BeforeHit += SpellHitFn(spell_warl_banish_SpellScript::HandleBanish); - AfterHit += SpellHitFn(spell_warl_banish_SpellScript::RemoveAura); + BeforeHit.Register(&spell_warl_banish_SpellScript::HandleBanish); + AfterHit.Register(&spell_warl_banish_SpellScript::RemoveAura); } bool _removed; @@ -218,8 +214,6 @@ class spell_warl_banish : public SpellScriptLoader // 17962 - Conflagrate class spell_warl_conflagrate : public SpellScript { - PrepareSpellScript(spell_warl_conflagrate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_IMMOLATE }); @@ -237,7 +231,7 @@ class spell_warl_conflagrate : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_conflagrate::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_warl_conflagrate::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -249,8 +243,6 @@ class spell_warl_create_healthstone : public SpellScriptLoader class spell_warl_create_healthstone_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_create_healthstone_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_CREATE_HEALTHSTONE }); @@ -268,7 +260,7 @@ class spell_warl_create_healthstone : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warl_create_healthstone_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -287,8 +279,6 @@ class spell_warl_bane_of_doom : public SpellScriptLoader class spell_warl_curse_of_doom_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_curse_of_doom_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_BANE_OF_DOOM_EFFECT }); @@ -313,7 +303,7 @@ class spell_warl_bane_of_doom : public SpellScriptLoader void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_curse_of_doom_AuraScript::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -332,8 +322,6 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader class spell_warl_demonic_circle_summon_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_demonic_circle_summon_AuraScript); - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes mode) { // If effect is removed by expire remove the summoned demonic circle too. @@ -365,8 +353,8 @@ class spell_warl_demonic_circle_summon : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectApplyFn(spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectRemove.Register(&spell_warl_demonic_circle_summon_AuraScript::HandleRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectPeriodic.Register(&spell_warl_demonic_circle_summon_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; @@ -385,8 +373,6 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader class spell_warl_demonic_circle_teleport_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_demonic_circle_teleport_AuraScript); - void HandleTeleport(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Player* player = GetTarget()->ToPlayer()) @@ -401,7 +387,7 @@ class spell_warl_demonic_circle_teleport : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply.Register(&spell_warl_demonic_circle_teleport_AuraScript::HandleTeleport, EFFECT_0, SPELL_AURA_MECHANIC_IMMUNITY, AURA_EFFECT_HANDLE_REAL); } }; @@ -419,8 +405,6 @@ class spell_warl_demon_soul : public SpellScriptLoader class spell_warl_demon_soul_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_demon_soul_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -467,7 +451,7 @@ class spell_warl_demon_soul : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warl_demon_soul_SpellScript::OnHitTarget, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -486,8 +470,6 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader class spell_warl_demonic_empowerment_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_demonic_empowerment_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -538,7 +520,7 @@ class spell_warl_demonic_empowerment : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warl_demonic_empowerment_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -557,8 +539,6 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader class spell_warl_everlasting_affliction_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_everlasting_affliction_SpellScript); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -576,7 +556,7 @@ class spell_warl_everlasting_affliction : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warl_everlasting_affliction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -594,8 +574,6 @@ class spell_warl_fel_flame : public SpellScriptLoader class spell_warl_fel_flame_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_fel_flame_SpellScript); - void OnHitTarget(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -613,7 +591,7 @@ class spell_warl_fel_flame : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warl_fel_flame_SpellScript::OnHitTarget, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -631,8 +609,6 @@ class spell_warl_fel_synergy : public SpellScriptLoader class spell_warl_fel_synergy_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_fel_synergy_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_FEL_SYNERGY_HEAL }); @@ -653,8 +629,8 @@ class spell_warl_fel_synergy : public SpellScriptLoader void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warl_fel_synergy_AuraScript::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warl_fel_synergy_AuraScript::CheckProc); + OnEffectProc.Register(&spell_warl_fel_synergy_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -672,8 +648,6 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader class spell_warl_glyph_of_shadowflame_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_glyph_of_shadowflame_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SHADOWFLAME }); @@ -687,7 +661,7 @@ class spell_warl_glyph_of_shadowflame : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_glyph_of_shadowflame_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_warl_glyph_of_shadowflame_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -706,8 +680,6 @@ class spell_warl_haunt : public SpellScriptLoader class spell_warl_haunt_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_haunt_SpellScript); - void HandleAfterHit() { if (Aura* aura = GetHitAura()) @@ -717,14 +689,12 @@ class spell_warl_haunt : public SpellScriptLoader void Register() override { - AfterHit += SpellHitFn(spell_warl_haunt_SpellScript::HandleAfterHit); + AfterHit.Register(&spell_warl_haunt_SpellScript::HandleAfterHit); } }; class spell_warl_haunt_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_haunt_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_HAUNT_HEAL }); @@ -741,7 +711,7 @@ class spell_warl_haunt : public SpellScriptLoader void Register() override { - OnEffectRemove += AuraEffectApplyFn(spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); + OnEffectRemove.Register(&spell_warl_haunt_AuraScript::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK); } }; @@ -765,8 +735,6 @@ class spell_warl_health_funnel : public SpellScriptLoader class spell_warl_health_funnel_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_health_funnel_AuraScript); - void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* caster = GetCaster(); @@ -806,9 +774,9 @@ class spell_warl_health_funnel : public SpellScriptLoader void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); - OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_health_funnel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH); + OnEffectApply.Register(&spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove.Register(&spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH, AURA_EFFECT_HANDLE_REAL); + OnEffectPeriodic.Register(&spell_warl_health_funnel_AuraScript::OnPeriodic, EFFECT_0, SPELL_AURA_OBS_MOD_HEALTH); } }; @@ -826,8 +794,6 @@ class spell_warl_healthstone_heal : public SpellScriptLoader class spell_warl_healthstone_heal_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_healthstone_heal_SpellScript); - void HandleOnHit() { int32 heal = int32(CalculatePct(GetCaster()->GetCreateHealth(), GetHitHeal())); @@ -836,7 +802,7 @@ class spell_warl_healthstone_heal : public SpellScriptLoader void Register() override { - OnHit += SpellHitFn(spell_warl_healthstone_heal_SpellScript::HandleOnHit); + OnHit.Register(&spell_warl_healthstone_heal_SpellScript::HandleOnHit); } }; @@ -849,8 +815,6 @@ class spell_warl_healthstone_heal : public SpellScriptLoader // -18119 - Improved Soul Fire class spell_warl_improved_soul_fire : public AuraScript { - PrepareAuraScript(spell_warl_improved_soul_fire); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -869,7 +833,7 @@ class spell_warl_improved_soul_fire : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_improved_soul_fire::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_warl_improved_soul_fire::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -882,8 +846,6 @@ class spell_warl_life_tap : public SpellScriptLoader class spell_warl_life_tap_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_life_tap_SpellScript); - bool Load() override { return GetCaster()->GetTypeId() == TYPEID_PLAYER; @@ -930,8 +892,8 @@ class spell_warl_life_tap : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - OnCheckCast += SpellCheckCastFn(spell_warl_life_tap_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_warl_life_tap_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnCheckCast.Register(&spell_warl_life_tap_SpellScript::CheckCast); } }; @@ -950,8 +912,6 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader class spell_warl_nether_ward_overrride_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_nether_ward_overrride_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -972,7 +932,7 @@ class spell_warl_nether_ward_overrride : public SpellScriptLoader void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_nether_ward_overrride_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS); + DoEffectCalcAmount.Register(&spell_warl_nether_ward_overrride_AuraScript::CalculateAmount, EFFECT_2, SPELL_AURA_OVERRIDE_ACTIONBAR_SPELLS); } }; @@ -990,8 +950,6 @@ class spell_warl_seduction : public SpellScriptLoader class spell_warl_seduction_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_seduction_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_GLYPH_OF_SUCCUBUS, SPELL_PRIEST_SHADOW_WORD_DEATH }); @@ -1013,7 +971,7 @@ class spell_warl_seduction : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_seduction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); + OnEffectHitTarget.Register(&spell_warl_seduction_SpellScript::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA); } }; @@ -1026,8 +984,6 @@ class spell_warl_seduction : public SpellScriptLoader // 27243 - Seed of Corruption class spell_warl_seed_of_corruption : public AuraScript { - PrepareAuraScript(spell_warl_seed_of_corruption); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1114,10 +1070,10 @@ class spell_warl_seed_of_corruption : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_warl_seed_of_corruption::HandleSoulburnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_seed_of_corruption::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - DoCheckProc += AuraCheckProcFn(spell_warl_seed_of_corruption::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warl_seed_of_corruption::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + AfterEffectApply.Register(&spell_warl_seed_of_corruption::HandleSoulburnApply, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_seed_of_corruption::HandleRemove, EFFECT_1, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + DoCheckProc.Register(&spell_warl_seed_of_corruption::CheckProc); + OnEffectProc.Register(&spell_warl_seed_of_corruption::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } private: bool _affectedBySoulburn = false; @@ -1127,8 +1083,6 @@ private: // 87385 - Seed of Corruption (explosion damage) class spell_warl_seed_of_corruption_aoe : public SpellScript { - PrepareSpellScript(spell_warl_seed_of_corruption_aoe); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1147,7 +1101,7 @@ class spell_warl_seed_of_corruption_aoe : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_seed_of_corruption_aoe::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_warl_seed_of_corruption_aoe::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1160,8 +1114,6 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader class spell_warl_shadow_trance_proc_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_shadow_trance_proc_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SHADOW_TRANCE }); @@ -1175,7 +1127,7 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_warl_shadow_trance_proc_AuraScript::OnProc, EFFECT_0, SPELL_AURA_DUMMY); } }; @@ -1188,8 +1140,6 @@ class spell_warl_shadow_trance_proc : public SpellScriptLoader // 6229 - Shadow Ward class spell_warl_shadow_ward : public AuraScript { - PrepareAuraScript(spell_warl_shadow_ward); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& canBeRecalculated) { canBeRecalculated = false; @@ -1205,15 +1155,13 @@ class spell_warl_shadow_ward : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warl_shadow_ward::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); + DoEffectCalcAmount.Register(&spell_warl_shadow_ward::CalculateAmount, EFFECT_0, SPELL_AURA_SCHOOL_ABSORB); } }; // -30293 - Soul Leech class spell_warl_soul_leech : public AuraScript { - PrepareAuraScript(spell_warl_soul_leech); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_GEN_REPLENISHMENT }); @@ -1226,7 +1174,7 @@ class spell_warl_soul_leech : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_soul_leech::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); + OnEffectProc.Register(&spell_warl_soul_leech::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL_WITH_VALUE); } }; @@ -1238,8 +1186,6 @@ class spell_warl_soul_swap : public SpellScriptLoader class spell_warl_soul_swap_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1258,7 +1204,7 @@ class spell_warl_soul_swap : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_warl_soul_swap_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1278,8 +1224,6 @@ class spell_warl_soul_swap_override : public SpellScriptLoader class spell_warl_soul_swap_override_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_soul_swap_override_AuraScript); - bool Load() override { _swapCaster = nullptr; @@ -1315,8 +1259,6 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader class spell_warl_soul_swap_dot_marker_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap_dot_marker_SpellScript); - typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript; void HandleHit(SpellEffIndex effIndex) @@ -1349,7 +1291,7 @@ class spell_warl_soul_swap_dot_marker : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_warl_soul_swap_dot_marker_SpellScript::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1367,9 +1309,7 @@ public: class spell_warl_soul_swap_exhale_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_soul_swap_exhale_SpellScript); - - typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript; + typedef spell_warl_soul_swap_override::spell_warl_soul_swap_override_AuraScript SoulSwapOverrideAuraScript; bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1430,8 +1370,8 @@ public: void Register() override { - OnCheckCast += SpellCheckCastFn(spell_warl_soul_swap_exhale_SpellScript::CheckCast); - OnEffectHitTarget += SpellEffectFn(spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnCheckCast.Register(&spell_warl_soul_swap_exhale_SpellScript::CheckCast); + OnEffectHitTarget.Register(&spell_warl_soul_swap_exhale_SpellScript::OnEffectHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -1450,8 +1390,6 @@ class spell_warl_soulshatter : public SpellScriptLoader class spell_warl_soulshatter_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_soulshatter_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SOULSHATTER_EFFECT }); @@ -1467,7 +1405,7 @@ class spell_warl_soulshatter : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_warl_soulshatter_SpellScript::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -1486,8 +1424,6 @@ class spell_warl_unstable_affliction : public SpellScriptLoader class spell_warl_unstable_affliction_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_UNSTABLE_AFFLICTION_DISPEL }); @@ -1506,7 +1442,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader void Register() override { - AfterDispel += AuraDispelFn(spell_warl_unstable_affliction_AuraScript::HandleDispel); + AfterDispel.Register(&spell_warl_unstable_affliction_AuraScript::HandleDispel); } }; @@ -1524,8 +1460,6 @@ class spell_warl_drain_life : public SpellScriptLoader class spell_warl_drain_life_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_drain_life_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) { return ValidateSpellInfo({ SPELL_WARLOCK_DRAIN_LIFE_HEAL }); @@ -1550,7 +1484,7 @@ class spell_warl_drain_life : public SpellScriptLoader void Register() { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_drain_life_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + OnEffectPeriodic.Register(&spell_warl_drain_life_AuraScript::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; @@ -1568,8 +1502,6 @@ class spell_warl_drain_life_heal : public SpellScriptLoader class spell_warl_drain_life_heal_SpellScript : public SpellScript { - PrepareSpellScript(spell_warl_drain_life_heal_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1615,7 +1547,7 @@ class spell_warl_drain_life_heal : public SpellScriptLoader void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warl_drain_life_heal_SpellScript::HandleSoulSiphon, EFFECT_0, SPELL_EFFECT_HEAL_PCT); + OnEffectHitTarget.Register(&spell_warl_drain_life_heal_SpellScript::HandleSoulSiphon, EFFECT_0, SPELL_EFFECT_HEAL_PCT); } }; @@ -1633,8 +1565,6 @@ class spell_warl_drain_soul : public SpellScriptLoader class spell_warl_drain_soul_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_drain_soul_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) { return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_SHARD_ENERGIZE }); @@ -1650,7 +1580,7 @@ class spell_warl_drain_soul : public SpellScriptLoader void Register() { - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_drain_soul_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_drain_soul_AuraScript::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1668,8 +1598,6 @@ class spell_warl_fel_armor : public SpellScriptLoader class spell_warl_fel_armor_AuraScript : public AuraScript { - PrepareAuraScript(spell_warl_fel_armor_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_FEL_ARMOR_HEAL }); @@ -1685,7 +1613,7 @@ class spell_warl_fel_armor : public SpellScriptLoader void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warl_fel_armor_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); + OnEffectProc.Register(&spell_warl_fel_armor_AuraScript::HandleProc, EFFECT_1, SPELL_AURA_DUMMY); } }; @@ -1697,8 +1625,6 @@ class spell_warl_fel_armor : public SpellScriptLoader class spell_warl_soul_harvest : public AuraScript { - PrepareAuraScript(spell_warl_soul_harvest); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_HARVEST_ENERGIZE }); @@ -1712,15 +1638,13 @@ class spell_warl_soul_harvest : public AuraScript void Register() override { - OnEffectPeriodic += AuraEffectPeriodicFn(spell_warl_soul_harvest::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); + OnEffectPeriodic.Register(&spell_warl_soul_harvest::HandleDummy, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); } }; // 74434 - Soulburn class spell_warl_soulburn : public AuraScript { - PrepareAuraScript(spell_warl_soulburn); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1785,18 +1709,16 @@ class spell_warl_soulburn : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warl_soulburn::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warl_soulburn::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); - AfterEffectApply += AuraEffectApplyFn(spell_warl_soulburn::HandleSeedOfCorruptionDummyApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_soulburn::HandleSeedOfCorruptionDummyRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + DoCheckProc.Register(&spell_warl_soulburn::CheckProc); + OnEffectProc.Register(&spell_warl_soulburn::HandleProc, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER); + AfterEffectApply.Register(&spell_warl_soulburn::HandleSeedOfCorruptionDummyApply, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_soulburn::HandleSeedOfCorruptionDummyRemove, EFFECT_0, SPELL_AURA_ADD_PCT_MODIFIER, AURA_EFFECT_HANDLE_REAL); } }; // 29722 - Incinerate class spell_warl_incinerate : public SpellScript { - PrepareSpellScript(spell_warl_incinerate); - void HandleDamageBonus(SpellEffIndex /*effIndex*/) { int32 bp = GetEffectValue(); @@ -1818,15 +1740,13 @@ class spell_warl_incinerate : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warl_incinerate::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warl_incinerate::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 29341 - Shadowburn class spell_warl_shadowburn : public AuraScript { - PrepareAuraScript(spell_warl_shadowburn); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_SOUL_SHARD }); @@ -1845,15 +1765,13 @@ class spell_warl_shadowburn : public AuraScript void Register() override { - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_shadowburn::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_shadowburn::OnAuraRemoveHandler, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // -91986 - Burning Embers class spell_warl_burning_embers : public AuraScript { - PrepareAuraScript(spell_warl_burning_embers); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARLOCK_BURNING_EMBERS_DAMAGE }); @@ -1878,16 +1796,14 @@ class spell_warl_burning_embers : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warl_burning_embers::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warl_burning_embers::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warl_burning_embers::CheckProc); + OnEffectProc.Register(&spell_warl_burning_embers::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 50796 - Chaos Bolt class spell_warl_chaos_bolt : public SpellScript { - PrepareSpellScript(spell_warl_chaos_bolt); - void HandleDamageBonus(SpellEffIndex /*effIndex*/) { int32 bp = GetEffectValue(); @@ -1902,15 +1818,13 @@ class spell_warl_chaos_bolt : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warl_chaos_bolt::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warl_chaos_bolt::HandleDamageBonus, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // -18179 - Jinx class spell_warl_jinx : public AuraScript { - PrepareAuraScript(spell_warl_jinx); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -1936,16 +1850,14 @@ class spell_warl_jinx : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warl_jinx::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warl_jinx::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warl_jinx::CheckProc); + OnEffectProc.Register(&spell_warl_jinx::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 702 - Curse of Weakness class spell_warl_curse_of_weakness : public AuraScript { - PrepareAuraScript(spell_warl_curse_of_weakness); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -2002,8 +1914,8 @@ class spell_warl_curse_of_weakness : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_warl_curse_of_weakness::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_warl_curse_of_weakness::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply.Register(&spell_warl_curse_of_weakness::HandleApply, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove.Register(&spell_warl_curse_of_weakness::HandleRemove, EFFECT_0, SPELL_AURA_MOD_DAMAGE_PERCENT_DONE, AURA_EFFECT_HANDLE_REAL); } private: uint32 _debuffSpellId = 0; diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index 4d86fa1512..538554aa0a 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -95,8 +95,6 @@ enum MiscSpells // 23881 - Bloodthirst class spell_warr_bloodthirst : public SpellScript { - PrepareSpellScript(spell_warr_bloodthirst); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST }); @@ -116,8 +114,8 @@ class spell_warr_bloodthirst : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_bloodthirst::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHit += SpellEffectFn(spell_warr_bloodthirst::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectLaunchTarget.Register(&spell_warr_bloodthirst::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHit.Register(&spell_warr_bloodthirst::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; @@ -125,8 +123,6 @@ class spell_warr_bloodthirst : public SpellScript // 23880 - Bloodthirst class spell_warr_bloodthirst_heal : public SpellScript { - PrepareSpellScript(spell_warr_bloodthirst_heal); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_BLOODTHIRST_DAMAGE }); @@ -140,15 +136,13 @@ class spell_warr_bloodthirst_heal : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_bloodthirst_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); + OnEffectHitTarget.Register(&spell_warr_bloodthirst_heal::HandleHeal, EFFECT_0, SPELL_EFFECT_HEAL); } }; /// Updated 4.3.4 class spell_warr_charge : public SpellScript { - PrepareSpellScript(spell_warr_charge); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -181,16 +175,14 @@ class spell_warr_charge : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_charge::HandleStun, EFFECT_0, SPELL_EFFECT_CHARGE); - OnEffectHitTarget += SpellEffectFn(spell_warr_charge::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_warr_charge::HandleStun, EFFECT_0, SPELL_EFFECT_CHARGE); + OnEffectHitTarget.Register(&spell_warr_charge::HandleDummy, EFFECT_1, SPELL_EFFECT_DUMMY); } }; /// Updated 4.3.4 class spell_warr_concussion_blow : public SpellScript { - PrepareSpellScript(spell_warr_concussion_blow); - void HandleDummy(SpellEffIndex /*effIndex*/) { SetEffectValue(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetSpellInfo()->Effects[EFFECT_2].CalcValue())); @@ -198,15 +190,13 @@ class spell_warr_concussion_blow : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_concussion_blow::HandleDummy, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warr_concussion_blow::HandleDummy, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 86346 - Colossus Smash class spell_warr_colossus_smash : public SpellScript { - PrepareSpellScript(spell_warr_colossus_smash); - void HandleGlyphEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -216,7 +206,7 @@ class spell_warr_colossus_smash : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_colossus_smash::HandleGlyphEffect, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + OnEffectHitTarget.Register(&spell_warr_colossus_smash::HandleGlyphEffect, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); } }; @@ -224,8 +214,6 @@ class spell_warr_colossus_smash : public SpellScript // -12834 - Deep Wounds class spell_warr_deep_wounds : public AuraScript { - PrepareAuraScript(spell_warr_deep_wounds); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_DEEP_WOUNDS_PERIODIC }); @@ -250,15 +238,13 @@ class spell_warr_deep_wounds : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warr_deep_wounds::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_warr_deep_wounds::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; /// Updated 4.3.4 class spell_warr_execute : public SpellScript { - PrepareSpellScript(spell_warr_execute); - void HandleEffect(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); @@ -287,15 +273,13 @@ class spell_warr_execute : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_execute::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warr_execute::HandleEffect, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } }; // 58387 - Glyph of Sunder Armor class spell_warr_glyph_of_sunder_armor : public AuraScript { - PrepareAuraScript(spell_warr_glyph_of_sunder_armor); - void HandleEffectCalcSpellMod(AuraEffect const* aurEff, SpellModifier*& spellMod) { if (!spellMod) @@ -312,15 +296,13 @@ class spell_warr_glyph_of_sunder_armor : public AuraScript void Register() override { - DoEffectCalcSpellMod += AuraEffectCalcSpellModFn(spell_warr_glyph_of_sunder_armor::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcSpellMod.Register(&spell_warr_glyph_of_sunder_armor::HandleEffectCalcSpellMod, EFFECT_0, SPELL_AURA_DUMMY); } }; // 5246 - Intimidating Shout class spell_warr_intimidating_shout : public SpellScript { - PrepareSpellScript(spell_warr_intimidating_shout); - void FilterTargets(std::list& unitList) { unitList.remove(GetExplTargetWorldObject()); @@ -328,16 +310,14 @@ class spell_warr_intimidating_shout : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_intimidating_shout::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_warr_intimidating_shout::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENEMY); + OnObjectAreaTargetSelect.Register(&spell_warr_intimidating_shout::FilterTargets, EFFECT_2, TARGET_UNIT_SRC_AREA_ENEMY); } }; // -84583 Lambs to the Slaughter class spell_warr_lambs_to_the_slaughter : public AuraScript { - PrepareAuraScript(spell_warr_lambs_to_the_slaughter); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_MORTAL_STRIKE, SPELL_WARRIOR_REND }); @@ -352,7 +332,7 @@ class spell_warr_lambs_to_the_slaughter : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warr_lambs_to_the_slaughter::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_warr_lambs_to_the_slaughter::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; @@ -360,8 +340,6 @@ class spell_warr_lambs_to_the_slaughter : public AuraScript // 12975 - Last Stand class spell_warr_last_stand : public SpellScript { - PrepareSpellScript(spell_warr_last_stand); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_LAST_STAND_TRIGGERED }); @@ -377,15 +355,13 @@ class spell_warr_last_stand : public SpellScript void Register() override { // add dummy effect spell handler to Last Stand - OnEffectHit += SpellEffectFn(spell_warr_last_stand::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit.Register(&spell_warr_last_stand::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 7384 - Overpower class spell_warr_overpower : public SpellScript { - PrepareSpellScript(spell_warr_overpower); - void HandleEffect(SpellEffIndex /*effIndex*/) { uint32 spellId = 0; @@ -404,15 +380,13 @@ class spell_warr_overpower : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_overpower::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); + OnEffectHitTarget.Register(&spell_warr_overpower::HandleEffect, EFFECT_0, SPELL_EFFECT_ANY); } }; // 97462 - Rallying Cry class spell_warr_rallying_cry : public SpellScript { - PrepareSpellScript(spell_warr_rallying_cry); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_RALLYING_CRY }); @@ -432,15 +406,13 @@ class spell_warr_rallying_cry : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_rallying_cry::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget.Register(&spell_warr_rallying_cry::HandleScript, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 94009 - Rend class spell_warr_rend : public AuraScript { - PrepareAuraScript(spell_warr_rend); - void CalculateAmount(AuraEffect const* aurEff, int32& amount, bool& canBeRecalculated) { if (Unit* caster = GetCaster()) @@ -459,15 +431,13 @@ class spell_warr_rend : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_rend::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); + DoEffectCalcAmount.Register(&spell_warr_rend::CalculateAmount, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE); } }; // 20230 - Retaliation class spell_warr_retaliation : public AuraScript { - PrepareAuraScript(spell_warr_retaliation); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_RETALIATION_DAMAGE }); @@ -487,16 +457,14 @@ class spell_warr_retaliation : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warr_retaliation::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warr_retaliation::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warr_retaliation::CheckProc); + OnEffectProc.Register(&spell_warr_retaliation::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; // 64380, 65941 - Shattering Throw class spell_warr_shattering_throw : public SpellScript { - PrepareSpellScript(spell_warr_shattering_throw); - void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -508,15 +476,13 @@ class spell_warr_shattering_throw : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_shattering_throw::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warr_shattering_throw::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; /// Updated 4.3.4 class spell_warr_slam : public SpellScript { - PrepareSpellScript(spell_warr_slam); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -543,14 +509,12 @@ class spell_warr_slam : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_slam::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectLaunchTarget.Register(&spell_warr_slam::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; class spell_warr_slam_triggered : public SpellScript { - PrepareSpellScript(spell_warr_slam_triggered); - bool Load() override { _bloodsurgeBonusActive = GetCaster()->HasAura(SPELL_WARRIOR_BLOODSURGE, GetCaster()->GetGUID()); @@ -583,7 +547,7 @@ class spell_warr_slam_triggered : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_slam_triggered::HandleBonusDamage, EFFECT_1, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warr_slam_triggered::HandleBonusDamage, EFFECT_1, SPELL_EFFECT_WEAPON_PERCENT_DAMAGE); } private: bool _bloodsurgeBonusActive = false; @@ -591,8 +555,6 @@ private: class spell_warr_second_wind_proc : public AuraScript { - PrepareAuraScript(spell_warr_second_wind_proc); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -631,15 +593,13 @@ class spell_warr_second_wind_proc : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warr_second_wind_proc::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warr_second_wind_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warr_second_wind_proc::CheckProc); + OnEffectProc.Register(&spell_warr_second_wind_proc::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_warr_second_wind_trigger : public AuraScript { - PrepareAuraScript(spell_warr_second_wind_trigger); - void CalculateAmount(AuraEffect const* /*aurEff*/, int32& amount, bool& /*canBeRecalculated*/) { amount = int32(GetUnitOwner()->CountPctFromMaxHealth(amount)); @@ -647,15 +607,13 @@ class spell_warr_second_wind_trigger : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_second_wind_trigger::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_warr_second_wind_trigger::CalculateAmount, EFFECT_1, SPELL_AURA_PERIODIC_HEAL); } }; // 52437 - Sudden Death class spell_warr_sudden_death : public AuraScript { - PrepareAuraScript(spell_warr_sudden_death); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_COLOSSUS_SMASH }); @@ -670,15 +628,13 @@ class spell_warr_sudden_death : public AuraScript void Register() override { - AfterEffectApply += AuraEffectRemoveFn(spell_warr_sudden_death::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); // correct? + AfterEffectApply.Register(&spell_warr_sudden_death::HandleApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 12328, 18765, 35429 - Sweeping Strikes class spell_warr_sweeping_strikes : public AuraScript { - PrepareAuraScript(spell_warr_sweeping_strikes); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -715,8 +671,8 @@ class spell_warr_sweeping_strikes : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warr_sweeping_strikes::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warr_sweeping_strikes::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warr_sweeping_strikes::CheckProc); + OnEffectProc.Register(&spell_warr_sweeping_strikes::HandleProc, EFFECT_0, SPELL_AURA_DUMMY); } private: Unit* _procTarget = nullptr; @@ -724,10 +680,7 @@ private: // -46951 - Sword and Board class spell_warr_sword_and_board : public AuraScript -{ - PrepareAuraScript(spell_warr_sword_and_board); - -private: +{private: bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_SHIELD_SLAM }); @@ -742,15 +695,13 @@ private: void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warr_sword_and_board::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_warr_sword_and_board::OnProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); } }; // 34428 - Victory Rush class spell_warr_victory_rush : public SpellScript { - PrepareSpellScript(spell_warr_victory_rush); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -791,16 +742,14 @@ class spell_warr_victory_rush : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_victory_rush::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); - OnEffectHitTarget += SpellEffectFn(spell_warr_victory_rush::HandleImpendingVictoryHeal, EFFECT_2, SPELL_EFFECT_HEAL_PCT); + OnEffectLaunchTarget.Register(&spell_warr_victory_rush::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectHitTarget.Register(&spell_warr_victory_rush::HandleImpendingVictoryHeal, EFFECT_2, SPELL_EFFECT_HEAL_PCT); } }; // 50720 - Vigilance class spell_warr_vigilance : public AuraScript { - PrepareAuraScript(spell_warr_vigilance); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_VENGEANCE }); @@ -832,9 +781,9 @@ class spell_warr_vigilance : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warr_vigilance::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warr_vigilance::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); - OnEffectRemove += AuraEffectRemoveFn(spell_warr_vigilance::HandleRemove, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); + DoCheckProc.Register(&spell_warr_vigilance::CheckProc); + OnEffectProc.Register(&spell_warr_vigilance::HandleProc, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectRemove.Register(&spell_warr_vigilance::HandleRemove, EFFECT_0, SPELL_AURA_PROC_TRIGGER_SPELL, AURA_EFFECT_HANDLE_REAL); } private: Unit* _procTarget = nullptr; @@ -843,8 +792,6 @@ private: // 50725 Vigilance class spell_warr_vigilance_trigger : public SpellScript { - PrepareSpellScript(spell_warr_vigilance_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_TAUNT }); @@ -861,15 +808,13 @@ class spell_warr_vigilance_trigger : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_vigilance_trigger::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget.Register(&spell_warr_vigilance_trigger::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 76838 - Strikes of Opportunity class spell_warr_strikes_of_opportunity : public AuraScript { - PrepareAuraScript(spell_warr_strikes_of_opportunity); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_OPPORTUNITY_STRIKE }); @@ -890,15 +835,13 @@ class spell_warr_strikes_of_opportunity : public AuraScript void Register() override { - DoCheckProc += AuraCheckProcFn(spell_warr_strikes_of_opportunity::CheckProc); - OnEffectProc += AuraEffectProcFn(spell_warr_strikes_of_opportunity::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); + DoCheckProc.Register(&spell_warr_strikes_of_opportunity::CheckProc); + OnEffectProc.Register(&spell_warr_strikes_of_opportunity::HandleEffectProc, EFFECT_0, SPELL_AURA_DUMMY); } }; class spell_warr_thunder_clap : public SpellScript { - PrepareSpellScript(spell_warr_thunder_clap); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_REND }); @@ -929,8 +872,8 @@ class spell_warr_thunder_clap : public SpellScript void Register() override { - OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_warr_thunder_clap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); - OnEffectHitTarget += SpellEffectFn(spell_warr_thunder_clap::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); + OnObjectAreaTargetSelect.Register(&spell_warr_thunder_clap::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY); + OnEffectHitTarget.Register(&spell_warr_thunder_clap::HandleHit, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); } private: @@ -939,8 +882,6 @@ private: class spell_warr_shield_specialization : public AuraScript { - PrepareAuraScript(spell_warr_shield_specialization); - void HandleProc(AuraEffect const* aurEff, ProcEventInfo& eventInfo) { if (eventInfo.GetHitMask() & PROC_HIT_REFLECT) @@ -957,14 +898,12 @@ class spell_warr_shield_specialization : public AuraScript void Register() override { - OnEffectProc += AuraEffectProcFn(spell_warr_shield_specialization::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); + OnEffectProc.Register(&spell_warr_shield_specialization::HandleProc, EFFECT_1, SPELL_AURA_PROC_TRIGGER_SPELL); } }; class spell_warr_blood_craze : public AuraScript { - PrepareAuraScript(spell_warr_blood_craze); - void HandleCalcAmount(AuraEffect const* aurEff, int32& amount, bool& /*canBeRecalculated*/) { int32 bp = GetSpellInfo()->Effects[EFFECT_0].BasePoints / 2; @@ -974,15 +913,13 @@ class spell_warr_blood_craze : public AuraScript void Register() override { - DoEffectCalcAmount += AuraEffectCalcAmountFn(spell_warr_blood_craze::HandleCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); + DoEffectCalcAmount.Register(&spell_warr_blood_craze::HandleCalcAmount, EFFECT_0, SPELL_AURA_PERIODIC_HEAL); } }; // 46968 - Shockwave class spell_warr_shockwave : public SpellScript { - PrepareSpellScript(spell_warr_shockwave); - void HandleDamage(SpellEffIndex /*effIndex*/) { SetEffectValue(CalculatePct(GetCaster()->GetTotalAttackPowerValue(BASE_ATTACK), GetSpellInfo()->Effects[EFFECT_2].CalcValue())); @@ -990,14 +927,12 @@ class spell_warr_shockwave : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_shockwave::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); + OnEffectLaunchTarget.Register(&spell_warr_shockwave::HandleDamage, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; class spell_warr_devastate : public SpellScript { - PrepareSpellScript(spell_warr_devastate); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_WARRIOR_SUNDER_ARMOR }); @@ -1018,15 +953,13 @@ class spell_warr_devastate : public SpellScript void Register() override { - OnEffectLaunchTarget += SpellEffectFn(spell_warr_devastate::HandleDamageBonus, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); - OnEffectHitTarget += SpellEffectFn(spell_warr_devastate::HandleSunderArmor, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + OnEffectLaunchTarget.Register(&spell_warr_devastate::HandleDamageBonus, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + OnEffectHitTarget.Register(&spell_warr_devastate::HandleSunderArmor, EFFECT_1, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); } }; class spell_warr_whirlwind : public SpellScript { - PrepareSpellScript(spell_warr_whirlwind); - void CountTargets(SpellEffIndex /*effIndex*/) { _hitTargets++; @@ -1043,8 +976,8 @@ class spell_warr_whirlwind : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_warr_whirlwind::CountTargets, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); - AfterCast += SpellCastFn(spell_warr_whirlwind::HandleCooldownReduction); + OnEffectHitTarget.Register(&spell_warr_whirlwind::CountTargets, EFFECT_0, SPELL_EFFECT_NORMALIZED_WEAPON_DMG); + AfterCast.Register(&spell_warr_whirlwind::HandleCooldownReduction); } private: uint8 _hitTargets = 0; @@ -1052,8 +985,6 @@ private: class spell_warr_heroic_leap : public SpellScript { - PrepareSpellScript(spell_warr_heroic_leap); - SpellCastResult CheckLocation() { // The client shows an area as unreachable once the target destination is 4 yards above your position @@ -1065,7 +996,7 @@ class spell_warr_heroic_leap : public SpellScript void Register() override { - OnCheckCast += SpellCheckCastFn(spell_warr_heroic_leap::CheckLocation); + OnCheckCast.Register(&spell_warr_heroic_leap::CheckLocation); } };