fix: add duty action.

ArchiDog1998 · Jul 29, 2023 · 47d35f6 · 47d35f6
1 parent 4fa7f26
commit 47d35f6
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 7 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs b/RotationSolver.Basic/Actions/BaseAction_BasicInfo.cs
@@ -44,6 +44,16 @@ public partial class BaseAction : IBaseAction
     /// </summary>
     public bool IsRealGCD => _option.HasFlag(ActionOption.RealGCD);
 
+    /// <summary>
+    /// Is this action a duty action.
+    /// </summary>
+    public bool IsDutyAction => _option.HasFlag(ActionOption.DutyAction);
+
+    /// <summary>
+    /// Is this duty action on the slot.
+    /// </summary>
+    public bool IsDutyActionOnSlot => ActionManager.GetDutyActionId(0) == AdjustedID || ActionManager.GetDutyActionId(1) == AdjustedID;
+
     /// <summary>
     /// How many gcd left to add the dot.
     /// </summary>

diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -67,6 +67,16 @@ public interface IBaseAction : IAction
     /// </summary>
     Func<IEnumerable<BattleChara>, IEnumerable<BattleChara>> FilterForHostiles { get; }
 
+    /// <summary>
+    /// Is this action a duty action.
+    /// </summary>
+    bool IsDutyAction { get; }
+
+    /// <summary>
+    /// Is this duty action on the slot.
+    /// </summary>
+    bool IsDutyActionOnSlot { get; }
+
     /// <summary>
     /// Can I use this action at this time. It will check a lot of things.
     /// Level, Enabled, Action Status, MP, Player Status, Coll down, Combo, Moving (for casting), Charges, Target, etc.

diff --git a/RotationSolver.Basic/Data/ActionOption.cs b/RotationSolver.Basic/Data/ActionOption.cs
@@ -36,6 +36,11 @@ public enum ActionOption : byte
     /// </summary>
     RealGCD = 1 << 4,
 
+    /// <summary>
+    /// The duty action
+    /// </summary>
+    DutyAction = 1 << 5,
+
     /// <summary>
     /// Dot action
     /// </summary>

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -219,19 +219,19 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
     /// 
     /// </summary>
     public static IBaseAction VariantRaise { get; } = new RoleAction(ActionID.VariantRaise,
-        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Friendly);
+        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Friendly | ActionOption.DutyAction);
 
     /// <summary>
     /// 
     /// </summary>
     public static IBaseAction VariantCure { get; } = new RoleAction(ActionID.VariantCure,
-        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Heal);
+        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Heal | ActionOption.DutyAction);
 
     /// <summary>
     /// 
     /// </summary>
     public static IBaseAction VariantSpiritDart { get; } = new RoleAction(ActionID.VariantSpiritDart,
-        new JobRole[] { JobRole.Healer, JobRole.Tank }, ActionOption.Dot)
+        new JobRole[] { JobRole.Healer, JobRole.Tank }, ActionOption.Dot | ActionOption.DutyAction)
     {
         TargetStatus = new StatusID[] { StatusID.VariantSpiritDart },
     };
@@ -240,7 +240,7 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
     /// 
     /// </summary>
     public static IBaseAction VariantRampart { get; } = new RoleAction(ActionID.VariantRampart,
-        new JobRole[] { JobRole.Melee, JobRole.Healer, JobRole.Ranged }, ActionOption.Buff);
+        new JobRole[] { JobRole.Melee, JobRole.Healer, JobRole.Ranged }, ActionOption.Buff | ActionOption.DutyAction);
     #endregion
 
     IBaseAction[] _allBaseActions;

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -164,8 +164,6 @@ private void DrawLastAction()
 
     private unsafe void DrawIcon()
     {
-        ImGui.Text(ActionManager.GetDutyActionId(0).ToString());
-        ImGui.Text(ActionManager.GetDutyActionId(1).ToString());
         //if(ImGui.BeginTable("BLUAction", 4, ImGuiTableFlags.Borders | ImGuiTableFlags.Resizable | ImGuiTableFlags.SizingFixedFit))
         //{
         //    foreach (var item in Svc.Data.GetExcelSheet<Lumina.Excel.GeneratedSheets.Action>())

diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs
@@ -362,6 +362,15 @@ public static IEnumerable<IGrouping<string, IAction>> AllGroupedActions
                 {
                     string result;
 
+                    if (act.IsDutyAction)
+                    {
+#if DEBUG
+                        return "Duty Action";
+#else
+                        return act.IsDutyActionOnSlot ? "Duty Action" : string.Empty;
+#endif
+                    }
+
                     if (act.IsRealGCD)
                     {
                         result = "GCD";
@@ -396,7 +405,7 @@ public static IEnumerable<IGrouping<string, IAction>> AllGroupedActions
                 }
                 return string.Empty;
 
-            }).OrderBy(g => g.Key);
+            }).Where(g => !string.IsNullOrEmpty(g.Key)).OrderBy(g => g.Key);
 
     public static void UpdateRotation()
     {