Merge pull request #2672 from Chaplain/master
Core/Spell: case TOTAL_PCT\BASE_PCT should be processed by multiplicative function not additive.
This commit is contained in:
@@ -5677,8 +5677,6 @@ void Player::HandleBaseModValue(BaseModGroup modGroup, BaseModType modType, floa
|
||||
m_auraBaseMod[modGroup][modType] += apply ? amount : -amount;
|
||||
break;
|
||||
case PCT_MOD:
|
||||
if (amount <= -100.0f)
|
||||
amount = -200.0f;
|
||||
ApplyPercentModFloatVar(m_auraBaseMod[modGroup][modType], amount, apply);
|
||||
break;
|
||||
}
|
||||
@@ -8094,7 +8092,7 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att
|
||||
if (unitModType == TOTAL_VALUE)
|
||||
ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, aura->GetAmount(), apply);
|
||||
else
|
||||
ApplyModSignedFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, aura->GetAmount() / 100.0f, apply);
|
||||
ApplyPercentModFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, aura->GetAmount(), apply);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13348,7 +13348,7 @@ bool Unit::HandleStatModifier(UnitMods unitMod, UnitModifierType modifierType, f
|
||||
break;
|
||||
case BASE_PCT:
|
||||
case TOTAL_PCT:
|
||||
m_auraModifiersGroup[unitMod][modifierType] += (apply ? amount : -amount) / 100.0f;
|
||||
ApplyPercentModFloatVar(m_auraModifiersGroup[unitMod][modifierType], amount, apply);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user