fix: ast use AspectedBenefic when not in combat.

ArchiDog1998 · Feb 7, 2023 · 52ddf21 · 52ddf21
1 parent c9a36bd
commit 52ddf21
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/RotationSolver/Rotations/Healer/AST/AST_Default.cs b/RotationSolver/Rotations/Healer/AST/AST_Default.cs
@@ -1,5 +1,6 @@
 using Dalamud.Game.ClientState.JobGauge.Enums;
 using RotationSolver.Actions;
+using RotationSolver.Actions.BaseAction;
 using RotationSolver.Configuration.RotationConfig;
 using RotationSolver.Data;
 using RotationSolver.Helpers;
@@ -26,6 +27,12 @@ internal sealed class AST_Default : AST_Base
         {DescType.BreakingAction, $"{Divination}"}
     };
 
+    private static IBaseAction AspectedBeneficDefense { get; } = new BaseAction(ActionID.AspectedBenefic, true, isEot: true)
+    {
+        ChoiceTarget = TargetFilter.FindAttackedTarget,
+        TargetStatus = new StatusID[] { StatusID.AspectedBenefic },
+    };
+
     private protected override bool DefenceSingleAbility(byte abilitiesRemaining, out IAction act)
     {
         //天星交错
@@ -46,6 +53,10 @@ private protected override bool DefenceAreaAbility(byte abilitiesRemaining, out
 
     private protected override bool GeneralGCD(out IAction act)
     {
+        //Add AspectedBeneficwhen not in combat.
+        if (!InCombat && TargetUpdater.PartyTanks.Any(t => !t.HasStatus(true, StatusID.AspectedBenefic))
+            && AspectedBeneficDefense.CanUse(out act)) return true;
+
         //群体输出
         if (Gravity.CanUse(out act)) return true;
 

diff --git a/RotationSolver/Windows/RotationConfigWindow_Debug.cs b/RotationSolver/Windows/RotationConfigWindow_Debug.cs
@@ -43,8 +43,6 @@ private void DrawDebugTab()
 
     private unsafe void DrawStatus()
     {
-        ImGui.Text(ActionUpdater.WeaponRemain.ToString());
-
         if ((IntPtr)FateManager.Instance() != IntPtr.Zero)
         {
             ImGui.Text("Fate: " + TargetUpdater.FateId.ToString());