Merge pull request #7090 from Faq/Idol4

Core/Spellaura: Fix Idol of Worship
This commit is contained in:
kandera
2012-07-13 09:46:32 -07:00
@@ -627,7 +627,10 @@ int32 AuraEffect::CalculateAmount(Unit* caster)
uint8 cp = caster->ToPlayer()->GetComboPoints(); uint8 cp = caster->ToPlayer()->GetComboPoints();
// Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs // Idol of Feral Shadows. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs
if (AuraEffect const* aurEff = caster->GetAuraEffect(34241, 0)) if (AuraEffect const* aurEff = caster->GetAuraEffect(34241, EFFECT_0))
amount += cp * aurEff->GetAmount();
// Idol of Worship. Cant be handled as SpellMod in SpellAura:Dummy due its dependency from CPs
else if (AuraEffect const* aurEff = caster->GetAuraEffect(60774, EFFECT_0))
amount += cp * aurEff->GetAmount(); amount += cp * aurEff->GetAmount();
amount += uint32(CalculatePctU(caster->GetTotalAttackPowerValue(BASE_ATTACK), cp)); amount += uint32(CalculatePctU(caster->GetTotalAttackPowerValue(BASE_ATTACK), cp));