Merge pull request #952 from FFXIV-CombatReborn/InterceptUpdate

Refactor action interception and cooldown properties

Author: LTS-FFXIV

RotationSolver.Basic/Actions/ActionConfig.cs

@@ -16,6 +16,17 @@ public bool IsEnabled
         set => _isEnable = value;
     }
 
+    private bool _isIntercepted = true;
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsIntercepted
+    {
+        get => _isIntercepted;
+        set => _isIntercepted = value;
+    }
+
     /// <summary>
     /// Should check the status for this action.
     /// </summary>
@@ -81,5 +92,5 @@ public bool IsEnabled
     /// <summary>
     /// Is this action in the cd window.
     /// </summary>
-    public bool IsInCooldown { get; set; } = true;
+    public bool IsOnCooldownWindow { get; set; } = true;
 }

RotationSolver.Basic/Actions/BaseAction.cs

@@ -74,10 +74,17 @@ public bool IsEnabled
     }
 
     /// <inheritdoc/>
-    public bool IsInCooldown
+    public bool IsIntercepted
     {
-        get => Config.IsInCooldown;
-        set => Config.IsInCooldown = value;
+        get => Config.IsIntercepted;
+        set => Config.IsIntercepted = value;
+    }
+
+    /// <inheritdoc/>
+    public bool IsOnCooldownWindow
+    {
+        get => Config.IsOnCooldownWindow;
+        set => Config.IsOnCooldownWindow = value;
     }
 
     /// <inheritdoc/>

RotationSolver.Basic/Actions/BaseItem.cs

@@ -74,21 +74,28 @@ public ItemConfig Config
     /// <summary>
     /// Is item enabled.
     /// </summary>
-
     public bool IsEnabled
     {
         get => Config.IsEnabled;
         set => Config.IsEnabled = value;
     }
 
     /// <summary>
-    /// Is the item in the cd window.
+    ///
     /// </summary>
+    public bool IsIntercepted
+    {
+        get => Config.IsIntercepted;
+        set => Config.IsIntercepted = value;
+    }
 
-    public bool IsInCooldown
+    /// <summary>
+    /// Is the item in the cd window.
+    /// </summary>
+    public bool IsOnCooldownWindow
     {
-        get => Config.IsInCooldown;
-        set => Config.IsInCooldown = value;
+        get => Config.IsOnCooldownWindow;
+        set => Config.IsOnCooldownWindow = value;
     }
 
     /// <summary>

RotationSolver.Basic/Actions/IAction.cs

@@ -23,7 +23,7 @@ public interface IAction : ITexture, IEnoughLevel
     /// <summary>
     /// Gets or sets a value indicating whether this action is in the cooldown UI window.
     /// </summary>
-    bool IsInCooldown { get; set; }
+    bool IsOnCooldownWindow { get; set; }
 
     /// <summary>
     /// Gets the cooldown information for this action.

RotationSolver.Basic/Actions/ItemConfig.cs

@@ -8,10 +8,15 @@ public class ItemConfig
     /// <summary>
     /// Is in the cooldown window.
     /// </summary>
-    public bool IsInCooldown { get; set; }
+    public bool IsOnCooldownWindow { get; set; }
 
     /// <summary>
     /// Is this action enabled.
     /// </summary>
     public bool IsEnabled { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsIntercepted { get; set; }
 }

RotationSolver.Basic/ITexture.cs

@@ -27,4 +27,9 @@ public interface ITexture
     /// Enable or disable the usage of a skill. Turning this option off prevents RSR from using it completely.
     /// </markdown>
     bool IsEnabled { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    bool IsIntercepted { get; set; }
 }

RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs

@@ -1,7 +1,6 @@
 using ECommons.DalamudServices;
 using ECommons.ExcelServices;
 using Lumina.Excel.Sheets;
-using static FFXIVClientStructs.FFXIV.Client.UI.Agent.HudStatus;
 
 namespace RotationSolver.Basic.Rotations;
 
@@ -52,6 +51,9 @@ public bool IsEnabled
         get => !Service.Config.DisabledJobs.Contains(Job); set => _ = value ? Service.Config.DisabledJobs.Remove(Job) : Service.Config.DisabledJobs.Add(Job);
     }
 
+    /// <inheritdoc/>
+    public bool IsIntercepted { get; set; }
+
     /// <inheritdoc/>
     public uint IconID { get; }
 

RotationSolver.Basic/Traits/BaseTrait.cs

@@ -34,12 +34,17 @@ public class BaseTrait : IBaseTrait
     /// Gets the description of this trait.
     /// </summary>
     public string Description => Name;
-
+    
     /// <summary>
     /// Gets or sets a value indicating whether this trait is enabled.
     /// </summary>
     public bool IsEnabled { get; set; }
 
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsIntercepted { get; set; }
+
     /// <summary>
     /// Gets the ID of this trait.
     /// </summary>

RotationSolver/Data/UiString.cs

@@ -124,22 +124,25 @@ internal enum UiString
         [Description("Show on CD window")]
         ConfigWindow_Actions_ShowOnCDWindow,
 
+        [Description("Allow action to be intercepted by the intercept system")]
+        ConfigWindow_Actions_IsIntercepted,
+
         [Description("Time-to-kill threshold required for this action to be used")]
         ConfigWindow_Actions_TTK,
 
         [Description("Number of targets needed to use this action")]
         ConfigWindow_Actions_AoeCount,
 
-        [Description("Should this action check status effects")]
+        [Description("Should this action check needed status effects")]
         ConfigWindow_Actions_CheckStatus,
 
-        [Description("Should this action check targets status effects")]
+        [Description("Should this action check targets needed status effects")]
         ConfigWindow_Actions_CheckTargetStatus,
 
-        [Description("Number of GCDs before the DoT is reapplied")]
+        [Description("Number of GCDs before the DOT/Status effect is reapplied")]
         ConfigWindow_Actions_GcdCount,
 
-        [Description("HP ratio for automatic healing")]
+        [Description("HP ratio for automatic healing (only applies to healing actions)")]
         ConfigWindow_Actions_HealRatio,
 
         [Description("Forced Conditions have higher priority. If Forced Conditions are met, Disabled Conditions will be ignored.")]

RotationSolver/ExtraRotations/Magical/Rabbs_BLM.cs

@@ -792,7 +792,7 @@ protected override bool GeneralGCD(out IAction? act)
                         if (DespairPvE.CanUse(out act)) return true;
                     }
 
-                    if (ManafontPvE.IsInCooldown && ManafontPvE.Cooldown.RecastTimeElapsed > 6 && AstralSoulStacks == 4)
+                    if (ManafontPvE.Cooldown.IsCoolingDown && ManafontPvE.Cooldown.RecastTimeElapsed > 6 && AstralSoulStacks == 4)
                     {
                         if (ParadoxPvE.CanUse(out act, skipStatusProvideCheck: true)) return true;
                         if (AltFlareOpenerPvE.CanUse(out act, skipAoeCheck: true)) return true;