fix: dot action's usage in Manual mode.

ArchiDog1998 · Jan 23, 2023 · 8399d37 · 8399d37
1 parent ccbc9eb
commit 8399d37
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs
@@ -294,11 +294,14 @@ private bool TargetHostileManual(BattleChara b, bool mustUse, int aoeCount, out
         {
             target = b;
 
-            //No need to dot.
-            if (TargetStatus != null && !ObjectHelper.CanDot(b)) return false;
+            if (!mustUse)
+            {
+                //No need to dot.
+                if (TargetStatus != null && !ObjectHelper.CanDot(b)) return false;
 
-            //Already has status.
-            if (!mustUse && !CheckStatus(b)) return false;
+                //Already has status.
+                if (!CheckStatus(b)) return false;
+            }
 
             return true;
         }

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -101,7 +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_HealOutOfCombat": "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",

diff --git a/RotationSolver/Rotations/Healer/WHM/WHM_Default.cs b/RotationSolver/Rotations/Healer/WHM/WHM_Default.cs
@@ -50,10 +50,9 @@ private protected override bool GeneralGCD(out IAction act)
         if (Holy.CanUse(out act)) return true;
 
         //单体输出
-        if (Aero.CanUse(out act, mustUse: IsMoving && HaveHostilesInRange)) return true;
+        if (Aero.CanUse(out act, mustUse: IsMoving)) return true;
         if (Stone.CanUse(out act)) return true;
 
-
         act = null;
         return false;
     }

diff --git a/RotationSolver/SigReplacers/IconReplacer.cs b/RotationSolver/SigReplacers/IconReplacer.cs
@@ -153,7 +153,8 @@ group combo by combo.JobIDs[0] into comboGrp
                         .ToArray();
 
         _customCombosDict = new SortedList<JobRole, CustomRotationGroup[]>
-            (_customRotations.GroupBy(g => g.rotations[0].Job.GetJobRole()).ToDictionary(set => set.Key, set => set.OrderBy(i => i.jobId).ToArray()));
+            (_customRotations.GroupBy(g => g.rotations[0].Job.GetJobRole())
+            .ToDictionary(set => set.Key, set => set.OrderBy(i => i.jobId).ToArray()));
     }
 
     private static ICustomRotation[] SetCombos(ICustomRotation[] combos)