araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-21 15:27:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/Stat: fixed Predatory Strikes

Browse Source 
- Fixed bonus getting stuck after removing weapon
- Fixed calculation (must count both feral ap and any ap the weapon has as stated on the talent "any attack power on your equipped weapon")
This commit is contained in:
ariel-
2016-12-09 20:03:26 -03:00
parent 201d990777
commit 19560fcea1
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/StatSystem.cpp
+18 -3
View File
@@ -402,9 +402,24 @@ void Player::UpdateAttackPowerAndDamage(bool ranged)
if (AuraEffect const* levelMod = GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 1563, EFFECT_0))
levelBonus = CalculatePct(1.0f, levelMod->GetAmount());
if (Item const* weapon = m_items[EQUIPMENT_SLOT_MAINHAND])
if (AuraEffect const* weaponMod = GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 1563, EFFECT_1))
weaponBonus = CalculatePct(static_cast<float>(ASSERT_NOTNULL(weapon->GetTemplate())->getFeralBonus()), weaponMod->GetAmount());
// = 0 if removing the weapon, do not calculate bonus (uses template)
if (m_baseFeralAP)
{
if (Item const* weapon = m_items[EQUIPMENT_SLOT_MAINHAND])
{
if (AuraEffect const* weaponMod = GetAuraEffect(SPELL_AURA_DUMMY, SPELLFAMILY_DRUID, 1563, EFFECT_1))
{
ItemTemplate const* itemTemplate = weapon->GetTemplate();
int32 bonusAP = 0;
for (uint32 i = 0; i < itemTemplate->StatsCount; ++i)
if (itemTemplate->ItemStat[i].ItemStatType == ITEM_MOD_ATTACK_POWER)
bonusAP += itemTemplate->ItemStat[i].ItemStatValue;
bonusAP += m_baseFeralAP;
weaponBonus = CalculatePct(static_cast<float>(bonusAP), weaponMod->GetAmount());
}
}
}
}
switch (GetShapeshiftForm())