diff options
| author | click <none@none> | 2010-04-23 21:24:32 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-04-23 21:24:32 +0200 |
| commit | f93443b41c85edf2e03303c9440d8a60c8d3e04d (patch) | |
| tree | b5270ff37392d312af66bf222c0476f3ea7a71a0 /src | |
| parent | c972765e0acc24ef11598325d9105ea7204659b9 (diff) | |
*Fixes conflagrate DOT damage so that warlocks finally can be the pyromaniacs they want to be
Closes issue #942
Fix by Liberate
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellEffects.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index cbdb666cd90..41dff1eb5c0 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -500,7 +500,12 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx) { uint32 pdamage = aura->GetAmount() > 0 ? aura->GetAmount() : 0; pdamage = m_caster->SpellDamageBonus(unitTarget, aura->GetSpellProto(), pdamage, DOT, aura->GetBase()->GetStackAmount()); - damage += pdamage * aura->GetTotalTicks() * 60 / 100; + uint32 pct_dir = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, (effect_idx + 1)); + damage += pdamage * aura->GetTotalTicks() * pct_dir / 100; + + uint32 pct_dot = m_caster->CalculateSpellDamage(unitTarget, m_spellInfo, (effect_idx + 2)) / 3; + m_currentBasePoints[1] = pdamage * aura->GetTotalTicks() * pct_dot / 100; + apply_direct_bonus = false; // Glyph of Conflagrate if (!m_caster->HasAura(56235)) |