aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Spells
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/scripts/Spells')
-rw-r--r--src/server/scripts/Spells/spell_dk.cpp4
-rw-r--r--src/server/scripts/Spells/spell_druid.cpp76
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp94
-rw-r--r--src/server/scripts/Spells/spell_holiday.cpp6
-rw-r--r--src/server/scripts/Spells/spell_hunter.cpp8
-rw-r--r--src/server/scripts/Spells/spell_item.cpp74
-rw-r--r--src/server/scripts/Spells/spell_mage.cpp10
-rw-r--r--src/server/scripts/Spells/spell_paladin.cpp6
-rw-r--r--src/server/scripts/Spells/spell_quest.cpp4
-rw-r--r--src/server/scripts/Spells/spell_rogue.cpp4
-rw-r--r--src/server/scripts/Spells/spell_shaman.cpp6
-rw-r--r--src/server/scripts/Spells/spell_warlock.cpp2
12 files changed, 147 insertions, 147 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index bf929e52919..724343fbf1a 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -3214,8 +3214,8 @@ void AddSC_deathknight_spell_scripts()
new spell_dk_glyph_of_death_grip();
new spell_dk_glyph_of_scourge_strike();
RegisterSpellScript(spell_dk_glyph_of_scourge_strike_script);
- RegisterAuraScript(spell_dk_hysteria);
- RegisterAuraScript(spell_dk_frost_fever);
+ RegisterSpellScript(spell_dk_hysteria);
+ RegisterSpellScript(spell_dk_frost_fever);
new spell_dk_hungering_cold();
new spell_dk_icebound_fortitude();
new spell_dk_improved_blood_presence();
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 1a2ffaec917..3fc2b43217b 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -1894,53 +1894,53 @@ class spell_dru_wild_growth_aura : public AuraScript
void AddSC_druid_spell_scripts()
{
- RegisterAuraScript(spell_dru_barkskin);
- RegisterAuraScript(spell_dru_bear_form_passive);
- RegisterAuraScript(spell_dru_berserk);
- RegisterAuraScript(spell_dru_dash);
- RegisterAuraScript(spell_dru_eclipse);
- RegisterAuraScript(spell_dru_enrage);
- RegisterAuraScript(spell_dru_forms_trinket);
+ RegisterSpellScript(spell_dru_barkskin);
+ RegisterSpellScript(spell_dru_bear_form_passive);
+ RegisterSpellScript(spell_dru_berserk);
+ RegisterSpellScript(spell_dru_dash);
+ RegisterSpellScript(spell_dru_eclipse);
+ RegisterSpellScript(spell_dru_enrage);
+ RegisterSpellScript(spell_dru_forms_trinket);
RegisterSpellScript(spell_dru_flight_form);
- RegisterAuraScript(spell_dru_frenzied_regeneration);
- RegisterAuraScript(spell_dru_glyph_of_barkskin);
- RegisterAuraScript(spell_dru_glyph_of_innervate);
- RegisterAuraScript(spell_dru_glyph_of_rake);
- RegisterAuraScript(spell_dru_glyph_of_rejuvenation);
- RegisterAuraScript(spell_dru_glyph_of_shred);
+ RegisterSpellScript(spell_dru_frenzied_regeneration);
+ RegisterSpellScript(spell_dru_glyph_of_barkskin);
+ RegisterSpellScript(spell_dru_glyph_of_innervate);
+ RegisterSpellScript(spell_dru_glyph_of_rake);
+ RegisterSpellScript(spell_dru_glyph_of_rejuvenation);
+ RegisterSpellScript(spell_dru_glyph_of_shred);
RegisterSpellScript(spell_dru_glyph_of_starfire);
- RegisterAuraScript(spell_dru_glyph_of_starfire_dummy);
- 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_moonkin_form_passive);
+ RegisterSpellScript(spell_dru_glyph_of_starfire_dummy);
+ 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_moonkin_form_passive);
RegisterSpellScript(spell_dru_nourish);
- RegisterAuraScript(spell_dru_omen_of_clarity);
- RegisterAuraScript(spell_dru_owlkin_frenzy);
- RegisterAuraScript(spell_dru_predatory_strikes);
- RegisterAuraScript(spell_dru_primal_tenacity);
- RegisterAuraScript(spell_dru_revitalize);
- RegisterAuraScript(spell_dru_rip);
- RegisterAuraScript(spell_dru_savage_defense);
+ RegisterSpellScript(spell_dru_omen_of_clarity);
+ RegisterSpellScript(spell_dru_owlkin_frenzy);
+ RegisterSpellScript(spell_dru_predatory_strikes);
+ RegisterSpellScript(spell_dru_primal_tenacity);
+ RegisterSpellScript(spell_dru_revitalize);
+ RegisterSpellScript(spell_dru_rip);
+ RegisterSpellScript(spell_dru_savage_defense);
RegisterSpellAndAuraScriptPair(spell_dru_savage_roar, spell_dru_savage_roar_aura);
RegisterSpellScript(spell_dru_starfall_aoe);
RegisterSpellScript(spell_dru_starfall_dummy);
RegisterSpellAndAuraScriptPair(spell_dru_survival_instincts, spell_dru_survival_instincts_aura);
- RegisterAuraScript(spell_dru_swift_flight_passive);
+ RegisterSpellScript(spell_dru_swift_flight_passive);
RegisterSpellScript(spell_dru_tiger_s_fury);
RegisterSpellScript(spell_dru_typhoon);
- RegisterAuraScript(spell_dru_t3_2p_bonus);
- RegisterAuraScript(spell_dru_t3_6p_bonus);
- RegisterAuraScript(spell_dru_t3_8p_bonus);
- RegisterAuraScript(spell_dru_t4_2p_bonus);
- RegisterAuraScript(spell_dru_item_t6_trinket);
- RegisterAuraScript(spell_dru_t9_feral_relic);
- RegisterAuraScript(spell_dru_t10_balance_4p_bonus);
+ RegisterSpellScript(spell_dru_t3_2p_bonus);
+ RegisterSpellScript(spell_dru_t3_6p_bonus);
+ RegisterSpellScript(spell_dru_t3_8p_bonus);
+ RegisterSpellScript(spell_dru_t4_2p_bonus);
+ RegisterSpellScript(spell_dru_item_t6_trinket);
+ RegisterSpellScript(spell_dru_t9_feral_relic);
+ RegisterSpellScript(spell_dru_t10_balance_4p_bonus);
RegisterSpellScript(spell_dru_t10_restoration_4p_bonus);
- RegisterAuraScript(spell_dru_t10_restoration_4p_bonus_dummy);
+ RegisterSpellScript(spell_dru_t10_restoration_4p_bonus_dummy);
RegisterSpellAndAuraScriptPair(spell_dru_wild_growth, spell_dru_wild_growth_aura);
}
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 7d77b668af6..c9185324957 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -4322,61 +4322,61 @@ class spell_gen_cannon_blast : public SpellScript
void AddSC_generic_spell_scripts()
{
- RegisterAuraScript(spell_gen_absorb0_hitlimit1);
- RegisterAuraScript(spell_gen_adaptive_warding);
+ RegisterSpellScript(spell_gen_absorb0_hitlimit1);
+ RegisterSpellScript(spell_gen_adaptive_warding);
RegisterSpellScript(spell_gen_allow_cast_from_item_only);
- RegisterAuraScript(spell_gen_animal_blood);
+ RegisterSpellScript(spell_gen_animal_blood);
RegisterSpellScript(spell_spawn_blood_pool);
RegisterSpellScript(spell_gen_arcane_charge);
- RegisterAuraScript(spell_gen_arena_drink);
- RegisterAuraScript(spell_gen_aura_of_anger);
- RegisterAuraScript(spell_gen_aura_of_fear);
- RegisterAuraScript(spell_gen_aura_service_uniform);
- RegisterAuraScript(spell_gen_av_drekthar_presence);
+ RegisterSpellScript(spell_gen_arena_drink);
+ RegisterSpellScript(spell_gen_aura_of_anger);
+ RegisterSpellScript(spell_gen_aura_of_fear);
+ RegisterSpellScript(spell_gen_aura_service_uniform);
+ RegisterSpellScript(spell_gen_av_drekthar_presence);
RegisterSpellScript(spell_gen_bandage);
- RegisterAuraScript(spell_gen_black_magic);
- RegisterAuraScript(spell_gen_blood_reserve);
- RegisterAuraScript(spell_gen_blade_warding);
+ RegisterSpellScript(spell_gen_black_magic);
+ RegisterSpellScript(spell_gen_blood_reserve);
+ RegisterSpellScript(spell_gen_blade_warding);
RegisterSpellScript(spell_gen_bonked);
RegisterSpellScriptWithArgs(spell_gen_break_shield, "spell_gen_break_shield");
RegisterSpellScriptWithArgs(spell_gen_break_shield, "spell_gen_tournament_counterattack");
- RegisterAuraScript(spell_gen_burn_brutallus);
- RegisterAuraScript(spell_gen_burning_depths_necrolyte_image);
+ RegisterSpellScript(spell_gen_burn_brutallus);
+ RegisterSpellScript(spell_gen_burning_depths_necrolyte_image);
RegisterSpellScript(spell_gen_cannibalize);
- RegisterAuraScript(spell_gen_chains_of_ice);
+ RegisterSpellScript(spell_gen_chains_of_ice);
RegisterSpellScript(spell_gen_chaos_blast);
- RegisterAuraScript(spell_gen_choking_vines);
+ RegisterSpellScript(spell_gen_choking_vines);
RegisterSpellScript(spell_gen_clear_fear_poly);
RegisterSpellScript(spell_gen_clone);
RegisterSpellScript(spell_gen_clone_weapon);
- RegisterAuraScript(spell_gen_clone_weapon_aura);
+ RegisterSpellScript(spell_gen_clone_weapon_aura);
RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_default_count_pct_from_max_hp");
RegisterSpellScriptWithArgs(spell_gen_count_pct_from_max_hp, "spell_gen_50pct_count_pct_from_max_hp", 50);
RegisterSpellScript(spell_gen_create_lance);
- RegisterAuraScript(spell_gen_creature_permanent_feign_death);
+ RegisterSpellScript(spell_gen_creature_permanent_feign_death);
RegisterSpellScriptWithArgs(spell_gen_dalaran_disguise, "spell_gen_sunreaver_disguise");
RegisterSpellScriptWithArgs(spell_gen_dalaran_disguise, "spell_gen_silver_covenant_disguise");
- RegisterAuraScript(spell_gen_damage_reduction_aura);
+ RegisterSpellScript(spell_gen_damage_reduction_aura);
RegisterSpellAndAuraScriptPair(spell_gen_decay_over_time_fungal_decay, spell_gen_decay_over_time_spell);
RegisterSpellAndAuraScriptPair(spell_gen_decay_over_time_tail_sting, spell_gen_decay_over_time_spell);
- RegisterAuraScript(spell_gen_defend);
+ RegisterSpellScript(spell_gen_defend);
RegisterSpellScript(spell_gen_despawn_self);
RegisterSpellScript(spell_gen_divine_storm_cd_reset);
RegisterSpellScript(spell_gen_ds_flush_knockback);
RegisterSpellScript(spell_gen_dungeon_credit);
RegisterSpellScript(spell_gen_elune_candle);
- RegisterAuraScript(spell_ethereal_pet_aura);
+ RegisterSpellScript(spell_ethereal_pet_aura);
RegisterSpellScript(spell_ethereal_pet_onsummon);
RegisterSpellScript(spell_ethereal_pet_aura_remove);
- RegisterAuraScript(spell_steal_essence_visual);
+ RegisterSpellScript(spell_steal_essence_visual);
RegisterSpellScript(spell_gen_5000_gold);
RegisterSpellScript(spell_gen_gadgetzan_transporter_backfire);
- RegisterAuraScript(spell_gen_gift_of_naaru);
+ RegisterSpellScript(spell_gen_gift_of_naaru);
RegisterSpellScript(spell_gen_gnomish_transporter);
- RegisterAuraScript(spell_gen_lich_pet_aura);
+ RegisterSpellScript(spell_gen_lich_pet_aura);
RegisterSpellScript(spell_gen_lich_pet_onsummon);
RegisterSpellScript(spell_gen_lich_pet_aura_remove);
- RegisterAuraScript(spell_gen_lifeblood);
+ RegisterSpellScript(spell_gen_lifeblood);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_hexlord_lifebloom", SPELL_HEXLORD_MALACRASS_LIFEBLOOM_FINAL_HEAL);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_tur_ragepaw_lifebloom", SPELL_TUR_RAGEPAW_LIFEBLOOM_FINAL_HEAL);
RegisterSpellScriptWithArgs(spell_gen_lifebloom, "spell_cenarion_scout_lifebloom", SPELL_CENARION_SCOUT_LIFEBLOOM_FINAL_HEAL);
@@ -4392,33 +4392,33 @@ void AddSC_generic_spell_scripts()
RegisterSpellScriptWithArgs(spell_gen_mount, "spell_celestial_steed", 0, SPELL_CELESTIAL_STEED_60, SPELL_CELESTIAL_STEED_100, SPELL_CELESTIAL_STEED_150, SPELL_CELESTIAL_STEED_280, SPELL_CELESTIAL_STEED_310);
RegisterSpellScriptWithArgs(spell_gen_mount, "spell_x53_touring_rocket", 0, 0, 0, SPELL_X53_TOURING_ROCKET_150, SPELL_X53_TOURING_ROCKET_280, SPELL_X53_TOURING_ROCKET_310);
RegisterSpellScript(spell_gen_mounted_charge);
- RegisterAuraScript(spell_gen_moss_covered_feet);
- RegisterAuraScript(spell_gen_negative_energy_periodic);
+ RegisterSpellScript(spell_gen_moss_covered_feet);
+ RegisterSpellScript(spell_gen_negative_energy_periodic);
RegisterSpellScript(spell_gen_netherbloom);
RegisterSpellScript(spell_gen_nightmare_vine);
- RegisterAuraScript(spell_gen_nitrous_boost);
- RegisterAuraScript(spell_gen_obsidian_armor);
- RegisterAuraScript(spell_gen_one_tick_dummy);
+ RegisterSpellScript(spell_gen_nitrous_boost);
+ RegisterSpellScript(spell_gen_obsidian_armor);
+ RegisterSpellScript(spell_gen_one_tick_dummy);
RegisterSpellScript(spell_gen_oracle_wolvar_reputation);
RegisterSpellScript(spell_gen_orc_disguise);
- RegisterAuraScript(spell_gen_paralytic_poison);
+ RegisterSpellScript(spell_gen_paralytic_poison);
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_soul_harvesters_charm");
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_commendation_of_kaelthas");
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_corpse_tongue_coin");
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_corpse_tongue_coin_heroic");
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_petrified_twilight_scale");
RegisterSpellScriptWithArgs(spell_gen_proc_below_pct_damaged, "spell_item_petrified_twilight_scale_heroic");
- RegisterAuraScript(spell_gen_proc_charge_drop_only);
- RegisterAuraScript(spell_gen_parachute);
+ RegisterSpellScript(spell_gen_proc_charge_drop_only);
+ RegisterSpellScript(spell_gen_parachute);
RegisterSpellScript(spell_gen_pet_summoned);
RegisterSpellScript(spell_gen_profession_research);
RegisterSpellScript(spell_gen_remove_flight_auras);
RegisterSpellScript(spell_gen_remove_impairing_auras);
- RegisterAuraScript(spell_gen_restoration);
+ RegisterSpellScript(spell_gen_restoration);
RegisterSpellAndAuraScriptPair(spell_gen_replenishment, spell_gen_replenishment_aura);
- RegisterAuraScript(spell_gen_remove_on_health_pct);
- RegisterAuraScript(spell_gen_remove_on_full_health);
- RegisterAuraScript(spell_gen_remove_on_full_health_pct);
+ RegisterSpellScript(spell_gen_remove_on_health_pct);
+ RegisterSpellScript(spell_gen_remove_on_full_health);
+ RegisterSpellScript(spell_gen_remove_on_full_health_pct);
RegisterSpellScript(spell_gen_seaforium_blast);
RegisterSpellScript(spell_gen_spectator_cheer_trigger);
RegisterSpellScript(spell_gen_spirit_healer_res);
@@ -4427,28 +4427,28 @@ void AddSC_generic_spell_scripts()
RegisterSpellScript(spell_gen_summon_tournament_mount);
RegisterSpellScript(spell_gen_throw_shield);
RegisterSpellScript(spell_gen_tournament_duel);
- RegisterAuraScript(spell_gen_tournament_pennant);
+ RegisterSpellScript(spell_gen_tournament_pennant);
RegisterSpellScript(spell_gen_teleporting);
RegisterSpellScriptWithArgs(spell_pvp_trinket_wotf_shared_cd<SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER>, "spell_pvp_trinket_shared_cd");
RegisterSpellScriptWithArgs(spell_pvp_trinket_wotf_shared_cd<SPELL_WILL_OF_THE_FORSAKEN_COOLDOWN_TRIGGER_WOTF>, "spell_wotf_shared_cd");
- RegisterAuraScript(spell_gen_turkey_marker);
+ RegisterSpellScript(spell_gen_turkey_marker);
RegisterSpellScript(spell_gen_upper_deck_create_foam_sword);
- RegisterAuraScript(spell_gen_vampiric_touch);
- RegisterAuraScript(spell_gen_vehicle_scaling);
+ RegisterSpellScript(spell_gen_vampiric_touch);
+ RegisterSpellScript(spell_gen_vehicle_scaling);
RegisterSpellScript(spell_gen_vendor_bark_trigger);
RegisterSpellScript(spell_gen_wg_water);
- RegisterAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper);
+ RegisterSpellScript(spell_gen_whisper_gulch_yogg_saron_whisper);
RegisterSpellScript(spell_gen_eject_all_passengers);
RegisterSpellScript(spell_gen_eject_passenger);
- RegisterAuraScript(spell_gen_gm_freeze);
+ RegisterSpellScript(spell_gen_gm_freeze);
RegisterSpellScript(spell_gen_stand);
- RegisterAuraScript(spell_gen_mixology_bonus);
+ RegisterSpellScript(spell_gen_mixology_bonus);
RegisterSpellScript(spell_gen_landmine_knockback_achievement);
RegisterSpellScript(spell_gen_clear_debuffs);
- RegisterAuraScript(spell_gen_pony_mount_check);
- RegisterAuraScript(spell_corrupting_plague_aura);
- RegisterAuraScript(spell_stasis_field_aura);
- RegisterAuraScript(spell_gen_vehicle_control_link);
+ RegisterSpellScript(spell_gen_pony_mount_check);
+ RegisterSpellScript(spell_corrupting_plague_aura);
+ RegisterSpellScript(spell_stasis_field_aura);
+ RegisterSpellScript(spell_gen_vehicle_control_link);
RegisterSpellScript(spell_freezing_circle);
RegisterSpellScript(spell_gen_charmed_unit_spell_cooldown);
RegisterSpellScript(spell_gen_cannon_blast);
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 4c230cfb74b..52b4c0ca1d3 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -1963,11 +1963,11 @@ void AddSC_holiday_spell_scripts()
new spell_brewfest_dismount_ram();
new spell_brewfest_barker_bunny();
// Midsummer Fire Festival
- RegisterAuraScript(spell_midsummer_braziers_hit);
+ RegisterSpellScript(spell_midsummer_braziers_hit);
RegisterSpellScript(spell_midsummer_torch_target_picker);
RegisterSpellScript(spell_midsummer_torch_toss_land);
- RegisterAuraScript(spell_midsummer_test_ribbon_pole_channel);
- RegisterAuraScript(spell_midsummer_ribbon_pole_periodic_visual);
+ RegisterSpellScript(spell_midsummer_test_ribbon_pole_channel);
+ RegisterSpellScript(spell_midsummer_ribbon_pole_periodic_visual);
RegisterSpellScript(spell_midsummer_juggle_torch);
RegisterSpellScript(spell_midsummer_torch_catch);
RegisterSpellScript(spell_midsummer_fling_torch);
diff --git a/src/server/scripts/Spells/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
index 48abad416b7..7aac8eba8ee 100644
--- a/src/server/scripts/Spells/spell_hunter.cpp
+++ b/src/server/scripts/Spells/spell_hunter.cpp
@@ -1679,7 +1679,7 @@ class spell_hun_wyvern_sting : public AuraScript
void AddSC_hunter_spell_scripts()
{
new spell_hun_aspect_of_the_beast();
- RegisterAuraScript(spell_hun_aspect_of_the_beast_pet);
+ RegisterSpellScript(spell_hun_aspect_of_the_beast_pet);
new spell_hun_ascpect_of_the_viper();
new spell_hun_chimera_shot();
new spell_hun_cobra_strikes();
@@ -1687,8 +1687,8 @@ void AddSC_hunter_spell_scripts()
new spell_hun_disengage();
new spell_hun_glyph_of_arcane_shot();
new spell_hun_glyph_of_mend_pet();
- RegisterAuraScript(spell_hun_explosive_shot);
- RegisterAuraScript(spell_hun_feeding_frenzy);
+ RegisterSpellScript(spell_hun_explosive_shot);
+ RegisterSpellScript(spell_hun_feeding_frenzy);
new spell_hun_hunting_party();
new spell_hun_improved_mend_pet();
new spell_hun_invigoration();
@@ -1712,5 +1712,5 @@ void AddSC_hunter_spell_scripts()
new spell_hun_thrill_of_the_hunt();
new spell_hun_t9_4p_bonus();
new spell_hun_viper_attack_speed();
- RegisterAuraScript(spell_hun_wyvern_sting);
+ RegisterSpellScript(spell_hun_wyvern_sting);
}
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index e4e859ad7c5..d3935e4b4a2 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -4296,18 +4296,18 @@ void AddSC_item_spell_scripts()
// 23075 Mithril Mechanical Dragonling
new spell_item_trigger_spell("spell_item_mithril_mechanical_dragonling", SPELL_MITHRIL_MECHANICAL_DRAGONLING);
- RegisterAuraScript(spell_item_aegis_of_preservation);
- RegisterAuraScript(spell_item_absorb_eye_of_grillok);
- RegisterAuraScript(spell_item_alchemists_stone);
+ RegisterSpellScript(spell_item_aegis_of_preservation);
+ RegisterSpellScript(spell_item_absorb_eye_of_grillok);
+ RegisterSpellScript(spell_item_alchemists_stone);
new spell_item_anger_capacitor<8>("spell_item_tiny_abomination_in_a_jar");
new spell_item_anger_capacitor<7>("spell_item_tiny_abomination_in_a_jar_hero");
- RegisterAuraScript(spell_item_arcane_shroud);
- RegisterAuraScript(spell_item_aura_of_madness);
- RegisterAuraScript(spell_item_dementia);
+ RegisterSpellScript(spell_item_arcane_shroud);
+ RegisterSpellScript(spell_item_aura_of_madness);
+ RegisterSpellScript(spell_item_dementia);
RegisterSpellScript(spell_item_brittle_armor);
- RegisterAuraScript(spell_item_blessing_of_ancient_kings);
- RegisterAuraScript(spell_item_valanyr_hammer_of_ancient_kings);
- RegisterAuraScript(spell_item_deadly_precision);
+ RegisterSpellScript(spell_item_blessing_of_ancient_kings);
+ RegisterSpellScript(spell_item_valanyr_hammer_of_ancient_kings);
+ RegisterSpellScript(spell_item_deadly_precision);
RegisterSpellScript(spell_item_deadly_precision_dummy);
new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA, SPELL_AGILITY_OF_THE_VRYKUL, SPELL_POWER_OF_THE_TAUNKA, SPELL_AIM_OF_THE_IRON_DWARVES, SPELL_SPEED_OF_THE_VRYKUL>("spell_item_deathbringers_will_normal");
new spell_item_deathbringers_will<SPELL_STRENGTH_OF_THE_TAUNKA_HERO, SPELL_AGILITY_OF_THE_VRYKUL_HERO, SPELL_POWER_OF_THE_TAUNKA_HERO, SPELL_AIM_OF_THE_IRON_DWARVES_HERO, SPELL_SPEED_OF_THE_VRYKUL_HERO>("spell_item_deathbringers_will_heroic");
@@ -4316,45 +4316,45 @@ void AddSC_item_spell_scripts()
new spell_item_defibrillate("spell_item_goblin_jumper_cables", 67, SPELL_GOBLIN_JUMPER_CABLES_FAIL);
new spell_item_defibrillate("spell_item_goblin_jumper_cables_xl", 50, SPELL_GOBLIN_JUMPER_CABLES_XL_FAIL);
new spell_item_defibrillate("spell_item_gnomish_army_knife", 33);
- RegisterAuraScript(spell_item_desperate_defense);
+ RegisterSpellScript(spell_item_desperate_defense);
RegisterSpellScript(spell_item_deviate_fish);
- RegisterAuraScript(spell_item_discerning_eye_beast_dummy);
+ RegisterSpellScript(spell_item_discerning_eye_beast_dummy);
RegisterSpellScript(spell_item_echoes_of_light);
- RegisterAuraScript(spell_item_extract_gas);
- RegisterAuraScript(spell_item_fate_rune_of_unsurpassed_vigor);
+ RegisterSpellScript(spell_item_extract_gas);
+ RegisterSpellScript(spell_item_fate_rune_of_unsurpassed_vigor);
RegisterSpellScript(spell_item_flask_of_the_north);
- RegisterAuraScript(spell_item_frozen_shadoweave);
+ RegisterSpellScript(spell_item_frozen_shadoweave);
RegisterSpellScript(spell_item_gnomish_death_ray);
- RegisterAuraScript(spell_item_harm_prevention_belt);
- RegisterAuraScript(spell_item_healing_touch_refund);
+ RegisterSpellScript(spell_item_harm_prevention_belt);
+ RegisterSpellScript(spell_item_healing_touch_refund);
new spell_item_heartpierce<SPELL_INVIGORATION_ENERGY, SPELL_INVIGORATION_MANA, SPELL_INVIGORATION_RAGE, SPELL_INVIGORATION_RP>("spell_item_heartpierce");
new spell_item_heartpierce<SPELL_INVIGORATION_ENERGY_HERO, SPELL_INVIGORATION_MANA_HERO, SPELL_INVIGORATION_RAGE_HERO, SPELL_INVIGORATION_RP_HERO>("spell_item_heartpierce_hero");
- RegisterAuraScript(spell_item_crystal_spire_of_karabor);
+ RegisterSpellScript(spell_item_crystal_spire_of_karabor);
RegisterSpellScript(spell_item_make_a_wish);
- RegisterAuraScript(spell_item_mark_of_conquest);
+ RegisterSpellScript(spell_item_mark_of_conquest);
RegisterSpellScript(spell_item_mercurial_shield);
RegisterSpellScript(spell_item_mingos_fortune_generator);
- RegisterAuraScript(spell_item_necrotic_touch);
+ RegisterSpellScript(spell_item_necrotic_touch);
RegisterSpellScript(spell_item_net_o_matic);
RegisterSpellScript(spell_item_noggenfogger_elixir);
- RegisterAuraScript(spell_item_pendant_of_the_violet_eye);
- RegisterAuraScript(spell_item_persistent_shield);
- RegisterAuraScript(spell_item_pet_healing);
+ RegisterSpellScript(spell_item_pendant_of_the_violet_eye);
+ RegisterSpellScript(spell_item_persistent_shield);
+ RegisterSpellScript(spell_item_pet_healing);
RegisterSpellScript(spell_item_piccolo_of_the_flaming_fire);
- RegisterAuraScript(spell_item_power_circle);
+ RegisterSpellScript(spell_item_power_circle);
RegisterSpellScript(spell_item_savory_deviate_delight);
RegisterSpellScript(spell_item_scroll_of_recall);
RegisterSpellScript(spell_item_dimensional_ripper_everlook);
RegisterSpellScript(spell_item_ultrasafe_transporter);
RegisterSpellScript(spell_item_dimensional_ripper_area52);
- RegisterAuraScript(spell_item_unsated_craving);
- RegisterAuraScript(spell_item_shadows_fate);
- RegisterAuraScript(spell_item_shadowmourne);
- RegisterAuraScript(spell_item_shadowmourne_soul_fragment);
+ RegisterSpellScript(spell_item_unsated_craving);
+ RegisterSpellScript(spell_item_shadows_fate);
+ RegisterSpellScript(spell_item_shadowmourne);
+ RegisterSpellScript(spell_item_shadowmourne_soul_fragment);
RegisterSpellScript(spell_item_six_demon_bag);
- RegisterAuraScript(spell_item_swift_hand_justice_dummy);
- RegisterAuraScript(spell_item_totem_of_flowing_water);
- RegisterAuraScript(spell_item_the_eye_of_diminution);
+ RegisterSpellScript(spell_item_swift_hand_justice_dummy);
+ RegisterSpellScript(spell_item_totem_of_flowing_water);
+ RegisterSpellScript(spell_item_the_eye_of_diminution);
RegisterSpellScript(spell_item_underbelly_elixir);
RegisterSpellScript(spell_item_worn_troll_dice);
RegisterSpellScript(spell_item_red_rider_air_rifle);
@@ -4366,7 +4366,7 @@ void AddSC_item_spell_scripts()
RegisterSpellScript(spell_item_vanquished_clutches);
RegisterSpellScript(spell_item_ashbringer);
- RegisterAuraScript(spell_magic_eater_food);
+ RegisterSpellScript(spell_magic_eater_food);
RegisterSpellScript(spell_item_shimmering_vessel);
RegisterSpellScript(spell_item_purify_helboar_meat);
RegisterSpellScript(spell_item_crystal_prison_dummy_dnd);
@@ -4379,7 +4379,7 @@ void AddSC_item_spell_scripts()
RegisterSpellScript(spell_item_impale_leviroth);
RegisterSpellScript(spell_item_brewfest_mount_transformation);
RegisterSpellScript(spell_item_nitro_boosts);
- RegisterAuraScript(spell_item_nitro_boosts_backfire);
+ RegisterSpellScript(spell_item_nitro_boosts_backfire);
RegisterSpellScript(spell_item_teach_language);
RegisterSpellScript(spell_item_rocket_boots);
RegisterSpellScript(spell_item_runic_healing_injector);
@@ -4391,20 +4391,20 @@ void AddSC_item_spell_scripts()
RegisterSpellScript(spell_item_greatmothers_soulcatcher);
new spell_item_shard_of_the_scale<SPELL_PURIFIED_CAUTERIZING_HEAL, SPELL_PURIFIED_SEARING_FLAMES>("spell_item_purified_shard_of_the_scale");
new spell_item_shard_of_the_scale<SPELL_SHINY_CAUTERIZING_HEAL, SPELL_SHINY_SEARING_FLAMES>("spell_item_shiny_shard_of_the_scale");
- RegisterAuraScript(spell_item_soul_preserver);
+ RegisterSpellScript(spell_item_soul_preserver);
new spell_item_sunwell_neck<SPELL_LIGHTS_WRATH, SPELL_ARCANE_BOLT>("spell_item_sunwell_exalted_caster_neck");
new spell_item_sunwell_neck<SPELL_LIGHTS_STRENGTH, SPELL_ARCANE_STRIKE>("spell_item_sunwell_exalted_melee_neck");
new spell_item_sunwell_neck<SPELL_LIGHTS_WARD, SPELL_ARCANE_INSIGHT>("spell_item_sunwell_exalted_tank_neck");
new spell_item_sunwell_neck<SPELL_LIGHTS_SALVATION, SPELL_ARCANE_SURGE>("spell_item_sunwell_exalted_healer_neck");
RegisterSpellScript(spell_item_toy_train_set_pulse);
- RegisterAuraScript(spell_item_death_choice);
+ RegisterSpellScript(spell_item_death_choice);
new spell_item_trinket_stack("spell_item_lightning_capacitor", SPELL_LIGHTNING_CAPACITOR_STACK, SPELL_LIGHTNING_CAPACITOR_TRIGGER);
new spell_item_trinket_stack("spell_item_thunder_capacitor", SPELL_THUNDER_CAPACITOR_STACK, SPELL_THUNDER_CAPACITOR_TRIGGER);
new spell_item_trinket_stack("spell_item_toc25_normal_caster_trinket", SPELL_TOC25_CASTER_TRINKET_NORMAL_STACK, SPELL_TOC25_CASTER_TRINKET_NORMAL_TRIGGER);
new spell_item_trinket_stack("spell_item_toc25_heroic_caster_trinket", SPELL_TOC25_CASTER_TRINKET_HEROIC_STACK, SPELL_TOC25_CASTER_TRINKET_HEROIC_TRIGGER);
- RegisterAuraScript(spell_item_darkmoon_card_greatness);
- RegisterAuraScript(spell_item_charm_witch_doctor);
- RegisterAuraScript(spell_item_mana_drain);
+ RegisterSpellScript(spell_item_darkmoon_card_greatness);
+ RegisterSpellScript(spell_item_charm_witch_doctor);
+ RegisterSpellScript(spell_item_mana_drain);
RegisterSpellScript(spell_item_taunt_flag_targeting);
RegisterSpellScript(spell_item_mirrens_drinking_hat);
RegisterSpellScript(spell_item_mind_control_cap);
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 5474d3d67df..79fd6e203f6 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -1474,7 +1474,7 @@ class spell_mage_summon_water_elemental : public SpellScriptLoader
void AddSC_mage_spell_scripts()
{
new spell_mage_arcane_potency();
- RegisterAuraScript(spell_mage_arcane_missiles);
+ RegisterSpellScript(spell_mage_arcane_missiles);
new spell_mage_blast_wave();
new spell_mage_blazing_speed();
new spell_mage_burning_determination();
@@ -1482,13 +1482,13 @@ void AddSC_mage_spell_scripts()
new spell_mage_cold_snap();
new spell_mage_combustion();
new spell_mage_combustion_proc();
- RegisterAuraScript(spell_mage_dragon_breath);
+ RegisterSpellScript(spell_mage_dragon_breath);
new spell_mage_imp_blizzard();
new spell_mage_imp_mana_gems();
new spell_mage_empowered_fire();
new spell_mage_fingers_of_frost();
new spell_mage_fire_frost_ward();
- RegisterAuraScript(spell_mage_frostfire_bolt);
+ RegisterSpellScript(spell_mage_frostfire_bolt);
new spell_mage_focus_magic();
new spell_mage_gen_extra_effects();
new spell_mage_glyph_of_polymorph();
@@ -1502,9 +1502,9 @@ void AddSC_mage_spell_scripts()
new spell_mage_magic_absorption();
new spell_mage_mana_shield();
new spell_mage_master_of_elements();
- RegisterAuraScript(spell_mage_mirror_image);
+ RegisterSpellScript(spell_mage_mirror_image);
new spell_mage_missile_barrage();
- RegisterAuraScript(spell_mage_missile_barrage_proc);
+ RegisterSpellScript(spell_mage_missile_barrage_proc);
new spell_mage_polymorph_cast_visual();
new spell_mage_summon_water_elemental();
}
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 228ed4a74bb..45975e49f1f 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -2424,11 +2424,11 @@ void AddSC_paladin_spell_scripts()
new spell_pal_aura_mastery();
new spell_pal_aura_mastery_immune();
new spell_pal_avenging_wrath();
- RegisterAuraScript(spell_pal_beacon_of_light);
+ RegisterSpellScript(spell_pal_beacon_of_light);
new spell_pal_blessing_of_faith();
new spell_pal_blessing_of_sanctuary();
new spell_pal_divine_purpose();
- RegisterAuraScript(spell_pal_divine_sacrifice);
+ RegisterSpellScript(spell_pal_divine_sacrifice);
new spell_pal_divine_storm();
new spell_pal_divine_storm_dummy();
new spell_pal_exorcism_and_holy_wrath_damage();
@@ -2437,7 +2437,7 @@ void AddSC_paladin_spell_scripts()
new spell_pal_glyph_of_holy_light();
new spell_pal_glyph_of_holy_light_dummy();
new spell_pal_guarded_by_the_light();
- RegisterAuraScript(spell_pal_hand_of_sacrifice);
+ RegisterSpellScript(spell_pal_hand_of_sacrifice);
new spell_pal_hand_of_salvation();
new spell_pal_heart_of_the_crusader();
new spell_pal_holy_shock();
diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp
index 756dec2e48e..dfcda747a01 100644
--- a/src/server/scripts/Spells/spell_quest.cpp
+++ b/src/server/scripts/Spells/spell_quest.cpp
@@ -2966,8 +2966,8 @@ void AddSC_quest_spell_scripts()
new spell_q13011_bear_flank_master();
new spell_q13086_cannons_target();
RegisterSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59576);
- RegisterAuraScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579);
- RegisterAuraScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death);
+ RegisterSpellScript(spell_q13264_q13276_q13288_q13289_burst_at_the_seams_59579);
+ RegisterSpellScript(spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death);
RegisterSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom);
RegisterSpellScript(spell_q13264_q13276_q13288_q13289_assign_credit_to_master);
RegisterSpellScript(spell_q12690_burst_at_the_seams_52510);
diff --git a/src/server/scripts/Spells/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
index 97c7f2fb405..17a5cdb6818 100644
--- a/src/server/scripts/Spells/spell_rogue.cpp
+++ b/src/server/scripts/Spells/spell_rogue.cpp
@@ -1172,9 +1172,9 @@ void AddSC_rogue_spell_scripts()
new spell_rog_setup();
new spell_rog_shiv();
RegisterSpellAndAuraScriptPair(spell_rog_tricks_of_the_trade, spell_rog_tricks_of_the_trade_aura);
- RegisterAuraScript(spell_rog_tricks_of_the_trade_proc);
+ RegisterSpellScript(spell_rog_tricks_of_the_trade_proc);
new spell_rog_honor_among_thieves();
new spell_rog_honor_among_thieves_proc();
new spell_rog_turn_the_tables();
- RegisterAuraScript(spell_rog_vanish);
+ RegisterSpellScript(spell_rog_vanish);
}
diff --git a/src/server/scripts/Spells/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
index 1d584b1b9f4..1f4c4d448d4 100644
--- a/src/server/scripts/Spells/spell_shaman.cpp
+++ b/src/server/scripts/Spells/spell_shaman.cpp
@@ -2391,7 +2391,7 @@ void AddSC_shaman_spell_scripts()
new spell_sha_ancestral_awakening_proc();
new spell_sha_astral_shift();
new spell_sha_astral_shift_aura();
- RegisterAuraScript(spell_sha_astral_shift_visual_dummy);
+ RegisterSpellScript(spell_sha_astral_shift_visual_dummy);
new spell_sha_bloodlust();
new spell_sha_chain_heal();
new spell_sha_cleansing_totem_pulse();
@@ -2419,7 +2419,7 @@ void AddSC_shaman_spell_scripts()
new spell_sha_lightning_shield();
new spell_sha_maelstrom_weapon();
new spell_sha_mana_spring_totem();
- RegisterAuraScript(spell_sha_mana_tide);
+ RegisterSpellScript(spell_sha_mana_tide);
new spell_sha_mana_tide_totem();
new spell_sha_nature_guardian();
new spell_sha_sentry_totem();
@@ -2431,7 +2431,7 @@ void AddSC_shaman_spell_scripts()
new spell_sha_thunderstorm();
new spell_sha_totemic_mastery();
new spell_sha_t3_6p_bonus();
- RegisterAuraScript(spell_sha_t3_8p_bonus);
+ RegisterSpellScript(spell_sha_t3_8p_bonus);
new spell_sha_t8_elemental_4p_bonus();
new spell_sha_t9_elemental_4p_bonus();
new spell_sha_t10_elemental_4p_bonus();
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 72232ed521c..f4d1f25003c 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -1574,7 +1574,7 @@ class spell_warl_unstable_affliction : public SpellScriptLoader
void AddSC_warlock_spell_scripts()
{
- RegisterAuraScript(spell_warl_curse_of_agony);
+ RegisterSpellScript(spell_warl_curse_of_agony);
new spell_warl_banish();
new spell_warl_create_healthstone();
new spell_warl_curse_of_doom();