fix: blm and some input stuff.

ArchiDog1998 · Mar 19, 2023 · a0dce2e · a0dce2e
1 parent 4769cf4
commit a0dce2e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/RotationSolver.Default/Magical/BLM_Default.cs b/RotationSolver.Default/Magical/BLM_Default.cs
@@ -103,7 +103,7 @@ protected override bool GeneralGCD(out IAction act)
         if (InFireOrIce(out act, out var mustGo)) return true;
         if (mustGo) return false;
         //Triplecast for moving.
-        if (IsMoving && Triplecast.CanUse(out act, emptyOrSkipCombo: true)) return true;
+        if (IsMoving && HasHostilesInRange && Triplecast.CanUse(out act, emptyOrSkipCombo: true)) return true;
 
         if (AddElementBase(out act)) return true;
         if (Scathe.CanUse(out act)) return true;

diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs
@@ -82,7 +82,7 @@ public override void Draw()
 
         ImGui.Columns(1);
 
-        if(Service.Config.ControlShowCooldown && RotationUpdater.RightNowRotation!= null)
+        if(MajorUpdater.IsValid && Service.Config.ControlShowCooldown && RotationUpdater.RightNowRotation!= null)
         {
             ImGui.Separator();
             foreach (var pair in RotationUpdater.AllGroupedActions)

diff --git a/RotationSolver/Updaters/InputUpdater.cs b/RotationSolver/Updaters/InputUpdater.cs
@@ -97,13 +97,13 @@ private static void KeyDown(KeyRecord key)
         if (Service.Config.KeyState.ContainsValue(key))
         {
             Service.CommandManager.ProcessCommand(Service.Config.KeyState
-                .First(k => k.Value == key && k.Key != 0).Key.GetCommandStr());
+                .FirstOrDefault(k => k.Value == key && k.Key != StateCommandType.None).Key.GetCommandStr());
         }
 
         if (Service.Config.KeySpecial.ContainsValue(key))
         {
             Service.CommandManager.ProcessCommand(Service.Config.KeySpecial
-                .First(k => k.Value == key && k.Key != 0).Key.GetCommandStr());
+                .FirstOrDefault(k => k.Value == key && k.Key != SpecialCommandType.None).Key.GetCommandStr());
         }
     }
 
@@ -135,13 +135,13 @@ private static void ButtonDown(ButtonRecord button)
         if (Service.Config.ButtonState.ContainsValue(button))
         {
             Service.CommandManager.ProcessCommand(Service.Config.ButtonState
-                .First(k => k.Value == button && k.Key != 0).Key.GetCommandStr());
+                .FirstOrDefault(k => k.Value == button && k.Key != StateCommandType.None).Key.GetCommandStr());
         }
 
         if (Service.Config.ButtonSpecial.ContainsValue(button))
         {
             Service.CommandManager.ProcessCommand(Service.Config.ButtonSpecial
-                .First(k => k.Value == button && k.Key != 0).Key.GetCommandStr());
+                .FirstOrDefault(k => k.Value == button && k.Key != SpecialCommandType.None).Key.GetCommandStr());
         }
     }
 }
diff --git a/RotationSolver/Updaters/MajorUpdater.cs b/RotationSolver/Updaters/MajorUpdater.cs
@@ -7,7 +7,7 @@ namespace RotationSolver.Updaters;
 
 internal static class MajorUpdater
 {
-    private static bool IsValid => Service.Conditions.Any() && Service.Player != null;
+    public static bool IsValid => Service.Conditions.Any() && Service.Player != null;
 
     //#if DEBUG
     //    private static readonly Dictionary<int, bool> _valus = new Dictionary<int, bool>();