Merge remote-tracking branch 'tkrokli/hunter_animal_handler' into 3.3.5 (PR #16554)

This commit is contained in:
treeston
2016-08-04 15:33:44 +02:00
2 changed files with 10 additions and 0 deletions

View File

@@ -0,0 +1,5 @@
-- animal handler, spell ranks
DELETE FROM `spell_ranks` WHERE `first_spell_id` = 34453;
INSERT INTO `spell_ranks` (`first_spell_id`,`spell_id`,`rank`) VALUES
(34453, 34453, 1), -- Animal Handler, Rank 1
(34453, 34454, 2); -- Animal Handler, Rank 2

View File

@@ -1327,6 +1327,11 @@ void Guardian::UpdateAttackPowerAndDamage(bool ranged)
}
bonusAP = owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.22f * mod;
if (AuraEffect* aurEff = owner->GetAuraEffectOfRankedSpell(34453, EFFECT_1, owner->GetGUID())) // Animal Handler
{
AddPct(bonusAP, aurEff->GetAmount());
AddPct(val, aurEff->GetAmount());
}
SetBonusDamage(int32(owner->GetTotalAttackPowerValue(RANGED_ATTACK) * 0.1287f * mod));
}
else if (IsPetGhoul() || IsRisenAlly()) //ghouls benefit from deathknight's attack power (may be summon pet or not)