fix: add an next action window.

RotationSolver.Basic/Configuration/PluginConfiguration.cs

@@ -164,6 +164,8 @@ public class PluginConfiguration : IPluginConfiguration
 
     public Vector4 ControlWindowLockBg = new Vector4(0, 0, 0, 0.6f);
     public Vector4 ControlWindowUnlockBg = new Vector4(0, 0, 0, 0.9f);
+    public Vector4 NextActionWindowBg = new Vector4(0, 0, 0, 0.4f);
+
     public float ControlWindowGCDSize = 40;
     public float ControlWindow0GCDSize = 30;
     public float ControlWindowNextSizeRatio = 1.5f;

RotationSolver.Basic/Data/IconSet.cs

@@ -55,7 +55,7 @@ public static void Dispose()
     {
         foreach (var item in _textures.Values)
         {
-            item.Dispose();
+            item?.Dispose();
         }
     }
 

RotationSolver/Localization/Localization.json

@@ -162,7 +162,7 @@
   "ConfigWindow_Param_MoveTowardsScreenDesc": "Using movement actions towards the object in the center of the screen, otherwise toward the facing object.",
   "ConfigWindow_Param_RaiseAll": "Raise all (include passerby)",
   "ConfigWindow_Param_TargetFriendly": "Target all for friendly actions(include passerby)",
-  "ConfigWindow_Param_RaiseBrinkofDeath": "Raise player even has Brink of Death",
+  "ConfigWindow_Param_RaiseBrinkOfDeath": "Raise player even has Brink of Death",
   "ConfigWindow_Param_MoveAreaActionFarthest": "Moving Area Ability to farthest",
   "ConfigWindow_Param_MoveAreaActionFarthestDesc": "Move to the furthest position from character's face direction.",
   "ConfigWindow_Param_Hostile": "Hostile",
@@ -172,16 +172,18 @@
   "ConfigWindow_Param_ConditionUp": "Up",
   "ConfigWindow_Param_ConditionDown": "Down",
   "ConfigWindow_Param_ConditionDelete": "Delete",
+  "ConfigWindow_Control_ShowNextActionWindow": "Show Next Action Window",
   "ConfigWindow_Control_ShowControlWindow": "Show Control Window",
   "ConfigWindow_Control_UseKeyboardCommand": "Use Keyboard Command",
   "ConfigWindow_Control_UseGamepadCommand": "Use GamePad Command",
   "ConfigWindow_Control_ControlShowCooldown": "Show action's cooldown",
   "ConfigWindow_Control_IsControlWindowLock": "Lock",
   "ConfigWindow_Control_BackgroundColor": "Control Window's Background",
+  "ConfigWindow_Control_NextActionWindowBg": "Next Action Window's Background",
   "ConfigWindow_Control_ControlWindowGCDSize": "GCD icon size",
   "ConfigWindow_Control_ControlWindow0GCDSize": "0GCD icon size",
   "ConfigWindow_Control_ControlWindowNextSizeRatio": "Next Action Size Ratio",
-  "ConfigWindow_Control_ResetButtonOrKeyCommand": "Right click to reset the gamepad button or key board key.\nHold Left Ctrl and right click to clear the key setting.",
+  "ConfigWindow_Control_ResetButtonOrKeyCommand": "Right click to reset the gamepad button or key board key.\nHold Left Ctrl and middle click to clear the key setting.",
   "ConfigWindow_Control_NeedToEnable": " (Need to enable)",
   "Timeline_DragdropDescription": "Drag&drop to move，Ctrl+Alt+RightClick to delete.",
   "Timeline_SearchBar": "Search Bar",

RotationSolver/Localization/Strings.cs

@@ -243,6 +243,7 @@ internal partial class Strings
     public string ConfigWindow_Control_ControlShowCooldown { get; set; } = "Show action's cooldown";
     public string ConfigWindow_Control_IsControlWindowLock { get; set; } = "Lock";
     public string ConfigWindow_Control_BackgroundColor { get; set; } = "Control Window's Background";
+    public string ConfigWindow_Control_NextActionWindowBg { get; set; } = "Next Action Window's Background";
     public string ConfigWindow_Control_ControlWindowGCDSize { get; set; } = "GCD icon size";
     public string ConfigWindow_Control_ControlWindow0GCDSize { get; set; } = "0GCD icon size";
     public string ConfigWindow_Control_ControlWindowNextSizeRatio { get; set; } = "Next Action Size Ratio";

RotationSolver/RotationSolver.csproj

@@ -19,6 +19,8 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\RotationSolver.Basic\RotationSolver.Basic.csproj" />
+		<ProjectReference Include="..\RotationSolver.Default\RotationSolver.Default.csproj" />
+		<ProjectReference Include="..\RotationSolver.Old\RotationSolver.Old.csproj" />
 
 		<EmbeddedResource Include="Localization\*.json" Exclude="Localization\Localization.json" />
 

RotationSolver/UI/ControlWindow.cs

@@ -1,19 +1,13 @@
-using Dalamud.Interface;
-using Dalamud.Interface.Colors;
+using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
-using Dalamud.Logging;
-using FFXIVClientStructs.FFXIV.Client.Game;
 using ImGuiNET;
 using ImGuiScene;
 using RotationSolver.Basic;
 using RotationSolver.Basic.Actions;
 using RotationSolver.Basic.Data;
-using RotationSolver.Basic.Helpers;
 using RotationSolver.Commands;
 using RotationSolver.Localization;
 using RotationSolver.Updaters;
-using System;
-using System.Buffers.Text;
 using System.Numerics;
 
 namespace RotationSolver.UI;
@@ -41,14 +35,14 @@ public override void PreDraw()
             Flags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoMove;
         }
 
-        ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
+        //ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
         ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
     }
 
     public override void PostDraw()
     {
         ImGui.PopStyleColor();
-        ImGui.PopStyleVar(2);
+        ImGui.PopStyleVar();
         base.PostDraw();
     }
 

RotationSolver/UI/NextActionWindow.cs

@@ -5,12 +5,7 @@
 using RotationSolver.Basic;
 using RotationSolver.Basic.Helpers;
 using RotationSolver.Updaters;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RotationSolver.UI;
 
@@ -25,11 +20,25 @@ internal class NextActionWindow : Window
     public NextActionWindow()
         : base(nameof(NextActionWindow), BaseFlags 
             | ImGuiWindowFlags.AlwaysAutoResize 
-            | ImGuiWindowFlags.NoResize
-            | ImGuiWindowFlags.NoInputs)
+            | ImGuiWindowFlags.NoResize)
     {
     }
 
+    public override void PreDraw()
+    {
+        ImGui.PushStyleColor(ImGuiCol.WindowBg, Service.Config.NextActionWindowBg);
+
+        //ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, new Vector2(0, 0));
+        ImGui.PushStyleVar(ImGuiStyleVar.WindowBorderSize, 0);
+    }
+
+    public override void PostDraw()
+    {
+        ImGui.PopStyleColor();
+        ImGui.PopStyleVar();
+        base.PostDraw();
+    }
+
     public override void Draw()
     {
         var width = Service.Config.ControlWindowGCDSize * Service.Config.ControlWindowNextSizeRatio;
@@ -44,7 +53,7 @@ public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
 
         if(drawTittle)
         {
-            var str = remain.ToString("F2") + "s";
+            var str = $"{remain:F2}s / {group->Total:F2}s";
             ImGui.SetCursorPosX(ImGui.GetCursorPosX() + width / 2 - ImGui.CalcTextSize(str).X / 2);
             ImGui.Text(str);
         }
@@ -59,23 +68,23 @@ public static unsafe void DrawGcdCooldown(float width, bool drawTittle)
         foreach (var value in CalculateValue(total, interval))
         {
             if (value < DataCenter.CastingTotal) continue;
-            var pt = cursor + new Vector2(total, 0) * value / total;
+            var pt = cursor + new Vector2(width, 0) * value / total;
 
-            ImGui.GetWindowDrawList().AddLine(pt, pt + new Vector2(0, height), 
+            ImGui.GetWindowDrawList().AddLine(pt, pt + new Vector2(0, height),
                 ImGui.ColorConvertFloat4ToU32(ImGuiColors.DalamudRed));
         }
     }
 
     static float[] CalculateValue(float total, float interval)
     {
-        if(interval <= 0 || total <= 0 || interval <= total) return new float[0];
+        if(interval <= 0 || total <= 0 || total <= interval) return new float[0];
 
         var count = (int)(total / interval);
-        var result = new List<float>(count);
+        var result = new List<float>();
 
         if(count > 1)
         {
-            for (int i = 1; i < count; i++)
+            for (int i = 1; i < count-1; i++)
             {
                 result.Add(i * interval);
             }

RotationSolver/UI/RotationConfigWindow_Control.cs

@@ -21,6 +21,12 @@ private void DrawControlTab()
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Control_ShowNextActionWindow,
             ref Service.Config.ShowNextActionWindow);
 
+        if (Service.Config.ShowNextActionWindow)
+        {
+            DrawColor4(LocalizationManager.RightLang.ConfigWindow_Control_NextActionWindowBg,
+                ref Service.Config.NextActionWindowBg);
+        }
+
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Control_ShowControlWindow,
             ref Service.Config.ShowControlWindow);
 

RotationSolver/UI/RotationConfigWindow_Debug.cs

@@ -21,6 +21,7 @@ private void DrawDebugTab()
 
         ImGui.PushStyleVar(ImGuiStyleVar.ItemSpacing, new Vector2(0f, 5f));
 
+
         if (ImGui.BeginTabBar("Debug Items"))
         {
             DrawParamTabItem("Status", DrawStatus);

RotationSolver/Updaters/ActionUpdater.cs

@@ -119,8 +119,8 @@ internal static unsafe void UpdateWeaponTime()
         var castTotal = player.TotalCastTime;
 
         var weaponTotal = instance->GetRecastTime(ActionType.Spell, 11);
-        castTotal = Math.Max(castTotal + 0.1f, weaponTotal);
-        if (player.IsCasting) weaponTotal = castTotal;
+        if (castTotal > 0) castTotal += 0.1f;
+        if (player.IsCasting) weaponTotal = Math.Max(castTotal, weaponTotal);
 
         DataCenter.WeaponElapsed = instance->GetRecastTimeElapsed(ActionType.Spell, 11);
         DataCenter.WeaponRemain = DataCenter.WeaponElapsed == 0 ? player.TotalCastTime - player.CurrentCastTime

RotationSolver/Updaters/SocialUpdater.cs

@@ -103,7 +103,7 @@ internal static async void UpdateSocial()
             await Task.Delay(new Random().Next(3000, 5000));
 
 #if DEBUG
-            Service.ChatGui.PrintError("Macro now.");
+            Service.ChatGui.Print("Macro now.");
 #endif
             Service.Config.DutyStart.AddMacro();
             await Task.Delay(new Random().Next(1000, 1500));
@@ -129,7 +129,7 @@ private static async void SayHelloToAuthor()
             }
 
 #if DEBUG
-            Service.ChatGui.PrintError("Author Time");
+            Service.ChatGui.Print("Author Time");
 #else
             Service.TargetManager.SetTarget(author);
             Service.SubmitToChat($"/{_macroToAuthor[new Random().Next(_macroToAuthor.Count)]} <t>");