fix: add duty action on slot check.

ArchiDog1998 · Aug 8, 2023 · 793df6b · 793df6b
1 parent 2adc575
commit 793df6b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -81,6 +81,7 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO
         Target = player;
 
         if (!SkipDisable && !IsEnabled) return false;
+        if (IsDutyAction && !IsDutyActionOnSlot) return false;
 
         if (DataCenter.DisabledAction != null && DataCenter.DisabledAction.Contains(ID)) return false;
 

diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -52,7 +52,7 @@ public partial class BaseAction : IBaseAction
     /// <summary>
     /// Is this duty action on the slot.
     /// </summary>
-    public bool IsDutyActionOnSlot => ActionManager.GetDutyActionId(0) == AdjustedID || ActionManager.GetDutyActionId(1) == AdjustedID;
+    public bool IsDutyActionOnSlot => DataCenter.BluSlots.Contains(AdjustedID);
 
     /// <summary>
     /// How many gcd left to add the dot.

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -183,6 +183,7 @@ public static float AbilityRemain
     public static float CastingTotal { get; internal set; }
     #endregion
     public static uint[] BluSlots { get; internal set; } = new uint[24];
+    public static uint[] DutyActions { get; internal set; } = new uint[2];
 
     static DateTime _specialStateStartTime = DateTime.MinValue;
     private static double SpecialTimeElapsed => (DateTime.Now - _specialStateStartTime).TotalSeconds;

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -79,16 +79,20 @@ internal unsafe static void UpdateActionInfo()
         SetAction(NextGCDAction?.AdjustedID ?? 0);
         UpdateWeaponTime();
         UpdateCombatTime();
-        UpdateBluSlots();
+        UpdateSlots();
         UpdateMoving();
         UpdateMPTimer();
     }
-    private unsafe static void UpdateBluSlots()
+    private unsafe static void UpdateSlots()
     {
         for (int i = 0; i < DataCenter.BluSlots.Length; i++)
         {
             DataCenter.BluSlots[i] = ActionManager.Instance()->GetActiveBlueMageActionInSlot(i);
         }
+        for (ushort i = 0; i < DataCenter.DutyActions.Length; i++)
+        {
+            DataCenter.DutyActions[i] = ActionManager.GetDutyActionId(i);
+        }
     }
 
     static DateTime _stopMovingTime = DateTime.MinValue;