feat: add heal out of combat option.

ArchiDog1998 · Jan 22, 2023 · ccbc9eb · ccbc9eb
1 parent 0eb96c9
commit ccbc9eb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/RotationSolver/Configuration/PluginConfiguration.cs b/RotationSolver/Configuration/PluginConfiguration.cs
@@ -42,7 +42,7 @@ public class PluginConfiguration : IPluginConfiguration
     public bool SayPotional = true;
 
     public bool FlytextPositional = true;
-
+    public bool HealOutOfCombat = false;
     public bool ShowInfoOnToast = true;
     public bool RaiseAll = false;
     public bool CastingDisplay = true;
@@ -53,7 +53,7 @@ public class PluginConfiguration : IPluginConfiguration
     public bool RaiseBrinkofDeath = true;
     public int LessMPNoRaise = 0;
     public bool AutoShield = true;
-    public bool AddEnemyListToHostile = false;
+    public bool AddEnemyListToHostile = true;
     public bool UseAOEWhenManual = false;
     public bool UseItem = false;
     public bool PositionalFeedback = true;

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -101,6 +101,7 @@
   "Configwindow_Param_UseItemDesc": "Use poison, WIP",
   "Configwindow_Param_Conditon": "Condition",
   "Configwindow_Param_StartOnCountdown": "Turn on auto-rotation on countdown",
+  "Configwindow_Param_HealingOutOfCombat": "Heal party members outside of combat.",
   "Configwindow_Param_HealthDifference": "Set the HP standard deviation threshold for using AOE heal (ability & spell)",
   "Configwindow_Param_HealthAreaAbility": "Set the HP threshold for using AOE healing ability",
   "Configwindow_Param_HealthAreaSpell": "Set the HP threshold for using AOE healing spell",
@@ -115,7 +116,7 @@
   "Configwindow_Param_TargetToHostileType2": "Targets have a target or all targets can attack",
   "Configwindow_Param_TargetToHostileType3": "Targets have a target",
   "Configwindow_Param_NoticeUnexpectedCombat": "NOTICE: You are not turn the auto off between area on. It may start a combat unexpectedly.",
-  "Configwindow_Param_AddEnemyListToHostile": "Enemies",
+  "Configwindow_Param_AddEnemyListToHostile": "Add Enemies list to the hostile target.",
   "Configwindow_Param_ChooseAttackMark": "Priority attack targets with attack markers",
   "Configwindow_Param_CanAttackMarkAOE": "Forced use of AOE",
   "Configwindow_Param_AttackMarkAOEDesc": "Attention: Checking this option , AA will attack as many hostile targets as possible, while ignoring whether the attack will cover the marked target.",

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -148,6 +148,9 @@ internal class Strings
     public string Configwindow_Param_UseItemDesc { get; set; } = "Use poison, WIP";
     public string Configwindow_Param_Conditon { get; set; } = "Condition";
     public string Configwindow_Param_StartOnCountdown { get; set; } = "Turn on auto-rotation on countdown";
+
+    public string Configwindow_Param_HealOutOfCombat { get; set; } = "Heal party members outside of combat.";
+
     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";
@@ -162,7 +165,7 @@ internal class Strings
     public string Configwindow_Param_TargetToHostileType2 { get; set; } = "Targets have a target or all targets can attack";
     public string Configwindow_Param_TargetToHostileType3 { get; set; } = "Targets have a target";
     public string Configwindow_Param_NoticeUnexpectedCombat { get; set; } = "NOTICE: You are not turn the auto off between area on. It may start a combat unexpectedly.";
-    public string Configwindow_Param_AddEnemyListToHostile { get; set; } = "Enemies";
+    public string Configwindow_Param_AddEnemyListToHostile { get; set; } = "Add Enemies list to the hostile target.";
     public string Configwindow_Param_ChooseAttackMark { get; set; } = "Priority attack targets with attack markers";
     public string Configwindow_Param_CanAttackMarkAOE { get; set; } = "Forced use of AOE";
     public string Configwindow_Param_AttackMarkAOEDesc { get; set; } = "Attention: Checking this option , AA will attack as many hostile targets as possible, while ignoring whether the attack will cover the marked target.";

diff --git a/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs b/RotationSolver/Rotations/CustomRotation/CustomRotation_GCD.cs
@@ -27,7 +27,7 @@ private IAction GCD(byte abilityRemain, bool helpDefenseAOE, bool helpDefenseSin
         }
 
         //General Heal
-        if (TargetUpdater.HPNotFull && ActionUpdater.InCombat)
+        if (TargetUpdater.HPNotFull && (ActionUpdater.InCombat || Service.Configuration.HealOutOfCombat))
         {
             if ((specialType == SpecialCommandType.HealArea || CanHealAreaSpell) && HealAreaGCD(out act)) return act;
             if ((specialType == SpecialCommandType.HealSingle || CanHealSingleSpell) && HealSingleGCD(out act)) return act;

diff --git a/RotationSolver/Windows/RotationConfigWindow_Param.cs b/RotationSolver/Windows/RotationConfigWindow_Param.cs
@@ -246,6 +246,9 @@ private void DrawParamCondition()
         DrawCheckBox(LocalizationManager.RightLang.Configwindow_Param_StartOnCountdown,
             ref Service.Configuration.StartOnCountdown);
 
+        DrawCheckBox(LocalizationManager.RightLang.Configwindow_Param_HealOutOfCombat,
+            ref Service.Configuration.HealOutOfCombat);
+
         const float speed = 0.005f;
         DrawFloatNumber(LocalizationManager.RightLang.Configwindow_Param_HealthDifference,
              ref Service.Configuration.HealthDifference,