Add more spell scripts.

Author: ratkosrb

sql/migrations/20250407022846_world.sql

@@ -0,0 +1,28 @@
+DROP PROCEDURE IF EXISTS add_migration;
+DELIMITER ??
+CREATE PROCEDURE `add_migration`()
+BEGIN
+DECLARE v INT DEFAULT 1;
+SET v = (SELECT COUNT(*) FROM `migrations` WHERE `id`='20250407022846');
+IF v = 0 THEN
+INSERT INTO `migrations` VALUES ('20250407022846');
+-- Add your query below.
+
+
+-- Add scripts for more spells.
+UPDATE `spell_template` SET `script_name`='spell_gnomeregan_collecting_fallout' WHERE `entry`=12709;
+DELETE FROM `spell_effect_mod` WHERE `Id`=12709;
+UPDATE `spell_template` SET `script_name`='spell_linkens_boomerang' WHERE `entry`=15712;
+UPDATE `spell_template` SET `script_name`='spell_scorpid_surprise' WHERE `entry`=6410;
+UPDATE `spell_template` SET `script_name`='spell_rogue_vanish' WHERE `entry` IN (1856, 1857, 27617);
+UPDATE `spell_template` SET `script_name`='spell_brittle_armor_dummy' WHERE `entry`=29284;
+UPDATE `spell_template` SET `script_name`='spell_mercurial_shield_dummy' WHERE `entry`=29286;
+UPDATE `spell_template` SET `script_name`='spell_everlook_transporter' WHERE `entry`=23442;
+
+
+-- End of migration.
+END IF;
+END??
+DELIMITER ;
+CALL add_migration();
+DROP PROCEDURE IF EXISTS add_migration;

src/game/ScriptMgr.h

@@ -140,7 +140,7 @@ struct SpellScript
     virtual ~SpellScript() = default;
 
     // called on spell init
-    virtual void OnInit(Spell* /*spell*/) const {}
+    virtual void OnInit(Spell* /*spell*/) {}
     // called on success during Spell::Prepare
     virtual void OnSuccessfulStart(Spell* /*spell*/) const {}
     // called on success inside Spell::finish - for channels this only happens if whole channel went through

src/game/Spells/SpellEffects.cpp

@@ -1472,64 +1472,6 @@ void Spell::EffectTriggerSpell(SpellEffectIndex effIdx)
 
     uint32 triggeredSpellId = m_spellInfo->EffectTriggerSpell[effIdx];
 
-    // special cases
-    switch (m_spellInfo->Id)
-    {
-        // The Only Cure is More Green Glow quest 2962
-        case 12709:
-            m_caster->CastSpell(unitTarget, (urand(0, 2) ? 11638 : 11637), true, m_CastItem, nullptr, m_originalCasterGUID);
-            return;
-        // Linken's Boomerang: 10% chance to proc stun, 3% chance to proc disarm (dubious numbers)
-        case 15712:
-            if (triggeredSpellId == 15753)
-            {
-                if (urand(0, 10))
-                    return;
-            }
-            else if (triggeredSpellId == 15752)
-            {
-                if (urand(0, 30))
-                    return;
-            }
-
-            break;
-    }
-    switch (triggeredSpellId)
-    {
-        // Item [Scorpid Surprise] - Heals 294 damage over 21 sec, assuming you don't bite down on a poison sac.
-        // 10% proc rate (no source !)
-        case 6411:
-            if (urand(0, 10))
-                return;
-            break;
-        // Vanish
-        case 18461:
-        {
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
-
-            // World of Warcraft Client Patch 1.12.0 (2006-08-22)
-            // -  Vanish now removes effects that allow the caster to always remain
-            //    aware of their target(currently Hunter's Mark and Mind Vision).
-#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_11_2
-            unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
-#endif
-
-            if (Player* pPlayer = unitTarget->ToPlayer())
-                pPlayer->CastHighestStealthRank();
-
-            return;
-        }
-        // Brittle Armor - (need add max stack of 24575 Brittle Armor)
-        case 29284:
-            m_caster->CastSpell(unitTarget, 24575, true, m_CastItem, nullptr, m_originalCasterGUID);
-            return;
-        // Mercurial Shield - (need add max stack of 26464 Mercurial Shield)
-        case 29286:
-            m_caster->CastSpell(unitTarget, 26464, true, m_CastItem, nullptr, m_originalCasterGUID);
-            return;
-    }
-
     // normal case
     SpellEntry const* spellInfo = sSpellMgr.GetSpellEntry(triggeredSpellId);
     if (!spellInfo)
@@ -1632,7 +1574,7 @@ void Spell::EffectTeleportUnits(SpellEffectIndex effIdx)
                 unitTarget->NearTeleportTo(*st, TELE_TO_NOT_LEAVE_COMBAT | TELE_TO_NOT_UNSUMMON_PET | (unitTarget == m_caster ? TELE_TO_SPELL : 0));
             else if (unitTarget->GetTypeId() == TYPEID_PLAYER)
                 ((Player*)unitTarget)->TeleportTo(*st, unitTarget == m_caster ? TELE_TO_SPELL : 0);
-            break;
+            return;
         }
         case TARGET_LOCATION_CASTER_DEST:
         {
@@ -1666,19 +1608,6 @@ void Spell::EffectTeleportUnits(SpellEffectIndex effIdx)
             return;
         }
     }
-
-    // post effects for TARGET_LOCATION_DATABASE
-    if (m_spellInfo->Id == 23442 && m_casterUnit)
-    {
-        int32 r = irand(0, 119);
-        if (r >= 70)                                    // 7/12 success
-        {
-            if (r < 100)                                // 4/12 evil twin
-                m_casterUnit->CastSpell(m_casterUnit, 23445, true);
-            else                                        // 1/12 fire
-                m_casterUnit->CastSpell(m_casterUnit, 23449, true);
-        }
-    }
 }
 
 void Spell::EffectApplyAura(SpellEffectIndex effIdx)

src/scripts/eastern_kingdoms/dun_morogh/gnomeregan/gnomeregan.cpp

@@ -885,7 +885,27 @@ bool QuestAccept_npc_kernobee(Player* pPlayer, Creature* pCreature, Quest const*
     return true;
 }
 
+// 12709 - Collecting Fallout (Heavy Leaden Collection Phial)
+struct GnomereganCollectingFalloutScript : public SpellScript
+{
+    uint32 chosenEffect = 0;
+
+    void OnInit(Spell* /*spell*/) final
+    {
+        chosenEffect = urand(EFFECT_INDEX_0, EFFECT_INDEX_1);
+    }
 
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        // only execute one of the trigger spell effects
+        return effIdx == chosenEffect;
+    }
+};
+
+SpellScript* GetScript_GnomereganCollectingFallout(SpellEntry const*)
+{
+    return new GnomereganCollectingFalloutScript();
+}
 
 void AddSC_gnomeregan()
 {
@@ -903,4 +923,9 @@ void AddSC_gnomeregan()
     pNewScript->GetAI = &GetAI_npc_kernobee;
     pNewScript->pQuestAcceptNPC = &QuestAccept_npc_kernobee;
     pNewScript->RegisterSelf();
+
+    pNewScript = new Script;
+    pNewScript->Name = "spell_gnomeregan_collecting_fallout";
+    pNewScript->GetSpellScript = &GetScript_GnomereganCollectingFallout;
+    pNewScript->RegisterSelf();
 }

src/scripts/spells/spell_item.cpp

@@ -133,6 +133,7 @@ struct NoggenfoggerElixirScript : public SpellScript
 
             pPlayer->CastSpell(pPlayer, randomSpellId, true, nullptr);
         }
+        return true;
     }
 };
 
@@ -141,6 +142,113 @@ SpellScript* GetScript_NoggenfoggerElixir(SpellEntry const*)
     return new NoggenfoggerElixirScript();
 }
 
+// 15712 - Linken's Boomerang
+struct LinkensBoomerangScript : public SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        // 10% chance to proc stun, 3% chance to proc disarm (dubious numbers)
+        if (effIdx == EFFECT_INDEX_1)
+        {
+            if (urand(0, 30))
+                return false;
+        }
+        else if (effIdx == EFFECT_INDEX_2)
+        {
+            if (urand(0, 10))
+                return false;
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_LinkensBoomerang(SpellEntry const*)
+{
+    return new LinkensBoomerangScript();
+}
+
+// 6410 - Food (Scorpid Surprise)
+struct ScorpidSurpriseScript : public SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        if (effIdx == EFFECT_INDEX_1)
+        {
+            // Heals 294 damage over 21 sec, assuming you don't bite down on a poison sac.
+            // 10% proc rate (no source !)
+            if (urand(0, 10))
+                return false;
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_ScorpidSurprise(SpellEntry const*)
+{
+    return new ScorpidSurpriseScript();
+}
+
+// 29284 - Brittle Armor (Zandalarian Hero Badge)
+struct BrittleArmorDummyScript : public SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        if (effIdx == EFFECT_INDEX_0 && spell->GetUnitTarget())
+        {
+            spell->m_caster->CastSpell(spell->GetUnitTarget(), 24575, true);
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_BrittleArmorDummy(SpellEntry const*)
+{
+    return new BrittleArmorDummyScript();
+}
+
+// 29286 - Mercurial Shield (Petrified Scarab)
+struct MercurialShieldDummyScript : public SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        if (effIdx == EFFECT_INDEX_0 && spell->GetUnitTarget())
+        {
+            spell->m_caster->CastSpell(spell->GetUnitTarget(), 26464, true);
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_MercurialShieldDummy(SpellEntry const*)
+{
+    return new MercurialShieldDummyScript();
+}
+
+// 23442 - Everlook Transporter (Dimensional Ripper - Everlook)
+struct EverlookTransporterScript : public SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        if (effIdx == EFFECT_INDEX_0 && spell->m_casterUnit)
+        {
+            int32 r = irand(0, 119);
+            if (r >= 70)                                    // 7/12 success
+            {
+                if (r < 100)                                // 4/12 evil twin
+                    spell->m_casterUnit->CastSpell(spell->m_casterUnit, 23445, true);
+                else                                        // 1/12 fire
+                    spell->m_casterUnit->CastSpell(spell->m_casterUnit, 23449, true);
+            }
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_EverlookTransporter(SpellEntry const*)
+{
+    return new EverlookTransporterScript();
+}
+
 void AddSC_item_spell_scripts()
 {
     Script* newscript;
@@ -164,4 +272,29 @@ void AddSC_item_spell_scripts()
     newscript->Name = "spell_noggenfogger_elixir";
     newscript->GetSpellScript = &GetScript_NoggenfoggerElixir;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_linkens_boomerang";
+    newscript->GetSpellScript = &GetScript_LinkensBoomerang;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_scorpid_surprise";
+    newscript->GetSpellScript = &GetScript_ScorpidSurprise;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_brittle_armor_dummy";
+    newscript->GetSpellScript = &GetScript_BrittleArmorDummy;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_mercurial_shield_dummy";
+    newscript->GetSpellScript = &GetScript_MercurialShieldDummy;
+    newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_everlook_transporter";
+    newscript->GetSpellScript = &GetScript_EverlookTransporter;
+    newscript->RegisterSelf();
 }

src/scripts/spells/spell_rogue.cpp

@@ -45,6 +45,38 @@ SpellScript* GetScript_RogueEviscerate(SpellEntry const*)
     return new RogueEviscerateScript();
 }
 
+// 1856, 1857, 27617 - Vanish
+struct RogueVanishScript : SpellScript
+{
+    bool OnEffectExecute(Spell* spell, SpellEffectIndex effIdx) const final
+    {
+        if (effIdx == EFFECT_INDEX_1 && spell->GetUnitTarget())
+        {
+            spell->GetUnitTarget()->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
+            spell->GetUnitTarget()->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
+
+            // World of Warcraft Client Patch 1.12.0 (2006-08-22)
+            // -  Vanish now removes effects that allow the caster to always remain
+            //    aware of their target(currently Hunter's Mark and Mind Vision).
+#if SUPPORTED_CLIENT_BUILD > CLIENT_BUILD_1_11_2
+            spell->GetUnitTarget()->RemoveSpellsCausingAura(SPELL_AURA_MOD_STALKED);
+#endif
+
+            if (Player* pPlayer = spell->GetUnitTarget()->ToPlayer())
+                pPlayer->CastHighestStealthRank();
+
+            return false;
+
+        }
+        return true;
+    }
+};
+
+SpellScript* GetScript_RogueVanish(SpellEntry const*)
+{
+    return new RogueVanishScript();
+}
+
 void AddSC_rogue_spell_scripts()
 {
     Script* newscript;
@@ -53,4 +85,9 @@ void AddSC_rogue_spell_scripts()
     newscript->Name = "spell_rogue_eviscerate";
     newscript->GetSpellScript = &GetScript_RogueEviscerate;
     newscript->RegisterSelf();
+
+    newscript = new Script;
+    newscript->Name = "spell_rogue_vanish";
+    newscript->GetSpellScript = &GetScript_RogueVanish;
+    newscript->RegisterSelf();
 }

src/scripts/spells/spell_special.cpp

@@ -43,7 +43,7 @@ SpellScript* GetScript_Meteor(SpellEntry const*)
 // 24934 - Darkmoon Steam Tonk Control Console
 struct DarkmoonSteamTonkControlConsoleScript : public SpellScript
 {
-    void OnInit(Spell* spell) const final
+    void OnInit(Spell* spell) final
     {
         // Unsummon a potential Hunter or Warlock pet when using the Tonk Control Console.
         // Without this, the player will be unable to summon a Tonk but will still be