Merge pull request #127 from FFXIV-CombatReborn/action-ahead-adjustments

Corrected slidecast calculation on next action window
FFXIV-CombatReborn · Apr 25, 2024 · cc17cac · cc17cac
2 parents e0d5a86 + 0138b41
commit cc17cac
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/RotationSolver/UI/NextActionWindow.cs b/RotationSolver/UI/NextActionWindow.cs
@@ -69,10 +69,9 @@ public override unsafe void Draw()
 
     public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
     {
-        var group = ActionManager.Instance()->GetRecastGroupDetail(ActionHelper.GCDCooldownGroup - 1);
-
-        var remain = group->Total - group->Elapsed;
+        var remain = DataCenter.DefaultGCDRemain;
         var total = DataCenter.DefaultGCDTotal;
+        var elapsed = DataCenter.DefaultGCDElapsed;
 
         if (drawTittle)
         {
@@ -84,12 +83,12 @@ public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
         var cursor = ImGui.GetCursorPos() + ImGui.GetWindowPos();
         var height = Service.Config.ControlProgressHeight   ;
 
-        ImGui.ProgressBar(group->Elapsed / group->Total, new Vector2(width, height), string.Empty);
+        ImGui.ProgressBar(elapsed / total, new Vector2(width, height), string.Empty);
 
-        var actionRemain = DataCenter.DefaultGCDElapsed;
+        var actionRemain = DataCenter.DefaultGCDRemain;
         if (actionRemain > 0)
         {
-            var value = total - remain + actionRemain;
+            var value = total - DataCenter.ActionAhead;
 
             if (value > Player.Object.TotalCastTime)
             {