mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-18 13:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tasty_sujamma' into 'master'

Browse Source 
Uncap attribute and skill damage for drain and absorb effects

See merge request OpenMW/openmw!1592
This commit is contained in:
jvoisin 2022-01-30 17:59:49 +00:00
commit 43f64e9f75
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwmechanics/spelleffects.cpp
View File

@ -74,6 +74,8 @@ namespace
{
auto& creatureStats = target.getClass().getCreatureStats(target);
auto attr = creatureStats.getAttribute(effect.mArg);
if(effect.mEffectId == ESM::MagicEffect::DamageAttribute)
magnitude = std::min(attr.getModified(), magnitude);
attr.damage(magnitude);
creatureStats.setAttribute(effect.mArg, attr);
}
@ -98,6 +100,8 @@ namespace
{
auto& npcStats = target.getClass().getNpcStats(target);
auto& skill = npcStats.getSkill(effect.mArg);
if(effect.mEffectId == ESM::MagicEffect::DamageSkill)
magnitude = std::min(skill.getModified(), magnitude);
skill.damage(magnitude);
}

7
apps/openmw/mwmechanics/stat.cpp
View File

@ -269,12 +269,7 @@ namespace MWMechanics
void AttributeValue::damage(float damage)
{
float threshold = mBase + mModifier;
if (mDamage + damage > threshold)
mDamage = threshold;
else
mDamage += damage;
mDamage += damage;
}
void AttributeValue::restore(float amount)
{