fix: macro available for TargetAllForFriendly

ArchiDog1998 · Jul 25, 2023 · cc532b7 · cc532b7
1 parent 2acf4fc
commit cc532b7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Actions/BaseAction_Target.cs b/RotationSolver.Basic/Actions/BaseAction_Target.cs
@@ -236,7 +236,7 @@ private bool TargetParty(float range, int aoeCount, bool mustUse, out BattleChar
 
         var availableCharas = DataCenter.PartyMembers.Where(player => player.CurrentHp != 0);
 
-        if (Service.Config.ActionTargetFriendly ? _action.CanTargetFriendly : (ActionID)ID == ActionID.AethericMimicry)
+        if (Service.Config.GetValue(SettingsCommand.TargetAllForFriendly) ? _action.CanTargetFriendly : (ActionID)ID == ActionID.AethericMimicry)
         {
             availableCharas = availableCharas.Union(DataCenter.AllianceMembers);
         }

diff --git a/RotationSolver.Basic/Configuration/PluginConfiguration.cs b/RotationSolver.Basic/Configuration/PluginConfiguration.cs
@@ -92,7 +92,6 @@ public class PluginConfiguration : IPluginConfiguration
     public bool UseHealWhenNotAHealer = true;
     public float HealthDifference = 0.25f;
     public float MeleeRangeOffset = 1;
-    public bool ActionTargetFriendly = false;
     public bool TargetFriendly = false;
     public float MinLastAbilityAdvanced = 0.1f;
 

diff --git a/RotationSolver.Basic/Data/RSCommandType.cs b/RotationSolver.Basic/Data/RSCommandType.cs
@@ -202,6 +202,11 @@ public enum SettingsCommand : byte
     /// 
     /// </summary>
     AutoSpeedOutOfCombat,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    TargetAllForFriendly,
 }
 
 /// <summary>
@@ -230,6 +235,7 @@ public static class SettingsCommandExtension
         SettingsCommand.PreventActions => false,
         SettingsCommand.PreventActionsDuty => false,
         SettingsCommand.AutoSpeedOutOfCombat => true,
+        SettingsCommand.TargetAllForFriendly => false,
         _ => false,
     };
 }
diff --git a/RotationSolver/UI/RotationConfigWindow_Param.cs b/RotationSolver/UI/RotationConfigWindow_Param.cs
@@ -533,7 +533,7 @@ private void DrawParamTarget()
             LocalizationManager.RightLang.ConfigWindow_Param_MoveAreaActionFarthestDesc);
 
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_ActionTargetFriendly,
-            ref Service.Config.ActionTargetFriendly, Service.Default.ActionTargetFriendly);
+    SettingsCommand.TargetAllForFriendly);
 
         DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_RaiseAll,
             ref Service.Config.RaiseAll, Service.Default.RaiseAll);