From 1a2b0603a121438af1af18b40685d1f1dc103bf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?=
 <53346444+ArchiDog1998@users.noreply.github.com>
Date: Sat, 24 Feb 2024 16:40:18 +0800
Subject: [PATCH] fix: icon drawing.

---
 Resources/AnimationLockTime.json              | 1 +
 Resources/HostileCastingArea.json             | 3 ++-
 Resources/RotationSolverRecord.json           | 4 ++--
 RotationSolver.Basic/Actions/IBaseAction.cs   | 5 ++++-
 RotationSolver.Basic/Data/IconSet.cs          | 4 +++-
 RotationSolver/Localization/Localization.json | 4 +++-
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
index 7cd74d4b9..05cc93145 100644
--- a/Resources/AnimationLockTime.json
+++ b/Resources/AnimationLockTime.json
@@ -360,6 +360,7 @@
   "16470": 0.6,
   "16472": 0.6,
   "16473": 0.6,
+  "16474": 0.6,
   "16478": 0.8,
   "16479": 0.6,
   "16480": 1.5,
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
index f69bb1d0b..0a55a07bf 100644
--- a/Resources/HostileCastingArea.json
+++ b/Resources/HostileCastingArea.json
@@ -494,5 +494,6 @@
   17435,
   35384,
   35386,
-  36001
+  36001,
+  20052
 ]
\ No newline at end of file
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
index 05f9caf15..32dd843af 100644
--- a/Resources/RotationSolverRecord.json
+++ b/Resources/RotationSolverRecord.json
@@ -1,5 +1,5 @@
 {
-  "ClickingCount": 70222,
-  "SayingHelloCount": 60,
+  "ClickingCount": 73576,
+  "SayingHelloCount": 61,
   "SaidUsers": []
 }
\ No newline at end of file
diff --git a/RotationSolver.Basic/Actions/IBaseAction.cs b/RotationSolver.Basic/Actions/IBaseAction.cs
index 7e3a45e84..6cfe3cde2 100644
--- a/RotationSolver.Basic/Actions/IBaseAction.cs
+++ b/RotationSolver.Basic/Actions/IBaseAction.cs
@@ -4,7 +4,10 @@ namespace RotationSolver.Basic.Actions;
 
 public interface IBaseAction : IAction
 {
-    internal static TargetType? TargetOverride { get; set; } = null;
+    /// <summary>
+    /// The target override.
+    /// </summary>
+    public static TargetType? TargetOverride { get; set; } = null;
     internal static bool ForceEnable { get; set; } = false;
     internal static bool AutoHealCheck { get; set; } = false;
     internal static bool ActionPreview { get; set; } = false;
diff --git a/RotationSolver.Basic/Data/IconSet.cs b/RotationSolver.Basic/Data/IconSet.cs
index 53fa66160..fcf992596 100644
--- a/RotationSolver.Basic/Data/IconSet.cs
+++ b/RotationSolver.Basic/Data/IconSet.cs
@@ -115,7 +115,9 @@ private static byte[] SvgToPng(byte[] data)
     /// <returns></returns>
     public static bool GetTexture(uint id, out IDalamudTextureWrap texture, uint @default = 0)
         => ThreadLoadImageHandler.TryGetIconTextureWrap(id, true, out texture)
+        || ThreadLoadImageHandler.TryGetIconTextureWrap(id, false, out texture)
         || ThreadLoadImageHandler.TryGetIconTextureWrap(@default, true, out texture)
+        || ThreadLoadImageHandler.TryGetIconTextureWrap(@default, false, out texture)
         || ThreadLoadImageHandler.TryGetIconTextureWrap(0, true, out texture);
 
     /// <summary>
@@ -141,7 +143,7 @@ public static bool GetTexture(string path, out IDalamudTextureWrap texture, bool
     /// <returns></returns>
     public static bool GetTexture(this IAction? action, out IDalamudTextureWrap texture, bool isAdjust = true)
     {
-        if (isAdjust)
+        if (isAdjust && action is IBaseAction)
         {
             return GetTexture((ActionID)(action?.AdjustedID ?? 0), out texture);
         }
diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
index 9373a156c..d8ddef886 100644
--- a/RotationSolver/Localization/Localization.json
+++ b/RotationSolver/Localization/Localization.json
@@ -229,5 +229,7 @@
   "PosFlameThrowerName": "",
   "PosImprovisationName": "",
   "PoslockModifierName": "The modifier key to unlock the movement temporary",
-  "PoslockModifierDescription": ""
+  "PoslockModifierDescription": "",
+  "RotationSolver.Data.UiString.ConfigWindow_Actions_ForcedConditionSet_Description": "Conditions for forced automatic use of action.",
+  "RotationSolver.Data.UiString.ConfigWindow_Actions_DisabledConditionSet_Description": "Conditions for automatic use of action being disabled."
 }
\ No newline at end of file