diff options
Diffstat (limited to 'src/server/scripts/EasternKingdoms')
32 files changed, 0 insertions, 194 deletions
diff --git a/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp b/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp index f3d6a928d91..4a30195833f 100644 --- a/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp +++ b/src/server/scripts/EasternKingdoms/ArathiBasin/arathi_basin.cpp @@ -52,8 +52,6 @@ struct npc_bg_ab_gryphon_bat_rider_leader : public ScriptedAI // 261985 - Blacksmith Working class spell_bg_ab_blacksmith_working : public AuraScript { - PrepareAuraScript(spell_bg_ab_blacksmith_working); - static constexpr uint32 ITEM_BLACKSMITH_HAMMER = 5956; void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index 59275958892..2e95e41e96f 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -214,8 +214,6 @@ class spell_occuthar_focused_fire : public SpellScriptLoader class spell_occuthar_focused_fire_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_focused_fire_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.size() < 2) @@ -250,8 +248,6 @@ class spell_occuthar_eyes_of_occuthar : public SpellScriptLoader class spell_occuthar_eyes_of_occuthar_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_eyes_of_occuthar_SpellScript); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -296,8 +292,6 @@ class spell_occuthar_eyes_of_occuthar_vehicle : public SpellScriptLoader class spell_occuthar_eyes_of_occuthar_vehicle_SpellScript : public SpellScript { - PrepareSpellScript(spell_occuthar_eyes_of_occuthar_vehicle_SpellScript); - bool Load() override { return InstanceHasScript(GetCaster(), BHScriptName); @@ -334,8 +328,6 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader class spell_occuthar_occuthars_destruction_AuraScript : public AuraScript { - PrepareAuraScript(spell_occuthar_occuthars_destruction_AuraScript); - bool Load() override { return GetCaster() && GetCaster()->GetTypeId() == TYPEID_UNIT; diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp index 42bf2b118d4..1c42ea4184f 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp @@ -130,8 +130,6 @@ class spell_argaloth_consuming_darkness : public SpellScriptLoader class spell_argaloth_consuming_darkness_SpellScript : public SpellScript { - PrepareSpellScript(spell_argaloth_consuming_darkness_SpellScript); - void FilterTargets(std::list<WorldObject*>& targets) { Trinity::Containers::RandomResize(targets, GetCaster()->GetMap()->Is25ManRaid() ? 8 : 3); @@ -157,8 +155,6 @@ class spell_argaloth_meteor_slash : public SpellScriptLoader class spell_argaloth_meteor_slash_SpellScript : public SpellScript { - PrepareSpellScript(spell_argaloth_meteor_slash_SpellScript); - void CountTargets(std::list<WorldObject*>& targets) { _targetCount = targets.size(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp index c78a58d6f78..e9f53d68c92 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp @@ -717,8 +717,6 @@ class spell_chains_of_woe_1 : public SpellScriptLoader class spell_chains_of_woe_1_SpellScript : public SpellScript { - PrepareSpellScript(spell_chains_of_woe_1_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAINS_OF_WOE_1 }); @@ -752,8 +750,6 @@ class spell_chains_of_woe_4 : public SpellScriptLoader class spell_chains_of_woe_4_SpellScript : public SpellScript { - PrepareSpellScript(spell_chains_of_woe_4_SpellScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CHAINS_OF_WOE_4 }); @@ -795,8 +791,6 @@ class spell_nether_dragon_essence_1 : public SpellScriptLoader class spell_nether_dragon_essence_1_AuraScript : public AuraScript { - PrepareAuraScript(spell_nether_dragon_essence_1_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -836,8 +830,6 @@ class spell_nether_dragon_essence_2 : public SpellScriptLoader class spell_nether_dragon_essence_2_SpellScript : public SpellScript { - PrepareSpellScript(spell_nether_dragon_essence_2_SpellScript); - void ModDestHeight(SpellDestination& dest) { Position offset = { frand(-35.0f, 35.0f), frand(-25.0f, 25.0f), 0.0f, 0.0f }; diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp index f4fee8fa86a..c2bb6d3c599 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp @@ -434,8 +434,6 @@ public: // 47691 - Summon Mole Machine Target Picker class spell_direbrew_summon_mole_machine_target_picker : public SpellScript { - PrepareSpellScript(spell_direbrew_summon_mole_machine_target_picker); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_MOLE_MACHINE_MINION_SUMMONER }); @@ -455,8 +453,6 @@ class spell_direbrew_summon_mole_machine_target_picker : public SpellScript // 47370 - Send Mug Target Picker class spell_send_mug_target_picker : public SpellScript { - PrepareSpellScript(spell_send_mug_target_picker); - void FilterTargets(std::list<WorldObject*>& targets) { Unit* caster = GetCaster(); @@ -496,8 +492,6 @@ class spell_send_mug_target_picker : public SpellScript // 47344 - Request Second Mug class spell_request_second_mug : public SpellScript { - PrepareSpellScript(spell_request_second_mug); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_SECOND_MUG }); @@ -517,8 +511,6 @@ class spell_request_second_mug : public SpellScript // 47369 - Send Mug Control Aura class spell_send_mug_control_aura : public AuraScript { - PrepareAuraScript(spell_send_mug_control_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SEND_MUG_TARGET_PICKER }); @@ -538,8 +530,6 @@ class spell_send_mug_control_aura : public AuraScript // 50278 - Barreled Control Aura class spell_barreled_control_aura : public AuraScript { - PrepareAuraScript(spell_barreled_control_aura); - void PeriodicTick(AuraEffect const* /*aurEff*/) { PreventDefaultAction(); @@ -555,8 +545,6 @@ class spell_barreled_control_aura : public AuraScript // 47407 - Direbrew's Disarm (precast) class spell_direbrew_disarm : public AuraScript { - PrepareAuraScript(spell_direbrew_disarm); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DIREBREW_DISARM, SPELL_DIREBREW_DISARM_GROW }); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp index a3d07b4ad77..c0c5c49cd8a 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp @@ -182,8 +182,6 @@ struct go_orb_of_domination : public GameObjectAI // 19873 - Destroy Egg class spell_egg_event : public SpellScript { - PrepareSpellScript(spell_egg_event); - void HandleOnHit() { if (InstanceScript* instance = GetCaster()->GetInstanceScript()) diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp index e09f932680a..1822ed1ff56 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp @@ -236,8 +236,6 @@ struct boss_vaelastrasz : public BossAI // 18173 - Burning Adrenaline class spell_vael_burning_adrenaline : public AuraScript { - PrepareAuraScript(spell_vael_burning_adrenaline); - void OnAuraRemoveHandler(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { //The tooltip says the on death the AoE occurs. According to information: http://qaliaresponse.stage.lithium.com/t5/WoW-Mayhem/Surviving-Burning-Adrenaline-For-tanks/td-p/48609 diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp index dfbdbf03349..b57ffcc1072 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp @@ -115,8 +115,6 @@ struct boss_baron_geddon : public BossAI // 19695 - Inferno class spell_baron_geddon_inferno : public AuraScript { - PrepareAuraScript(spell_baron_geddon_inferno); - void OnPeriodic(AuraEffect const* aurEff) { PreventDefaultAction(); diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp index 78946546c00..c87e3661a12 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp @@ -112,8 +112,6 @@ struct boss_shazzrah : public BossAI // 23138 - Gate of Shazzrah class spell_shazzrah_gate_dummy : public SpellScript { - PrepareSpellScript(spell_shazzrah_gate_dummy); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SHAZZRAH_GATE }); diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp index aeebe791a63..1f0044a137c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp @@ -392,8 +392,6 @@ class spell_rain_of_bones : public SpellScriptLoader class spell_rain_of_bones_AuraScript : public AuraScript { - PrepareAuraScript(spell_rain_of_bones_AuraScript); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_SKELETON }); diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 9b035976388..e5a48916459 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -487,8 +487,6 @@ private: // 44191 - Flame Strike class spell_felblood_kaelthas_flame_strike : public AuraScript { - PrepareAuraScript(spell_felblood_kaelthas_flame_strike); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_FLAME_STRIKE_DAMAGE }); diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp index 2047f9ee505..95a4271be0c 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp @@ -355,8 +355,6 @@ class go_acherus_soul_prison : public GameObjectScript // 51519 - Death Knight Initiate Visual class spell_death_knight_initiate_visual : public SpellScript { - PrepareSpellScript(spell_death_knight_initiate_visual); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { Creature* target = GetHitCreature(); @@ -841,8 +839,6 @@ enum HorseSeats // 52265 - Repo class spell_stable_master_repo : public AuraScript { - PrepareAuraScript(spell_stable_master_repo); - void AfterApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Creature* creature = GetTarget()->ToCreature(); @@ -865,8 +861,6 @@ class spell_stable_master_repo : public AuraScript // 52264 - Deliver Stolen Horse class spell_deliver_stolen_horse : public SpellScript { - PrepareSpellScript(spell_deliver_stolen_horse); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_DELIVER_STOLEN_HORSE, SPELL_EFFECT_STOLEN_HORSE }); @@ -1079,8 +1073,6 @@ enum GiftOfTheHarvester // 52479 - Gift of the Harvester class spell_gift_of_the_harvester : public SpellScript { - PrepareSpellScript(spell_gift_of_the_harvester); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -1125,8 +1117,6 @@ enum Runeforging 327082 - Rune of the Apocalypse */ class spell_chapter1_runeforging_credit : public SpellScript { - PrepareSpellScript(spell_chapter1_runeforging_credit); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RUNEFORGING_CREDIT }) && diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp index 11cc168d497..b93c1646e46 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp @@ -614,8 +614,6 @@ public: // 53110 - Devour Humanoid class spell_death_knight_devour_humanoid : public SpellScript { - PrepareSpellScript(spell_death_knight_devour_humanoid); - void HandleScriptEffect(SpellEffIndex /* effIndex */) { GetHitUnit()->CastSpell(GetCaster(), GetEffectValue(), true); diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 83850147e3f..8a16c962d0a 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -793,8 +793,6 @@ private: // 42432 - Headless Horseman Yell Timer class spell_headless_horseman_yell_timer : public AuraScript { - PrepareAuraScript(spell_headless_horseman_yell_timer); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Creature* horseman = GetTarget()->ToCreature(); @@ -813,8 +811,6 @@ class spell_headless_horseman_yell_timer : public AuraScript // 43893 - Headless Horseman - Maniacal Laugh, Maniacal, Delayed 8 class spell_headless_horseman_maniacal_laugh : public AuraScript { - PrepareAuraScript(spell_headless_horseman_maniacal_laugh); - void HandleSound(AuraEffect const* /*aurEff*/) { GetTarget()->PlayDirectSound(SOUNDID_MANIACAL_LAUGH); @@ -829,8 +825,6 @@ class spell_headless_horseman_maniacal_laugh : public AuraScript // 42410 - Headless Horseman Climax - Command, Head Repositions class spell_headless_horseman_head_reposition : public SpellScript { - PrepareSpellScript(spell_headless_horseman_head_reposition); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Position random = GetCaster()->GetRandomNearPosition(30.0f); @@ -846,8 +840,6 @@ class spell_headless_horseman_head_reposition : public SpellScript // 42399 - Headless Horseman Climax - Send Head class spell_headless_horseman_send_head : public SpellScript { - PrepareSpellScript(spell_headless_horseman_send_head); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* head = GetHitUnit(); @@ -864,8 +856,6 @@ class spell_headless_horseman_send_head : public SpellScript // 42603 - Headless Horseman Climax, Head: Periodic class spell_headless_horseman_head_periodic : public AuraScript { - PrepareAuraScript(spell_headless_horseman_head_periodic); - void HandleHPCheck(AuraEffect const* /*aurEff*/) { Unit* target = GetTarget(); @@ -886,8 +876,6 @@ class spell_headless_horseman_head_periodic : public AuraScript // 43101 - Headless Horseman Climax - Command, Head Requests Body class spell_headless_horseman_command_head_request_body : public SpellScript { - PrepareSpellScript(spell_headless_horseman_command_head_request_body); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* horseman = GetHitUnit(); @@ -904,8 +892,6 @@ class spell_headless_horseman_command_head_request_body : public SpellScript // 42401 - Headless Horseman Climax - Return Head class spell_headless_horseman_return_head : public SpellScript { - PrepareSpellScript(spell_headless_horseman_return_head); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* horseman = GetHitUnit(); @@ -922,8 +908,6 @@ class spell_headless_horseman_return_head : public SpellScript // 52236 - Summon Pumpkin Burst Delay class spell_summon_pumpkin_burst_delay : public AuraScript { - PrepareAuraScript(spell_summon_pumpkin_burst_delay); - void HandleText(AuraEffect const* /*aurEff*/) { if (Creature* horseman = GetTarget()->ToCreature()) @@ -939,8 +923,6 @@ class spell_summon_pumpkin_burst_delay : public AuraScript // 42428 - Headless Horseman Climax - Head Is Dead class spell_headless_horseman_head_is_dead : public SpellScript { - PrepareSpellScript(spell_headless_horseman_head_is_dead); - void HandleDummy(SpellEffIndex /*effIndex*/) { Creature* target = GetHitCreature(); @@ -970,8 +952,6 @@ class spell_headless_horseman_head_is_dead : public SpellScript // 42879 - Headless Horseman Climax - Summoning Rhyme Aura class spell_headless_horseman_summoning_rhyme_aura : public AuraScript { - PrepareAuraScript(spell_headless_horseman_summoning_rhyme_aura); - void PeriodicTick(AuraEffect const* aurEff) { if (!GetCaster()) @@ -1013,8 +993,6 @@ class spell_headless_horseman_summoning_rhyme_aura : public AuraScript // 42281 - Sprouting class spell_headless_horseman_sprouting : public SpellScript { - PrepareSpellScript(spell_headless_horseman_sprouting); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { Unit* pumpkin = GetHitUnit(); @@ -1032,8 +1010,6 @@ class spell_headless_horseman_sprouting : public SpellScript // 42818 - Headless Horseman - Wisp Flight Port class spell_headless_horseman_wisp_teleport : public SpellScript { - PrepareSpellScript(spell_headless_horseman_wisp_teleport); - void SetDest(SpellDestination& dest) { dest.Relocate(EarthBunnySpawnPosition); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp index aed2154129f..f32f4e29111 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_darkmaster_gandling.cpp @@ -170,8 +170,6 @@ class spell_shadow_portal : public SpellScriptLoader class spell_shadow_portal_SpellScript : public SpellScript { - PrepareSpellScript(spell_shadow_portal_SpellScript); - bool Load() override { _instance = GetCaster()->GetInstanceScript(); @@ -289,8 +287,6 @@ class spell_shadow_portal_rooms : public SpellScriptLoader class spell_shadow_portal_rooms_SpellScript : public SpellScript { - PrepareSpellScript(spell_shadow_portal_rooms_SpellScript); - bool Load() override { _instance = GetCaster()->GetInstanceScript(); diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp index b5fd8141e25..e58ac8b67c5 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_kormok.cpp @@ -150,8 +150,6 @@ class spell_kormok_summon_bone_mages : SpellScriptLoader class spell_kormok_summon_bone_magesSpellScript : public SpellScript { - PrepareSpellScript(spell_kormok_summon_bone_magesSpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonMageSpells); @@ -184,8 +182,6 @@ class spell_kormok_summon_bone_minions : SpellScriptLoader class spell_kormok_summon_bone_minionsSpellScript : public SpellScript { - PrepareSpellScript(spell_kormok_summon_bone_minionsSpellScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_SUMMON_BONE_MINIONS }); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp index 88a9d539fba..7d5ff186908 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp @@ -365,8 +365,6 @@ private: // 68965 - [DND] Lingering Fumes Targetting (starter) class spell_apothecary_lingering_fumes : public SpellScript { - PrepareSpellScript(spell_apothecary_lingering_fumes); - void HandleAfterCast() { Unit* caster = GetCaster(); @@ -399,8 +397,6 @@ class spell_apothecary_lingering_fumes : public SpellScript // 68644 - [DND] Valentine Boss Validate Area class spell_apothecary_validate_area : public SpellScript { - PrepareSpellScript(spell_apothecary_validate_area); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_BUNNY_LOCKDOWN)); @@ -428,8 +424,6 @@ class spell_apothecary_validate_area : public SpellScript // 69038 - Throw Cologne class spell_apothecary_throw_cologne : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_cologne); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_COLOGNE_SPILL, true); @@ -444,8 +438,6 @@ class spell_apothecary_throw_cologne : public SpellScript // 68966 - Throw Perfume class spell_apothecary_throw_perfume : public SpellScript { - PrepareSpellScript(spell_apothecary_throw_perfume); - void HandleScript(SpellEffIndex /*effindex*/) { GetHitUnit()->CastSpell(GetHitUnit(), SPELL_PERFUME_SPILL, true); @@ -460,8 +452,6 @@ class spell_apothecary_throw_perfume : public SpellScript // 68798 - Concentrated Alluring Perfume Spill class spell_apothecary_perfume_spill : public AuraScript { - PrepareAuraScript(spell_apothecary_perfume_spill); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_PERFUME_SPILL_DAMAGE, true); @@ -476,8 +466,6 @@ class spell_apothecary_perfume_spill : public AuraScript // 68614 - Concentrated Irresistible Cologne Spill class spell_apothecary_cologne_spill : public AuraScript { - PrepareAuraScript(spell_apothecary_cologne_spill); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(GetTarget(), SPELL_COLOGNE_SPILL_DAMAGE, true); diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 9ea91aa40e0..c4a21f989a7 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -329,8 +329,6 @@ class spell_shadowfang_keep_haunting_spirits : public SpellScriptLoader class spell_shadowfang_keep_haunting_spirits_AuraScript : public AuraScript { - PrepareAuraScript(spell_shadowfang_keep_haunting_spirits_AuraScript); - void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { isPeriodic = true; diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp index d35ef8f2bb7..ae665d2b2d1 100644 --- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp +++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp @@ -325,8 +325,6 @@ public: // 31912 - Ysida Saved Credit Trigger class spell_ysida_saved_credit : public SpellScript { - PrepareSpellScript(spell_ysida_saved_credit); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_YSIDA_SAVED }); @@ -365,8 +363,6 @@ enum HauntingPhantoms // 16336 - Haunting Phantoms class spell_stratholme_haunting_phantoms : public AuraScript { - PrepareAuraScript(spell_stratholme_haunting_phantoms); - void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { isPeriodic = true; diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp index 18e62d1d88f..d27985051b0 100644 --- a/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp +++ b/src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.cpp @@ -97,8 +97,6 @@ enum HexOfJammalan // 12479 - Hex of Jammal'an class spell_sunken_temple_hex_of_jammalan : public AuraScript { - PrepareAuraScript(spell_sunken_temple_hex_of_jammalan); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEX_OF_JAMMALAN_TRANSFORM, SPELL_HEX_OF_JAMMALAN_CHARM }); @@ -128,8 +126,6 @@ class spell_sunken_temple_hex_of_jammalan : public AuraScript // 12480 - Hex of Jammal'an class spell_sunken_temple_hex_of_jammalan_transform : public AuraScript { - PrepareAuraScript(spell_sunken_temple_hex_of_jammalan_transform); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_HEX_OF_JAMMALAN_CHARM }); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp index 33a133b37cf..a2d27715662 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp @@ -332,8 +332,6 @@ struct boss_brutallus : public BossAI // 46394 - Burn class spell_brutallus_burn : public AuraScript { - PrepareAuraScript(spell_brutallus_burn); - void HandleEffectPeriodicUpdate(AuraEffect* aurEff) { if (aurEff->GetTickNumber() % 11 == 0) @@ -349,8 +347,6 @@ class spell_brutallus_burn : public AuraScript // 45185 - Stomp class spell_brutallus_stomp : public SpellScript { - PrepareSpellScript(spell_brutallus_stomp); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BURN }); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index 18f3500416f..1e7d9b13b84 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -603,8 +603,6 @@ class go_kalecgos_spectral_rift : public GameObjectScript // 46732 - Tap Check class spell_kalecgos_tap_check : public SpellScript { - PrepareSpellScript(spell_kalecgos_tap_check); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ uint32(spellInfo->GetEffect(EFFECT_0).CalcValue()) }); @@ -639,8 +637,6 @@ class SpectralBlastSelector : NonTankTargetSelector // 44869 - Spectral Blast class spell_kalecgos_spectral_blast : public SpellScript { - PrepareSpellScript(spell_kalecgos_spectral_blast); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo( @@ -676,8 +672,6 @@ class spell_kalecgos_spectral_blast : public SpellScript // 44811 - Spectral Realm class spell_kalecgos_spectral_realm_trigger : public SpellScript { - PrepareSpellScript(spell_kalecgos_spectral_realm_trigger); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -707,8 +701,6 @@ class spell_kalecgos_spectral_realm_trigger : public SpellScript // 46021 - Spectral Realm class spell_kalecgos_spectral_realm_aura : public AuraScript { - PrepareAuraScript(spell_kalecgos_spectral_realm_aura); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( @@ -736,8 +728,6 @@ class spell_kalecgos_spectral_realm_aura : public AuraScript // 45032, 45034 - Curse of Boundless Agony class spell_kalecgos_curse_of_boundless_agony : public AuraScript { - PrepareAuraScript(spell_kalecgos_curse_of_boundless_agony); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo( diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp index 8805c80753c..3b932075070 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp @@ -510,8 +510,6 @@ private: // 46050 - Summon Blood Elves Script class spell_summon_blood_elves_script : public SpellScript { - PrepareSpellScript(spell_summon_blood_elves_script); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonBloodElvesSpells); @@ -532,8 +530,6 @@ class spell_summon_blood_elves_script : public SpellScript // 45996 - Darkness class spell_muru_darkness : public SpellScript { - PrepareSpellScript(spell_muru_darkness); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo(SummonDarkFiendSpells); @@ -554,8 +550,6 @@ class spell_muru_darkness : public SpellScript // 45934 - Dark Fiend class spell_dark_fiend_skin : public AuraScript { - PrepareAuraScript(spell_dark_fiend_skin); - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (GetTargetApplication()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL) @@ -580,8 +574,6 @@ class spell_dark_fiend_skin : public AuraScript // 46205 - Transform Visual Missile Periodic class spell_transform_visual_missile_periodic : public AuraScript { - PrepareAuraScript(spell_transform_visual_missile_periodic); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, RAND(TRANSFORM_VISUAL_MISSILE_1, TRANSFORM_VISUAL_MISSILE_2), true); @@ -596,8 +588,6 @@ class spell_transform_visual_missile_periodic : public AuraScript // 46041 - Summon Blood Elves Periodic class spell_summon_blood_elves_periodic : public AuraScript { - PrepareAuraScript(spell_summon_blood_elves_periodic); - void OnPeriodic(AuraEffect const* /*aurEff*/) { GetTarget()->CastSpell(nullptr, SPELL_SUMMON_BLOOD_ELVES_SCRIPT, true); @@ -612,8 +602,6 @@ class spell_summon_blood_elves_periodic : public AuraScript // 46284 - Negative Energy Periodic class spell_muru_negative_energy_periodic : public AuraScript { - PrepareAuraScript(spell_muru_negative_energy_periodic); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellEffect({ { spellInfo->Id, EFFECT_0 } }) && ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp index 0c5ed3dbc58..cf321021290 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp @@ -112,8 +112,6 @@ class spell_hexlord_unstable_affliction : public SpellScriptLoader class spell_hexlord_unstable_affliction_AuraScript : public AuraScript { - PrepareAuraScript(spell_hexlord_unstable_affliction_AuraScript); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_WL_UNSTABLE_AFFL_DISPEL }); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index f7de0c791ac..d5e0e4f31d5 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -410,8 +410,6 @@ private: // 96682 - Decapitate class spell_mandokir_decapitate : public SpellScript { - PrepareSpellScript(spell_mandokir_decapitate); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -439,8 +437,6 @@ class spell_mandokir_decapitate : public SpellScript // 96776 - Bloodletting class spell_mandokir_bloodletting : public AuraScript { - PrepareAuraScript(spell_mandokir_bloodletting); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_BLOODLETTING_DAMAGE, SPELL_BLOODLETTING_HEAL }); @@ -470,8 +466,6 @@ class spell_mandokir_bloodletting : public AuraScript // 96821 - Spirit's Vengeance Cancel class spell_mandokir_spirit_vengeance_cancel : public SpellScript { - PrepareSpellScript(spell_mandokir_spirit_vengeance_cancel); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Player* target = GetHitPlayer()) @@ -508,8 +502,6 @@ class DevastatingSlamTargetSelector // 96761 - Devastating Slam class spell_mandokir_devastating_slam : public SpellScript { - PrepareSpellScript(spell_mandokir_devastating_slam); - void FilterTargets(std::list<WorldObject*>& targets) { targets.remove_if(DevastatingSlamTargetSelector(GetCaster()->ToCreature(), GetCaster()->GetVictim())); @@ -556,8 +548,6 @@ class spell_mandokir_devastating_slam : public SpellScript // 96721 - Ohgan's Orders class spell_mandokir_ohgan_orders : public SpellScript { - PrepareSpellScript(spell_mandokir_ohgan_orders); - void FilterTargets(std::list<WorldObject*>& targets) { if (targets.empty()) @@ -585,8 +575,6 @@ class spell_mandokir_ohgan_orders : public SpellScript // 96722 - Ohgan's Orders class spell_mandokir_ohgan_orders_trigger : public AuraScript { - PrepareAuraScript(spell_mandokir_ohgan_orders_trigger); - void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -610,8 +598,6 @@ class spell_mandokir_ohgan_orders_trigger : public AuraScript // 96724 - Reanimate Ohgan class spell_mandokir_reanimate_ohgan : public SpellScript { - PrepareSpellScript(spell_mandokir_reanimate_ohgan); - void HandleScript(SpellEffIndex /*effIndex*/) { if (Unit* target = GetHitUnit()) diff --git a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 508eb441582..77a958a31ed 100644 --- a/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp @@ -33,8 +33,6 @@ enum TeleportToRazelikh // 27686 - Teleport to Razelikh (GROUP) class spell_razelikh_teleport_group : public SpellScript { - PrepareSpellScript(spell_razelikh_teleport_group); - bool Validate(SpellInfo const* /*spell*/) override { return ValidateSpellInfo({ SPELL_TELEPORT_SINGLE, SPELL_TELEPORT_SINGLE_IN_GROUP }); diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp index 2f1b2c51517..0020eb30559 100644 --- a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp +++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp @@ -375,8 +375,6 @@ public: class spell_a_trip_to_ironforge_quest_complete_SpellScript : public SpellScript { - PrepareSpellScript(spell_a_trip_to_ironforge_quest_complete_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -407,8 +405,6 @@ public: class spell_follow_that_gyrocopter_quest_start_SpellScript : public SpellScript { - PrepareSpellScript(spell_follow_that_gyrocopter_quest_start_SpellScript); - void HandleForceCast(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); @@ -439,8 +435,6 @@ public: class spell_low_health_SpellScript : public SpellScript { - PrepareSpellScript(spell_low_health_SpellScript); - void HandleDummyEffect(SpellEffIndex /*eff*/) { if (Creature* target = GetHitCreature()) diff --git a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index cbeaf452188..60c69ab9851 100644 --- a/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp @@ -32,8 +32,6 @@ enum MaraudersOfDarrowshire // 17271 - Test Fetid Skull class spell_eastern_plaguelands_test_fetid_skull : public SpellScript { - PrepareSpellScript(spell_eastern_plaguelands_test_fetid_skull); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_CREATE_RESONATING_SKULL, SPELL_CREATE_BONE_DUST }); diff --git a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index 66435eb86dc..263c764a098 100644 --- a/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -692,8 +692,6 @@ private: // 228928 - Stealth class spell_stealth_vanessa_human_heritage : public AuraScript { - PrepareAuraScript(spell_stealth_vanessa_human_heritage); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { GetTarget()->SetDisplayId(DISPLAY_VANESSA_INVISIBLE); diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index c43de96c55d..4054d4ff6f5 100644 --- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp @@ -221,8 +221,6 @@ enum MagicalChainsHauler // 84238 - Magical Chains (Hauler) class spell_silverpine_magical_chains_hauler : public AuraScript { - PrepareAuraScript(spell_silverpine_magical_chains_hauler); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -938,8 +936,6 @@ enum RaiseForsakenCometh // 83173 - Raise Forsaken class spell_silverpine_raise_forsaken_83173 : public AuraScript { - PrepareAuraScript(spell_silverpine_raise_forsaken_83173); - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); @@ -1083,8 +1079,6 @@ enum SpellForsakenTrooperMasterScriptCometh // 83149 - Forsaken Trooper Master Script (Forsaken High Command) class spell_silverpine_forsaken_trooper_masterscript_high_command : public SpellScript { - PrepareSpellScript(spell_silverpine_forsaken_trooper_masterscript_high_command); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -1271,8 +1265,6 @@ private: // 80365 - Flurry of Claws class spell_silverpine_flurry_of_claws : public AuraScript { - PrepareAuraScript(spell_silverpine_flurry_of_claws); - bool Validate(SpellInfo const* spellInfo) override { return ValidateSpellInfo({ spellInfo->GetEffect(EFFECT_0).TriggerSpell }); @@ -3196,8 +3188,6 @@ private: // 83840 - Despawn All Summons class spell_silverpine_despawn_all_summons_steel_thunder : public SpellScript { - PrepareSpellScript(spell_silverpine_despawn_all_summons_steel_thunder); - void HandleScriptEffect(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -3402,8 +3392,6 @@ enum PickUpOrcCrate // 83838 - Pick Up Orc Crate class spell_silverpine_pick_up_orc_crate : public SpellScript { - PrepareSpellScript(spell_silverpine_pick_up_orc_crate); - bool Validate(SpellInfo const* /*spellInfi*/) override { return ValidateSpellInfo @@ -3722,8 +3710,6 @@ private: // 83902 - Release Diseased Mutant Bush Chicken class spell_silverpine_release_diseased_mutant_bush_chicken : public SpellScript { - PrepareSpellScript(spell_silverpine_release_diseased_mutant_bush_chicken); - void HandleHit(SpellEffIndex /*effIndex*/) { Unit* target = GetHitUnit(); @@ -3793,8 +3779,6 @@ enum FreeWebbedVictim // 83919 - Free Webbed Victim class spell_silverpine_free_webbed_victim_random : public SpellScript { - PrepareSpellScript(spell_silverpine_free_webbed_victim_random); - void HandleHit(SpellEffIndex /*effIndex*/) { if (Unit* caster = GetCaster()) @@ -4085,8 +4069,6 @@ enum BondoftheValkyr // 83979 - Bond of the Val'kyr class spell_silverpine_bond_of_the_valkyr : public AuraScript { - PrepareAuraScript(spell_silverpine_bond_of_the_valkyr); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_SUMMON_AGATHA_FENRIS }); @@ -4383,8 +4365,6 @@ enum NotifyAgatha // 83990 - Notify Agatha class spell_silverpine_notify_agatha : public SpellScript { - PrepareSpellScript(spell_silverpine_notify_agatha); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_RISE_FORSAKEN_FENRIS }); @@ -4446,8 +4426,6 @@ enum SpellForsakenTrooperMasterScriptFenrisIsle // 83997 - Forsaken Trooper Master Script (Fenris Isle) class spell_silverpine_forsaken_trooper_masterscript_fenris_isle : public SpellScript { - PrepareSpellScript(spell_silverpine_forsaken_trooper_masterscript_fenris_isle); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo @@ -4837,8 +4815,6 @@ enum SummonFenrisActors // 84053 - Summon Fenris Actors class spell_silverpine_summon_fenris_keep_actors : public SpellScript { - PrepareSpellScript(spell_silverpine_summon_fenris_keep_actors); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo diff --git a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp index e0da4c64877..c6e52086289 100644 --- a/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tol_barad.cpp @@ -85,8 +85,6 @@ public: class spell_siege_cannon_SpellScript : public SpellScript { - PrepareSpellScript(spell_siege_cannon_SpellScript); - void SelectRandomTarget(std::list<WorldObject*>& targets) { if (targets.empty()) diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index b7aad7ddd9b..d91500c33d7 100644 --- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp @@ -333,8 +333,6 @@ enum DragonmawShinbones // 8856 - Bending Shinbone class spell_undercity_bending_shinbone : public SpellScript { - PrepareSpellScript(spell_undercity_bending_shinbone); - bool Validate(SpellInfo const* /*spellInfo*/) override { return ValidateSpellInfo({ SPELL_BENDING_SHINBONE1, SPELL_BENDING_SHINBONE2 }); |