fix: fixed description.

Resources/AnimationLockTime.json

@@ -131,7 +131,7 @@
   "3593": 0.6,
   "3594": 0.1,
   "3595": 0.6,
-  "3596": 0.6,
+  "3596": 0.1,
   "3598": 0.1,
   "3599": 0.6,
   "3600": 0.1,
@@ -336,7 +336,7 @@
   "16552": 0.6,
   "16553": 0.6,
   "16554": 0.6,
-  "16555": 0.1,
+  "16555": 0.6,
   "16926": 0.1,
   "17209": 0.6,
   "17215": 0.1,

Resources/HostileCastingArea.json

@@ -2,6 +2,7 @@
   458,
   1038,
   1365,
+  1385,
   1688,
   2225,
   2317,
@@ -62,6 +63,7 @@
   9774,
   9790,
   9808,
+  9828,
   9841,
   9869,
   10086,

RotationSolver.Basic/Data/MacroItem.cs

@@ -22,7 +22,7 @@ public bool StartUseMacro()
         if (RaptureShellModule.Instance->MacroCurrentLine > -1) return false;
 
         _lastTarget = Svc.Targets.Target;
-        Svc.Targets.SetTarget(Target);
+        Svc.Targets.Target = Target;
         RaptureShellModule.Instance->ExecuteMacro(Macro);
 
         IsRunning = true;
@@ -33,7 +33,7 @@ public bool EndUseMacro()
     {
         if (RaptureShellModule.Instance->MacroCurrentLine > -1) return false;
 
-        Svc.Targets.SetTarget(_lastTarget);
+        Svc.Targets.Target = _lastTarget;
 
         IsRunning = false;
         return true;

RotationSolver/Commands/RSCommands_Actions.cs

@@ -77,7 +77,7 @@ public static void DoAction()
                         || Svc.Targets.Target?.GetObjectKind() == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Treasure)
                         && (act.Target?.IsNPCEnemy() ?? false))
                     {
-                        Svc.Targets.SetTarget(act.Target);
+                        Svc.Targets.Target = act.Target;
                     }
                 }
 

RotationSolver/Localization/Localization.json

@@ -137,19 +137,18 @@
   "ConfigWindow_Param_HealOutOfCombat": "Heal party members outside of combat.",
   "ConfigWindow_Param_OnlyHotOnTanks": "Use single target healing over time actions only on tanks",
   "ConfigWindow_Param_BeneficialAreaOnTarget": "Use Beneficial Area abilities on target.",
-  "ConfigWindow_Param_HealthDifference": "HP ratio for standard deviation for using AOE heal.",
-  "ConfigWindow_Param_HealthAreaAbility": "HP ratio for AOE healing OGCDs",
-  "ConfigWindow_Param_HealthAreaSpell": "HP ratio for AOE healing GCDs",
-  "ConfigWindow_Param_Normal": "Normal",
-  "ConfigWindow_Param_Hot": "Hot",
-  "ConfigWindow_Param_HealthSingleAbility": "HP ratio for ST healing OGCDs",
-  "ConfigWindow_Param_HealthSingleSpell": "HP ratio for ST healing GCDs",
-  "ConfigWindow_Param_HealthHealerRatio": "Heal healer first if its HP ratio is lower than this.",
-  "ConfigWindow_Param_HealthTankRatio": "Heal tank first if its HP ratio is lower than this.",
+  "ConfigWindow_Param_HealthDifference": "HP%% for standard deviation for using AOE heal.",
+  "ConfigWindow_Param_HealthAreaAbility": "HP%% for AOE healing OGCDs",
+  "ConfigWindow_Param_HealthAreaSpell": "HP%% for AOE healing GCDs",
+  "ConfigWindow_Param_Normal": "Normal Targets",
+  "ConfigWindow_Param_HOT": "Targets with HOT",
+  "ConfigWindow_Param_HealthSingleAbility": "HP%% for ST healing OGCDs",
+  "ConfigWindow_Param_HealthSingleSpell": "HP%% for ST healing GCDs",
+  "ConfigWindow_Param_HealthHealerRatio": "Heal healer first if its HP%% is lower than this.",
+  "ConfigWindow_Param_HealthTankRatio": "Heal tank first if its HP%% is lower than this.",
   "ConfigWindow_Param_DistanceForMoving": "If the distance between Melee or Tank to target is less than this, using moving ability as attack ability.",
-  "ConfigWindow_Param_HealWhenNothingTodoBelow": "Healing the members with GCD if there is nothing to do in combat and their min HP ratio is lower than this.",
-  "ConfigWindow_Param_HealingOfTimeSubtractSingle": "Set the HP threshold reduce with hot effect(single)",
-  "ConfigWindow_Param_HealthForDyingTank": "Set the HP threshold for tank to use invincibility",
+  "ConfigWindow_Param_HealWhenNothingTodoBelow": "Healing the members with GCD if there is nothing to do in combat and their min HP%% is lower than this.",
+  "ConfigWindow_Param_HealthForDyingTank": "Set the HP%% for tank to use invincibility",
   "ConfigWindow_Param_MeleeRangeOffset": "Melee Range action using offset",
   "ConfigWindow_Param_Target": "Target",
   "ConfigWindow_Param_RightNowTargetToHostileType": "Engage settings",

RotationSolver/Localization/Strings.cs

@@ -199,28 +199,27 @@ internal partial class Strings
 
     public string ConfigWindow_Param_BeneficialAreaOnTarget { get; set; } = "Use Beneficial Area abilities on target.";
 
-    public string ConfigWindow_Param_HealthDifference { get; set; } = "HP ratio for standard deviation for using AOE heal.";
-    public string ConfigWindow_Param_HealthAreaAbility { get; set; } = "HP ratio for AOE healing OGCDs";
+    public string ConfigWindow_Param_HealthDifference { get; set; } = "HP%% for standard deviation for using AOE heal.";
+    public string ConfigWindow_Param_HealthAreaAbility { get; set; } = "HP%% for AOE healing OGCDs";
 
-    public string ConfigWindow_Param_HealthAreaSpell { get; set; } = "HP ratio for AOE healing GCDs";
+    public string ConfigWindow_Param_HealthAreaSpell { get; set; } = "HP%% for AOE healing GCDs";
 
-    public string ConfigWindow_Param_Normal { get; set; } = "Normal";
-    public string ConfigWindow_Param_Hot { get; set; } = "Hot";
+    public string ConfigWindow_Param_Normal { get; set; } = "Normal Targets";
+    public string ConfigWindow_Param_HOT { get; set; } = "Targets with HOT";
 
-    public string ConfigWindow_Param_HealthSingleAbility { get; set; } = "HP ratio for ST healing OGCDs";
+    public string ConfigWindow_Param_HealthSingleAbility { get; set; } = "HP%% for ST healing OGCDs";
 
-    public string ConfigWindow_Param_HealthSingleSpell { get; set; } = "HP ratio for ST healing GCDs";
+    public string ConfigWindow_Param_HealthSingleSpell { get; set; } = "HP%% for ST healing GCDs";
 
-    public string ConfigWindow_Param_HealthHealerRatio { get; set; } = "Heal healer first if its HP ratio is lower than this.";
+    public string ConfigWindow_Param_HealthHealerRatio { get; set; } = "Heal healer first if its HP%% is lower than this.";
 
-    public string ConfigWindow_Param_HealthTankRatio { get; set; } = "Heal tank first if its HP ratio is lower than this.";
+    public string ConfigWindow_Param_HealthTankRatio { get; set; } = "Heal tank first if its HP%% is lower than this.";
 
     public string ConfigWindow_Param_DistanceForMoving { get; set; } = "If the distance between Melee or Tank to target is less than this, using moving ability as attack ability.";
 
-    public string ConfigWindow_Param_HealWhenNothingTodoBelow { get; set; } = "Healing the members with GCD if there is nothing to do in combat and their min HP ratio is lower than this.";
+    public string ConfigWindow_Param_HealWhenNothingTodoBelow { get; set; } = "Healing the members with GCD if there is nothing to do in combat and their min HP%% is lower than this.";
 
-    public string ConfigWindow_Param_HealingOfTimeSubtractSingle { get; set; } = "Set the HP threshold reduce with hot effect(single)";
-    public string ConfigWindow_Param_HealthForDyingTank { get; set; } = "Set the HP threshold for tank to use invincibility";
+    public string ConfigWindow_Param_HealthForDyingTank { get; set; } = "Set the HP%% for tank to use invincibility";
 
     public string ConfigWindow_Param_MeleeRangeOffset { get; set; } = "Melee Range action using offset";
     public string ConfigWindow_Param_Target { get; set; } = "Target";

RotationSolver/UI/RotationConfigWindow_Param.cs

@@ -405,7 +405,7 @@ private void DrawParamCondition()
             ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_Normal);
 
             ImGui.TableNextColumn();
-            ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_Hot);
+            ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_HOT);
 
             ImGui.TableNextRow();
             ImGui.TableNextColumn();
@@ -465,6 +465,12 @@ private void DrawParamCondition()
 
             ImGui.EndTable();
         }
+
+        DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_HealthHealerRatio,
+            ref Service.Config.HealthHealerRatio, Service.Default.HealthHealerRatio, speed);
+
+        DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_HealthTankRatio,
+            ref Service.Config.HealthTankRatio, Service.Default.HealthTankRatio, speed);
     }
 
     private void DrawParamTarget()

RotationSolver/UI/RotationConfigWindow_Rotation.cs

@@ -145,7 +145,7 @@ private static void DrawHealerSettings(Job job)
             ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_Normal);
 
             ImGui.TableNextColumn();
-            ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_Hot);
+            ImGui.TableHeader(LocalizationManager.RightLang.ConfigWindow_Param_HOT);
 
             ImGui.TableNextRow();
             ImGui.TableNextColumn();

RotationSolver/Updaters/SocialUpdater.cs

@@ -194,7 +194,7 @@ private static async void SayHelloToAuthor()
 
 #if DEBUG
 #else
-            Svc.Targets.SetTarget(c);
+            Svc.Targets.Target = c;
             Chat.Instance.SendMessage($"/{_macroToAuthor[new Random().Next(_macroToAuthor.Count)]} <t>");
 #endif
             var message = new SeString(new IconPayload(BitmapFontIcon.Mentor),
@@ -222,7 +222,7 @@ private static async void SayHelloToAuthor()
             UIModule.PlaySound(20, 0, 0, 0);
 
             await Task.Delay(new Random().Next(800, 1200));
-            Svc.Targets.SetTarget(null);
+            Svc.Targets.Target = null;
             await Task.Delay(new Random().Next(800, 1200));
         }
     }