4 files changed, 8 insertions(+), 0 deletions(-)

M Core/NosSmooth.Core/Commands/Walking/PetWalkCommand.cs
M Core/NosSmooth.Core/Commands/Walking/PlayerWalkCommand.cs
M Core/NosSmooth.Core/Commands/Walking/WalkCommand.cs
M Core/NosSmooth.Core/Commands/Walking/WalkCommandHandler.cs

@@ 14,6 14,7 @@ namespace NosSmooth.Core.Commands.Walking;
 /// <param name="PetSelector">Index of the pet to move.</param>
 /// <param name="TargetX">The target x coordinate.</param>
 /// <param name="TargetY">The target y coordinate.</param>
+/// <param name="ReturnDistanceTolerance">The distance tolerance to the target when to return successful result.</param>
 /// <param name="CanBeCancelledByAnother">Whether the command may be cancelled by another task within the same group.</param>
 /// <param name="WaitForCancellation">Whether to wait for finish of the previous task</param>
 /// <param name="AllowUserCancel">Whether to allow the user to cancel by taking any walk/focus/unfollow action</param>


@@ 22,6 23,7 @@ public record PetWalkCommand
     int PetSelector,
     short TargetX,
     short TargetY,
+    ushort ReturnDistanceTolerance,
     bool CanBeCancelledByAnother = true,
     bool WaitForCancellation = true,
     bool AllowUserCancel = true

@@ 14,6 14,7 @@ namespace NosSmooth.Core.Commands.Walking;
 /// </summary>
 /// <param name="TargetX">The x coordinate of the target position to move to.</param>
 /// <param name="TargetY">The y coordinate of the target position to move to.</param>
+/// <param name="ReturnDistanceTolerance">The distance tolerance to the target when to return successful result.</param>
 /// <param name="CanBeCancelledByAnother">Whether the command may be cancelled by another task within the same group.</param>
 /// <param name="WaitForCancellation">Whether to wait for finish of the previous task</param>
 /// <param name="AllowUserCancel">Whether to allow the user to cancel by taking any walk/focus/unfollow action</param>


@@ 21,6 22,7 @@ public record PlayerWalkCommand
 (
     short TargetX,
     short TargetY,
+    ushort ReturnDistanceTolerance,
     bool CanBeCancelledByAnother = true,
     bool WaitForCancellation = true,
     bool AllowUserCancel = true

@@ 14,6 14,7 @@ namespace NosSmooth.Core.Commands.Walking;
 /// <param name="TargetX">The target x coordinate.</param>
 /// <param name="TargetY">The target y coordinate.</param>
 /// <param name="PetSelectors">The pet indices.</param>
+/// <param name="ReturnDistanceTolerance">The distance tolerance to the target when to return successful result.</param>
 /// <param name="CanBeCancelledByAnother">Whether the command may be cancelled by another task within the same group.</param>
 /// <param name="WaitForCancellation">Whether to wait for finish of the previous task</param>
 /// <param name="AllowUserCancel">Whether to allow the user to cancel by taking any walk/focus/unfollow action</param>


@@ 22,6 23,7 @@ public record WalkCommand
     short TargetX,
     short TargetY,
     int[] PetSelectors,
+    ushort ReturnDistanceTolerance,
     bool CanBeCancelledByAnother = true,
     bool WaitForCancellation = true,
     bool AllowUserCancel = true

@@ 65,6 65,7 @@ public class WalkCommandHandler : ICommandHandler<WalkCommand>
                         command.PetSelectors[i],
                         (short)x,
                         (short)y,
+                        command.ReturnDistanceTolerance,
                         command.CanBeCancelledByAnother,
                         command.WaitForCancellation,
                         command.AllowUserCancel


@@ 82,6 83,7 @@ public class WalkCommandHandler : ICommandHandler<WalkCommand>
                 (
                     command.TargetX,
                     command.TargetY,
+                    command.ReturnDistanceTolerance,
                     command.CanBeCancelledByAnother,
                     command.WaitForCancellation,
                     command.AllowUserCancel