Merge pull request #958 from FFXIV-CombatReborn/DTRACM

Added additonal DTR config option, ironed out a bug with player action intercept system

Author: LTS-FFXIV

RotationSolver.Basic/Configuration/Configs.cs

@@ -861,6 +861,10 @@ public const string
         Filter = TargetConfig)]
     private static readonly bool _bigHP = false;
 
+    [ConditionBool, UI("Change clicking the DTR bar behaviour to cycle between Off and Manual (Overrides below option).",
+        Filter = TargetConfig)]
+    private static readonly bool _dtrManual = false;
+
     [ConditionBool, UI("Change clicking the DTR bar behaviour to cycle through each Target Type selected.",
         Filter = TargetConfig)]
     private static readonly bool _dtrCycle = false;

RotationSolver.Basic/DataCenter.cs

@@ -135,7 +135,7 @@ public static IAction? CommandNextAction
             }
 
             while (next != null && NextActs.Count > 0 &&
-                   (next.DeadTime < DateTime.Now || IActionHelper.IsLastAction(true, next.Act)))
+                   (next.DeadTime < DateTime.Now || IActionHelper.IsLastAction(false, next.Act)))
             {
                 NextActs.RemoveAt(0);
                 next = NextActs.Count > 0 ? NextActs[0] : null;

RotationSolver/Updaters/ActionQueueManager.cs

@@ -109,7 +109,7 @@ private static unsafe bool UseActionDetour(ActionManager* actionManager, uint ac
                             {
                                 if (matchingAction.IsIntercepted)
                                 {
-                                    if (matchingAction.EnoughLevel && (!matchingAction.Cooldown.IsCoolingDown || Service.Config.InterceptCooldown))
+                                    if (matchingAction.EnoughLevel && (matchingAction.Cooldown.CurrentCharges > 0 || Service.Config.InterceptCooldown))
                                     {
                                         HandleInterceptedAction(matchingAction, actionID);
                                         return false; // Block the original action

RotationSolver/Updaters/MajorUpdater.cs

@@ -149,8 +149,8 @@ private static void RSRUpdate(IFramework framework)
                 MacroUpdater.UpdateMacro();
                 TargetUpdater.UpdateTargets();
                 StateUpdater.UpdateState();
-                ActionSequencerUpdater.UpdateActionSequencerAction();
                 ActionUpdater.UpdateNextAction();
+                ActionSequencerUpdater.UpdateActionSequencerAction();
             }
             catch (Exception ex)
             {

RotationSolver/Updaters/MiscUpdater.cs

@@ -53,7 +53,11 @@ internal static void UpdateEntry()
                     new IconPayload(icon),
                     new TextPayload(showStr)
                 );
-                if (Service.Config.DtrCycle)
+                if (Service.Config.DtrManual)
+                {
+                    _dtrEntry.OnClick = _ => CycleStateWithAllTargetTypes();
+                }
+                else if (Service.Config.DtrCycle)
                 {
                     _dtrEntry.OnClick = _ => CycleStateWithAllTargetTypes();
                 }
@@ -69,6 +73,23 @@ internal static void UpdateEntry()
         }
     }
 
+    private static void CycleStateManual()
+    {
+        // If currently in off mode and not manual, go to Manual
+        if (DataCenter.State && !DataCenter.IsManual)
+        {
+            RSCommands.DoStateCommandType(StateCommandType.Manual);
+            return;
+        }
+
+        // If currently in Manual mode, turn off
+        if (DataCenter.State && DataCenter.IsManual)
+        {
+            RSCommands.DoStateCommandType(StateCommandType.Off);
+            return;
+        }
+    }
+
     private static void CycleStateWithAllTargetTypes()
     {
         // If currently Off, start with the first TargetType