diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2022_04_11_00_world.sql | 30 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp | 48 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_dragonblight.cpp | 40 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_icecrown.cpp | 32 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_storm_peaks.cpp | 32 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_zuldrak.cpp | 56 |
6 files changed, 134 insertions, 104 deletions
diff --git a/sql/updates/world/3.3.5/2022_04_11_00_world.sql b/sql/updates/world/3.3.5/2022_04_11_00_world.sql new file mode 100644 index 00000000000..826d5f2a9ac --- /dev/null +++ b/sql/updates/world/3.3.5/2022_04_11_00_world.sql @@ -0,0 +1,30 @@ +-- +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_nerubar_web_random_unit_not_on_quest' WHERE `ScriptName` = 'spell_nerubar_web_random_unit_not_on_quest'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy' WHERE `ScriptName` = 'spell_nerubar_web_random_unit_not_on_quest_dummy'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy' WHERE `ScriptName` = 'spell_nerubar_web_random_unit_on_quest_dummy'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_dispel_freed_soldier_debuff' WHERE `ScriptName` = 'spell_dispel_freed_soldier_debuff'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_deliver_kodo' WHERE `ScriptName` = 'spell_deliver_kodo'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_borean_tundra_kodo_delivered' WHERE `ScriptName` = 'spell_kodo_delivered'; + +UPDATE `spell_script_names` SET `ScriptName` = 'spell_dragonblight_warsong_battle_standard' WHERE `ScriptName` = 'spell_warsong_battle_standard'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_dragonblight_moti_mirror_image_script_effect' WHERE `ScriptName` = 'spell_moti_mirror_image_script_effect'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_dragonblight_moti_hourglass_cast_see_invis_on_master' WHERE `ScriptName` = 'spell_moti_hourglass_cast_see_invis_on_master'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_dragonblight_call_out_injured_soldier' WHERE `ScriptName` = 'spell_call_out_injured_soldier'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_dragonblight_high_executor_branding_iron' WHERE `ScriptName` = 'spell_high_executor_branding_iron'; + +UPDATE `spell_script_names` SET `ScriptName` = 'spell_icecrown_the_ocular_on_death' WHERE `ScriptName` = 'spell_the_ocular_on_death'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_icecrown_summon_tualiq_proxy' WHERE `ScriptName` = 'spell_summon_tualiq_proxy'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_icecrown_pound_drum' WHERE `ScriptName` = 'spell_q14076_14092_pound_drum'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_icecrown_chum_the_water' WHERE `ScriptName` = 'spell_q14112_14145_chum_the_water'; + +UPDATE `spell_script_names` SET `ScriptName` = 'spell_storm_peaks_remove_collapsing_cave_aura' WHERE `ScriptName` = 'spell_q12823_remove_collapsing_cave_aura'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_storm_peaks_read_pronouncement' WHERE `ScriptName` = 'spell_read_pronouncement'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_storm_peaks_bear_flank_master' WHERE `ScriptName` = 'spell_bear_flank_master'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_storm_peaks_bear_flank_fail' WHERE `ScriptName` = 'spell_bear_flank_fail'; + +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_scourge_disguise' WHERE `ScriptName` = 'spell_scourge_disguise'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_scourge_disguise_instability' WHERE `ScriptName` = 'spell_scourge_disguise_instability'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_scourge_disguise_expiring' WHERE `ScriptName` = 'spell_scourge_disguise_expiring'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_drop_disguise' WHERE `ScriptName` = 'spell_drop_disguise'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_cocooned_not_on_quest' WHERE `ScriptName` = 'spell_cocooned_not_on_quest'; +UPDATE `spell_script_names` SET `ScriptName` = 'spell_zuldrak_cocooned_on_quest' WHERE `ScriptName` = 'spell_cocooned_on_quest'; diff --git a/src/server/scripts/Northrend/zone_borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index f255d83261f..e6bdec7f426 100644 --- a/src/server/scripts/Northrend/zone_borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp @@ -1592,9 +1592,9 @@ std::array<uint32, 3> const CocoonSummonSpells = }; // 45516 - Nerub'ar Web Random Unit (Not On Quest, Script Effect) -class spell_nerubar_web_random_unit_not_on_quest : public SpellScript +class spell_borean_tundra_nerubar_web_random_unit_not_on_quest : public SpellScript { - PrepareSpellScript(spell_nerubar_web_random_unit_not_on_quest); + PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest); bool Validate(SpellInfo const* spellInfo) override { @@ -1608,14 +1608,14 @@ class spell_nerubar_web_random_unit_not_on_quest : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_nerubar_web_random_unit_not_on_quest::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_borean_tundra_nerubar_web_random_unit_not_on_quest::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 45515 - Nerub'ar Web Random Unit (Not On Quest, Dummy) -class spell_nerubar_web_random_unit_not_on_quest_dummy : public SpellScript +class spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy : public SpellScript { - PrepareSpellScript(spell_nerubar_web_random_unit_not_on_quest_dummy); + PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1634,14 +1634,14 @@ class spell_nerubar_web_random_unit_not_on_quest_dummy : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_nerubar_web_random_unit_not_on_quest_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit += SpellEffectFn(spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 45535 - Nerub'ar Web Random Unit (On Quest, Dummy) -class spell_nerubar_web_random_unit_on_quest_dummy : public SpellScript +class spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy : public SpellScript { - PrepareSpellScript(spell_nerubar_web_random_unit_on_quest_dummy); + PrepareSpellScript(spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1662,14 +1662,14 @@ class spell_nerubar_web_random_unit_on_quest_dummy : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_nerubar_web_random_unit_on_quest_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHit += SpellEffectFn(spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 45522 - Dispel Freed Soldier Debuff -class spell_dispel_freed_soldier_debuff : public SpellScript +class spell_borean_tundra_dispel_freed_soldier_debuff : public SpellScript { - PrepareSpellScript(spell_dispel_freed_soldier_debuff); + PrepareSpellScript(spell_borean_tundra_dispel_freed_soldier_debuff); bool Validate(SpellInfo const* spellInfo) override { @@ -1684,7 +1684,7 @@ class spell_dispel_freed_soldier_debuff : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_dispel_freed_soldier_debuff::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_borean_tundra_dispel_freed_soldier_debuff::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1704,9 +1704,9 @@ enum BringEmBackAlive }; // 45877 - Deliver Kodo -class spell_deliver_kodo : public SpellScript +class spell_borean_tundra_deliver_kodo : public SpellScript { - PrepareSpellScript(spell_deliver_kodo); + PrepareSpellScript(spell_borean_tundra_deliver_kodo); bool Validate(SpellInfo const* /*spell*/) override { @@ -1721,14 +1721,14 @@ class spell_deliver_kodo : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_deliver_kodo::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_borean_tundra_deliver_kodo::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 48204 - Kodo Delivered -class spell_kodo_delivered : public SpellScript +class spell_borean_tundra_kodo_delivered : public SpellScript { - PrepareSpellScript(spell_kodo_delivered); + PrepareSpellScript(spell_borean_tundra_kodo_delivered); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1747,7 +1747,7 @@ class spell_kodo_delivered : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_kodo_delivered::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_borean_tundra_kodo_delivered::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1902,12 +1902,12 @@ void AddSC_borean_tundra() RegisterSpellScript(spell_q11719_bloodspore_ruination_45997); RegisterCreatureAI(npc_bloodmage_laurith); RegisterSpellScript(spell_q11653_shortening_blaster); - RegisterSpellScript(spell_nerubar_web_random_unit_not_on_quest); - RegisterSpellScript(spell_nerubar_web_random_unit_not_on_quest_dummy); - RegisterSpellScript(spell_nerubar_web_random_unit_on_quest_dummy); - RegisterSpellScript(spell_dispel_freed_soldier_debuff); - RegisterSpellScript(spell_deliver_kodo); - RegisterSpellScript(spell_kodo_delivered); + RegisterSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest); + RegisterSpellScript(spell_borean_tundra_nerubar_web_random_unit_not_on_quest_dummy); + RegisterSpellScript(spell_borean_tundra_nerubar_web_random_unit_on_quest_dummy); + RegisterSpellScript(spell_borean_tundra_dispel_freed_soldier_debuff); + RegisterSpellScript(spell_borean_tundra_deliver_kodo); + RegisterSpellScript(spell_borean_tundra_kodo_delivered); RegisterSpellScript(spell_borean_tundra_neural_needle); RegisterSpellScript(spell_borean_tundra_prototype_neural_needle); } diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 586836daa50..164e8d24046 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -551,9 +551,9 @@ enum WarsongBattleStandard }; // 47304 - Warsong Battle Standard -class spell_warsong_battle_standard : public SpellScript +class spell_dragonblight_warsong_battle_standard : public SpellScript { - PrepareSpellScript(spell_warsong_battle_standard); + PrepareSpellScript(spell_dragonblight_warsong_battle_standard); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -574,7 +574,7 @@ class spell_warsong_battle_standard : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_warsong_battle_standard::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_dragonblight_warsong_battle_standard::HandleScript, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -588,9 +588,9 @@ enum MysteryOfTheInfinite }; // 49686 - Mystery of the Infinite: Script Effect Player Cast Mirror Image -class spell_moti_mirror_image_script_effect : public SpellScript +class spell_dragonblight_moti_mirror_image_script_effect : public SpellScript { - PrepareSpellScript(spell_moti_mirror_image_script_effect); + PrepareSpellScript(spell_dragonblight_moti_mirror_image_script_effect); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -604,14 +604,14 @@ class spell_moti_mirror_image_script_effect : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_moti_mirror_image_script_effect::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_dragonblight_moti_mirror_image_script_effect::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 50020 - Mystery of the Infinite: Hourglass cast See Invis on Master -class spell_moti_hourglass_cast_see_invis_on_master : public SpellScript +class spell_dragonblight_moti_hourglass_cast_see_invis_on_master : public SpellScript { - PrepareSpellScript(spell_moti_hourglass_cast_see_invis_on_master); + PrepareSpellScript(spell_dragonblight_moti_hourglass_cast_see_invis_on_master); bool Validate(SpellInfo const* spellInfo) override { @@ -627,7 +627,7 @@ class spell_moti_hourglass_cast_see_invis_on_master : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_moti_hourglass_cast_see_invis_on_master::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_dragonblight_moti_hourglass_cast_see_invis_on_master::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -643,9 +643,9 @@ enum TheChainGunAndYou // BasePoints of the dummy effect is ID of npc_text used to group texts, it's not implemented so texts are grouped manually. Same with 49556 but looks like it's not used // 49550 - Call Out Injured Soldier -class spell_call_out_injured_soldier : public SpellScript +class spell_dragonblight_call_out_injured_soldier : public SpellScript { - PrepareSpellScript(spell_call_out_injured_soldier); + PrepareSpellScript(spell_dragonblight_call_out_injured_soldier); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -661,7 +661,7 @@ class spell_call_out_injured_soldier : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_call_out_injured_soldier::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_dragonblight_call_out_injured_soldier::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -683,9 +683,9 @@ enum TortureTheTorturer }; // 48603 - High Executor's Branding Iron -class spell_high_executor_branding_iron : public SpellScript +class spell_dragonblight_high_executor_branding_iron : public SpellScript { - PrepareSpellScript(spell_high_executor_branding_iron); + PrepareSpellScript(spell_dragonblight_high_executor_branding_iron); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -732,7 +732,7 @@ class spell_high_executor_branding_iron : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_high_executor_branding_iron::HandleWhisper); + AfterHit += SpellHitFn(spell_dragonblight_high_executor_branding_iron::HandleWhisper); } }; @@ -742,9 +742,9 @@ void AddSC_dragonblight() RegisterSpellScript(spell_q12096_q12092_dummy); RegisterSpellScript(spell_q12096_q12092_bark); RegisterCreatureAI(npc_wyrmrest_defender); - RegisterSpellScript(spell_warsong_battle_standard); - RegisterSpellScript(spell_moti_mirror_image_script_effect); - RegisterSpellScript(spell_moti_hourglass_cast_see_invis_on_master); - RegisterSpellScript(spell_call_out_injured_soldier); - RegisterSpellScript(spell_high_executor_branding_iron); + RegisterSpellScript(spell_dragonblight_warsong_battle_standard); + RegisterSpellScript(spell_dragonblight_moti_mirror_image_script_effect); + RegisterSpellScript(spell_dragonblight_moti_hourglass_cast_see_invis_on_master); + RegisterSpellScript(spell_dragonblight_call_out_injured_soldier); + RegisterSpellScript(spell_dragonblight_high_executor_branding_iron); } diff --git a/src/server/scripts/Northrend/zone_icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 59be4cfab0c..a55ed0e888c 100644 --- a/src/server/scripts/Northrend/zone_icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp @@ -731,9 +731,9 @@ struct npc_frostbrood_skytalon : public VehicleAI ######*/ // 55288 - It's All Fun and Games: The Ocular On Death -class spell_the_ocular_on_death : public SpellScript +class spell_icecrown_the_ocular_on_death : public SpellScript { - PrepareSpellScript(spell_the_ocular_on_death); + PrepareSpellScript(spell_icecrown_the_ocular_on_death); bool Validate(SpellInfo const* spellInfo) override { @@ -748,7 +748,7 @@ class spell_the_ocular_on_death : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_the_ocular_on_death::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_icecrown_the_ocular_on_death::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -757,9 +757,9 @@ class spell_the_ocular_on_death : public SpellScript ######*/ // 66411 - Summon Tualiq Proxy -class spell_summon_tualiq_proxy : public SpellScript +class spell_icecrown_summon_tualiq_proxy : public SpellScript { - PrepareSpellScript(spell_summon_tualiq_proxy); + PrepareSpellScript(spell_icecrown_summon_tualiq_proxy); void SetDest(SpellDestination& dest) { @@ -769,7 +769,7 @@ class spell_summon_tualiq_proxy : public SpellScript void Register() override { - OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_summon_tualiq_proxy::SetDest, EFFECT_0, TARGET_DEST_CASTER); + OnDestinationTargetSelect += SpellDestinationTargetSelectFn(spell_icecrown_summon_tualiq_proxy::SetDest, EFFECT_0, TARGET_DEST_CASTER); } }; @@ -784,9 +784,9 @@ enum BreakfastOfChampions }; // 66512 - Pound Drum -class spell_q14076_14092_pound_drum : public SpellScript +class spell_icecrown_pound_drum : public SpellScript { - PrepareSpellScript(spell_q14076_14092_pound_drum); + PrepareSpellScript(spell_icecrown_pound_drum); bool Validate(SpellInfo const* /*spell*/) override { @@ -800,7 +800,7 @@ class spell_q14076_14092_pound_drum : public SpellScript void Register() override { - OnCast += SpellCastFn(spell_q14076_14092_pound_drum::HandleSummon); + OnCast += SpellCastFn(spell_icecrown_pound_drum::HandleSummon); } }; @@ -825,9 +825,9 @@ std::array<uint32, 4> const ChumTheWaterSummonSpells = }; // 66741 - Chum the Water -class spell_q14112_14145_chum_the_water : public SpellScript +class spell_icecrown_chum_the_water : public SpellScript { - PrepareSpellScript(spell_q14112_14145_chum_the_water); + PrepareSpellScript(spell_icecrown_chum_the_water); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -842,7 +842,7 @@ class spell_q14112_14145_chum_the_water : public SpellScript void Register() override { - OnEffectHit += SpellEffectFn(spell_q14112_14145_chum_the_water::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_icecrown_chum_the_water::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -853,8 +853,8 @@ void AddSC_icecrown() RegisterCreatureAI(npc_tournament_training_dummy); RegisterCreatureAI(npc_blessed_banner); RegisterCreatureAI(npc_frostbrood_skytalon); - RegisterSpellScript(spell_the_ocular_on_death); - RegisterSpellScript(spell_summon_tualiq_proxy); - RegisterSpellScript(spell_q14076_14092_pound_drum); - RegisterSpellScript(spell_q14112_14145_chum_the_water); + RegisterSpellScript(spell_icecrown_the_ocular_on_death); + RegisterSpellScript(spell_icecrown_summon_tualiq_proxy); + RegisterSpellScript(spell_icecrown_pound_drum); + RegisterSpellScript(spell_icecrown_chum_the_water); } diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 6bcb02c4e49..f13957ec394 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -1052,9 +1052,9 @@ class spell_player_mount_wyrm : public AuraScript ######*/ // 55693 - Remove Collapsing Cave Aura -class spell_q12823_remove_collapsing_cave_aura : public SpellScript +class spell_storm_peaks_remove_collapsing_cave_aura : public SpellScript { - PrepareSpellScript(spell_q12823_remove_collapsing_cave_aura); + PrepareSpellScript(spell_storm_peaks_remove_collapsing_cave_aura); bool Validate(SpellInfo const* spellInfo) override { @@ -1068,7 +1068,7 @@ class spell_q12823_remove_collapsing_cave_aura : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_q12823_remove_collapsing_cave_aura::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_storm_peaks_remove_collapsing_cave_aura::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; @@ -1084,9 +1084,9 @@ enum MountingHodirsHelm }; // 56278 - Read Pronouncement -class spell_read_pronouncement : public AuraScript +class spell_storm_peaks_read_pronouncement : public AuraScript { - PrepareAuraScript(spell_read_pronouncement); + PrepareAuraScript(spell_storm_peaks_read_pronouncement); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1107,7 +1107,7 @@ class spell_read_pronouncement : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_read_pronouncement::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply += AuraEffectApplyFn(spell_storm_peaks_read_pronouncement::OnApply, EFFECT_0, SPELL_AURA_NONE, AURA_EFFECT_HANDLE_REAL); } }; @@ -1123,9 +1123,9 @@ enum JormuttarIsSooFat }; // 56565 - Bear Flank Master -class spell_bear_flank_master : public SpellScript +class spell_storm_peaks_bear_flank_master : public SpellScript { - PrepareSpellScript(spell_bear_flank_master); + PrepareSpellScript(spell_storm_peaks_bear_flank_master); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1139,14 +1139,14 @@ class spell_bear_flank_master : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_bear_flank_master::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHitTarget += SpellEffectFn(spell_storm_peaks_bear_flank_master::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; // 56569 - Bear Flank Fail -class spell_bear_flank_fail : public AuraScript +class spell_storm_peaks_bear_flank_fail : public AuraScript { - PrepareAuraScript(spell_bear_flank_fail); + PrepareAuraScript(spell_storm_peaks_bear_flank_fail); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -1161,7 +1161,7 @@ class spell_bear_flank_fail : public AuraScript void Register() override { - AfterEffectApply += AuraEffectApplyFn(spell_bear_flank_fail::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectApply += AuraEffectApplyFn(spell_storm_peaks_bear_flank_fail::AfterApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; @@ -1261,10 +1261,10 @@ void AddSC_storm_peaks() RegisterSpellScript(spell_claw_swipe_check); RegisterSpellScript(spell_fatal_strike); RegisterSpellScript(spell_player_mount_wyrm); - RegisterSpellScript(spell_q12823_remove_collapsing_cave_aura); - RegisterSpellScript(spell_read_pronouncement); - RegisterSpellScript(spell_bear_flank_master); - RegisterSpellScript(spell_bear_flank_fail); + RegisterSpellScript(spell_storm_peaks_remove_collapsing_cave_aura); + RegisterSpellScript(spell_storm_peaks_read_pronouncement); + RegisterSpellScript(spell_storm_peaks_bear_flank_master); + RegisterSpellScript(spell_storm_peaks_bear_flank_fail); RegisterSpellScript(spell_storm_peaks_mammoth_explosion_master); RegisterSpellScript(spell_storm_peaks_unstable_explosive_detonation); } diff --git a/src/server/scripts/Northrend/zone_zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 4acff22283c..0b25a673ce3 100644 --- a/src/server/scripts/Northrend/zone_zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp @@ -800,9 +800,9 @@ enum ScourgeDisguise }; // 51966 - Scourge Disguise -class spell_scourge_disguise : public AuraScript +class spell_zuldrak_scourge_disguise : public AuraScript { - PrepareAuraScript(spell_scourge_disguise); + PrepareAuraScript(spell_zuldrak_scourge_disguise); void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { @@ -818,15 +818,15 @@ class spell_scourge_disguise : public AuraScript void Register() override { - OnEffectRemove += AuraEffectRemoveFn(spell_scourge_disguise::RemoveEffect, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); - OnEffectApply += AuraEffectApplyFn(spell_scourge_disguise::ApplyEffect, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + OnEffectRemove += AuraEffectRemoveFn(spell_zuldrak_scourge_disguise::RemoveEffect, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); + OnEffectApply += AuraEffectApplyFn(spell_zuldrak_scourge_disguise::ApplyEffect, EFFECT_0, SPELL_AURA_TRANSFORM, AURA_EFFECT_HANDLE_REAL); } }; // 51971 - Scourge Disguise Instability -class spell_scourge_disguise_instability : public AuraScript +class spell_zuldrak_scourge_disguise_instability : public AuraScript { - PrepareAuraScript(spell_scourge_disguise_instability); + PrepareAuraScript(spell_zuldrak_scourge_disguise_instability); void CalcPeriodic(AuraEffect const* /*aurEff*/, bool& isPeriodic, int32& amplitude) { @@ -846,16 +846,16 @@ class spell_scourge_disguise_instability : public AuraScript void Register() override { - DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_scourge_disguise_instability::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectPeriodic += AuraEffectPeriodicFn(spell_scourge_disguise_instability::HandleDummyTick, EFFECT_0, SPELL_AURA_DUMMY); - OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_scourge_disguise_instability::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_DUMMY); + DoEffectCalcPeriodic += AuraEffectCalcPeriodicFn(spell_zuldrak_scourge_disguise_instability::CalcPeriodic, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectPeriodic += AuraEffectPeriodicFn(spell_zuldrak_scourge_disguise_instability::HandleDummyTick, EFFECT_0, SPELL_AURA_DUMMY); + OnEffectUpdatePeriodic += AuraEffectUpdatePeriodicFn(spell_zuldrak_scourge_disguise_instability::HandleUpdatePeriodic, EFFECT_0, SPELL_AURA_DUMMY); } }; // 52010 - Scourge Disguise Expiring -class spell_scourge_disguise_expiring : public AuraScript +class spell_zuldrak_scourge_disguise_expiring : public AuraScript { - PrepareAuraScript(spell_scourge_disguise_expiring); + PrepareAuraScript(spell_zuldrak_scourge_disguise_expiring); void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { @@ -871,15 +871,15 @@ class spell_scourge_disguise_expiring : public AuraScript void Register() override { - OnEffectApply += AuraEffectApplyFn(spell_scourge_disguise_expiring::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - AfterEffectRemove += AuraEffectRemoveFn(spell_scourge_disguise_expiring::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + OnEffectApply += AuraEffectApplyFn(spell_zuldrak_scourge_disguise_expiring::OnApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); + AfterEffectRemove += AuraEffectRemoveFn(spell_zuldrak_scourge_disguise_expiring::AfterRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); } }; // 54089 - Drop Disguise -class spell_drop_disguise : public SpellScript +class spell_zuldrak_drop_disguise : public SpellScript { - PrepareSpellScript(spell_drop_disguise); + PrepareSpellScript(spell_zuldrak_drop_disguise); void HandleHit() { @@ -890,7 +890,7 @@ class spell_drop_disguise : public SpellScript void Register() override { - AfterHit += SpellHitFn(spell_drop_disguise::HandleHit); + AfterHit += SpellHitFn(spell_zuldrak_drop_disguise::HandleHit); } }; @@ -905,9 +905,9 @@ enum Cocooned }; // 51596 - Cocooned: Player Not On Quest -class spell_cocooned_not_on_quest : public SpellScript +class spell_zuldrak_cocooned_not_on_quest : public SpellScript { - PrepareSpellScript(spell_cocooned_not_on_quest); + PrepareSpellScript(spell_zuldrak_cocooned_not_on_quest); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -921,14 +921,14 @@ class spell_cocooned_not_on_quest : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_cocooned_not_on_quest::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_zuldrak_cocooned_not_on_quest::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; // 51598 - Cocooned: Player On Quest -class spell_cocooned_on_quest : public SpellScript +class spell_zuldrak_cocooned_on_quest : public SpellScript { - PrepareSpellScript(spell_cocooned_on_quest); + PrepareSpellScript(spell_zuldrak_cocooned_on_quest); bool Validate(SpellInfo const* /*spellInfo*/) override { @@ -942,7 +942,7 @@ class spell_cocooned_on_quest : public SpellScript void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_cocooned_on_quest::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); + OnEffectHitTarget += SpellEffectFn(spell_zuldrak_cocooned_on_quest::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); } }; @@ -959,10 +959,10 @@ void AddSC_zuldrak() RegisterSpellScript(spell_pot_check); RegisterSpellScript(spell_fetch_ingredient_aura); RegisterCreatureAI(npc_storm_cloud); - RegisterSpellScript(spell_scourge_disguise); - RegisterSpellScript(spell_scourge_disguise_instability); - RegisterSpellScript(spell_scourge_disguise_expiring); - RegisterSpellScript(spell_drop_disguise); - RegisterSpellScript(spell_cocooned_not_on_quest); - RegisterSpellScript(spell_cocooned_on_quest); + RegisterSpellScript(spell_zuldrak_scourge_disguise); + RegisterSpellScript(spell_zuldrak_scourge_disguise_instability); + RegisterSpellScript(spell_zuldrak_scourge_disguise_expiring); + RegisterSpellScript(spell_zuldrak_drop_disguise); + RegisterSpellScript(spell_zuldrak_cocooned_not_on_quest); + RegisterSpellScript(spell_zuldrak_cocooned_on_quest); } |