mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-03 11:06:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'thirstytherana' into 'master'

Browse source 
Prevent spell priority skyrocketing in useless cases

Closes #8102

See merge request OpenMW/openmw!4310
This commit is contained in:
psi29a 2024-08-12 08:35:41 +00:00
commit c8c09b1905
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmechanics/spellpriority.cpp
View file

@ -440,12 +440,12 @@ namespace MWMechanics
// NB: this currently assumes the hardcoded magic effect flags are used // NB: this currently assumes the hardcoded magic effect flags are used
const float magnitude = (effect.mMagnMin + effect.mMagnMax) / 2.f; const float magnitude = (effect.mMagnMin + effect.mMagnMax) / 2.f;
const float toHeal = magnitude * std::max(1, effect.mDuration); const float toHeal = magnitude * std::max(1, effect.mDuration);
const float damage = current.getModified() - current.getCurrent(); const float damage = std::max(current.getModified() - current.getCurrent(), 0.f);
float priority = 0.f; float priority = 0.f;
if (effect.mEffectID == ESM::MagicEffect::RestoreHealth) if (effect.mEffectID == ESM::MagicEffect::RestoreHealth)
priority = 4.f; priority = 4.f;
else if (effect.mEffectID == ESM::MagicEffect::RestoreMagicka) else if (effect.mEffectID == ESM::MagicEffect::RestoreMagicka)
priority = std::max(0.1f, getRestoreMagickaPriority(actor)); priority = getRestoreMagickaPriority(actor);
else if (effect.mEffectID == ESM::MagicEffect::RestoreFatigue) else if (effect.mEffectID == ESM::MagicEffect::RestoreFatigue)
priority = 2.f; priority = 2.f;
float overheal = 0.f; float overheal = 0.f;
@ -456,9 +456,8 @@ namespace MWMechanics
heal = damage; heal = damage;
} }
priority = (std::pow(priority + heal / current.getModified(), damage * 4.f / current.getModified()) priority = (priority - 1.f) / 2.f * std::pow((damage / current.getModified() + 0.6f), priority * 2)
- priority - overheal / current.getModified()) + priority * (heal - 2.f * overheal) / current.getModified() - 0.5f;
/ priority;
rating = priority; rating = priority;
} }
break; break;