Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Do not make nonphysical damage spells that use EffectWeaponDmg (like Seal of Command) receive total damage mod % auras twice - based on nos4r2zod's patch for MaNGOS

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-10-07 19:34:20 +02:00
parent 58258597d9
commit b059ff3839
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/SpellEffects.cpp
View File

@@ -4262,7 +4262,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
// multiple weapon dmg effect workaround
// execute only the last weapon damage
// and handle all effects at once
for (int j = 0; j < 3; ++j)
for (int j = i+i; j < 3; ++j)
{
switch(m_spellInfo->Effect[j])
{
@@ -4270,8 +4270,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
case SPELL_EFFECT_WEAPON_DAMAGE_NOSCHOOL:
case SPELL_EFFECT_NORMALIZED_WEAPON_DMG:
case SPELL_EFFECT_WEAPON_PERCENT_DAMAGE:
if (j < i) // we must calculate only at last weapon effect
return;
return; // we must calculate only at last weapon effect
break;
}
}
@@ -4539,7 +4538,9 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
case RANGED_ATTACK: unitMod = UNIT_MOD_DAMAGE_RANGED; break;
}
float weapon_total_pct = m_caster->GetModifierValue(unitMod, TOTAL_PCT);
float weapon_total_pct = 1.0f;
if ( m_spellInfo->SchoolMask & SPELL_SCHOOL_MASK_NORMAL )
weapon_total_pct = m_caster->GetModifierValue(unitMod, TOTAL_PCT);
if(fixed_bonus)
fixed_bonus = int32(fixed_bonus * weapon_total_pct);
@@ -4547,7 +4548,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i)
spell_bonus = int32(spell_bonus * weapon_total_pct);
}
int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized);
int32 weaponDamage = m_caster->CalculateDamage(m_attackType, normalized, true);
// Sequence is important
for (int j = 0; j < 3; ++j)