Merge commit 'origin/master' into 320

This commit is contained in:
tomrus88 2009-08-01 09:22:30 +04:00
commit b99565ef42
9 changed files with 73 additions and 19 deletions

View file

@ -577,7 +577,8 @@ void Spell::EffectSchoolDMG(uint32 effect_idx)
//Gore
if (m_spellInfo->SpellIconID == 1578)
{
damage+= rand()%2 ? damage : 0;
if (m_caster->HasAura(57627)) // Charge 6 sec post-affect
damage *= 2;
}
// Mongoose Bite
else if ((m_spellInfo->SpellFamilyFlags & UI64LIT(0x000000002)) && m_spellInfo->SpellVisual[0]==342)