Merge pull request #3478 from Havenard/fix0011

Core/Spells: Fix Divine Storm
This commit is contained in:
Shocker
2012-01-04 13:35:29 -08:00
3 changed files with 47 additions and 12 deletions
+6 -12
View File
@@ -1145,9 +1145,13 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
return;
m_caster->CastCustomSpell(unitTarget, 52752, &damage, NULL, NULL, true);
return;
case 54171: //Divine Storm
case 54171: // Divine Storm
{
m_caster->CastCustomSpell(unitTarget, 54172, &damage, 0, 0, true);
if (m_UniqueTargetInfo.size())
{
int32 heal = damage / m_UniqueTargetInfo.size();
m_caster->CastCustomSpell(unitTarget, 54172, &heal, NULL, NULL, true);
}
return;
}
case 58418: // Portal to Orgrimmar
@@ -1374,16 +1378,6 @@ void Spell::EffectDummy(SpellEffIndex effIndex)
}
break;
case SPELLFAMILY_PALADIN:
// Divine Storm
if (m_spellInfo->SpellFamilyFlags[1] & SPELLFAMILYFLAG1_PALADIN_DIVINESTORM && effIndex == 1)
{
int32 dmg = CalculatePctN(m_damage, damage);
if (!unitTarget)
unitTarget = m_caster;
m_caster->CastCustomSpell(unitTarget, 54171, &dmg, 0, 0, true);
return;
}
switch (m_spellInfo->Id)
{
case 31789: // Righteous Defense (step 1)