diff options
| author | QAston <none@none> | 2009-07-27 18:05:30 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-07-27 18:05:30 +0200 |
| commit | 491051e194c12f3bb968c6d6f702a10e3b22cdb2 (patch) | |
| tree | 968cfc6a8516d1cbbd61fb15424aa06ead3c3a65 /src/game/SpellAuras.cpp | |
| parent | e8f8b66636cbcd5d9995ce8b3bb64afb5a835851 (diff) | |
*Rage is now generated by damage absorbed
*Fix rage calculation for level > 70
*Allow rage generation for NPC using rage
*Make mitigated damage not add rage
*Fix Warriors' Berserker Rage
Author of all of these: thenecromancer
--HG--
branch : trunk
Diffstat (limited to 'src/game/SpellAuras.cpp')
| -rw-r--r-- | src/game/SpellAuras.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 3597c670e8b..7515126b6cd 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -6150,7 +6150,7 @@ void AuraEffect::PeriodicTick() uint32 absorb=0; uint32 resist=0; - CleanDamage cleanDamage = CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL ); + CleanDamage cleanDamage = CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL ); // ignore non positive values (can be result apply spellmods to aura damage //uint32 amount = GetModifierValuePerStack() > 0 ? GetModifierValuePerStack() : 0; @@ -6166,7 +6166,7 @@ void AuraEffect::PeriodicTick() GetEffectMechanic(GetSpellProto(), m_effIndex) != MECHANIC_BLEED) { uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage, GetSpellProto()); - cleanDamage.damage += pdamage - pdamageReductedArmor; + cleanDamage.mitigated_damage += pdamage - pdamageReductedArmor; pdamage = pdamageReductedArmor; } @@ -6250,7 +6250,7 @@ void AuraEffect::PeriodicTick() uint32 absorb=0; uint32 resist=0; - CleanDamage cleanDamage = CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL ); + CleanDamage cleanDamage = CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL ); //uint32 pdamage = GetModifierValuePerStack() > 0 ? GetModifierValuePerStack() : 0; uint32 pdamage = GetAmount() > 0 ? GetAmount() : 0; @@ -6260,7 +6260,7 @@ void AuraEffect::PeriodicTick() if (GetSpellSchoolMask(GetSpellProto()) & SPELL_SCHOOL_MASK_NORMAL) { uint32 pdamageReductedArmor = pCaster->CalcArmorReducedDamage(m_target, pdamage, GetSpellProto()); - cleanDamage.damage += pdamage - pdamageReductedArmor; + cleanDamage.mitigated_damage += pdamage - pdamageReductedArmor; pdamage = pdamageReductedArmor; } @@ -6420,7 +6420,7 @@ void AuraEffect::PeriodicTick() pCaster->DealDamageMods(pCaster,damage,&absorb); pCaster->SendSpellNonMeleeDamageLog(pCaster, GetId(), damage, GetSpellSchoolMask(GetSpellProto()), absorb, 0, false, 0, false); - CleanDamage cleanDamage = CleanDamage(0, BASE_ATTACK, MELEE_HIT_NORMAL ); + CleanDamage cleanDamage = CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL ); pCaster->DealDamage(pCaster, damage, &cleanDamage, NODAMAGE, GetSpellSchoolMask(GetSpellProto()), GetSpellProto(), true); } } |