From 01fa3cc4e61b2fcc86cf4230502f56f9890d190b Mon Sep 17 00:00:00 2001
From: Aussiemon <1407091-Aussiemon@users.noreply.gitlab.com>
Date: Sun, 20 Jul 2025 10:05:24 -0600
Subject: [PATCH] Subtract Charm from permanent disposition clamp range

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 9f3bb0b26f..ab92300804 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -12,6 +12,7 @@
 #include <components/esm3/loaddial.hpp>
 #include <components/esm3/loadfact.hpp>
 #include <components/esm3/loadinfo.hpp>
+#include <components/esm3/loadmgef.hpp>
 
 #include <components/compiler/errorhandler.hpp>
 #include <components/compiler/exception.hpp>
@@ -448,12 +449,14 @@ namespace MWDialogue
         {
             updateOriginalDisposition();
             MWMechanics::NpcStats& npcStats = mActor.getClass().getNpcStats(mActor);
-            // Clamp permanent disposition change so that final disposition doesn't go below 0 (could happen with
-            // intimidate)
-            npcStats.setBaseDisposition(0);
-            int zero = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false);
-            int disposition = std::clamp(mOriginalDisposition + mPermanentDispositionChange, -zero, 100 - zero);
 
+            // Get the sum of disposition effects minus charm (shouldn't be made permanent)
+            npcStats.setBaseDisposition(0);
+            int zero = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor, false)
+                - npcStats.getMagicEffects().getOrDefault(ESM::MagicEffect::Charm).getMagnitude();
+
+            // Clamp new permanent disposition to avoid negative derived disposition (can be caused by intimidate)
+            int disposition = std::clamp(mOriginalDisposition + mPermanentDispositionChange, -zero, 100 - zero);
             npcStats.setBaseDisposition(disposition);
         }
         mPermanentDispositionChange = 0;