fix: more condition for tank defense single.

ArchiDog1998 · Sep 25, 2023 · 2557b26 · 2557b26
1 parent dd3fa8b
commit 2557b26
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/ECommons b/ECommons
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1,3 +1,3 @@
 {
-  "ClickingCount": 11521
+  "ClickingCount": 11754
 }
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -169,6 +169,7 @@ public enum JobConfigFloat : byte
     [Default(0.55f)] HealthSingleSpell,
 
     [Default(0.15f)] HealthForDyingTanks,
+    [Default(1f)] HealthForAutoDefense,
 }
 #endregion
 

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
@@ -231,6 +231,7 @@ private bool AutoDefense(JobRole role, bool helpDefenseAOE, bool helpDefenseSing
 
             //A lot targets are targeting on me.
             if (tarOnMeCount >= Service.Config.GetValue(PluginConfigInt.AutoDefenseNumber) 
+                && Player.GetHealthRatio() <= Service.Config.GetValue(DataCenter.Job, JobConfigFloat.HealthForAutoDefense)
                 && movingHere && attacked)
             {
                 if (DefenseSingleAbility(out act)) return true;

diff --git a/RotationSolver/Localization/ConfigTranslation.cs b/RotationSolver/Localization/ConfigTranslation.cs
@@ -29,6 +29,7 @@ internal static class ConfigTranslation
     public static string ToName(this JobConfigFloat config) => config switch
     {
         JobConfigFloat.HealthForDyingTanks => LocalizationManager.RightLang.ConfigWindow_Param_HealthForDyingTank,
+        JobConfigFloat.HealthForAutoDefense => LocalizationManager.RightLang.ConfigWindow_Auto_HealthForAutoDefense,
         _ => string.Empty,
     };
 

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -745,4 +745,5 @@ internal class Strings
     public string ConfigWindow_Actions_ConditionDescription  { get; set; }= "Forced Conditions have a higher priority. If Forced Conditions are met, Disabled Condition will be ignored.";
 
     public string ConfigWindow_Auto_UseResourcesAction { get; set; } = "Use actions that use resources";
+    public string ConfigWindow_Auto_HealthForAutoDefense { get; set; } = "HP Ratio about defense single of Tanks";
 }
diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs
@@ -638,6 +638,7 @@ private static void DrawAutoActionCondition()
                     ECommons.ExcelServices.Job.BRD,
                 },
             },
+
         new DragFloatRangeSearchPlugin(PluginConfigFloat.WeakenDelayMin, PluginConfigFloat.WeakenDelayMax, 0.002f)
             {
                 JobRoles = new JobRole[]
@@ -692,6 +693,14 @@ private static void DrawAutoActionCondition()
         {
             new CheckBoxSearchPlugin(PluginConfigBool.UseDefenseAbility,
                 new DragIntSearchPlugin(PluginConfigInt.AutoDefenseNumber, 0.05f)
+                {
+                    JobRoles = new JobRole[]
+                    {
+                        JobRole.Tank,
+                    }
+                },
+
+                new DragFloatSearchJob(JobConfigFloat.HealthForAutoDefense, 0.02f)
                 {
                     JobRoles = new JobRole[]
                     {
+2 −2		ECommons/GenericHelpers.cs
+11 −1		ECommons/Reflection/ReflectionHelper.cs