*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
bb75a8a21a
5 files changed
+33
-11
No files matched your search
@@ -436,6 +436,13 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
|
||||
if(unitTarget->HasAuraState(AURA_STATE_IMMOLATE))
|
||||
damage += int32(damage*0.25f);
|
||||
}
|
||||
// Haunt
|
||||
else if (m_spellProto->SpellFamilyFlags[1] & 0x40000)
|
||||
{
|
||||
// Save damage for future healing
|
||||
// TODO: Implement spell proc on aura expire
|
||||
m_currentBasePoints[1] = int32(damage * m_currentBasePoints[1] / 100);
|
||||
}
|
||||
|
||||
// Conflagrate - consumes immolate
|
||||
if (m_spellInfo->TargetAuraState == AURA_STATE_IMMOLATE)
|
||||
|
||||
Reference in new issue
Block a user