mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stats_gave_me_a_headache' into 'master'

Browse Source 
Make Set- and ModStat behave as they should

Closes #2036

See merge request OpenMW/openmw!1410
This commit is contained in:
psi29a 2021-12-26 19:47:09 +00:00
commit 01ac96e900
4 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
Bug #1751: Birthsign abilities increase modified attribute values instead of base ones
Bug #1930: Followers are still fighting if a target stops combat with a leader
Bug #2036: SetStat and ModStat instructions aren't implemented the same way as in Morrowind
Bug #3246: ESSImporter: Most NPCs are dead on save load
Bug #3488: AI combat aiming is too slow
Bug #3514: Editing a reference's position after loading an esp file makes the reference disappear

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

@ -246,14 +246,25 @@ namespace MWMechanics
return mModifier;
}
void AttributeValue::setBase(float base)
void AttributeValue::setBase(float base, bool clearModifier)
{
mBase = base;
if(clearModifier)
{
mModifier = 0.f;
mDamage = 0.f;
}
}
void AttributeValue::setModifier(float mod)
{
mModifier = mod;
if(mod < 0)
{
mModifier = 0.f;
mDamage -= mod;
}
else
mModifier = mod;
}
void AttributeValue::damage(float damage)

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

@ -133,13 +133,14 @@ namespace MWMechanics
float getBase() const;
float getModifier() const;
void setBase(float base);
void setBase(float base, bool clearModifier = false);
void setModifier(float mod);
// Maximum attribute damage is limited to the modified value.
// Note: I think MW applies damage directly to mModified, since you can also
// "restore" drained attributes. We need to rewrite the magic effect system to support this.
// Note: MW applies damage directly to mModified, however it does track how much
// a damaged attribute that has been fortified beyond its base can be restored.
// Getting rid of mDamage would require calculating its value by ignoring active effects when restoring
void damage(float damage);
void restore(float amount);

47
apps/openmw/mwscript/statsextensions.cpp
View File

@ -40,6 +40,22 @@ namespace
return factionId;
}
void modStat(MWMechanics::AttributeValue& stat, float amount)
{
float base = stat.getBase();
float modifier = stat.getModifier() - stat.getDamage();
float modified = base + modifier;
if(modified <= 0.f && amount < 0.f)
amount = 0.f;
else if(amount < 0.f && modified + amount < 0.f)
amount = -modified;
else if((modifier <= 0.f || base >= 100.f) && amount > 0.f)
amount = std::clamp(100.f - modified, 0.f, amount);
stat.setBase(std::min(base + amount, 100.f), true);
modifier += base - stat.getBase() + amount;
stat.setModifier(modifier);
}
}
namespace MWScript
@ -122,7 +138,7 @@ namespace MWScript
runtime.pop();
MWMechanics::AttributeValue attribute = ptr.getClass().getCreatureStats(ptr).getAttribute(mIndex);
attribute.setBase (value);
attribute.setBase(value, true);
ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
}
};
@ -146,19 +162,7 @@ namespace MWScript
MWMechanics::AttributeValue attribute = ptr.getClass()
.getCreatureStats(ptr)
.getAttribute(mIndex);
if (value == 0)
return;
if (((attribute.getBase() <= 0) && (value < 0))
|| ((attribute.getBase() >= 100) && (value > 0)))
return;
if (value < 0)
attribute.setBase(std::max(0.f, attribute.getBase() + value));
else
attribute.setBase(std::min(100.f, attribute.getBase() + value));
modStat(attribute, value);
ptr.getClass().getCreatureStats(ptr).setAttribute(mIndex, attribute);
}
};
@ -372,7 +376,7 @@ namespace MWScript
MWMechanics::NpcStats& stats = ptr.getClass().getNpcStats (ptr);
stats.getSkill (mIndex).setBase (value);
stats.getSkill(mIndex).setBase(value, true);
}
};
@ -395,18 +399,7 @@ namespace MWScript
MWMechanics::SkillValue &skill = ptr.getClass()
.getNpcStats(ptr)
.getSkill(mIndex);
if (value == 0)
return;
if (((skill.getBase() <= 0.f) && (value < 0.f))
|| ((skill.getBase() >= 100.f) && (value > 0.f)))
return;
if (value < 0)
skill.setBase(std::max(0.f, skill.getBase() + value));
else
skill.setBase(std::min(100.f, skill.getBase() + value));
modStat(skill, value);
}
};