fix: changed some ui default values.

ArchiDog1998 · Apr 7, 2023 · 5d8c545 · 5d8c545
1 parent ad9bd34
commit 5d8c545
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -179,7 +179,7 @@ private bool TargetAreaFriend(float range, bool mustUse, PlayerCharacter player)
                 else
                 {
                     Vector3 directionToTank = attackT.Position - player.Position;
-                    var MoveDirection = directionToTank / directionToTank.Length() * (disToTankRound - _action.EffectRange);
+                    var MoveDirection = directionToTank / directionToTank.Length() * Math.Max(0, disToTankRound - _action.EffectRange);
                     _position = player.Position + MoveDirection;
                 }
             }

diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -168,7 +168,7 @@ public class PluginConfiguration : IPluginConfiguration
     public bool OnlyShowWithHostileOrInDuty = true;
     public bool ShowControlWindow = false;
     public bool IsControlWindowLock = false;
-    public bool ShowNextActionWindow = false;
+    public bool ShowNextActionWindow = true;
     public bool IsInfoWindowNoInputs = false;
     public bool IsInfoWindowNoMove = false;
     public bool UseKeyboardCommand = false;

diff --git a/RotationSolver.Default/Ranged/MCH_Default.cs b/RotationSolver.Default/Ranged/MCH_Default.cs
@@ -77,8 +77,7 @@ protected override bool AttackAbility(byte abilitiesRemaining, out IAction act)
         }
 
         if (!CombatElapsedLess(12) && CanUseHypercharge(out act)) return true;
-        if (!AirAnchorBlockTime(8)
-            && RookAutoturret.CanUse(out act)) return true;
+        if (CanUseRookAutoturret(out act)) return true;
 
         if (BarrelStabilizer.CanUse(out act)) return true;
 
@@ -106,6 +105,21 @@ private static bool AirAnchorBlockTime(float time)
         }
     }
 
+    private bool CanUseRookAutoturret(out IAction act)
+    {
+        act = null;
+        if (AirAnchor.EnoughLevel)
+        {
+            if (!AirAnchor.IsCoolingDown || AirAnchor.ElapsedAfter(10)) return false;
+        }
+        else
+        {
+            if (!HotShot.IsCoolingDown || HotShot.ElapsedAfter(10)) return false;
+        }
+
+        return RookAutoturret.CanUse(out act);
+    }
+
     const float REST_TIME = 6f;
     private static bool CanUseHypercharge(out IAction act)
     {
@@ -135,7 +149,6 @@ private static bool CanUseHypercharge(out IAction act)
         if (Drill.EnoughLevel && Drill.WillHaveOneCharge(REST_TIME)) return false;
         if (ChainSaw.EnoughLevel && ChainSaw.WillHaveOneCharge(REST_TIME)) return false;
 
-        if (Hypercharge.CanUse(out act)) return true;
-        return false;
+        return Hypercharge.CanUse(out act);
     }
 }
diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -18,7 +18,7 @@ internal class ControlWindow : Window
     public ControlWindow()
         : base(nameof(ControlWindow), BaseFlags)
     {
-        Size = new Vector2(540f, 490f);
+        Size = new Vector2(540f, 300f);
         SizeCondition = ImGuiCond.FirstUseEver;
     }
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Debug.cs b/RotationSolver/UI/RotationConfigWindow_Debug.cs
@@ -141,6 +141,9 @@ private void DrawCDEX()
 
     private unsafe void DrawIcon()
     {
+        var A = new Vector3(3, 4, 0);
+        var B = new Vector3(6, 8, 0);
+        ImGui.Text(Vector3.Distance(B, A).ToString());
         //var pointer = (AddonActionCross*) Service.GetAddon<AddonActionCross>();
         //if (pointer != null) 
         //{