fix: fixed with SMN base.

ArchiDog1998 · Apr 23, 2023 · b9c8509 · b9c8509
1 parent 4c3b339
commit b9c8509
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs b/RotationSolver.Basic/Rotations/Basic/SMN_Base.cs
@@ -42,6 +42,13 @@ protected static bool AttunmentTimeEndAfterGCD(uint gctCount = 0, float offset =
     private static bool HasSummon => DataCenter.HasPet && SummonTimeEndAfterGCD();
     #endregion
 
+    public override void DisplayStatus()
+    {
+        ImGui.Text("AttunmentTime: " + AttunmentTimerRemaining.ToString());
+        ImGui.Text("SummonTime: " + SummonTimerRemaining.ToString());
+        base.DisplayStatus();
+    }
+
     #region Summon
     public static IBaseAction SummonRuby { get; } = new BaseAction(ActionID.SummonRuby)
     {
@@ -69,12 +76,12 @@ protected static bool AttunmentTimeEndAfterGCD(uint gctCount = 0, float offset =
     #region Summon Actions
     public static IBaseAction Gemshine { get; } = new BaseAction(ActionID.Gemshine)
     {
-        ActionCheck = b => Attunement > 0,
+        ActionCheck = b => Attunement > 0 && !AttunmentTimeEndAfter(Gemshine.CastTime),
     };
 
     public static IBaseAction PreciousBrilliance { get; } = new BaseAction(ActionID.PreciousBrilliance)
     {
-        ActionCheck = b => Attunement > 0,
+        ActionCheck = b => Attunement > 0 && !AttunmentTimeEndAfter(PreciousBrilliance.CastTime),
     };
 
     public static IBaseAction AetherCharge { get; } = new BaseAction(ActionID.AetherCharge)
@@ -84,7 +91,7 @@ protected static bool AttunmentTimeEndAfterGCD(uint gctCount = 0, float offset =
 
     public static IBaseAction SummonBahamut { get; } = new BaseAction(ActionID.SummonBahamut)
     {
-        ActionCheck = b => InCombat && HasSummon
+        ActionCheck = AetherCharge.ActionCheck
     };
 
     public static IBaseAction EnkindleBahamut { get; } = new BaseAction(ActionID.EnkindleBahamut)