From 8b4eb77d3520934c47b8f405c90ccb3b9897baaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E6=B0=B4?= <1123993881@qq.com> Date: Sun, 2 Apr 2023 16:09:41 +0800 Subject: [PATCH] fix: removed one bad status from previous version. --- .../Actions/BaseAction/BaseAction_ActionInfo.cs | 4 +--- RotationSolver.Basic/Helpers/ConfigurationHelper.cs | 2 +- RotationSolver.Basic/Rotations/Basic/NIN_Base.cs | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs b/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs index 669057e97..7d27f457d 100644 --- a/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs +++ b/RotationSolver.Basic/Actions/BaseAction/BaseAction_ActionInfo.cs @@ -22,8 +22,6 @@ public partial class BaseAction public Func ActionCheck { get; set; } = null; - protected virtual bool CheckBadStatus => true; - private bool WillCooldown { get @@ -58,7 +56,7 @@ public unsafe virtual bool CanUse(out IAction act, CanUseOption option = CanUseO if (!option.HasFlag(CanUseOption.SkipDisable) && !IsEnabled) return false; - if (CheckBadStatus && ConfigurationHelper.BadStatus.Contains(ActionManager.Instance()->GetActionStatus(ActionType.Spell, AdjustedID))) + if (ConfigurationHelper.BadStatus.Contains(ActionManager.Instance()->GetActionStatus(ActionType.Spell, AdjustedID))) return false; if (!EnoughLevel) return false; diff --git a/RotationSolver.Basic/Helpers/ConfigurationHelper.cs b/RotationSolver.Basic/Helpers/ConfigurationHelper.cs index b77eda0e1..7d9f7fa10 100644 --- a/RotationSolver.Basic/Helpers/ConfigurationHelper.cs +++ b/RotationSolver.Basic/Helpers/ConfigurationHelper.cs @@ -32,7 +32,7 @@ public record PositionalInfo(EnemyPositional Pos, byte[] Tags); 579, //Between Area 574, //Job 573, //没学会 ? - 572, //一些额外条件未满足 ? + //572, //一些额外条件未满足 ? }; public static readonly VirtualKey[] Keys = new VirtualKey[] { VirtualKey.CONTROL, VirtualKey.SHIFT, VirtualKey.MENU }; diff --git a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs index e1bdde9c1..f825c71d0 100644 --- a/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs +++ b/RotationSolver.Basic/Rotations/Basic/NIN_Base.cs @@ -35,7 +35,6 @@ public abstract class NIN_Base : CustomRotation public class NinAction : BaseAction, INinAction { - protected override bool CheckBadStatus => false; public IBaseAction[] Ninjutsu { get; } internal NinAction(ActionID actionID, params IBaseAction[] ninjutsu) : base(actionID, false, false)