diff --git a/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs b/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs index 7e18fe757..e676ec77a 100644 --- a/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs +++ b/RotationSolver/Actions/BaseAction/BaseAction_ActionInfo.cs @@ -92,13 +92,8 @@ public unsafe virtual bool CanUse(out IAction act, bool mustUse = false, bool em } } - if (CastTime > 0 && MovingUpdater.IsMoving) - { - if (!player.HasStatus(true, CustomRotation.Swiftcast.StatusProvide)) - { - return false; - } - } + if (CastTime > 0 && MovingUpdater.IsMoving && + !player.HasStatus(true, CustomRotation.Swiftcast.StatusProvide)) return false; if (!FindTarget(mustUse, out var target)) return false; diff --git a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs index a9aa08890..18e055e64 100644 --- a/RotationSolver/Actions/BaseAction/BaseAction_Target.cs +++ b/RotationSolver/Actions/BaseAction/BaseAction_Target.cs @@ -151,8 +151,8 @@ private bool TargetAreaMove(float range, bool mustUse, out BattleChara target) { Vector3 pPosition = Service.ClientState.LocalPlayer.Position; float rotation = Service.ClientState.LocalPlayer.Rotation; - _position = new Vector3(pPosition.X + (float)Math.Sin(rotation), pPosition.Y, - pPosition.Z + (float)Math.Cos(rotation)); + _position = new Vector3(pPosition.X + (float)Math.Sin(rotation) * range, pPosition.Y, + pPosition.Z + (float)Math.Cos(rotation) * range); return true; } return false; diff --git a/RotationSolver/Rotations/Basic/BLU_Base.cs b/RotationSolver/Rotations/Basic/BLU_Base.cs index 46cd94753..49b71abeb 100644 --- a/RotationSolver/Rotations/Basic/BLU_Base.cs +++ b/RotationSolver/Rotations/Basic/BLU_Base.cs @@ -694,7 +694,7 @@ public override bool CanUse(out IAction act, bool mustUse = false, bool emptyOrS /// /// 若隐若现 /// - private static IBLUAction Loom { get; } = new BLUAction(ActionID.Loom, BLUActionType.None); + private static IBLUAction Loom { get; } = new BLUAction(ActionID.Loom, BLUActionType.None, shouldEndSpecial: true); /// /// 斗争本能