mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-20 01:15:35 +01:00
*Move shockwave bonus ap damage to SpellDamageSchoolDmg from dummy effect, because the effect has incorrect target data.
--HG-- branch : trunk
This commit is contained in:
@@ -413,6 +413,14 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
|
||||
// Heroic Throw ${$m1+$AP*.50}
|
||||
else if(m_spellInfo->SpellFamilyFlags[1] & 0x00000001)
|
||||
damage+= uint32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f);
|
||||
// Shockwave ${$m3/100*$AP}
|
||||
else if(m_spellInfo->SpellFamilyFlags[1] & 0x00008000)
|
||||
{
|
||||
int32 pct = m_caster->CalculateSpellDamage(m_spellInfo, 2, m_spellInfo->EffectBasePoints[2], unitTarget);
|
||||
if (pct > 0)
|
||||
damage+= int32(m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * pct / 100);
|
||||
break;
|
||||
}
|
||||
// Thunder Clap
|
||||
else if(m_spellInfo->SpellFamilyFlags[0] & 0x80)
|
||||
{
|
||||
@@ -1394,12 +1402,6 @@ void Spell::EffectDummy(uint32 i)
|
||||
m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
|
||||
return;
|
||||
}
|
||||
// Shockwave
|
||||
if(m_spellInfo->SpellFamilyFlags[1] & 0x8000)
|
||||
{
|
||||
m_damage+= uint32(damage * m_caster->GetTotalAttackPowerValue(BASE_ATTACK) / 100);
|
||||
return;
|
||||
}
|
||||
switch(m_spellInfo->Id)
|
||||
{
|
||||
// Warrior's Wrath
|
||||
|
||||
Reference in New Issue
Block a user