diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json index 9112bf57f..fe487e05a 100644 --- a/Resources/HostileCastingArea.json +++ b/Resources/HostileCastingArea.json @@ -527,5 +527,7 @@ 21515, 21521, 20182, - 36114 + 36114, + 33323, + 33303 ] \ No newline at end of file diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json index 46de49981..1009633ee 100644 --- a/Resources/RotationSolverRecord.json +++ b/Resources/RotationSolverRecord.json @@ -1,5 +1,5 @@ { - "ClickingCount": 111146, - "SayingHelloCount": 179, + "ClickingCount": 111724, + "SayingHelloCount": 180, "SaidUsers": [] } \ No newline at end of file diff --git a/RotationSolver.Basic/Actions/ActionTargetInfo.cs b/RotationSolver.Basic/Actions/ActionTargetInfo.cs index 2143d4953..e98e1de13 100644 --- a/RotationSolver.Basic/Actions/ActionTargetInfo.cs +++ b/RotationSolver.Basic/Actions/ActionTargetInfo.cs @@ -523,7 +523,7 @@ private readonly bool CanGetTarget(GameObject target, GameObject subTarget) break; case SpecialActionType.MovingForward: - if (DataCenter.MergedStatus.HasFlag(AutoStatus.MoveForward)) + if (DataCenter.MergedStatus.HasFlag(AutoStatus.MoveForward) || Service.CountDownTime > 0) { type = TargetType.Move; }