fix: make cooldown ation not adjust icon.

ArchiDog1998 · Apr 22, 2023 · 4ab116f · 4ab116f
1 parent 2c7a0f3
commit 4ab116f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -321,10 +321,10 @@ static string GetHelp(StateCommandType command)
 
     static readonly Dictionary<uint, uint> _actionIcons = new Dictionary<uint, uint>();
 
-    static TextureWrap GetTexture(IAction action)
+    static TextureWrap GetTexture(IAction action, bool isAdjust = true)
     {
         uint iconId = 0;
-        if(action != null && !_actionIcons.TryGetValue(action.AdjustedID, out iconId))
+        if(action != null && !_actionIcons.TryGetValue(isAdjust ? action.AdjustedID : action.ID, out iconId))
         {
             iconId = action is IBaseAction ? Service.GetSheet<Lumina.Excel.GeneratedSheets.Action>().GetRow(action.AdjustedID).Icon
                 : Service.GetSheet<Lumina.Excel.GeneratedSheets.Item>().GetRow(action.AdjustedID).Icon;
@@ -411,9 +411,9 @@ static void DrawIAction(nint handle, string id, float width, StateCommandType co
         }
     }
 
-    internal static (Vector2, Vector2) DrawIAction(IAction action, float width, float percent)
+    internal static (Vector2, Vector2) DrawIAction(IAction action, float width, float percent, bool isAdjust = true)
     {
-        var result = DrawIAction(GetTexture(action).ImGuiHandle, width, action == null ? -1 : percent);
+        var result = DrawIAction(GetTexture(action, isAdjust).ImGuiHandle, width, action == null ? -1 : percent);
         if (action != null) ImGuiHelper.HoveredString(action.Name, () =>
         {
             if (DataCenter.StateType == StateCommandType.Cancel)

diff --git a/RotationSolver/UI/CooldownWindow.cs b/RotationSolver/UI/CooldownWindow.cs
@@ -56,7 +56,7 @@ private static void DrawActionCooldown(IAction act)
         {
             r = !act.EnoughLevel ? 0: recast == 0 || !act.IsCoolingDown || shouldSkip ? 1 : elapsed / recast;
         }
-        var pair = ControlWindow.DrawIAction(act, width, r);
+        var pair = ControlWindow.DrawIAction(act, width, r, false);
         var pos = pair.Item1;
         var size = pair.Item2;
         ImGuiHelper.HoveredString(act.Name + "\n" + LocalizationManager.RightLang.ConfigWindow_Control_ClickToUse);