diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-08-04 15:33:44 +0200 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-08-04 15:33:44 +0200 |
| commit | d76e15b587173e44de45e764eade4f221f9cb715 (patch) | |
| tree | 420ad1b9b4263b0f4b827865f7425d90438d674a | |
| parent | 4030e4d780ed60d281c2b0eaff58ed2b40ad7f47 (diff) | |
| parent | 259690b3ce0d53cabf7ea60e7e5767014e27a268 (diff) | |
Merge remote-tracking branch 'tkrokli/hunter_animal_handler' into 3.3.5 (PR #16554)
| -rw-r--r-- | sql/updates/world/3.3.5/2016_08_04_01_world.sql | 5 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/StatSystem.cpp | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sql/updates/world/3.3.5/2016_08_04_01_world.sql b/sql/updates/world/3.3.5/2016_08_04_01_world.sql new file mode 100644 index 00000000000..4871f6de86a --- /dev/null +++ b/sql/updates/world/3.3.5/2016_08_04_01_world.sql @@ -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 diff --git a/src/server/game/Entities/Unit/StatSystem.cpp b/src/server/game/Entities/Unit/StatSystem.cpp index 82792a49c96..def6c382893 100644 --- a/src/server/game/Entities/Unit/StatSystem.cpp +++ b/src/server/game/Entities/Unit/StatSystem.cpp @@ -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) |