fix: fixed the case of no gcd.

ArchiDog1998 · Jul 29, 2023 · 4fa7f26 · 4fa7f26
1 parent 04b9fac
commit 4fa7f26
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 70 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs b/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
@@ -58,7 +58,7 @@ public bool WillHaveOneCharge(float remain)
 
     unsafe RecastDetail* CoolDownDetail => ActionManager.Instance()->GetRecastGroupDetail(CoolDownGroup - 1);
 
-    private unsafe float RecastTime => CoolDownDetail->Total;
+    private unsafe float RecastTime => CoolDownDetail == null ? 0 : CoolDownDetail->Total;
 
     /// <summary>
     /// 
@@ -69,12 +69,12 @@ public bool WillHaveOneCharge(float remain)
     /// 
     /// </summary>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public unsafe float RecastTimeElapsedRaw => CoolDownDetail->Elapsed;
+    public unsafe float RecastTimeElapsedRaw => CoolDownDetail == null ? 0 : CoolDownDetail->Elapsed;
 
     /// <summary>
     /// 
     /// </summary>
-    public unsafe bool IsCoolingDown => CoolDownDetail->IsActive != 0;
+    public unsafe bool IsCoolingDown => CoolDownDetail == null ? false : CoolDownDetail->IsActive != 0;
 
     private float RecastTimeRemain => RecastTime - RecastTimeElapsedRaw;
 

diff --git a/RotationSolver.Basic/Data/ActionID.cs b/RotationSolver.Basic/Data/ActionID.cs
@@ -177,21 +177,6 @@ public enum ActionID : uint
     Spire = 4406,
     #endregion
 
-
-    #region VariantActions
-
-    VariantRaise = 29731,
-
-    VariantCure = 29729,
-
-    VariantSpiritDart = 29732,
-
-    VariantRampart = 29733
-
-    #endregion
-
-
-
     #region BlackMage
     /// <summary>
     /// 
@@ -3576,4 +3561,26 @@ public enum ActionID : uint
     /// </summary>
     Sprint = 3,
     #endregion
+
+    #region VariantActions
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantRaise = 29731,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantCure = 29729,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantSpiritDart = 29732,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    VariantRampart = 29733,
+    #endregion
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -14,57 +14,6 @@ internal RoleAction(ActionID actionID, JobRole[] roles, ActionOption option = Ac
         internal bool InRole(JobRole role) => _roles.Contains(role);
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
-    public static IBaseAction VariantRaise {
-    get;
-    } = new RoleAction(ActionID.VariantRaise, new JobRole[] {
-    JobRole.Melee,
-    JobRole.Tank,
-    JobRole.Ranged
-    },
-    ActionOption.Friendly);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public static IBaseAction VariantCure {
-    get;
-    } = new RoleAction(ActionID.VariantCure, new JobRole[] {
-    JobRole.Melee,
-    JobRole.Tank,
-    JobRole.Ranged
-    },
-    ActionOption.Heal);
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public static IBaseAction VariantSpiritDart {
-    get;
-    } = new RoleAction(ActionID.VariantSpiritDart, new JobRole[] {
-    JobRole.Healer,
-    JobRole.Tank
-    },
-    ActionOption.Dot) {
-    TargetStatus = new StatusID[] {
-      StatusID.VariantSpiritDart
-    }
-    };
-
-    /// <summary>
-    /// 
-    /// </summary>
-    public static IBaseAction VariantRampart {
-    get;
-    } = new RoleAction(ActionID.VariantRampart, new JobRole[] {
-    JobRole.Melee,
-    JobRole.Healer,
-    JobRole.Ranged
-    },
-    ActionOption.Buff);
-
     /// <summary>
     /// 
     /// </summary>
@@ -265,6 +214,35 @@ public static IBaseAction VariantRampart {
     private protected virtual IBaseAction Raise => null;
     private protected virtual IBaseAction TankStance => null;
 
+    #region Duty Action
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantRaise { get; } = new RoleAction(ActionID.VariantRaise,
+        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Friendly);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantCure { get; } = new RoleAction(ActionID.VariantCure,
+        new JobRole[] { JobRole.Melee, JobRole.Tank, JobRole.Ranged }, ActionOption.Heal);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantSpiritDart { get; } = new RoleAction(ActionID.VariantSpiritDart,
+        new JobRole[] { JobRole.Healer, JobRole.Tank }, ActionOption.Dot)
+    {
+        TargetStatus = new StatusID[] { StatusID.VariantSpiritDart },
+    };
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public static IBaseAction VariantRampart { get; } = new RoleAction(ActionID.VariantRampart,
+        new JobRole[] { JobRole.Melee, JobRole.Healer, JobRole.Ranged }, ActionOption.Buff);
+    #endregion
+
     IBaseAction[] _allBaseActions;
 
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member

diff --git a/RotationSolver/UI/RotationConfigWindowNew.cs b/RotationSolver/UI/RotationConfigWindowNew.cs
@@ -49,6 +49,7 @@ private void DrawHeader(float wholeWidth)
         var size = MathF.Max(_scale * MathF.Min(wholeWidth, _scale * 150), 100);
 
         var logo = IconSet.GetTexture("https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/docs/RotationSolverIcon_128.png");
+        logo = IconSet.GetTexture("https://raw.githubusercontent.com/ArchiDog1998/RotationSolver/main/docs/assets/HowAndWhenToClick.svg");
 
 
         if (logo != null)

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -164,7 +164,8 @@ private void DrawLastAction()
 
     private unsafe void DrawIcon()
     {
-        //ImGui.Text( ActionManager.Instance()->GetActionStatus(ActionType.Spell, 29733).ToString());
+        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>())