diff options
| author | Duarte Duarte <dnpd.dd@gmail.com> | 2015-01-31 20:05:25 +0000 |
|---|---|---|
| committer | Duarte Duarte <dnpd.dd@gmail.com> | 2015-01-31 20:05:25 +0000 |
| commit | 26e016aacbfb225184378c70278f4e8c6e0a4dae (patch) | |
| tree | 5be715c0fdc268f11635eec2160eec877e12032d /src | |
| parent | 91b2519b9396dc1fc0a4e3932fc68eddf08779d6 (diff) | |
| parent | 24af925c963ffc1d87f8abeb8495398d4bbfddf4 (diff) | |
Merge pull request #13973 from Unholychick/6.x
Spells/Scripts: Some small fixes to spell_dk.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Spells/spell_dk.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp index a3d3eee8d6d..65b25564401 100644 --- a/src/server/scripts/Spells/spell_dk.cpp +++ b/src/server/scripts/Spells/spell_dk.cpp @@ -452,7 +452,7 @@ class spell_dk_death_coil : public SpellScriptLoader { SpellInfo const* DCD = sSpellMgr->EnsureSpellInfo(SPELL_DK_DEATH_COIL_DAMAGE); SpellEffectInfo const* eff = DCD->GetEffect(EFFECT_0); - int32 bp = caster->SpellDamageBonusDone(target, DCD, eff->CalcValue(caster), DIRECT_DAMAGE, eff); + int32 bp = caster->SpellDamageBonusDone(target, DCD, eff->CalcValue(caster), SPELL_DIRECT_DAMAGE, eff); caster->CastCustomSpell(target, SPELL_DK_DEATH_COIL_BARRIER, &bp, nullptr, nullptr, true); } @@ -667,7 +667,7 @@ class spell_dk_festering_strike : public SpellScriptLoader void HandleScriptEffect(SpellEffIndex /*effIndex*/) { - int32 extraDuration = GetSpellInfo()->GetEffect(EFFECT_2)->CalcValue(); + int32 extraDuration = GetEffectValue(); Unit* target = GetHitUnit(); ObjectGuid casterGUID = GetCaster()->GetGUID(); @@ -722,6 +722,11 @@ class spell_dk_ghoul_explode : public SpellScriptLoader return true; } + void HandleDamage(SpellEffIndex /*effIndex*/) + { + SetHitDamage(GetCaster()->CountPctFromMaxHealth(GetEffectInfo(EFFECT_2)->CalcValue(GetCaster()))); + } + void Suicide(SpellEffIndex /*effIndex*/) { if (Unit* unitTarget = GetHitUnit()) @@ -733,6 +738,7 @@ class spell_dk_ghoul_explode : public SpellScriptLoader void Register() override { + OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE); OnEffectHitTarget += SpellEffectFn(spell_dk_ghoul_explode_SpellScript::Suicide, EFFECT_1, SPELL_EFFECT_SCHOOL_DAMAGE); } }; @@ -946,7 +952,7 @@ class spell_dk_raise_dead : public SpellScriptLoader void HandleDummy(SpellEffIndex /*effIndex*/) { - GetCaster()->CastSpell(((Unit*)nullptr), GetSpellInfo()->GetEffect(EFFECT_0)->CalcValue(), true); + GetCaster()->CastSpell(((Unit*)nullptr), GetEffectValue(), true); } void Register() override |