fix: moving target choice.

RotationSolver.Basic/Rotations/CustomRotation_BasicInfo.cs

@@ -41,7 +41,7 @@ public bool IsEnabled
 
     public IRotationConfigSet Configs { get; }
 
-    public BattleChara MoveTarget { get; private set; }
+    public static BattleChara MoveTarget { get; private set; }
 
     public virtual string Description { get; } = string.Empty;
 

RotationSolver.Basic/Rotations/CustomRotation_Invoke.cs

@@ -17,8 +17,9 @@ public bool TryInvoke(out IAction newAction, out IAction gcdAction)
         var role = Job.GetJobRole();
 
         ActionMoveForwardGCD = MoveForwardGCD(out var act) ? act : null;
-        ActionMoveForwardAbility = MoveForwardAbility(1, out act, recordTarget: false) ? act : null;
-        MoveTarget = act is IBaseAction a ? a.Target : null;
+        var movingTarget = MoveForwardAbility(1, out act, recordTarget: false);
+        ActionMoveForwardAbility = movingTarget ? act : null;
+        MoveTarget = (movingTarget && act is IBaseAction a) ? a.Target : null;
 
         ActionMoveBackAbility = MoveBackAbility(DataCenter.AbilityRemainCount, out act) ? act : null;
 

RotationSolver.Basic/Rotations/ICustomRotation.cs

@@ -18,7 +18,6 @@ public interface ICustomRotation : ITexture
     string RotationName { get; }
     IRotationConfigSet Configs { get; }
     MedicineType MedicineType { get; }
-    BattleChara MoveTarget { get; }
 
     IBaseAction[] AllBaseActions { get; }
     IAction[] AllActions { get; }

RotationSolver.Default/Tank/GNB_Default.cs

@@ -100,9 +100,6 @@ protected override bool DefenseSingleAbility(byte abilitiesRemaining, out IActio
     {
         if (abilitiesRemaining == 2)
         {
-            //10
-            if (HeartofStone.CanUse(out act)) return true;
-
             //30
             if (Nebula.CanUse(out act)) return true;
 
@@ -112,6 +109,8 @@ protected override bool DefenseSingleAbility(byte abilitiesRemaining, out IActio
             //10
             if (Camouflage.CanUse(out act)) return true;
         }
+        //10
+        if (HeartofStone.CanUse(out act)) return true;
 
         if (Reprisal.CanUse(out act)) return true;
 

RotationSolver/RotationSolverPlugin.cs

@@ -59,7 +59,6 @@ public unsafe RotationSolverPlugin(DalamudPluginInterface pluginInterface)
         ChangeUITranslation();
 
         RotationUpdater.GetAllCustomRotations();
-        OpenControlWindow();
     }
 
 
@@ -102,9 +101,8 @@ internal static void OpenConfigWindow()
         _comboConfigWindow.Toggle();
     }
 
-    internal static void OpenControlWindow()
+    internal static void UpdateControlWindow()
     {
-        _controlWindow.IsOpen = Service.Config.ShowControlWindow;
+        _controlWindow.IsOpen = MajorUpdater.IsValid && Service.Config.ShowControlWindow;
     }
-
 }

RotationSolver/UI/ControlWindow.cs

@@ -133,7 +133,12 @@ private static void DrawActionCooldown(IAction act)
         DrawIAction(act, width);
         ImGuiHelper.HoveredString(act.Name);
 
-        if (act.IsCoolingDown)
+        if (!act.EnoughLevel)
+        {
+            ImGui.GetWindowDrawList().AddRectFilled(new Vector2(pos.X, pos.Y) + winPos,
+                new Vector2(pos.X + width, pos.Y + width) + winPos, progressCol);
+        }
+        else if (act.IsCoolingDown)
         {
             var ratio = recast == 0 ? 0 : elapsed % recast / recast;
             ImGui.GetWindowDrawList().AddRectFilled(new Vector2(pos.X + width * ratio, pos.Y) + winPos, 
@@ -146,7 +151,7 @@ private static void DrawActionCooldown(IAction act)
             TextShade(fontPos, time, 1.5f, white, black);
         }
 
-        if(act is IBaseAction bAct && bAct.MaxCharges > 1)
+        if(act.EnoughLevel && act is IBaseAction bAct && bAct.MaxCharges > 1)
         {
             for (int i = 0; i < bAct.CurrentCharges; i++)
             {

RotationSolver/UI/OverlayWindow.cs

@@ -5,6 +5,7 @@
 using RotationSolver.Basic;
 using RotationSolver.Basic.Data;
 using RotationSolver.Basic.Helpers;
+using RotationSolver.Rotations.CustomRotation;
 using RotationSolver.Updaters;
 using System.Numerics;
 
@@ -98,7 +99,7 @@ private unsafe static void DrawMoveTarget()
         var c = Service.Config.MovingTargetColor;
         var color = ImGui.GetColorU32(new Vector4(c.X, c.Y, c.Z, 1));
 
-        var tar = RotationUpdater.RightNowRotation?.MoveTarget;
+        var tar = CustomRotation.MoveTarget;
         if (tar == null || tar == Service.Player) return;
 
         DrawTarget(tar, color, 8, out var scrPos);

RotationSolver/UI/RotationConfigWindow_Control.cs

@@ -15,7 +15,7 @@ internal partial class RotationConfigWindow
     private void DrawControlTab()
     {
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Control_ShowControlWindow,
-            ref Service.Config.ShowControlWindow, otherThing: RotationSolverPlugin.OpenControlWindow);
+            ref Service.Config.ShowControlWindow);
 
         if (!Service.Config.ShowControlWindow) return;
 

RotationSolver/Updaters/ActionUpdater.cs

@@ -16,7 +16,6 @@ internal static class ActionUpdater
 
     static  RandomDelay _GCDDelay = new RandomDelay(() => (Service.Config.WeaponDelayMin, Service.Config.WeaponDelayMax));
 
-
     internal static IAction NextAction { get; private set; }
     internal static IBaseAction NextGCDAction { get; private set; }
 
@@ -26,7 +25,6 @@ internal static class ActionUpdater
 
     internal static void UpdateNextAction()
     {
-
         PlayerCharacter localPlayer = Service.Player;
         if (localPlayer == null) return;
 

RotationSolver/Updaters/MajorUpdater.cs

@@ -15,6 +15,7 @@ internal static class MajorUpdater
 
     private static void FrameworkUpdate(Framework framework)
     {
+        RotationSolverPlugin.UpdateControlWindow();
         if (!IsValid) return;
 
         //#if DEBUG