Merge branch 'drainfatigue' into 'master'

Uncap Drain Fatigue again (bug #7573) Closes #7573 See merge request OpenMW/openmw!3414
OpenMW · Sep 11, 2023 · d87db1d · d87db1d
2 parents 39a209c + 0f2e5f9
commit d87db1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -71,6 +71,7 @@
     Bug #7505: Distant terrain does not support sample size greater than cell size
     Bug #7553: Faction reaction loading is incorrect
     Bug #7557: Terrain::ChunkManager::createChunk is called twice for the same position, lod on initial loading
+    Bug #7573: Drain Fatigue can't bring fatigue below zero by default
     Feature #3537: Shader-based water ripples
     Feature #5492: Let rain and snow collide with statics
     Feature #6149: Dehardcode Lua API_REVISION

diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp
@@ -717,8 +717,8 @@ namespace MWMechanics
                 if (!godmode)
                 {
                     int index = effect.mEffectId - ESM::MagicEffect::DrainHealth;
-                    adjustDynamicStat(
-                        target, index, -effect.mMagnitude, Settings::game().mUncappedDamageFatigue && index == 2);
+                    // Unlike Absorb and Damage effects Drain effects can bring stats below zero
+                    adjustDynamicStat(target, index, -effect.mMagnitude, true);
                     if (index == 0)
                         receivedMagicDamage = affectedHealth = true;
                 }