fix: add an option for beneficial area on target.

ArchiDog1998 · Apr 7, 2023 · 4ad1f99 · 4ad1f99
1 parent 20c5680
commit 4ad1f99
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -148,8 +148,11 @@ private bool TargetAreaFriend(float range, bool mustUse, PlayerCharacter player)
         //如果用户不想使用自动友方地面放置功能
         if (!Service.Config.UseGroundBeneficialAbility) return false;
 
-        //如果当前目标是Boss且有身位，放他身上。
-        if (Service.TargetManager.Target is BattleChara b && b.DistanceToPlayer() < range && 
+        if (Service.Config.BeneficialAreaOnTarget && Service.TargetManager.Target != null)
+        {
+            _position = Service.TargetManager.Target.Position;
+        }
+        else if (Service.TargetManager.Target is BattleChara b && b.DistanceToPlayer() < range && 
             b.IsBoss() && b.HasPositional() && b.HitboxRadius <= 8)
         {
             _position = b.Position;

diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -143,6 +143,7 @@ public class PluginConfiguration : IPluginConfiguration
     public bool EsunaAll = false;
     public bool OnlyAttackInView = false;
     public bool OnlyHotOnTanks = false;
+    public bool BeneficialAreaOnTarget = false;
 
     public string PositionalErrorText = string.Empty;
     public float CountDownAhead = 0.6f;

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -197,6 +197,8 @@ internal partial class Strings
 
     public string ConfigWindow_Param_OnlyHotOnTanks { get; set; } = "Only use hot actions on tank rols.";
 
+    public string ConfigWindow_Param_BeneficialAreaOnTarget { get; set; } = "Use Beneficial Area abilities on target.";
+
     public string ConfigWindow_Param_HealthDifference { get; set; } = "Set the HP standard deviation threshold for using AOE heal (ability & spell)";
     public string ConfigWindow_Param_HealthAreaAbility { get; set; } = "Set the HP threshold for using AOE healing ability";
     public string ConfigWindow_Param_HealthAreaSpell { get; set; } = "Set the HP threshold for using AOE healing spell";

diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -373,6 +373,12 @@ private void DrawParamCondition()
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_OnlyHotOnTanks,
             ref Service.Config.OnlyHotOnTanks, Service.Default.OnlyHotOnTanks);
 
+        if (Service.Config.UseGroundBeneficialAbility)
+        {
+            DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_BeneficialAreaOnTarget,
+                ref Service.Config.BeneficialAreaOnTarget, Service.Default.BeneficialAreaOnTarget);
+        }
+
         const float speed = 0.005f;
 
         DrawFloatNumber(LocalizationManager.RightLang.ConfigWindow_Param_MeleeRangeOffset,