diff options
3 files changed, 22 insertions, 18 deletions
diff --git a/sql/updates/world/master/2022_03_12_26_world_2021_08_15_01_world.sql b/sql/updates/world/master/2022_03_12_26_world_2021_08_15_01_world.sql new file mode 100644 index 00000000000..d777a6e5753 --- /dev/null +++ b/sql/updates/world/master/2022_03_12_26_world_2021_08_15_01_world.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_gen_submerged','spell_xt002_submerged'); +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(37751,'spell_gen_submerged'); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index ea5c6b3a038..bd4fc05f99c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -869,23 +869,6 @@ class spell_xt002_tympanic_tantrum : public SpellScript } }; -// 37751 - Submerged -class spell_xt002_submerged : public SpellScript -{ - PrepareSpellScript(spell_xt002_submerged); - - void HandleScript(SpellEffIndex /*eff*/) - { - if (Creature* target = GetHitCreature()) - target->SetStandState(UNIT_STAND_STATE_SUBMERGED); - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_xt002_submerged::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); - } -}; - // 65032 - 321-Boombot Aura class spell_xt002_321_boombot_aura : public AuraScript { @@ -1012,7 +995,6 @@ void AddSC_boss_xt002() RegisterSpellScript(spell_xt002_heart_overload_periodic); RegisterSpellScript(spell_xt002_energy_orb); RegisterSpellScript(spell_xt002_tympanic_tantrum); - RegisterSpellScript(spell_xt002_submerged); RegisterSpellScript(spell_xt002_321_boombot_aura); RegisterSpellScript(spell_xt002_exposed_heart); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index ba45619edc9..2b1178991d8 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -4430,6 +4430,23 @@ class spell_gen_cannon_blast : public SpellScript } }; +// 37751 - Submerged +class spell_gen_submerged : public SpellScript +{ + PrepareSpellScript(spell_gen_submerged); + + void HandleScript(SpellEffIndex /*eff*/) + { + if (Creature* target = GetHitCreature()) + target->SetStandState(UNIT_STAND_STATE_SUBMERGED); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_gen_submerged::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + // 169869 - Transformation Sickness class spell_gen_decimatus_transformation_sickness : public SpellScript { @@ -4899,6 +4916,7 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_freezing_circle); RegisterSpellScript(spell_gen_charmed_unit_spell_cooldown); RegisterSpellScript(spell_gen_cannon_blast); + RegisterSpellScript(spell_gen_submerged); RegisterSpellScript(spell_gen_decimatus_transformation_sickness); RegisterSpellScript(spell_gen_anetheron_summon_towering_infernal); RegisterSpellAndAuraScriptPair(spell_gen_mark_of_kazrogal_hellfire, spell_gen_mark_of_kazrogal_hellfire_aura); |