fix: make healer more selfish

ArchiDog1998 · Apr 10, 2023 · 8c44f2e · 8c44f2e
1 parent 189b4ff
commit 8c44f2e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -104,7 +104,7 @@ public class PluginConfiguration : IPluginConfiguration
 
     public Dictionary<ClassJobID, float> HealthForDyingTanks { get; set; } = new Dictionary<ClassJobID, float>();
 
-    public float HealthTankRatio = 0.4f;
+    public float HealthTankHealerRatio = 0.4f;
 
     public bool InterruptibleMoreCheck = true;
     public float SpecialDuration = 3;

diff --git a/RotationSolver.Basic/Helpers/TargetFilter.cs b/RotationSolver.Basic/Helpers/TargetFilter.cs
@@ -15,10 +15,15 @@ internal static BattleChara DefaultChooseFriend(IEnumerable<BattleChara> availab
 
         availableCharas = availableCharas.Where(StatusHelper.NeedHealing);
 
+        var healerTars = availableCharas.GetJobCategory(JobRole.Healer);
         var tankTars = availableCharas.GetJobCategory(JobRole.Tank);
 
+        var healerTar = tankTars.OrderBy(ObjectHelper.GetHealingRatio).FirstOrDefault();
+        if (healerTar != null && healerTar.GetHealingRatio() < Service.Config.HealthTankHealerRatio)
+            return healerTar;
+
         var tankTar = tankTars.OrderBy(ObjectHelper.GetHealingRatio).FirstOrDefault();
-        if (tankTar != null &&　tankTar.GetHealingRatio() < Service.Config.HealthTankRatio)
+        if (tankTar != null &&　tankTar.GetHealingRatio() < Service.Config.HealthTankHealerRatio)
             return tankTar;
 
         var tar = availableCharas.OrderBy(ObjectHelper.GetHealingRatio).FirstOrDefault();

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -205,7 +205,7 @@ internal partial class Strings
     public string ConfigWindow_Param_HealthSingleAbility { get; set; } = "Set the HP threshold for using single healing ability";
     public string ConfigWindow_Param_HealthSingleSpell { get; set; } = "Set the HP threshold for using single healing spell";
 
-    public string ConfigWindow_Param_HealthTankRatio { get; set; } = "Heal tank first it tank's HP threshold is lower than this.";
+    public string ConfigWindow_Param_HealthTankHealerRatio { get; set; } = "Heal healer or tank first if its HP threshold is lower than this.";
 
 
     public string ConfigWindow_Param_HealingOfTimeSubtractSingle { get; set; } = "Set the HP threshold reduce with hot effect(single)";

diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -379,8 +379,8 @@ private void DrawParamCondition()
         DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_HealthSingleSpell,
             ref Service.Config.HealthSingleSpell, speed);
 
-        DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_HealthTankRatio,
-            ref Service.Config.HealthTankRatio, speed);
+        DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_HealthTankHealerRatio,
+            ref Service.Config.HealthTankHealerRatio, speed);
     }
 
     private void DrawParamTarget()