fix: fixed the searching issue.

ArchiDog1998 · Aug 21, 2023 · a7e8788 · a7e8788
1 parent 89c875a
commit a7e8788
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -152,6 +152,7 @@
   "3614": 0.6,
   "3615": 0.1,
   "3625": 0.6,
+  "3629": 0.6,
   "4262": 0.6,
   "4401": 0.6,
   "4402": 0.6,

diff --git a/Resources/BeneficialPositions.json b/Resources/BeneficialPositions.json
@@ -1,5 +1,6 @@
 {
   "0": [],
   "641": [],
-  "837": []
+  "837": [],
+  "613": []
 }
diff --git a/Resources/NoHostileNames.json b/Resources/NoHostileNames.json
@@ -7,5 +7,8 @@
   ],
   "837": [
     ""
+  ],
+  "613": [
+    ""
   ]
 }
diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -1671,8 +1671,7 @@ private static void DrawStatusList(string name, HashSet<uint> statuses, Status[]
 
         foreach (var status in statuses.Select(a => Service.GetSheet<Status>().GetRow(a))
             .Where(a => a != null)
-            .OrderByDescending(s => Math.Min(Similarity(s.Name, _statusSearching)
-            , Similarity(s.RowId.ToString(), _statusSearching))))
+            .OrderByDescending(s => Similarity(s.Name + " " + s.RowId.ToString(), _statusSearching)))
         {
             void Delete() => removeId = status.RowId;
 
@@ -1715,8 +1714,7 @@ internal static void StatusPopUp(string popupId, Status[] allStatus, ref string
                 var index = 0;
 
                 var searchingKey = searching;
-                foreach (var status in allStatus.OrderByDescending(s => Math.Min(Similarity(s.Name, searchingKey)
-                , Similarity(s.RowId.ToString(), searchingKey))))
+                foreach (var status in allStatus.OrderByDescending(s => Similarity(s.Name + " " + s.RowId.ToString(), searchingKey)))
                 {
                     if (IconSet.GetTexture(status.Icon, out var texture, notLoadId))
                     {
@@ -1794,8 +1792,7 @@ private static void DrawActionsList(string name, HashSet<uint> actions)
 
             if (ImGui.BeginChild("Rotation Solver Add action", new Vector2(-1, 400 * _scale)))
             {
-                foreach (var action in AllActions.OrderByDescending(s => Math.Min(Similarity(s.Name, _actionSearching)
-                , Similarity(s.RowId.ToString(), _actionSearching))))
+                foreach (var action in AllActions.OrderByDescending(s =>Similarity(s.Name  + " " + s.RowId.ToString(), _actionSearching)))
                 {
                     var selected = ImGui.Selectable($"{action.Name} ({action.RowId})");
                     if (ImGui.IsItemHovered())
@@ -1825,8 +1822,7 @@ private static void DrawActionsList(string name, HashSet<uint> actions)
 
         foreach (var action in actions.Select(a => Service.GetSheet<GAction>().GetRow(a))
             .Where(a => a != null)
-            .OrderByDescending(s => Math.Min(Similarity(s.Name, _actionSearching)
-            , Similarity(s.RowId.ToString(), _actionSearching))))
+            .OrderByDescending(s => Similarity(s.Name + " " + s.RowId.ToString(), _actionSearching)))
         {
             void Reset() => removeId = action.RowId;
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -1,12 +1,10 @@
 using Dalamud.Game.ClientState.Keys;
 using Dalamud.Interface.Colors;
 using ECommons.ImGuiMethods;
-using ImGuiNET;
 using RotationSolver.Basic.Configuration;
 using RotationSolver.Localization;
 using RotationSolver.UI.SearchableConfigs;
 using RotationSolver.UI.SearchableSettings;
-using System.Net.NetworkInformation;
 
 namespace RotationSolver.UI;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,8 @@ @@
       ],
       "837": [
         ""
+      ],
+      "613": [
+        ""
       ]
     }