From 44e0d6c0f92db1f03b207e0f2782db72d416559b Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 23 Aug 2020 17:44:48 +0200 Subject: [PATCH] Scripts/Spells: Replace RegisterAuraScript with RegisterSpellScript and remove it --- src/server/game/Scripting/ScriptMgr.h | 1 - .../boss_ascendant_council.cpp | 12 ++-- .../BastionOfTwilight/boss_chogall.cpp | 16 ++--- .../boss_ascendant_lord_obsidius.cpp | 8 +-- .../BlackrockCaverns/boss_beauty.cpp | 2 +- .../boss_corla_herald_of_twilight.cpp | 4 +- .../boss_karsh_steelbender.cpp | 4 +- .../BlackwingDescent/blackwing_descent.cpp | 4 +- .../BlackwingDescent/boss_atramedes.cpp | 14 ++--- .../BlackwingDescent/boss_chimaeron.cpp | 8 +-- .../BlackwingDescent/boss_magmaw.cpp | 10 +-- .../BlackwingDescent/boss_maloriak.cpp | 10 +-- .../BlackwingDescent/boss_nefarians_end.cpp | 22 +++---- .../boss_omnotron_defense_system.cpp | 12 ++-- .../Deadmines/boss_helix_gearbreaker.cpp | 10 +-- .../EasternKingdoms/Deadmines/deadmines.cpp | 2 +- .../GrimBatol/boss_general_umbriss.cpp | 2 +- .../boss_felblood_kaelthas.cpp | 2 +- .../ShadowfangKeep/boss_baron_ashbury.cpp | 6 +- .../ShadowfangKeep/boss_lord_godfrey.cpp | 6 +- .../ShadowfangKeep/boss_lord_walden.cpp | 4 +- .../ShadowfangKeep/shadowfang_keep.cpp | 2 +- .../SunwellPlateau/boss_kalecgos.cpp | 4 +- .../boss_commander_ulthok.cpp | 2 +- .../EasternKingdoms/ZulAman/boss_akilzon.cpp | 2 +- .../ZulGurub/boss_bloodlord_mandokir.cpp | 2 +- .../ZulGurub/boss_high_priest_venoxis.cpp | 6 +- .../ZulGurub/boss_high_priestess_kilnara.cpp | 6 +- .../EasternKingdoms/ZulGurub/boss_zanzil.cpp | 6 +- .../EasternKingdoms/ZulGurub/zulgurub.cpp | 4 +- .../scripts/EasternKingdoms/zone_westfall.cpp | 2 +- .../boss_salramm_the_fleshcrafter.cpp | 2 +- .../DragonSoul/boss_madness_of_deathwing.cpp | 10 +-- .../HallsOfOrigination/boss_anraphet.cpp | 2 +- .../boss_earthrager_ptah.cpp | 2 +- .../Kalimdor/HallsOfOrigination/boss_rajh.cpp | 2 +- .../boss_temple_guardian_anhuur.cpp | 4 +- .../boss_general_husam.cpp | 2 +- .../ThroneOfTheFourWinds/boss_alakir.cpp | 6 +- .../boss_conclave_of_wind.cpp | 4 +- .../Kalimdor/VortexPinnacle/boss_altairus.cpp | 2 +- .../VortexPinnacle/vortex_pinnacle.cpp | 8 +-- .../scripts/Kalimdor/zone_mount_hyjal.cpp | 8 +-- .../Maelstrom/Stonecore/boss_corborus.cpp | 2 +- .../Maelstrom/Stonecore/boss_ozruk.cpp | 4 +- .../AzjolNerub/Ahnkahet/instance_ahnkahet.cpp | 2 +- src/server/scripts/Spells/spell_dk.cpp | 56 ++++++++--------- src/server/scripts/Spells/spell_druid.cpp | 62 +++++++++---------- src/server/scripts/Spells/spell_generic.cpp | 16 ++--- src/server/scripts/Spells/spell_holiday.cpp | 4 +- src/server/scripts/Spells/spell_hunter.cpp | 22 +++---- src/server/scripts/Spells/spell_item.cpp | 14 ++--- src/server/scripts/Spells/spell_mage.cpp | 24 +++---- src/server/scripts/Spells/spell_paladin.cpp | 28 ++++----- src/server/scripts/Spells/spell_pet.cpp | 42 ++++++------- src/server/scripts/Spells/spell_priest.cpp | 58 ++++++++--------- src/server/scripts/Spells/spell_rogue.cpp | 28 ++++----- src/server/scripts/Spells/spell_shaman.cpp | 18 +++--- src/server/scripts/Spells/spell_warlock.cpp | 22 +++---- src/server/scripts/Spells/spell_warrior.cpp | 28 ++++----- 60 files changed, 338 insertions(+), 339 deletions(-) diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 4ff193f1dd..dd05b72f6f 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1104,7 +1104,6 @@ private: #define RegisterSpellScriptWithArgs(spell_script, script_name, ...) new GenericSpellAndAuraScriptLoader(script_name, std::make_tuple(__VA_ARGS__)) #define RegisterSpellScript(spell_script) RegisterSpellScriptWithArgs(spell_script, #spell_script) -#define RegisterAuraScript(aura_script) RegisterSpellScriptWithArgs(aura_script, #aura_script) #define RegisterSpellAndAuraScriptPairWithArgs(script_1, script_2, script_name, ...) new GenericSpellAndAuraScriptLoader(script_name, std::make_tuple(__VA_ARGS__)) #define RegisterSpellAndAuraScriptPair(script_1, script_2) RegisterSpellAndAuraScriptPairWithArgs(script_1, script_2, #script_1) diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp index f630ffb956..c1cc46e859 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp @@ -2839,11 +2839,11 @@ void AddSC_boss_ascendant_council() RegisterSpellScript(spell_feludius_water_bomb_targeting); RegisterSpellScript(spell_feludius_water_bomb); RegisterSpellScript(spell_feludius_glaciate); - RegisterAuraScript(spell_feludius_heart_of_ice); + RegisterSpellScript(spell_feludius_heart_of_ice); RegisterSpellAndAuraScriptPair(spell_feludius_frost_imbued, spell_feludius_frost_imbued_AuraScript); RegisterSpellScript(spell_feludius_frozen_orb_targeting); - RegisterAuraScript(spell_ignacious_rising_flames); - RegisterAuraScript(spell_ignacious_burning_blood); + RegisterSpellScript(spell_ignacious_rising_flames); + RegisterSpellScript(spell_ignacious_burning_blood); RegisterSpellAndAuraScriptPair(spell_ignacious_flame_imbued, spell_ignacious_flame_imbued_AuraScript); RegisterSpellScript(spell_ignacious_inferno_leap); RegisterSpellScript(spell_ignacious_inferno_rush); @@ -2858,14 +2858,14 @@ void AddSC_boss_ascendant_council() RegisterSpellScript(spell_arion_static_overload); RegisterSpellScript(spell_arion_static_overload_triggered); RegisterSpellScript(spell_terrastra_gravity_well); - RegisterAuraScript(spell_terrastra_harden_skin); + RegisterSpellScript(spell_terrastra_harden_skin); RegisterSpellScript(spell_terrastra_quake); RegisterSpellScript(spell_terrastra_eruption); RegisterSpellScript(spell_terrastra_gravity_core); RegisterSpellScript(spell_terrastra_gravity_core_triggered); RegisterSpellScript(spell_elementium_monstrosity_lava_seed); - RegisterAuraScript(spell_elementium_monstrosity_cryogenic_aura); - RegisterAuraScript(spell_elementium_monstrosity_liquid_ice); + RegisterSpellScript(spell_elementium_monstrosity_cryogenic_aura); + RegisterSpellScript(spell_elementium_monstrosity_liquid_ice); RegisterSpellScript(spell_elementium_monstrosity_electric_instability); RegisterSpellScript(spell_elementium_monstrosity_gravity_crush); new achievement_elementary(); diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp index 372bddf3a7..e2da65de31 100644 --- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp +++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp @@ -1505,23 +1505,23 @@ void AddSC_boss_chogall() RegisterSpellScript(spell_chogall_absorb_elemental_reverse_cast); RegisterSpellScript(spell_chogall_absorb_elemental); RegisterSpellAndAuraScriptPair(spell_chogall_absorb_elemental_heroic, spell_chogall_absorb_elemental_heroic_AuraScript); - RegisterAuraScript(spell_chogall_elemental_power); - RegisterAuraScript(spell_chogall_flaming_destruction_heroic); - RegisterAuraScript(spell_chogall_empowered_shadows_heroic); + RegisterSpellScript(spell_chogall_elemental_power); + RegisterSpellScript(spell_chogall_flaming_destruction_heroic); + RegisterSpellScript(spell_chogall_empowered_shadows_heroic); RegisterSpellScript(spell_chogall_summon_corrupted_adherent); RegisterSpellScript(spell_chogall_fester_blood); RegisterSpellScript(spell_chogall_fester_blood_summon); RegisterSpellScript(spell_chogall_conversion); - RegisterAuraScript(spell_chogall_worshipping); - RegisterAuraScript(spell_chogall_consume_blood_of_the_old_god); + RegisterSpellScript(spell_chogall_worshipping); + RegisterSpellScript(spell_chogall_consume_blood_of_the_old_god); RegisterSpellScript(spell_chogall_consume_blood_of_the_old_god_triggered); RegisterSpellScript(spell_chogall_corruption_significant); RegisterSpellScript(spell_chogall_corruption_normal); RegisterSpellScript(spell_chogall_corruption_normal_alternative); RegisterSpellScript(spell_chogall_corruption_of_the_old_god); - RegisterAuraScript(spell_chogall_corruption_sickness); - RegisterAuraScript(spell_chogall_corruption_malformation); + RegisterSpellScript(spell_chogall_corruption_sickness); + RegisterSpellScript(spell_chogall_corruption_malformation); RegisterSpellScript(spell_chogall_shadow_bolt); - RegisterAuraScript(spell_chogall_debilitating_beam); + RegisterSpellScript(spell_chogall_debilitating_beam); new achievement_the_abyss_will_gaze_into_you(); } 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 c0d1a6f59f..2584683a58 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 @@ -398,11 +398,11 @@ class achievement_ascendant_descending : public AchievementCriteriaScript void AddSC_boss_ascendant_lord_obsidius() { RegisterBlackrockCavernsCreatureAI(boss_ascendant_lord_obsidius); - RegisterAuraScript(spell_obsidius_twitchy); + RegisterSpellScript(spell_obsidius_twitchy); RegisterSpellScript(spell_obsidius_transformation); - RegisterAuraScript(spell_obsidius_transformation_not_selectable); - RegisterAuraScript(spell_obsidius_transformation_scale); + RegisterSpellScript(spell_obsidius_transformation_not_selectable); + RegisterSpellScript(spell_obsidius_transformation_scale); RegisterSpellScript(spell_obsidius_crepuscular_veil); - RegisterAuraScript(spell_obsidius_shadow_of_obsidius); + RegisterSpellScript(spell_obsidius_shadow_of_obsidius); new achievement_ascendant_descending(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp index eb1a8bd13f..3b843aec0b 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp @@ -255,5 +255,5 @@ void AddSC_boss_beauty() { RegisterBlackrockCavernsCreatureAI(boss_beauty); RegisterBlackrockCavernsCreatureAI(npc_beauty_puppy); - RegisterAuraScript(spell_beauty_magma_spit); + RegisterSpellScript(spell_beauty_magma_spit); } 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 d64c5c21c4..10bf6056ea 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 @@ -549,10 +549,10 @@ void AddSC_boss_corla() { RegisterBlackrockCavernsCreatureAI(boss_corla_herald_of_twilight); RegisterBlackrockCavernsCreatureAI(npc_corla_twilight_zealot); - RegisterAuraScript(spell_corla_nether_dragon_essence); + RegisterSpellScript(spell_corla_nether_dragon_essence); RegisterSpellScript(spell_corla_nether_dragon_essence_visual); RegisterSpellScript(spell_corla_nether_beam); RegisterSpellScript(spell_corla_evolution); - RegisterAuraScript(spell_corla_grievous_whirl); + RegisterSpellScript(spell_corla_grievous_whirl); new achievement_arrested_development(); } 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 e03d590c1c..4c9ddc0689 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp @@ -330,8 +330,8 @@ class achievement_too_hot_to_handle : public AchievementCriteriaScript void AddSC_boss_karsh_steelbender() { RegisterBlackrockCavernsCreatureAI(boss_karsh_steelbender); - RegisterAuraScript(spell_karsh_quicksilver_armor); + RegisterSpellScript(spell_karsh_quicksilver_armor); RegisterSpellAndAuraScriptPair(spell_karsh_superheated_quicksilver_armor, spell_karsh_superheated_quicksilver_armor_AuraScript); - RegisterAuraScript(spell_karsh_superheated_quicksilver_armor_proc); + RegisterSpellScript(spell_karsh_superheated_quicksilver_armor_proc); new achievement_too_hot_to_handle(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp index 47770e413e..d5c4c09130 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp @@ -701,10 +701,10 @@ void AddSC_blackwing_descent() RegisterBlackwingDescentCreatureAI(npc_bwd_dwarven_spirit); RegisterGameObjectAI(go_bwd_ancient_bell); RegisterSpellScript(spell_bwd_dragon_orb); - RegisterAuraScript(spell_bwd_grievous_wound); + RegisterSpellScript(spell_bwd_grievous_wound); RegisterSpellScript(spell_bwd_execution_sentence_visual); RegisterSpellScript(spell_bwd_execution_sentence_dummy); - RegisterAuraScript(spell_bwd_execution_sentence); + RegisterSpellScript(spell_bwd_execution_sentence); RegisterSpellScript(spell_bwd_stoneblood); new at_bwd_intro(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp index 5c14c890ad..239bd40709 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp @@ -1098,19 +1098,19 @@ void AddSC_boss_atramedes() RegisterBlackwingDescentCreatureAI(npc_atramedes_obnoxious_fiend); RegisterSpellScript(spell_atramedes_modulation); RegisterSpellScript(spell_atramedes_roaring_flame_breath_reverse_cast); - RegisterAuraScript(spell_atramedes_roaring_flame_breath); + RegisterSpellScript(spell_atramedes_roaring_flame_breath); RegisterSpellScript(spell_atramedes_roaring_flame_breath_fire_periodic); RegisterSpellScript(spell_atramedes_resonating_clash_ground); RegisterSpellScript(spell_atramedes_resonating_clash_air); RegisterSpellScript(spell_atramedes_resonating_clash); - RegisterAuraScript(spell_atramedes_sound_bar); - RegisterAuraScript(spell_atramedes_noisy); - RegisterAuraScript(spell_atramedes_vertigo); + RegisterSpellScript(spell_atramedes_sound_bar); + RegisterSpellScript(spell_atramedes_noisy); + RegisterSpellScript(spell_atramedes_vertigo); RegisterSpellAndAuraScriptPair(spell_atramedes_sonic_flames, spell_atramedes_sonic_flames_AuraScript); - RegisterAuraScript(spell_atramedes_devastation_trigger); + RegisterSpellScript(spell_atramedes_devastation_trigger); RegisterSpellScript(spell_atramedes_sonic_breath); RegisterSpellScript(spell_atramedes_destroy_shield); - RegisterAuraScript(spell_atramedes_pestered); - RegisterAuraScript(spell_atramedes_apply_vehicle_periodic); + RegisterSpellScript(spell_atramedes_pestered); + RegisterSpellScript(spell_atramedes_apply_vehicle_periodic); new achievement_silence_is_golden(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp index bfadb008d6..61b0392fd8 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp @@ -735,10 +735,10 @@ void AddSC_boss_chimaeron() RegisterBlackwingDescentCreatureAI(npc_chimaeron_bile_o_tron); RegisterSpellScript(spell_chimaeron_caustic_slime_targeting); RegisterSpellScript(spell_chimaeron_caustic_slime); - RegisterAuraScript(spell_chimaeron_double_attack); - RegisterAuraScript(spell_chimaeron_finkles_mixture); - RegisterAuraScript(spell_chimaeron_reroute_power); - RegisterAuraScript(spell_chimaeron_feud); + RegisterSpellScript(spell_chimaeron_double_attack); + RegisterSpellScript(spell_chimaeron_finkles_mixture); + RegisterSpellScript(spell_chimaeron_reroute_power); + RegisterSpellScript(spell_chimaeron_feud); RegisterSpellScript(spell_chimaeron_shadow_whip); new achievement_full_of_sound_and_fury(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp index 793072c6fb..c765a44bc3 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp @@ -1280,14 +1280,14 @@ void AddSC_boss_magmaw() RegisterSpellScript(spell_magmaw_pillar_of_flame_dummy); RegisterSpellScript(spell_magmaw_pillar_of_flame_forcecast); RegisterSpellScript(spell_magmaw_ride_vehicle); - RegisterAuraScript(spell_magmaw_launch_hook); + RegisterSpellScript(spell_magmaw_launch_hook); RegisterSpellScript(spell_magmaw_eject_passenger); - RegisterAuraScript(spell_magmaw_lava_parasite); + RegisterSpellScript(spell_magmaw_lava_parasite); RegisterSpellScript(spell_magmaw_lava_parasite_summon); RegisterSpellScript(spell_magmaw_blazing_inferno_targeting); RegisterSpellScript(spell_magmaw_shadow_breath_targeting); - RegisterAuraScript(spell_magmaw_massive_crash); - RegisterAuraScript(spell_magmaw_impale_self); - RegisterAuraScript(spell_magmaw_captured); + RegisterSpellScript(spell_magmaw_massive_crash); + RegisterSpellScript(spell_magmaw_impale_self); + RegisterSpellScript(spell_magmaw_captured); new achievement_parasite_evening(); } diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp index a6fb1cb50d..e3e9543239 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp @@ -1290,14 +1290,14 @@ void AddSC_boss_maloriak() RegisterBlackwingDescentCreatureAI(npc_maloriak_vile_swill); RegisterSpellScript(spell_maloriak_throw_bottle); RegisterSpellScript(spell_maloriak_throw_bottle_triggered); - RegisterAuraScript(spell_maloriak_consuming_flames); + RegisterSpellScript(spell_maloriak_consuming_flames); RegisterSpellScript(spell_maloriak_flash_freeze_targeting); RegisterSpellScript(spell_maloriak_flash_freeze_dummy); RegisterSpellScript(spell_maloriak_release_experiments); RegisterSpellScript(spell_maloriak_magma_jets_script); - RegisterAuraScript(spell_maloriak_magma_jets_periodic); + RegisterSpellScript(spell_maloriak_magma_jets_periodic); RegisterSpellScript(spell_maloriak_absolute_zero); - RegisterAuraScript(spell_maloriak_vile_swill); - RegisterAuraScript(spell_maloriak_vile_swill_summon); - RegisterAuraScript(spell_maloriak_master_adventurer_award); + RegisterSpellScript(spell_maloriak_vile_swill); + RegisterSpellScript(spell_maloriak_vile_swill_summon); + RegisterSpellScript(spell_maloriak_master_adventurer_award); } 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 bd04596e53..f2ec35b2d9 100644 --- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp +++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp @@ -2120,29 +2120,29 @@ void AddSC_boss_nefarians_end() RegisterBlackwingDescentCreatureAI(npc_nefarians_end_animated_bone_warrior); RegisterBlackwingDescentCreatureAI(npc_nefarians_end_chromatic_prototype); RegisterBlackwingDescentCreatureAI(npc_nefarians_end_shadowblaze); - RegisterAuraScript(spell_nefarians_end_electrical_charge); - RegisterAuraScript(spell_nefarians_end_lightning_discharge_triggered_periodic_aura); + RegisterSpellScript(spell_nefarians_end_electrical_charge); + RegisterSpellScript(spell_nefarians_end_lightning_discharge_triggered_periodic_aura); RegisterSpellScript(spell_nefarians_end_lightning_discharge_cone); RegisterSpellScript(spell_nefarians_end_lightning_discharge_damage); - RegisterAuraScript(spell_nefarians_end_children_of_deathwing); - RegisterAuraScript(spell_nefarians_end_animate_bones); + RegisterSpellScript(spell_nefarians_end_children_of_deathwing); + RegisterSpellScript(spell_nefarians_end_animate_bones); RegisterSpellScript(spell_nefarians_end_animate_bones_dummy); RegisterSpellScript(spell_nefarians_end_shadowflame_breath); RegisterSpellScript(spell_nefarians_end_jump_down_to_platform); RegisterSpellScript(spell_nefarians_end_shadow_of_cowardice); RegisterSpellScript(spell_nefarians_end_onyxia_start_fight_2_effect); - RegisterAuraScript(spell_nefarians_end_empowering_strikes); - RegisterAuraScript(spell_nefarians_end_brushfire_pre_start_periodic); + RegisterSpellScript(spell_nefarians_end_empowering_strikes); + RegisterSpellScript(spell_nefarians_end_brushfire_pre_start_periodic); RegisterSpellScript(spell_nefarians_end_brushfire_start); - RegisterAuraScript(spell_nefarians_end_brushfire_growth); + RegisterSpellScript(spell_nefarians_end_brushfire_growth); RegisterSpellScript(spell_nefarians_end_shadowblaze); RegisterSpellScript(spell_nefarians_end_dominion_dummy); - RegisterAuraScript(spell_nefarians_end_dominion); - RegisterAuraScript(spell_nefarians_end_determine_farthest_portal_stalker); + RegisterSpellScript(spell_nefarians_end_dominion); + RegisterSpellScript(spell_nefarians_end_determine_farthest_portal_stalker); RegisterSpellScript(spell_nefarians_end_dominion_portal_trigger); - RegisterAuraScript(spell_nefarians_end_free_your_mind); + RegisterSpellScript(spell_nefarians_end_free_your_mind); RegisterSpellScript(spell_nefarians_end_siphon_power); - RegisterAuraScript(spell_nefarians_end_explosive_cinders); + RegisterSpellScript(spell_nefarians_end_explosive_cinders); RegisterGameObjectAI(go_nefarians_end_orb_of_culmination); new achievement_keeping_it_in_the_family(); } 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 635c28b5ad..251d180612 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 @@ -1692,19 +1692,19 @@ void AddSC_boss_omnotron_defense_system() RegisterBlackwingDescentCreatureAI(npc_lord_victor_nefarius_omnotron); RegisterBlackwingDescentCreatureAI(npc_omnotron_poison_bomb); RegisterSpellScript(spell_omnotron_controller_recharge); - RegisterAuraScript(spell_omnotron_recharging); - RegisterAuraScript(spell_omnotron_activated); + RegisterSpellScript(spell_omnotron_recharging); + RegisterSpellScript(spell_omnotron_activated); RegisterSpellScript(spell_omnotron_inactive); RegisterSpellScript(spell_omnotron_electrical_discharge); RegisterSpellScript(spell_omnotron_electrical_discharge_trigger); - RegisterAuraScript(spell_omnotron_unstable_shield); + RegisterSpellScript(spell_omnotron_unstable_shield); RegisterSpellScript(spell_omnotron_aquiring_target); - RegisterAuraScript(spell_omnotron_acquiring_target_periodic); - RegisterAuraScript(spell_omnotron_barrier); + RegisterSpellScript(spell_omnotron_acquiring_target_periodic); + RegisterSpellScript(spell_omnotron_barrier); RegisterSpellScript(spell_omnotron_shadow_infusion); RegisterSpellScript(spell_omnotron_shadow_conductor); RegisterSpellScript(spell_omnotron_overcharge); - RegisterAuraScript(spell_omnotron_overcharged_power_generator); + RegisterSpellScript(spell_omnotron_overcharged_power_generator); RegisterSpellScript(spell_omnotron_flamethrower); new achievement_achieve_a_tron_static_shock; new achievement_achieve_a_tron_poison_bomb; diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp index 2ddfb8f90f..8d9bc15faa 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp @@ -882,14 +882,14 @@ void AddSC_boss_helix_gearbreaker() RegisterDeadminesCreatureAI(npc_helix_sticky_bomb); RegisterDeadminesCreatureAI(npc_helix_crew); RegisterSpellScript(spell_helix_throw_bomb_targeting); - RegisterAuraScript(spell_helix_sticky_bomb_periodic_trigger); + RegisterSpellScript(spell_helix_sticky_bomb_periodic_trigger); RegisterSpellScript(spell_helix_oaf_grab_targeting); RegisterSpellScript(spell_helix_force_player_to_ride_oaf); RegisterSpellScript(spell_helix_oaf_smash); - RegisterAuraScript(spell_helix_helix_ride); + RegisterSpellScript(spell_helix_helix_ride); RegisterSpellScript(spell_helix_ride_face_targeting); - RegisterAuraScript(spell_helix_helix_ride_face_timer_aura); + RegisterSpellScript(spell_helix_helix_ride_face_timer_aura); RegisterSpellScript(spell_helix_chest_bomb_emote); - RegisterAuraScript(spell_helix_chest_bomb); - RegisterAuraScript(spell_helix_ride_vehicle); + RegisterSpellScript(spell_helix_chest_bomb); + RegisterSpellScript(spell_helix_ride_vehicle); } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp index 4b2243b727..65369ae90e 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp @@ -672,7 +672,7 @@ void AddSC_deadmines() new npc_deadmines_vanessa_van_cleef_nightmare(); new npc_deadmines_helix_nightmare(); new go_deadmines_defias_cannon(); - RegisterAuraScript(spell_deadmines_on_fire); + RegisterSpellScript(spell_deadmines_on_fire); new spell_deadmines_ride_magma_vehicle(); new spell_deadmines_magma_trap_throw_to_location(); new spell_deadmines_bloodbath(); diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp index ddeae38676..33b2642fb9 100644 --- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp +++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp @@ -385,5 +385,5 @@ void AddSC_boss_general_umbriss() RegisterGrimBatolCreatureAI(npc_umbriss_skardyn); RegisterSpellScript(spell_umbriss_summon_blitz_trigger); RegisterSpellScript(spell_umbriss_summon_ground_siege_trigger); - RegisterAuraScript(spell_umbriss_bleeding_wound); + RegisterSpellScript(spell_umbriss_bleeding_wound); } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index 34682cb098..f631729fd0 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -506,5 +506,5 @@ void AddSC_boss_felblood_kaelthas() { RegisterMagistersTerraceCreatureAI(boss_felblood_kaelthas); RegisterMagistersTerraceCreatureAI(npc_felblood_kaelthas_phoenix); - RegisterAuraScript(spell_felblood_kaelthas_flame_strike); + RegisterSpellScript(spell_felblood_kaelthas_flame_strike); } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp index 41694b94a0..285f5681ba 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp @@ -324,8 +324,8 @@ class achievement_pardon_denied : public AchievementCriteriaScript void AddSC_boss_baron_ashbury() { RegisterShadowfangKeepCreatureAI(boss_baron_ashbury); - RegisterAuraScript(spell_ashbury_asphyxiate); - RegisterAuraScript(spell_ashbury_pain_and_suffering); - RegisterAuraScript(spell_ashbury_dark_archangel_form); + RegisterSpellScript(spell_ashbury_asphyxiate); + RegisterSpellScript(spell_ashbury_pain_and_suffering); + RegisterSpellScript(spell_ashbury_dark_archangel_form); new achievement_pardon_denied(); } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp index 8da2d2eb67..cf6cc85580 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp @@ -364,8 +364,8 @@ private: void AddSC_boss_lord_godfrey() { RegisterShadowfangKeepCreatureAI(boss_lord_godfrey); - RegisterAuraScript(spell_godfrey_summon_bloodthirsty_ghouls); - RegisterAuraScript(spell_godfrey_pistol_barrage); + RegisterSpellScript(spell_godfrey_summon_bloodthirsty_ghouls); + RegisterSpellScript(spell_godfrey_pistol_barrage); RegisterSpellScript(spell_godfrey_pistol_barrage_aoe); - RegisterAuraScript(spell_godfrey_cursed_bullets); + RegisterSpellScript(spell_godfrey_cursed_bullets); } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp index 6b2f6147fd..62b50bf2e1 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp @@ -317,9 +317,9 @@ class spell_walden_toxic_catalyst : public SpellScript void AddSC_boss_lord_walden() { RegisterShadowfangKeepCreatureAI(boss_lord_walden); - RegisterAuraScript(spell_walden_toxic_coagulent); + RegisterSpellScript(spell_walden_toxic_coagulent); RegisterSpellScript(spell_walden_conjure_poisonous_mixture); - RegisterAuraScript(spell_walden_ice_shards); + RegisterSpellScript(spell_walden_ice_shards); RegisterSpellScript(spell_walden_conjure_mystery_toxin); RegisterSpellScript(spell_walden_toxic_catalyst); } diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp index 370f84df9c..20d84191e6 100644 --- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp +++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp @@ -152,7 +152,7 @@ public: void AddSC_shadowfang_keep() { - RegisterAuraScript(spell_sfk_shield_of_bones); + RegisterSpellScript(spell_sfk_shield_of_bones); new at_sfk_outside_troups(); new at_sfk_outside_ivar_bloodfang(); new at_sfk_godfrey_intro(); diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp index fb60fd9a5b..9aa0a8eb5e 100644 --- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp +++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp @@ -791,6 +791,6 @@ void AddSC_boss_kalecgos() RegisterSpellScript(spell_kalecgos_tap_check); RegisterSpellScript(spell_kalecgos_spectral_blast); RegisterSpellScript(spell_kalecgos_spectral_realm_trigger); - RegisterAuraScript(spell_kalecgos_spectral_realm_aura); - RegisterAuraScript(spell_kalecgos_curse_of_boundless_agony); + RegisterSpellScript(spell_kalecgos_spectral_realm_aura); + RegisterSpellScript(spell_kalecgos_curse_of_boundless_agony); } diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp index 860911bb9b..5891683503 100644 --- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp +++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp @@ -222,5 +222,5 @@ class spell_ulthok_dark_fissure : public AuraScript void AddSC_boss_commander_ulthok() { RegisterThroneOfTheTidesCreatureAI(boss_commander_ulthok); - RegisterAuraScript(spell_ulthok_dark_fissure); + RegisterSpellScript(spell_ulthok_dark_fissure); } diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp index 6830cd5759..6cb2ced121 100644 --- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp +++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp @@ -687,7 +687,7 @@ void AddSC_boss_akilzon() RegisterZulAamanCreatureAI(boss_akilzon); RegisterZulAamanCreatureAI(npc_akilzon_soaring_eagle); RegisterZulAamanCreatureAI(npc_akilzon_amani_kidnapper); - RegisterAuraScript(spell_akilzon_electrical_storm); + RegisterSpellScript(spell_akilzon_electrical_storm); RegisterSpellScript(spell_akilzon_electrical_storm_damage); RegisterSpellScript(spell_akilzon_electrical_overloard_graphic_pulse); RegisterSpellScript(spell_akilzon_teleport_self); diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp index 77bb8a1fd0..356c30407e 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_bloodlord_mandokir.cpp @@ -694,7 +694,7 @@ void AddSC_boss_mandokir() RegisterZulGurubCreatureAI(npc_mandokir_ohgan); RegisterZulGurubCreatureAI(npc_mandokir_chained_spirit); RegisterSpellScript(spell_mandokir_decapitate); - RegisterAuraScript(spell_mandokir_bloodletting); + RegisterSpellScript(spell_mandokir_bloodletting); RegisterSpellScript(spell_mandokir_spirit_vengeance_cancel); RegisterSpellScript(spell_mandokir_devastating_slam); RegisterSpellScript(spell_mandokir_ohgan_orders); 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 092b9c9eaf..fd040038fb 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp @@ -610,11 +610,11 @@ void AddSC_boss_high_priest_venoxis() { RegisterZulGurubCreatureAI(boss_high_priest_venoxis); RegisterSpellScript(spell_venoxis_venomous_effusion); - RegisterAuraScript(spell_venoxis_whispers_of_hethiss); + RegisterSpellScript(spell_venoxis_whispers_of_hethiss); RegisterSpellScript(spell_venoxis_toxic_link_targeting); - RegisterAuraScript(spell_venoxis_toxic_link); + RegisterSpellScript(spell_venoxis_toxic_link); RegisterSpellScript(spell_venoxis_toxic_link_ally); - RegisterAuraScript(spell_venoxis_pool_of_acrid_tears); + RegisterSpellScript(spell_venoxis_pool_of_acrid_tears); RegisterSpellScript(spell_venoxis_blood_venom_forcecast); RegisterSpellScript(spell_venom_withdrawal); } 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 f3132d5bbc..e5a0cee0db 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp @@ -480,9 +480,9 @@ void AddSC_boss_high_priestess_kilnara() RegisterZulGurubCreatureAI(boss_high_priestess_kilnara); RegisterZulGurubCreatureAI(npc_kilnara_pride_of_bethekk); - RegisterAuraScript(spell_kilnara_tears_of_blood); + RegisterSpellScript(spell_kilnara_tears_of_blood); RegisterSpellScript(spell_kilnara_wave_of_agony); - RegisterAuraScript(spell_kilnara_wave_of_agony_dummy); - RegisterAuraScript(spell_kilnara_primal_awakening); + RegisterSpellScript(spell_kilnara_wave_of_agony_dummy); + RegisterSpellScript(spell_kilnara_primal_awakening); RegisterSpellScript(spell_kilnara_gaping_wound); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp index fc9be42b79..5bc8a97731 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp @@ -681,9 +681,9 @@ void AddSC_boss_zanzil() { RegisterZulGurubCreatureAI(boss_zanzil); RegisterZulGurubCreatureAI(npc_zanzil_zanzili_berserker); - RegisterAuraScript(spell_zanzil_zanzili_fire); - RegisterAuraScript(spell_zanzil_zanzils_resurrection_elixir); + RegisterSpellScript(spell_zanzil_zanzili_fire); + RegisterSpellScript(spell_zanzil_zanzils_resurrection_elixir); RegisterSpellScript(spell_zanzil_zanzils_resurrection_elixir_red_script); RegisterSpellScript(spell_zanzil_zanzils_graveyard_gas); - RegisterAuraScript(spell_zanzil_frostburn_formula); + RegisterSpellScript(spell_zanzil_frostburn_formula); } diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp index c35b4cfe49..170602fb75 100644 --- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp +++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp @@ -675,8 +675,8 @@ void AddSC_zulgurub() RegisterZulGurubCreatureAI(npc_zulgurub_tiki_lord_mu_loa); RegisterZulGurubCreatureAI(npc_zulgurub_tiki_lord_zim_wae); RegisterZulGurubCreatureAI(npc_zulgurub_gurubashi_berserker); - RegisterAuraScript(spell_zulgurub_rolling_boulders); + RegisterSpellScript(spell_zulgurub_rolling_boulders); RegisterSpellScript(spell_zulgurub_sigil_shatter); - RegisterAuraScript(spell_zulgurub_ancient_guardian); + RegisterSpellScript(spell_zulgurub_ancient_guardian); RegisterSpellScript(spell_zulgurub_toad_explode); } diff --git a/src/server/scripts/EasternKingdoms/zone_westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 0bd475f2e3..123b539795 100644 --- a/src/server/scripts/EasternKingdoms/zone_westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp @@ -538,7 +538,7 @@ void AddSC_westfall() { RegisterSpellScript(spell_westfall_unbound_energy); RegisterCreatureAI(npc_westfall_overloaded_harvest_golem); - RegisterAuraScript(spell_westfall_reaping_blows); + RegisterSpellScript(spell_westfall_reaping_blows); RegisterSpellScript(spell_westfall_wake_harvest_golem); RegisterSpellScript(spell_westfall_quest_credit_jangolode_event); RegisterCreatureAI(npc_westfall_hobo_witness); 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 eb0463fff1..bbb4a92502 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 @@ -158,5 +158,5 @@ class spell_salramm_steal_flesh : public AuraScript void AddSC_boss_salramm() { new boss_salramm(); - RegisterAuraScript(spell_salramm_steal_flesh); + RegisterSpellScript(spell_salramm_steal_flesh); } 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 5372627497..b640619110 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 @@ -2696,14 +2696,14 @@ void AddSC_boss_madness_of_deathwing() RegisterSpellScript(spell_madness_of_deathwing_hemorrhage); RegisterSpellScript(spell_madness_of_deathwing_hemorrhage_script); RegisterSpellScript(spell_madness_of_deathwing_regenerative_blood_script); - RegisterAuraScript(spell_madness_of_deathwing_regenerative_blood_periodic); + RegisterSpellScript(spell_madness_of_deathwing_regenerative_blood_periodic); RegisterSpellScript(spell_madness_of_deathwing_elementium_meteor_script); RegisterSpellScript(spell_madness_of_deathwing_elementium_meteor_visual); - RegisterAuraScript(spell_madness_of_deathwing_burning_blood); + RegisterSpellScript(spell_madness_of_deathwing_burning_blood); RegisterSpellScript(spell_madness_of_deathwing_spawn_blistering_tentacles); RegisterSpellScript(spell_madness_of_deathwing_time_zone); RegisterSpellScript(spell_madness_of_deathwing_trigger_concentration); - RegisterAuraScript(spell_madness_of_deathwing_concentration); + RegisterSpellScript(spell_madness_of_deathwing_concentration); RegisterSpellScript(spell_madness_of_deathwing_trigger_aspect_buffs); RegisterSpellScript(spell_madness_of_deathwing_share_health); RegisterSpellScript(spell_madness_of_deathwing_summon_elementium_terror); @@ -2712,8 +2712,8 @@ void AddSC_boss_madness_of_deathwing() RegisterSpellScript(spell_madness_of_deathwing_fire_dragon_soul); RegisterSpellScript(spell_madness_of_deathwing_fire_dragon_soul_aspects); RegisterSpellScript(spell_madness_of_deathwing_trigger_aspect_yell); - RegisterAuraScript(spell_madness_of_deathwing_corrupted_blood_stacker); - RegisterAuraScript(spell_madness_of_deathwing_corrupted_blood); + RegisterSpellScript(spell_madness_of_deathwing_corrupted_blood_stacker); + RegisterSpellScript(spell_madness_of_deathwing_corrupted_blood); RegisterSpellScript(spell_madness_of_deathwing_spellweave); RegisterSpellScript(spell_madness_of_deathwing_elementium_blast); RegisterSpellScript(spell_madness_of_deathwing_cataclysm); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp index 27de36494c..afee9153ea 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp @@ -665,7 +665,7 @@ void AddSC_boss_anraphet() RegisterHallsOfOriginationCreatureAI(npc_omega_stance); RegisterSpellScript(spell_anraphet_destruction_protocol); RegisterSpellScript(spell_anraphet_alpha_beams); - RegisterAuraScript(spell_anraphet_omega_stance); + RegisterSpellScript(spell_anraphet_omega_stance); RegisterSpellScript(spell_anraphet_omega_stance_summon); RegisterSpellScript(spell_anraphet_omega_stance_spider_effect); new at_hoo_brann_idle_emote(); diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp index 556985d52b..c1982449e2 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp @@ -417,7 +417,7 @@ void AddSC_boss_earthrager_ptah() RegisterHallsOfOriginationCreatureAI(npc_ptah_beetle_stalker); RegisterSpellScript(spell_earthrager_ptah_flame_bolt); RegisterSpellScript(spell_earthrager_ptah_sandstorm); - RegisterAuraScript(spell_earthrager_ptah_explosion); + RegisterSpellScript(spell_earthrager_ptah_explosion); RegisterSpellScript(spell_earthrager_ptah_consume); new achievement_straw_broke_camels_back(); } diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp index 3a4a860c65..d061ef0409 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp @@ -450,6 +450,6 @@ void AddSC_boss_rajh() RegisterHallsOfOriginationCreatureAI(npc_rajh_orb_of_the_sun); RegisterSpellScript(spell_rajh_summon_meteor); RegisterSpellScript(spell_rajh_summon_sun_orb); - RegisterAuraScript(spell_rajh_summon_sun_orb_power_cost); + RegisterSpellScript(spell_rajh_summon_sun_orb_power_cost); new achievement_sun_of_a(); } 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 b604b5eba0..e0772501b0 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -465,9 +465,9 @@ void AddSC_boss_temple_guardian_anhuur() { RegisterHallsOfOriginationCreatureAI(boss_temple_guardian_anhuur); RegisterGameObjectAI(go_anhuur_beacon_of_light); - RegisterAuraScript(spell_anhuur_divine_reckoning); + RegisterSpellScript(spell_anhuur_divine_reckoning); RegisterSpellScript(spell_anhuur_shield_of_light), - RegisterAuraScript(spell_anhuur_reverberating_hymn); + RegisterSpellScript(spell_anhuur_reverberating_hymn); RegisterSpellScript(spell_anhuur_disable_beacon_beams); RegisterSpellScript(spell_anhuur_burning_light_forcecast); new achievement_i_hate_that_song(); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp index 6eb59cd78b..ba7e5c3d20 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_general_husam.cpp @@ -510,7 +510,7 @@ void AddSC_boss_general_husam() RegisterLostCityOfTheTolvirAI(npc_husam_tolvir_land_mine); RegisterLostCityOfTheTolvirAI(npc_husam_bad_intentions_target); RegisterLostCityOfTheTolvirAI(npc_husam_shockwave_visual); - RegisterAuraScript(spell_husam_hammer_fist); + RegisterSpellScript(spell_husam_hammer_fist); RegisterSpellScript(spell_husam_shockwave); RegisterSpellScript(spell_husam_shockwave_summon_search); RegisterSpellScript(spell_husam_mystic_trap); diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp index 87aae05f59..c0e01510dc 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp @@ -1218,13 +1218,13 @@ void AddSC_boss_alakir() RegisterSpellScript(spell_alakir_lightning_strike_script); RegisterSpellScript(spell_alakir_lightning_strike_periodic); RegisterSpellScript(spell_alakir_lightning_strike_damage); - RegisterAuraScript(spell_alakir_electrocute); + RegisterSpellScript(spell_alakir_electrocute); RegisterSpellScript(spell_alakir_squall_line_pre_aura); RegisterSpellScript(spell_alakir_squall_line_script); RegisterSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride_trigger); RegisterSpellScript(spell_alakir_relentless_storm_initial_vehicle_ride); - RegisterAuraScript(spell_alakir_wind_burst); - RegisterAuraScript(spell_alakir_lightning_clouds_periodic); + RegisterSpellScript(spell_alakir_wind_burst); + RegisterSpellScript(spell_alakir_lightning_clouds_periodic); RegisterSpellScript(spell_alakir_lightning_clouds_damage); RegisterSpellScript(spell_alakir_lightning_clouds_targeting); RegisterSpellScript(spell_alakir_lightning_clouds_dummy); 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 024e8ffcb6..aa8ed3d6bc 100644 --- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp +++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp @@ -1300,9 +1300,9 @@ void AddSC_boss_conclave_of_wind() RegisterThroneOfTheFourWindsCreatureAI(boss_rohash); RegisterThroneOfTheFourWindsCreatureAI(npc_conclave_of_wind_ravenous_creeper_trigger); RegisterThroneOfTheFourWindsCreatureAI(npc_conclave_of_wind_ravenous_creeper); - RegisterAuraScript(spell_conclave_of_wind_winds_pre_effect_warning); + RegisterSpellScript(spell_conclave_of_wind_winds_pre_effect_warning); RegisterSpellScript(spell_conclave_of_wind_teleport_to_center); - RegisterAuraScript(spell_conclave_of_wind_winds); + RegisterSpellScript(spell_conclave_of_wind_winds); RegisterSpellAndAuraScriptPair(spell_conclave_of_wind_wind_blast, spell_conclave_of_wind_wind_blast_AuraScript); RegisterSpellScript(spell_conclave_of_wind_wind_blast_triggered); RegisterSpellScript(spell_conclave_of_wind_hurricane); diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp index fc725dcf4b..eba8b68047 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp @@ -373,5 +373,5 @@ void AddSC_boss_altairus() RegisterSpellScript(spell_altairus_upwind_of_altairus); RegisterSpellScript(spell_altairus_call_the_wind_channel); RegisterSpellScript(spell_altairus_chilling_breath); - RegisterAuraScript(spell_altairus_safe_area); + RegisterSpellScript(spell_altairus_safe_area); } diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index 6bd248f1f6..16d9a59d5b 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -889,12 +889,12 @@ void AddSC_vortex_pinnacle() RegisterVortexPinnacleCreatureAI(npc_grounding_field); RegisterVortexPinnacleCreatureAI(npc_skyfall); RegisterVortexPinnacleCreatureAI(npc_skyfall_star); - RegisterAuraScript(spell_vp_lurk_search_periodic); + RegisterSpellScript(spell_vp_lurk_search_periodic); RegisterSpellScript(spell_vp_lurk_search); RegisterSpellAndAuraScriptPair(spell_vp_feign_death, spell_vp_feign_death_AuraScript); - RegisterAuraScript(spell_vp_lurk_ressurect); - RegisterAuraScript(spell_vp_howling_gale); - RegisterAuraScript(spell_vp_howling_gale_knockback); + RegisterSpellScript(spell_vp_lurk_ressurect); + RegisterSpellScript(spell_vp_howling_gale); + RegisterSpellScript(spell_vp_howling_gale_knockback); RegisterSpellScript(spell_slipstream); RegisterSpellScript(spell_grounding_field); RegisterSpellScript(spell_skyfall); diff --git a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp index 2d6f7b9837..e65fcaa724 100644 --- a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp +++ b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp @@ -752,9 +752,9 @@ void AddSC_mount_hyjal() RegisterCreatureAI(npc_mh_arch_druid_fandral_staghelm); RegisterSpellScript(spell_mh_summon_emerald_flameweaver); RegisterSpellScript(spell_mh_ragnaros); - RegisterAuraScript(spell_mh_flamebreaker); - RegisterAuraScript(spell_mh_weakening); - RegisterAuraScript(spell_mh_inferno); - RegisterAuraScript(spell_mh_fandral_creator_aura); + RegisterSpellScript(spell_mh_flamebreaker); + RegisterSpellScript(spell_mh_weakening); + RegisterSpellScript(spell_mh_inferno); + RegisterSpellScript(spell_mh_fandral_creator_aura); new at_mh_hyjal_barrow_dens(); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp index 998a32c0a5..af13afecff 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp @@ -480,5 +480,5 @@ void AddSC_boss_corborus() new npc_rock_borer(); new npc_crystal_shard(); RegisterSpellScript(spell_corborus_crystal_barrage_targeting); - RegisterAuraScript(spell_corborus_crystal_barrage); + RegisterSpellScript(spell_corborus_crystal_barrage); } diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp index 563261e37b..3fa668ecfd 100644 --- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp +++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp @@ -311,9 +311,9 @@ class spell_ozruk_paralyze_stun : public AuraScript void AddSC_boss_ozruk() { new boss_ozruk(); - RegisterAuraScript(spell_ozruk_rupture); + RegisterSpellScript(spell_ozruk_rupture); RegisterSpellScript(spell_ozuruk_rupture_summon); RegisterSpellScript(spell_ozruk_elementium_spike_shield); RegisterSpellScript(spell_ozruk_paralyze); - RegisterAuraScript(spell_ozruk_paralyze_stun); + RegisterSpellScript(spell_ozruk_paralyze_stun); } diff --git a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp index bd751a282d..82174d1461 100644 --- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp @@ -307,5 +307,5 @@ class spell_combined_toxins : public AuraScript void AddSC_instance_ahnkahet() { new instance_ahnkahet(); - RegisterAuraScript(spell_combined_toxins); + RegisterSpellScript(spell_combined_toxins); } diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index b174578bdd..387279a7a2 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -1779,49 +1779,49 @@ class spell_dk_killing_machine : public SpellScript void AddSC_deathknight_spell_scripts() { - RegisterAuraScript(spell_dk_anti_magic_shell); - RegisterAuraScript(spell_dk_anti_magic_zone); - RegisterAuraScript(spell_dk_army_of_the_dead); + RegisterSpellScript(spell_dk_anti_magic_shell); + RegisterSpellScript(spell_dk_anti_magic_zone); + RegisterSpellScript(spell_dk_army_of_the_dead); RegisterSpellScript(spell_dk_blood_boil); - RegisterAuraScript(spell_dk_blood_gorged); - RegisterAuraScript(spell_dk_blood_rites); - RegisterAuraScript(spell_dk_butchery); - RegisterAuraScript(spell_dk_crimson_scourge); + RegisterSpellScript(spell_dk_blood_gorged); + RegisterSpellScript(spell_dk_blood_rites); + RegisterSpellScript(spell_dk_butchery); + RegisterSpellScript(spell_dk_crimson_scourge); RegisterSpellScript(spell_dk_dark_transformation); - RegisterAuraScript(spell_dk_dark_transformation_aura); - RegisterAuraScript(spell_dk_death_and_decay); + RegisterSpellScript(spell_dk_dark_transformation_aura); + RegisterSpellScript(spell_dk_death_and_decay); RegisterSpellScript(spell_dk_death_coil); RegisterSpellScript(spell_dk_death_gate); RegisterSpellScript(spell_dk_death_grip); RegisterSpellScript(spell_dk_death_grip_initial); RegisterSpellScript(spell_dk_death_pact); RegisterSpellScript(spell_dk_death_strike); - RegisterAuraScript(spell_dk_death_strike_enabler); - RegisterAuraScript(spell_dk_deaths_advance); - RegisterAuraScript(spell_dk_deaths_advance_aura); - RegisterAuraScript(spell_dk_desecration); - RegisterAuraScript(spell_dk_disease); - RegisterAuraScript(spell_dk_ebon_plaguebringer); + RegisterSpellScript(spell_dk_death_strike_enabler); + RegisterSpellScript(spell_dk_deaths_advance); + RegisterSpellScript(spell_dk_deaths_advance_aura); + RegisterSpellScript(spell_dk_desecration); + RegisterSpellScript(spell_dk_disease); + RegisterSpellScript(spell_dk_ebon_plaguebringer); RegisterSpellScript(spell_dk_festering_strike); RegisterSpellScript(spell_dk_ghoul_explode); RegisterSpellScript(spell_dk_ghoul_taunt); RegisterSpellScript(spell_dk_howling_blast); - RegisterAuraScript(spell_dk_icebound_fortitude); - RegisterAuraScript(spell_dk_improved_presence); + RegisterSpellScript(spell_dk_icebound_fortitude); + RegisterSpellScript(spell_dk_improved_presence); RegisterSpellScript(spell_dk_killing_machine); - RegisterAuraScript(spell_dk_necrotic_strike); + RegisterSpellScript(spell_dk_necrotic_strike); RegisterSpellScript(spell_dk_pestilence); - RegisterAuraScript(spell_dk_presence); + RegisterSpellScript(spell_dk_presence); RegisterSpellScript(spell_dk_raise_dead); - RegisterAuraScript(spell_dk_reaping); + RegisterSpellScript(spell_dk_reaping); RegisterSpellScript(spell_dk_rune_tap_party); - RegisterAuraScript(spell_dk_runic_empowerment); - RegisterAuraScript(spell_dk_scent_of_blood); - RegisterAuraScript(spell_dk_shadow_infusion); + RegisterSpellScript(spell_dk_runic_empowerment); + RegisterSpellScript(spell_dk_scent_of_blood); + RegisterSpellScript(spell_dk_shadow_infusion); RegisterSpellScript(spell_dk_scourge_strike); - RegisterAuraScript(spell_dk_threat_of_thassarian); - RegisterAuraScript(spell_dk_unoly_blight); - RegisterAuraScript(spell_dk_unholy_command); - RegisterAuraScript(spell_dk_vampiric_blood); - RegisterAuraScript(spell_dk_will_of_the_necropolis); + RegisterSpellScript(spell_dk_threat_of_thassarian); + RegisterSpellScript(spell_dk_unoly_blight); + RegisterSpellScript(spell_dk_unholy_command); + RegisterSpellScript(spell_dk_vampiric_blood); + RegisterSpellScript(spell_dk_will_of_the_necropolis); } diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp index 0bf10876e1..89745bc875 100644 --- a/src/server/scripts/Spells/spell_druid.cpp +++ b/src/server/scripts/Spells/spell_druid.cpp @@ -2046,53 +2046,53 @@ class spell_dru_item_t11_feral_4p_bonus : public AuraScript void AddSC_druid_spell_scripts() { - RegisterAuraScript(spell_dru_astral_alignment); - RegisterAuraScript(spell_dru_berserk); - RegisterAuraScript(spell_dru_blood_in_the_water); + RegisterSpellScript(spell_dru_astral_alignment); + RegisterSpellScript(spell_dru_berserk); + RegisterSpellScript(spell_dru_blood_in_the_water); RegisterSpellScript(spell_dru_blood_in_the_water_script); RegisterSpellAndAuraScriptPair(spell_dru_dash, spell_dru_dash_AuraScript); - RegisterAuraScript(spell_dru_eclipse); + RegisterSpellScript(spell_dru_eclipse); RegisterSpellScript(spell_dru_eclipse_energize); - RegisterAuraScript(spell_dru_eclipse_mastery_driver_passive); - RegisterAuraScript(spell_dru_effloresence); - RegisterAuraScript(spell_dru_effloresence_aoe); + RegisterSpellScript(spell_dru_eclipse_mastery_driver_passive); + RegisterSpellScript(spell_dru_effloresence); + RegisterSpellScript(spell_dru_effloresence_aoe); RegisterSpellScript(spell_dru_effloresence_heal); - RegisterAuraScript(spell_dru_empowered_touch); + RegisterSpellScript(spell_dru_empowered_touch); RegisterSpellScript(spell_dru_empowered_touch_script); - RegisterAuraScript(spell_dru_enrage); + RegisterSpellScript(spell_dru_enrage); RegisterSpellScript(spell_dru_ferocious_bite); - RegisterAuraScript(spell_dru_frenzied_regeneration); - RegisterAuraScript(spell_dru_furor); + RegisterSpellScript(spell_dru_frenzied_regeneration); + RegisterSpellScript(spell_dru_furor); RegisterSpellScript(spell_dru_glyph_of_starfire); - RegisterAuraScript(spell_dru_glyph_of_starfire_proc); - RegisterAuraScript(spell_dru_harmony); - RegisterAuraScript(spell_dru_harmony_triggered); - RegisterAuraScript(spell_dru_idol_lifebloom); - RegisterAuraScript(spell_dru_innervate); - RegisterAuraScript(spell_dru_insect_swarm); - RegisterAuraScript(spell_dru_leader_of_the_pack); - RegisterAuraScript(spell_dru_lifebloom); - RegisterAuraScript(spell_dru_living_seed); - RegisterAuraScript(spell_dru_living_seed_proc); - RegisterAuraScript(spell_dru_moonfire); + RegisterSpellScript(spell_dru_glyph_of_starfire_proc); + RegisterSpellScript(spell_dru_harmony); + RegisterSpellScript(spell_dru_harmony_triggered); + RegisterSpellScript(spell_dru_idol_lifebloom); + RegisterSpellScript(spell_dru_innervate); + RegisterSpellScript(spell_dru_insect_swarm); + RegisterSpellScript(spell_dru_leader_of_the_pack); + RegisterSpellScript(spell_dru_lifebloom); + RegisterSpellScript(spell_dru_living_seed); + RegisterSpellScript(spell_dru_living_seed_proc); + RegisterSpellScript(spell_dru_moonfire); RegisterSpellScript(spell_dru_pulverize); - RegisterAuraScript(spell_dru_rejuvenation); - RegisterAuraScript(spell_dru_rip); - RegisterAuraScript(spell_dru_savage_defense); + RegisterSpellScript(spell_dru_rejuvenation); + RegisterSpellScript(spell_dru_rip); + RegisterSpellScript(spell_dru_savage_defense); RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_AuraScript); RegisterSpellScript(spell_dru_shooting_stars); RegisterSpellScript(spell_dru_starfall_dummy); - RegisterAuraScript(spell_dru_stampede); - RegisterAuraScript(spell_dru_solar_beam); + RegisterSpellScript(spell_dru_stampede); + RegisterSpellScript(spell_dru_solar_beam); RegisterSpellAndAuraScriptPair(spell_dru_survival_instincts, spell_dru_survival_instincts_AuraScript); - RegisterAuraScript(spell_dru_swift_flight_passive); - RegisterAuraScript(spell_dru_swift_flight_form); + RegisterSpellScript(spell_dru_swift_flight_passive); + RegisterSpellScript(spell_dru_swift_flight_form); RegisterSpellScript(spell_dru_flight_form); RegisterSpellScript(spell_dru_tiger_s_fury); - RegisterAuraScript(spell_dru_tree_of_life); + RegisterSpellScript(spell_dru_tree_of_life); RegisterSpellScript(spell_dru_typhoon); RegisterSpellScript(spell_dru_t10_restoration_4p_bonus); - RegisterAuraScript(spell_dru_item_t11_feral_4p_bonus); + RegisterSpellScript(spell_dru_item_t11_feral_4p_bonus); RegisterSpellScript(spell_dru_wild_growth); RegisterSpellScript(spell_dru_wild_mushroom); RegisterSpellScript(spell_dru_wild_mushroom_detonate); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index d8124dcc3a..58c827b1c2 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -5563,7 +5563,7 @@ void AddSC_generic_spell_scripts() new spell_gen_ds_flush_knockback(); new spell_gen_dungeon_credit(); new spell_gen_elune_candle(); - RegisterAuraScript(spell_gen_flurry_of_claws); + RegisterSpellScript(spell_gen_flurry_of_claws); new spell_gen_gadgetzan_transporter_backfire(); new spell_gen_gift_of_naaru(); new spell_gen_gnomish_transporter(); @@ -5621,7 +5621,7 @@ void AddSC_generic_spell_scripts() new spell_gen_upper_deck_create_foam_sword(); new spell_gen_vampiric_touch(); RegisterSpellScript(spell_gen_vehicle_scaling_trigger); - RegisterAuraScript(spell_gen_vehicle_scaling); + RegisterSpellScript(spell_gen_vehicle_scaling); new spell_gen_vendor_bark_trigger(); new spell_gen_wg_water(); new spell_gen_whisper_gulch_yogg_saron_whisper(); @@ -5638,8 +5638,8 @@ void AddSC_generic_spell_scripts() new spell_gen_blink(); new spell_gen_toxic_blow_dart(); new spell_gen_projectile_goods(); - RegisterAuraScript(spell_gen_vengeance); - RegisterAuraScript(spell_gen_vengeance_triggered); + RegisterSpellScript(spell_gen_vengeance); + RegisterSpellScript(spell_gen_vengeance_triggered); new spell_gen_gilneas_prison_periodic_dummy(); new spell_gen_throw_torch(); RegisterSpellScript(spell_gen_revserse_cast_mirror_image); @@ -5647,12 +5647,12 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_gen_reverse_cast_ride_vehicle); RegisterSpellScript(spell_gen_launch_quest); RegisterSpellScript(spell_gen_charmed_unit_spell_cooldown); - RegisterAuraScript(spell_gen_sunflower_dnd); - RegisterAuraScript(spell_gen_guild_battle_standard); + RegisterSpellScript(spell_gen_sunflower_dnd); + RegisterSpellScript(spell_gen_guild_battle_standard); RegisterSpellScript(spell_gen_guild_battle_standard_buff); RegisterSpellScript(spell_gen_mobile_banking); RegisterSpellScript(spell_gen_cauldron_of_battle); RegisterSpellScript(spell_gen_flask_of_battle); - RegisterAuraScript(spell_gen_ghost); - RegisterAuraScript(spell_gen_zero_energy_zero_regen); + RegisterSpellScript(spell_gen_ghost); + RegisterSpellScript(spell_gen_zero_energy_zero_regen); } diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 6a1e2dddeb..47fde45418 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -2013,10 +2013,10 @@ void AddSC_holiday_spell_scripts() // Darkmoon Island RegisterSpellScript(spell_darkmoon_island_deathmatch); RegisterSpellScript(spell_darkmoon_island_ring_toss); - RegisterAuraScript(spell_darkmoon_island_whack_summon_aura); + RegisterSpellScript(spell_darkmoon_island_whack_summon_aura); RegisterSpellScript(spell_darkmoon_island_gnoll_aura_okay_to_hit); RegisterSpellScript(spell_darkmoon_island_whack_dummy); RegisterSpellScript(spell_darkmoon_island_whack); - RegisterAuraScript(spell_darkmoon_island_whack_a_gnoll); + RegisterSpellScript(spell_darkmoon_island_whack_a_gnoll); RegisterSpellScript(spell_darkmoon_island_whack_a_gnoll_player_action_bar_removed); } diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp index 8a0aea6cdd..68c9ad8c9b 100644 --- a/src/server/scripts/Spells/spell_hunter.cpp +++ b/src/server/scripts/Spells/spell_hunter.cpp @@ -1856,24 +1856,24 @@ void AddSC_hunter_spell_scripts() new spell_hun_ancient_hysteria(); new spell_hun_bombardment(); RegisterSpellScript(spell_hun_camouflage); - RegisterAuraScript(spell_hun_camouflage_duration); - RegisterAuraScript(spell_hun_camouflage_triggered); + RegisterSpellScript(spell_hun_camouflage_duration); + RegisterSpellScript(spell_hun_camouflage_triggered); new spell_hun_chimera_shot(); new spell_hun_cobra_shot(); - RegisterAuraScript(spell_hun_crouching_tiger_hidden_chimera); + RegisterSpellScript(spell_hun_crouching_tiger_hidden_chimera); new spell_hun_disengage(); RegisterSpellScript(spell_hun_fervor); new spell_hun_fire(); - RegisterAuraScript(spell_hun_focus_fire); - RegisterAuraScript(spell_hun_frenzy_effect); - RegisterAuraScript(spell_hun_glyph_of_kill_shot); + RegisterSpellScript(spell_hun_focus_fire); + RegisterSpellScript(spell_hun_frenzy_effect); + RegisterSpellScript(spell_hun_glyph_of_kill_shot); new spell_hun_improved_mend_pet(); RegisterSpellScript(spell_hun_invigoration); - RegisterAuraScript(spell_hun_killing_streak); + RegisterSpellScript(spell_hun_killing_streak); RegisterSpellScript(spell_hun_kill_command); new spell_hun_last_stand_pet(); new spell_hun_lock_and_load(); - RegisterAuraScript(spell_hun_marked_for_death); + RegisterSpellScript(spell_hun_marked_for_death); new spell_hun_master_marksman(); new spell_hun_masters_call(); new spell_hun_misdirection(); @@ -1885,14 +1885,14 @@ void AddSC_hunter_spell_scripts() new spell_hun_readiness(); new spell_hun_ready_set_aim(); new spell_hun_scatter_shot(); - RegisterAuraScript(spell_hun_serpent_sting); + RegisterSpellScript(spell_hun_serpent_sting); new spell_hun_sniper_training(); new spell_hun_steady_shot(); new spell_hun_improved_steady_shot(); new spell_hun_tame_beast(); new spell_hun_target_only_pet_and_owner(); new spell_hun_thrill_of_the_hunt(); - RegisterAuraScript(spell_hun_tnt); - RegisterAuraScript(spell_hun_trap_launcher); + RegisterSpellScript(spell_hun_tnt); + RegisterSpellScript(spell_hun_trap_launcher); new spell_hun_wild_quiver(); } diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index c5947a2b59..8893984acf 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -5163,7 +5163,7 @@ void AddSC_item_spell_scripts() new spell_item_aura_of_madness(); new spell_item_dementia(); new spell_item_blessing_of_ancient_kings(); - RegisterAuraScript(spell_item_valanyr_hammer_of_ancient_kings); + RegisterSpellScript(spell_item_valanyr_hammer_of_ancient_kings); new spell_item_deadly_precision(); new spell_item_deadly_precision_dummy(); new spell_item_deathbringers_will("spell_item_deathbringers_will_normal"); @@ -5194,7 +5194,7 @@ void AddSC_item_spell_scripts() new spell_item_persistent_shield(); new spell_item_pet_healing(); new spell_item_piccolo_of_the_flaming_fire(); - RegisterAuraScript(spell_item_power_circle); + RegisterSpellScript(spell_item_power_circle); new spell_item_savory_deviate_delight(); new spell_item_scroll_of_recall(); new spell_item_unsated_craving(); @@ -5263,14 +5263,14 @@ void AddSC_item_spell_scripts() new spell_item_mad_alchemists_potion(); new spell_item_crazy_alchemists_potion(); - RegisterAuraScript(spell_item_egg_shell); - RegisterAuraScript(spell_item_song_of_sorrow); - RegisterAuraScript(spell_item_crescendo_of_suffering); + RegisterSpellScript(spell_item_egg_shell); + RegisterSpellScript(spell_item_song_of_sorrow); + RegisterSpellScript(spell_item_crescendo_of_suffering); new spell_item_consume_charges("spell_item_forged_fury", SPELL_RAW_FURY); RegisterSpellAndAuraScriptPair(spell_item_hearts_judgement, spell_item_hearts_judgement_AuraScript); RegisterSpellScript(spell_item_blessing_of_khazgoroth); - RegisterAuraScript(spell_item_weight_of_a_feather); + RegisterSpellScript(spell_item_weight_of_a_feather); RegisterSpellScript(spell_item_tipping_of_the_scales); RegisterSpellScript(spell_item_blind_spot); - RegisterAuraScript(spell_item_variable_pulse_lightning_capacitor); + RegisterSpellScript(spell_item_variable_pulse_lightning_capacitor); } diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp index b07421bc28..033120021a 100644 --- a/src/server/scripts/Spells/spell_mage.cpp +++ b/src/server/scripts/Spells/spell_mage.cpp @@ -2311,8 +2311,8 @@ class spell_mage_frostfire_bolt : public SpellScript void AddSC_mage_spell_scripts() { - RegisterAuraScript(spell_mage_arcane_missiles_trigger); - RegisterAuraScript(spell_mage_arcane_potency); + RegisterSpellScript(spell_mage_arcane_missiles_trigger); + RegisterSpellScript(spell_mage_arcane_potency); new spell_mage_blast_wave(); new spell_mage_blazing_speed(); new spell_mage_blizzard(); @@ -2321,36 +2321,36 @@ void AddSC_mage_spell_scripts() new spell_mage_cone_of_cold(); new spell_mage_conjure_refreshment(); RegisterSpellScript(spell_mage_deep_freeze); - RegisterAuraScript(spell_mage_dragon_breath); + RegisterSpellScript(spell_mage_dragon_breath); new spell_mage_early_frost(); new spell_mage_fire_frost_ward(); new spell_mage_flame_orb(); new spell_mage_flame_orb_aoe_dummy(); new spell_mage_focus_magic(); - RegisterAuraScript(spell_mage_fingers_of_frost_charges); + RegisterSpellScript(spell_mage_fingers_of_frost_charges); RegisterSpellScript(spell_mage_frostbolt); RegisterSpellScript(spell_mage_frostfire_bolt); new spell_mage_hot_streak(); new spell_mage_ice_barrier(); - RegisterAuraScript(spell_mage_ignite); - RegisterAuraScript(spell_mage_impact); + RegisterSpellScript(spell_mage_ignite); + RegisterSpellScript(spell_mage_impact); RegisterSpellScript(spell_mage_impact_triggered); new spell_mage_improved_hot_streak(); RegisterSpellScript(spell_mage_initialize_images); new spell_mage_glyph_of_ice_block(); new spell_mage_glyph_of_icy_veins(); new spell_mage_glyph_of_polymorph(); - RegisterAuraScript(spell_mage_living_bomb); + RegisterSpellScript(spell_mage_living_bomb); new spell_mage_mage_ward(); new spell_mage_mana_shield(); - RegisterAuraScript(spell_mage_master_of_elements); + RegisterSpellScript(spell_mage_master_of_elements); RegisterSpellAndAuraScriptPair(spell_mage_mirror_image, spell_mage_mirror_image_AurasScript); - RegisterAuraScript(spell_mage_nether_vortex); - RegisterAuraScript(spell_mage_offensive_state_dnd); - RegisterAuraScript(spell_mage_permafrost); + RegisterSpellScript(spell_mage_nether_vortex); + RegisterSpellScript(spell_mage_offensive_state_dnd); + RegisterSpellScript(spell_mage_permafrost); new spell_mage_polymorph(); new spell_mage_polymorph_cast_visual(); - RegisterAuraScript(spell_mage_pyromaniac); + RegisterSpellScript(spell_mage_pyromaniac); new spell_mage_replenish_mana(); new spell_mage_ring_of_frost(); new spell_mage_ring_of_frost_freeze(); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 9299c37023..a6bdfe5a7b 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -2052,17 +2052,17 @@ class spell_pal_divine_shield : public SpellScript void AddSC_paladin_spell_scripts() { - RegisterAuraScript(spell_pal_ardent_defender); - RegisterAuraScript(spell_pal_ancient_healer); - RegisterAuraScript(spell_pal_ancient_crusader); + RegisterSpellScript(spell_pal_ardent_defender); + RegisterSpellScript(spell_pal_ancient_healer); + RegisterSpellScript(spell_pal_ancient_crusader); RegisterSpellScript(spell_pal_ancient_fury); new spell_pal_aura_mastery(); new spell_pal_aura_mastery_immune(); - RegisterAuraScript(spell_pal_avenging_wrath); + RegisterSpellScript(spell_pal_avenging_wrath); new spell_pal_blessing_of_faith(); - RegisterAuraScript(spell_pal_communion); + RegisterSpellScript(spell_pal_communion); new spell_pal_consecration(); - RegisterAuraScript(spell_pal_divine_purpose); + RegisterSpellScript(spell_pal_divine_purpose); new spell_pal_divine_sacrifice(); RegisterSpellScript(spell_pal_divine_shield); RegisterSpellScript(spell_pal_divine_storm); @@ -2078,24 +2078,24 @@ void AddSC_paladin_spell_scripts() RegisterSpellScript(spell_pal_hand_of_protection); new spell_pal_hand_of_sacrifice(); new spell_pal_holy_shock(); - RegisterAuraScript(spell_pal_illuminated_healing); + RegisterSpellScript(spell_pal_illuminated_healing); new spell_pal_improved_aura_effect("spell_pal_improved_concentraction_aura_effect"); new spell_pal_improved_aura_effect("spell_pal_improved_devotion_aura_effect"); new spell_pal_improved_aura_effect("spell_pal_sanctified_retribution_effect"); RegisterSpellScript(spell_pal_inquisition); new spell_pal_item_healing_discount(); RegisterSpellScript(spell_pal_judgement); - RegisterAuraScript(spell_pal_judgements); + RegisterSpellScript(spell_pal_judgements); new spell_pal_lay_on_hands(); - RegisterAuraScript(spell_pal_lights_beacon); + RegisterSpellScript(spell_pal_lights_beacon); RegisterSpellScript(spell_pal_light_of_dawn); - RegisterAuraScript(spell_pal_long_arm_of_the_law); + RegisterSpellScript(spell_pal_long_arm_of_the_law); new spell_pal_righteous_defense(); - RegisterAuraScript(spell_pal_sacred_shield); - RegisterAuraScript(spell_pal_seal_of_righteousness); - RegisterAuraScript(spell_pal_seal_of_truth); + RegisterSpellScript(spell_pal_sacred_shield); + RegisterSpellScript(spell_pal_seal_of_righteousness); + RegisterSpellScript(spell_pal_seal_of_truth); new spell_pal_shield_of_the_righteous(); - RegisterAuraScript(spell_pal_selfless_healer); + RegisterSpellScript(spell_pal_selfless_healer); RegisterSpellScript(spell_pal_templar_s_verdict); RegisterSpellAndAuraScriptPair(spell_pal_word_of_glory, spell_pal_word_of_glory_AuraScript); } diff --git a/src/server/scripts/Spells/spell_pet.cpp b/src/server/scripts/Spells/spell_pet.cpp index 5fbd1e4500..4b8b19c7c1 100644 --- a/src/server/scripts/Spells/spell_pet.cpp +++ b/src/server/scripts/Spells/spell_pet.cpp @@ -1122,29 +1122,29 @@ class spell_mage_water_elemental_scaling_02 : public AuraScript void AddSC_pet_spell_scripts() { - RegisterAuraScript(spell_warl_pet_scaling_01); - RegisterAuraScript(spell_warl_pet_scaling_02); - RegisterAuraScript(spell_warl_pet_scaling_03); - RegisterAuraScript(spell_warl_pet_scaling_04); - RegisterAuraScript(spell_warl_pet_scaling_05); - RegisterAuraScript(spell_warl_pet_scaling_06); - RegisterAuraScript(spell_warl_pet_passive); + RegisterSpellScript(spell_warl_pet_scaling_01); + RegisterSpellScript(spell_warl_pet_scaling_02); + RegisterSpellScript(spell_warl_pet_scaling_03); + RegisterSpellScript(spell_warl_pet_scaling_04); + RegisterSpellScript(spell_warl_pet_scaling_05); + RegisterSpellScript(spell_warl_pet_scaling_06); + RegisterSpellScript(spell_warl_pet_passive); - RegisterAuraScript(spell_hun_pet_scaling_01); - RegisterAuraScript(spell_hun_pet_scaling_02); - RegisterAuraScript(spell_hun_pet_scaling_03); - RegisterAuraScript(spell_hun_pet_scaling_04); - RegisterAuraScript(spell_hun_pet_scaling_05); - RegisterAuraScript(spell_hun_pet_passive_crit); + RegisterSpellScript(spell_hun_pet_scaling_01); + RegisterSpellScript(spell_hun_pet_scaling_02); + RegisterSpellScript(spell_hun_pet_scaling_03); + RegisterSpellScript(spell_hun_pet_scaling_04); + RegisterSpellScript(spell_hun_pet_scaling_05); + RegisterSpellScript(spell_hun_pet_passive_crit); - RegisterAuraScript(spell_dk_avoidance_passive); - RegisterAuraScript(spell_dk_pet_scaling_01); - RegisterAuraScript(spell_dk_pet_scaling_02); - RegisterAuraScript(spell_dk_pet_scaling_03); - RegisterAuraScript(spell_dk_pet_scaling_05); + RegisterSpellScript(spell_dk_avoidance_passive); + RegisterSpellScript(spell_dk_pet_scaling_01); + RegisterSpellScript(spell_dk_pet_scaling_02); + RegisterSpellScript(spell_dk_pet_scaling_03); + RegisterSpellScript(spell_dk_pet_scaling_05); - RegisterAuraScript(spell_dk_rune_weapon_scaling_02); + RegisterSpellScript(spell_dk_rune_weapon_scaling_02); - RegisterAuraScript(spell_mage_water_elemental_scaling_01); - RegisterAuraScript(spell_mage_water_elemental_scaling_02); + RegisterSpellScript(spell_mage_water_elemental_scaling_01); + RegisterSpellScript(spell_mage_water_elemental_scaling_02); } diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 6fe7336fa4..9889116d3c 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -1844,51 +1844,51 @@ class spell_pri_harnessed_shadows : public AuraScript void AddSC_priest_spell_scripts() { RegisterSpellScript(spell_pri_archangel); - RegisterAuraScript(spell_pri_atonement); + RegisterSpellScript(spell_pri_atonement); RegisterSpellScript(spell_pri_atonement_heal); - RegisterAuraScript(spell_pri_body_and_soul); - RegisterAuraScript(spell_pri_chakra); - RegisterAuraScript(spell_pri_chakra_sanctuary); + RegisterSpellScript(spell_pri_body_and_soul); + RegisterSpellScript(spell_pri_chakra); + RegisterSpellScript(spell_pri_chakra_sanctuary); RegisterSpellScript(spell_pri_chakra_serenity_script); - RegisterAuraScript(spell_pri_chakra_flow_removal); + RegisterSpellScript(spell_pri_chakra_flow_removal); RegisterSpellScript(spell_pri_circle_of_healing); RegisterSpellScript(spell_pri_dispel_magic); - RegisterAuraScript(spell_pri_divine_aegis); + RegisterSpellScript(spell_pri_divine_aegis); RegisterSpellScript(spell_pri_divine_hymn); - RegisterAuraScript(spell_pri_echo_of_light); - RegisterAuraScript(spell_pri_evangelism); - RegisterAuraScript(spell_pri_evangelism_triggered); - RegisterAuraScript(spell_pri_glyph_of_prayer_of_healing); - RegisterAuraScript(spell_pri_harnessed_shadows); + RegisterSpellScript(spell_pri_echo_of_light); + RegisterSpellScript(spell_pri_evangelism); + RegisterSpellScript(spell_pri_evangelism_triggered); + RegisterSpellScript(spell_pri_glyph_of_prayer_of_healing); + RegisterSpellScript(spell_pri_harnessed_shadows); RegisterSpellScript(spell_pri_hymn_of_hope); - RegisterAuraScript(spell_pri_improved_power_word_shield); - RegisterAuraScript(spell_pri_item_greater_heal_refund); - RegisterAuraScript(spell_pri_guardian_spirit); - RegisterAuraScript(spell_pri_holy_word_sanctuary); + RegisterSpellScript(spell_pri_improved_power_word_shield); + RegisterSpellScript(spell_pri_item_greater_heal_refund); + RegisterSpellScript(spell_pri_guardian_spirit); + RegisterSpellScript(spell_pri_holy_word_sanctuary); RegisterSpellScript(spell_pri_holy_word_sanctuary_triggered); RegisterSpellScript(spell_pri_leap_of_faith_effect_trigger); - RegisterAuraScript(spell_pri_lightwell_renew); - RegisterAuraScript(spell_pri_mana_leech); - RegisterAuraScript(spell_pri_masochism); + RegisterSpellScript(spell_pri_lightwell_renew); + RegisterSpellScript(spell_pri_mana_leech); + RegisterSpellScript(spell_pri_masochism); RegisterSpellScript(spell_pri_mind_blast); RegisterSpellScript(spell_pri_mind_sear); RegisterSpellScript(spell_pri_mind_spike); RegisterSpellScript(spell_pri_pain_and_suffering_proc); RegisterSpellScript(spell_pri_penance); - RegisterAuraScript(spell_pri_phantasm); - RegisterAuraScript(spell_power_word_barrier); + RegisterSpellScript(spell_pri_phantasm); + RegisterSpellScript(spell_power_word_barrier); RegisterSpellAndAuraScriptPair(spell_pri_power_word_shield, spell_pri_power_word_shield_AuraScript); RegisterSpellScript(spell_pri_prayer_of_mending_heal); - RegisterAuraScript(spell_pri_shadow_orb); - RegisterAuraScript(spell_pri_shadow_orbs); - RegisterAuraScript(spell_pri_shadow_orb_power); - RegisterAuraScript(spell_pri_strength_of_soul); + RegisterSpellScript(spell_pri_shadow_orb); + RegisterSpellScript(spell_pri_shadow_orbs); + RegisterSpellScript(spell_pri_shadow_orb_power); + RegisterSpellScript(spell_pri_strength_of_soul); RegisterSpellScript(spell_pri_strength_of_soul_script); - RegisterAuraScript(spell_pri_spirit_of_redemption); - RegisterAuraScript(spell_pri_renew); + RegisterSpellScript(spell_pri_spirit_of_redemption); + RegisterSpellScript(spell_pri_renew); RegisterSpellScript(spell_pri_shadow_word_death); - RegisterAuraScript(spell_pri_shadowform); - RegisterAuraScript(spell_pri_vampiric_embrace); + RegisterSpellScript(spell_pri_shadowform); + RegisterSpellScript(spell_pri_vampiric_embrace); RegisterSpellScript(spell_pri_vampiric_embrace_target); - RegisterAuraScript(spell_pri_vampiric_touch); + RegisterSpellScript(spell_pri_vampiric_touch); } diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp index bdecab586a..3bdf718c43 100644 --- a/src/server/scripts/Spells/spell_rogue.cpp +++ b/src/server/scripts/Spells/spell_rogue.cpp @@ -1542,35 +1542,35 @@ private: void AddSC_rogue_spell_scripts() { - RegisterAuraScript(spell_rog_bandits_guile); + RegisterSpellScript(spell_rog_bandits_guile); new spell_rog_blade_flurry(); new spell_rog_cheat_death(); new spell_rog_crippling_poison(); new spell_rog_cut_to_the_chase(); - RegisterAuraScript(spell_rog_combat_potency); - RegisterAuraScript(spell_rog_deadly_momentum); + RegisterSpellScript(spell_rog_combat_potency); + RegisterSpellScript(spell_rog_deadly_momentum); new spell_rog_deadly_poison(); RegisterSpellScript(spell_rog_envenom); RegisterSpellScript(spell_rog_eviscerate); - RegisterAuraScript(spell_rog_glyph_of_hemorrhage); - RegisterAuraScript(spell_rog_improved_expose_armor); + RegisterSpellScript(spell_rog_glyph_of_hemorrhage); + RegisterSpellScript(spell_rog_improved_expose_armor); new spell_rog_killing_spree(); - RegisterAuraScript(spell_rog_main_gauche); + RegisterSpellScript(spell_rog_main_gauche); new spell_rog_master_of_subtlety(); - RegisterAuraScript(spell_rog_murderous_intent); + RegisterSpellScript(spell_rog_murderous_intent); new spell_rog_nerves_of_steel(); new spell_rog_overkill(); new spell_rog_preparation(); new spell_rog_prey_on_the_weak(); - RegisterAuraScript(spell_rog_recuperate); - RegisterAuraScript(spell_rog_restless_blades); - RegisterAuraScript(spell_rog_rupture); + RegisterSpellScript(spell_rog_recuperate); + RegisterSpellScript(spell_rog_restless_blades); + RegisterSpellScript(spell_rog_rupture); new spell_rog_glyph_of_backstab_triggered(); - RegisterAuraScript(spell_rog_sap); + RegisterSpellScript(spell_rog_sap); new spell_rog_shiv(); - RegisterAuraScript(spell_rog_slice_and_dice); + RegisterSpellScript(spell_rog_slice_and_dice); new spell_rog_stealth(); RegisterSpellAndAuraScriptPair(spell_rog_tricks_of_the_trade, spell_rog_tricks_of_the_trade_aura); - RegisterAuraScript(spell_rog_tricks_of_the_trade_proc); - RegisterAuraScript(spell_rog_honor_among_thieves); + RegisterSpellScript(spell_rog_tricks_of_the_trade_proc); + RegisterSpellScript(spell_rog_honor_among_thieves); } diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp index 3e7755b82c..38899d1a2b 100644 --- a/src/server/scripts/Spells/spell_shaman.cpp +++ b/src/server/scripts/Spells/spell_shaman.cpp @@ -2134,21 +2134,21 @@ void AddSC_shaman_spell_scripts() new spell_sha_bloodlust(); new spell_sha_cleanse_spirit(); new spell_sha_chain_heal(); - RegisterAuraScript(spell_sha_earth_shield); + RegisterSpellScript(spell_sha_earth_shield); RegisterSpellScript(spell_sha_earth_shock); new spell_sha_earthbind_totem(); new spell_sha_earthen_power(); new spell_sha_earthliving_weapon(); - RegisterAuraScript(spell_sha_earthquake); + RegisterSpellScript(spell_sha_earthquake); RegisterSpellScript(spell_sha_earthquake_damage); - RegisterAuraScript(spell_sha_elemental_overload); + RegisterSpellScript(spell_sha_elemental_overload); new spell_sha_feedback(); RegisterSpellScript(spell_sha_fire_nova); RegisterSpellScript(spell_sha_fire_nova_damage); new spell_sha_flame_shock(); - RegisterAuraScript(spell_sha_flametongue_weapon); + RegisterSpellScript(spell_sha_flametongue_weapon); new spell_sha_focused_insight(); - RegisterAuraScript(spell_sha_frozen_power); + RegisterSpellScript(spell_sha_frozen_power); new spell_sha_glyph_of_healing_wave(); new spell_sha_healing_rain(); RegisterSpellScript(spell_sha_healing_rain_triggered); @@ -2162,17 +2162,17 @@ void AddSC_shaman_spell_scripts() RegisterSpellScript(spell_sha_lava_lash_script); new spell_sha_lava_surge(); new spell_sha_lava_surge_proc(); - RegisterAuraScript(spell_sha_lightning_shield); + RegisterSpellScript(spell_sha_lightning_shield); new spell_sha_mana_tide_totem(); new spell_sha_nature_guardian(); new spell_sha_resurgence(); - RegisterAuraScript(spell_sha_rolling_thunder); + RegisterSpellScript(spell_sha_rolling_thunder); RegisterSpellScript(spell_sha_searing_bolt); - RegisterAuraScript(spell_sha_static_shock); + RegisterSpellScript(spell_sha_static_shock); new spell_sha_telluric_currents(); RegisterSpellScript(spell_sha_thunderstorm); new spell_sha_tidal_waves(); new spell_sha_totemic_mastery(); RegisterSpellScript(spell_sha_unleash_elements); - RegisterAuraScript(spell_sha_windfury_weapon); + RegisterSpellScript(spell_sha_windfury_weapon); } diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 2231065ee4..7ec37288f9 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -2011,13 +2011,13 @@ private: void AddSC_warlock_spell_scripts() { - RegisterAuraScript(spell_warl_aftermath); + RegisterSpellScript(spell_warl_aftermath); new spell_warl_bane_of_doom(); new spell_warl_banish(); - RegisterAuraScript(spell_warl_burning_embers); + RegisterSpellScript(spell_warl_burning_embers); RegisterSpellScript(spell_warl_chaos_bolt); RegisterSpellScript(spell_warl_conflagrate); - RegisterAuraScript(spell_warl_curse_of_weakness); + RegisterSpellScript(spell_warl_curse_of_weakness); new spell_warl_create_healthstone(); new spell_warl_demonic_circle_summon(); new spell_warl_demonic_circle_teleport(); @@ -2034,20 +2034,20 @@ void AddSC_warlock_spell_scripts() new spell_warl_haunt(); new spell_warl_health_funnel(); new spell_warl_healthstone_heal(); - RegisterAuraScript(spell_warl_improved_soul_fire); + RegisterSpellScript(spell_warl_improved_soul_fire); RegisterSpellScript(spell_warl_incinerate); - RegisterAuraScript(spell_warl_jinx); + RegisterSpellScript(spell_warl_jinx); new spell_warl_life_tap(); new spell_warl_nether_ward_overrride(); new spell_warl_seduction(); - RegisterAuraScript(spell_warl_seed_of_corruption); + RegisterSpellScript(spell_warl_seed_of_corruption); RegisterSpellScript(spell_warl_seed_of_corruption_aoe); new spell_warl_shadow_trance_proc(); - RegisterAuraScript(spell_warl_shadow_ward); - RegisterAuraScript(spell_warl_soulburn); - RegisterAuraScript(spell_warl_soul_harvest); - RegisterAuraScript(spell_warl_soul_leech); - RegisterAuraScript(spell_warl_shadowburn); + RegisterSpellScript(spell_warl_shadow_ward); + RegisterSpellScript(spell_warl_soulburn); + RegisterSpellScript(spell_warl_soul_harvest); + RegisterSpellScript(spell_warl_soul_leech); + RegisterSpellScript(spell_warl_shadowburn); new spell_warl_soul_swap(); new spell_warl_soul_swap_dot_marker(); new spell_warl_soul_swap_exhale(); diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp index b9b6233ecc..7f29ba9ff2 100644 --- a/src/server/scripts/Spells/spell_warrior.cpp +++ b/src/server/scripts/Spells/spell_warrior.cpp @@ -1052,37 +1052,37 @@ class spell_warr_heroic_leap : public SpellScript void AddSC_warrior_spell_scripts() { - RegisterAuraScript(spell_warr_blood_craze); + RegisterSpellScript(spell_warr_blood_craze); RegisterSpellScript(spell_warr_bloodthirst); RegisterSpellScript(spell_warr_bloodthirst_heal); RegisterSpellScript(spell_warr_charge); RegisterSpellScript(spell_warr_concussion_blow); - RegisterAuraScript(spell_warr_deep_wounds); + RegisterSpellScript(spell_warr_deep_wounds); RegisterSpellScript(spell_warr_devastate); RegisterSpellScript(spell_warr_execute); - RegisterAuraScript(spell_warr_glyph_of_sunder_armor); + RegisterSpellScript(spell_warr_glyph_of_sunder_armor); RegisterSpellScript(spell_warr_heroic_leap); RegisterSpellScript(spell_warr_intimidating_shout); - RegisterAuraScript(spell_warr_lambs_to_the_slaughter); + RegisterSpellScript(spell_warr_lambs_to_the_slaughter); RegisterSpellScript(spell_warr_last_stand); RegisterSpellScript(spell_warr_overpower); RegisterSpellScript(spell_warr_rallying_cry); - RegisterAuraScript(spell_warr_rend); - RegisterAuraScript(spell_warr_retaliation); - RegisterAuraScript(spell_warr_second_wind_proc); - RegisterAuraScript(spell_warr_second_wind_trigger); + RegisterSpellScript(spell_warr_rend); + RegisterSpellScript(spell_warr_retaliation); + RegisterSpellScript(spell_warr_second_wind_proc); + RegisterSpellScript(spell_warr_second_wind_trigger); RegisterSpellScript(spell_warr_shattering_throw); - RegisterAuraScript(spell_warr_shield_specialization); + RegisterSpellScript(spell_warr_shield_specialization); RegisterSpellScript(spell_warr_shockwave); RegisterSpellScript(spell_warr_slam); RegisterSpellScript(spell_warr_slam_triggered); - RegisterAuraScript(spell_warr_strikes_of_opportunity); - RegisterAuraScript(spell_warr_sudden_death); - RegisterAuraScript(spell_warr_sweeping_strikes); - RegisterAuraScript(spell_warr_sword_and_board); + RegisterSpellScript(spell_warr_strikes_of_opportunity); + RegisterSpellScript(spell_warr_sudden_death); + RegisterSpellScript(spell_warr_sweeping_strikes); + RegisterSpellScript(spell_warr_sword_and_board); RegisterSpellScript(spell_warr_thunder_clap); RegisterSpellScript(spell_warr_victory_rush); - RegisterAuraScript(spell_warr_vigilance); + RegisterSpellScript(spell_warr_vigilance); RegisterSpellScript(spell_warr_vigilance_trigger); RegisterSpellScript(spell_warr_whirlwind); }