fix: action list drawing.

ArchiDog1998 · Feb 29, 2024 · 74e2afe · 74e2afe
1 parent 1884b1f
commit 74e2afe
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
 		<TargetFramework>net7.0-windows</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Authors>ArchiTed</Authors>
-		<Version>4.1.2</Version>
+		<Version>4.1.2.1</Version>
 		<PlatformTarget>x64</PlatformTarget>
 		<Platforms>AnyCPU</Platforms>
 		<LangVersion>latest</LangVersion>

diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,5 +1,5 @@
 {
-  "ClickingCount": 88666,
-  "SayingHelloCount": 113,
+  "ClickingCount": 88749,
+  "SayingHelloCount": 115,
   "SaidUsers": []
 }
diff --git a/RotationSolver.Basic/Helpers/ActionHelper.cs b/RotationSolver.Basic/Helpers/ActionHelper.cs
@@ -19,4 +19,15 @@ internal static byte GetCoolDownGroup(this Action action)
         if (group == 0) group = GCDCooldownGroup;
         return group;
     }
+
+    internal static bool IsInJob(this Action i)
+    {
+        var cate = i.ClassJobCategory.Value;
+        if (cate != null)
+        {
+            var inJob = (bool?)cate.GetType().GetProperty(DataCenter.Job.ToString())?.GetValue(cate);
+            if (inJob.HasValue && !inJob.Value) return false;
+        }
+        return true;
+    }
 }
diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs b/RotationSolver.Basic/Rotations/CustomRotation_Actions.cs
@@ -137,16 +137,7 @@ static partial void ModifySprintPvP(ref ActionSetting setting)
     /// </summary>
     public virtual IAction[] AllActions => 
     [
-        .. AllBaseActions.Where(i =>
-        {
-            var cate = i.Action.ClassJobCategory.Value;
-            if (cate != null)
-            {
-                var inJob = (bool?)cate.GetType().GetProperty(DataCenter.Job.ToString())?.GetValue(cate);
-                if (inJob.HasValue && !inJob.Value) return false;
-            }
-            return true;
-        }),
+        .. AllBaseActions.Where(i => i.Action.IsInJob()),
         .. Medicines.Where(i => i.HasIt),
         .. MpPotions.Where(i => i.HasIt),
         .. HpPotions.Where(i => i.HasIt),

diff --git a/RotationSolver/UI/ConditionDrawer.cs b/RotationSolver/UI/ConditionDrawer.cs
@@ -148,7 +148,7 @@ public static void ActionSelectorPopUp(string popUpId, CollapsingHeaderGroup gro
 
         group.ClearCollapsingHeader();
 
-        foreach (var pair in RotationUpdater.GroupActions(rotation.AllBaseActions)!)
+        foreach (var pair in RotationUpdater.GroupActions(rotation.AllBaseActions.Where(i => i.Action.IsInJob()))!)
         {
             group.AddCollapsingHeader(() => pair.Key, () =>
             {

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -774,7 +774,7 @@ void Down()
                         (Down, [VirtualKey.DOWN]));
 
                     var time = timeLineItem.Time;
-                    if (ConditionDrawer.DrawDragFloat(ConfigUnitType.Seconds, $"Time##Time{timeLineItem.GetHashCode()}", ref time))
+                    if (ConditionDrawer.DrawDragFloat(ConfigUnitType.Seconds, $" ##Time{timeLineItem.GetHashCode()}", ref time))
                     {
                         timeLineItem.Time = time;
                     }