Script siphon life with spell script and fix on cast proc

Closes cmangos/issues#1555
cmangos · Dec 31, 2021 · fda13c2 · fda13c2
1 parent bdd412c
commit fda13c2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/sql/scriptdev2/spell.sql b/sql/scriptdev2/spell.sql
@@ -776,7 +776,8 @@ INSERT INTO spell_scripts(Id, ScriptName) VALUES
 (19734,'spell_devour_magic'),
 (19736,'spell_devour_magic'),
 (27276,'spell_devour_magic'),
-(27277,'spell_devour_magic');
+(27277,'spell_devour_magic'),
+(63108,'spell_siphon_life_wotlk');
 
 -- Pet Scaling
 INSERT INTO spell_scripts(Id, ScriptName) VALUES

diff --git a/src/game/Spells/Scripts/Scripting/ClassScripts/Warlock.cpp b/src/game/Spells/Scripts/Scripting/ClassScripts/Warlock.cpp
@@ -266,6 +266,30 @@ struct SeedOfCorruptionDamage : public SpellScript
     }
 };
 
+struct SiphonLifeWotlk : public AuraScript
+{
+    bool OnCheckProc(Aura* /*aura*/, ProcExecutionData& data) const override
+    {
+        if (data.damage == 0)
+            return false;
+        return true;
+    }
+
+    SpellAuraProcResult OnProc(Aura* aura, ProcExecutionData& procData) const override
+    {
+        int32  triggerAmount = aura->GetModifier()->m_amount;
+        // Glyph of Siphon Life
+        if (Aura* aur = aura->GetTarget()->GetAura(56216, EFFECT_INDEX_0))
+            triggerAmount += triggerAmount * aur->GetModifier()->m_amount / 100;
+
+        procData.basepoints[0] = int32(procData.damage * triggerAmount / 100);
+        procData.triggeredSpellId = 63106;
+        procData.triggerTarget = nullptr;
+
+        return SPELL_AURA_PROC_OK;
+    }
+};
+
 void LoadWarlockScripts()
 {
     RegisterAuraScript<UnstableAffliction>("spell_unstable_affliction");
@@ -278,4 +302,5 @@ void LoadWarlockScripts()
     RegisterSpellScript<SeedOfCorruptionDamage>("spell_seed_of_corruption_damage");
     RegisterScript<CurseOfDoom>("spell_curse_of_doom");
     RegisterSpellScript<CurseOfDoomEffect>("spell_curse_of_doom_effect");
+    RegisterAuraScript<SiphonLifeWotlk>("spell_siphon_life_wotlk");
 }
diff --git a/src/game/Spells/UnitAuraProcHandler.cpp b/src/game/Spells/UnitAuraProcHandler.cpp
@@ -1725,17 +1725,6 @@ SpellAuraProcResult Unit::HandleDummyAuraProc(ProcExecutionData& data)
                     triggered_spell_id = 37378;
                     break;
                 }
-                // Siphon Life
-                case 63108:
-                {
-                    // Glyph of Siphon Life
-                    if (Aura* aur = GetAura(56216, EFFECT_INDEX_0))
-                        triggerAmount += triggerAmount * aur->GetModifier()->m_amount / 100;
-
-                    basepoints[0] = int32(damage * triggerAmount / 100);
-                    triggered_spell_id = 63106;
-                    break;
-                }
             }
             break;
         }