fix: refine the MP check.

ArchiDog1998 · Apr 29, 2023 · a4f3198 · a4f3198
1 parent 85950e7
commit a4f3198
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -57,7 +57,7 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
 
         if (!EnoughLevel) return false;
 
-        if (player.CurrentMp < MPNeed) return false;
+        if (player.GetMP() < MPNeed) return false;
 
         if (StatusNeed != null)
         {

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -66,6 +66,17 @@ or 71344 //Major Quest
         return false;
     }
 
+    public static uint GetMP(this BattleChara b)
+    {
+        if(b == null) return 0;
+        var mp = b.CurrentMp;
+        if (!b.IsCasting) return mp;
+
+        var subMp = (uint)ActionManager.GetActionCost(ActionType.Spell, b.CastActionId, 0, 0, 0, 0);
+        if (subMp < 100) subMp = 0;
+        return mp - subMp;
+    }
+
     public static unsafe uint GetNamePlateIcon(this GameObject obj) => obj.GetAddress()->NamePlateIconId;
     public static unsafe void SetNamePlateIcon(this GameObject obj, uint id) => obj.GetAddress()->NamePlateIconId = id;
     public static unsafe EventHandlerType GetEventType(this GameObject obj) => obj.GetAddress()->EventId.Type;