diff options
| -rw-r--r-- | sql/updates/world/master/2021_12_12_29_world_2019_07_01_08_world.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 21 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_item.cpp | 37 |
3 files changed, 39 insertions, 21 deletions
diff --git a/sql/updates/world/master/2021_12_12_29_world_2019_07_01_08_world.sql b/sql/updates/world/master/2021_12_12_29_world_2019_07_01_08_world.sql new file mode 100644 index 00000000000..2f2312ebed8 --- /dev/null +++ b/sql/updates/world/master/2021_12_12_29_world_2019_07_01_08_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_dimensional_ripper_everlook'; +INSERT INTO `spell_script_names` VALUES (23442,'spell_item_dimensional_ripper_everlook'); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 1916f6b4ad5..c6659ea56cd 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -897,27 +897,6 @@ void Spell::EffectTeleportUnits() TC_LOG_ERROR("spells", "Spell::EffectTeleportUnits - spellId %u attempted to teleport creature to a different map.", m_spellInfo->Id); return; } - - // post effects for TARGET_DEST_DB - /// @todo: awful hacks, move this to spellscripts - switch (m_spellInfo->Id) - { - // Dimensional Ripper - Everlook - case 23442: - { - int32 r = irand(0, 119); - if (r >= 70) // 7/12 success - { - if (r < 100) // 4/12 evil twin - m_caster->CastSpell(m_caster, 23445, CastSpellExtraArgs(TRIGGERED_FULL_MASK) - .SetOriginalCastId(m_castId)); - else // 1/12 fire - m_caster->CastSpell(m_caster, 23449, CastSpellExtraArgs(TRIGGERED_FULL_MASK) - .SetOriginalCastId(m_castId)); - } - return; - } - } } class DelayedSpellTeleportEvent : public BasicEvent diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index cc7078b8f69..9471cedc4c8 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -1714,6 +1714,7 @@ class spell_item_scroll_of_recall : public SpellScript enum TransporterSpells { SPELL_EVIL_TWIN = 23445, + SPELL_TRANSPORTER_MALFUNCTION_FIRE = 23449, SPELL_TRANSPORTER_MALFUNCTION_SMALLER = 36893, SPELL_TRANSPORTER_MALFUNCTION_BIGGER = 36895, SPELL_TRANSPORTER_MALFUNCTION_CHICKEN = 36940, @@ -1723,6 +1724,41 @@ enum TransporterSpells SPELL_SOUL_SPLIT_GOOD = 36901 }; +// 23442 - Dimensional Ripper - Everlook +class spell_item_dimensional_ripper_everlook : public SpellScript +{ + PrepareSpellScript(spell_item_dimensional_ripper_everlook); + + bool Validate(SpellInfo const* /*spellInfo*/) override + { + return ValidateSpellInfo({ SPELL_TRANSPORTER_MALFUNCTION_FIRE, SPELL_EVIL_TWIN }); + } + + bool Load() override + { + return GetCaster()->GetTypeId() == TYPEID_PLAYER; + } + + void HandleScript(SpellEffIndex /* effIndex */) + { + int32 r = irand(0, 119); + if (r <= 70) // 7/12 success + return; + + Unit* caster = GetCaster(); + + if (r < 100) // 4/12 evil twin + caster->CastSpell(caster, SPELL_EVIL_TWIN, true); + else // 1/12 fire + caster->CastSpell(caster, SPELL_TRANSPORTER_MALFUNCTION_FIRE, true); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_item_dimensional_ripper_everlook::HandleScript, EFFECT_0, SPELL_EFFECT_TELEPORT_UNITS); + } +}; + // 36941 - Ultrasafe Transporter: Toshley's Station class spell_item_ultrasafe_transporter : public SpellScript { @@ -4386,6 +4422,7 @@ void AddSC_item_spell_scripts() RegisterAuraScript(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); |