From 1572491b979dd4e107527bc311163edfccce7d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Fri, 28 Apr 2023 18:40:38 +0800 Subject: [PATCH] fix: add shadowtime for DRK. --- RotationSolver.Basic/Rotations/Basic/DRK_Base.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs index 60d4a53a7..e6ce8da31 100644 --- a/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/DRK_Base.cs @@ -24,6 +24,18 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, float offset = 0) { return EndAfterGCD(DarkSideTimeRemaining, gctCount, offset); } + + private static float ShadowTimeRemaining => JobGauge.ShadowTimeRemaining / 1000f; + + protected static bool ShadowTimeEndAfter(float time) + { + return EndAfter(ShadowTimeRemaining, time); + } + + protected static bool ShadowTimeEndAfterGCD(uint gctCount = 0, float offset = 0) + { + return EndAfterGCD(ShadowTimeRemaining, gctCount, offset); + } #endregion #region Attack Single @@ -97,7 +109,7 @@ protected static bool DarkSideEndAfterGCD(uint gctCount = 0, float offset = 0) public static IBaseAction ShadowBringer { get; } = new BaseAction(ActionID.ShadowBringer) { - ActionCheck = b => DarkSideTimeRemaining > 0, + ActionCheck = b => !DarkSideEndAfterGCD(), }; #endregion