From 1289409e573134a529ded1cbb9eb9dab149b859c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com>
Date: Fri, 14 Apr 2023 21:55:47 +0800
Subject: [PATCH] fix: add the missed obsolete method.

---
 RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs | 2 +-
 RotationSolver.Basic/Actions/BaseAction_Cooldown.cs   | 6 ++++++
 RotationSolver.Basic/Helpers/StatusHelper.cs          | 5 +++++
 RotationSolver/Watcher.cs                             | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
index 6185ec071..f221a63e8 100644
--- a/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_ActionInfo.cs
@@ -24,7 +24,7 @@ private bool WillCooldown
             {
                 if (IsRealGCD)
                 {
-                    if (!WillHaveOneChargeGCD()) return false;
+                    if (!WillHaveOneChargeGCD(0, 0)) return false;
                 }
                 else
                 {
diff --git a/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs b/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
index 86597e267..a8bd33785 100644
--- a/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
+++ b/RotationSolver.Basic/Actions/BaseAction_Cooldown.cs
@@ -32,6 +32,7 @@ public bool ElapsedAfter(float time)
         return CooldownHelper.ElapsedAfter(elapsed, time);
     }
 
+
     public bool WillHaveOneChargeGCD(uint gcdCount = 0, int abilityCount = 0)
     {
         if (HasOneCharge) return true;
@@ -39,6 +40,11 @@ public bool WillHaveOneChargeGCD(uint gcdCount = 0, int abilityCount = 0)
         return CooldownHelper.RecastAfterGCD(recast, gcdCount, abilityCount);
     }
 
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("Please use the int abilityCoune one.", true)]
+    public bool WillHaveOneChargeGCD(uint gcdCount = 0, uint abilityCount = 0)
+    => WillHaveOneChargeGCD(gcdCount, (int)abilityCount);
+
     public bool WillHaveOneCharge(float remain) => WillHaveOneCharge(remain, true);
 
     private bool WillHaveOneCharge(float remain, bool addWeaponRemain)
diff --git a/RotationSolver.Basic/Helpers/StatusHelper.cs b/RotationSolver.Basic/Helpers/StatusHelper.cs
index 31fb2fea7..93763d8f7 100644
--- a/RotationSolver.Basic/Helpers/StatusHelper.cs
+++ b/RotationSolver.Basic/Helpers/StatusHelper.cs
@@ -44,6 +44,11 @@ internal record Burst2MinsInfo( StatusID status, bool isOnHostile, byte level, p
 
     public static bool NeedHealing(this BattleChara p) => p.WillStatusEndGCD(2, 0, false, NoNeedHealingStatus);
 
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("Please Use the abilityCount int one please.", true)]
+    public static bool WillStatusEndGCD(this BattleChara obj, uint gcdCount = 0, uint abilityCount = 0, bool isFromSelf = true, params StatusID[] statusIDs)
+        => obj.WillStatusEndGCD(gcdCount, (int)abilityCount, isFromSelf, statusIDs);
+
     /// <summary>
     /// Will any of <paramref name="statusIDs"/> be end after <paramref name="gcdCount"/> gcds and <paramref name="abilityCount"/> abilities?
     /// </summary>
diff --git a/RotationSolver/Watcher.cs b/RotationSolver/Watcher.cs
index 82b5c1407..7e4a68cf1 100644
--- a/RotationSolver/Watcher.cs
+++ b/RotationSolver/Watcher.cs
@@ -55,6 +55,7 @@ private static void ActionFromEnemy(uint sourceId, ActionEffectSet set)
         if (source == null) return;
         if (source is not BattleChara battle) return;
         if (battle is PlayerCharacter) return;
+        if (battle.SubKind == 9) return; //Friend!
 
         ShowStrEnemy = set.ToString();
     }