From be299e556f54b8b28a55392352b2da95e1bba37d Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Sat, 17 Oct 2020 07:12:58 -0600 Subject: [PATCH] Removed unnecessary unstucking code. Fixed vehicles stopping briefly at waypoint they were directed to --- SceneManager/AITasking.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/SceneManager/AITasking.cs b/SceneManager/AITasking.cs index 2790328..ea2d539 100644 --- a/SceneManager/AITasking.cs +++ b/SceneManager/AITasking.cs @@ -21,18 +21,19 @@ namespace SceneManager if (currentWaypoint != null && collectedVehicle.Directed) { + collectedVehicle.Dismissed = false; float acceptedDistance = GetAcceptedStoppingDistance(path.Waypoints, path.Waypoints.IndexOf(currentWaypoint)); while (!collectedVehicle.ReadyForDirectTasks) { GameFiber.Yield(); } - if (collectedVehicle.StoppedAtWaypoint) - { - Logger.Log($"Unstucking {collectedVehicle.Vehicle.Model.Name}"); - collectedVehicle.StoppedAtWaypoint = false; - Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(collectedVehicle.Vehicle, 0f, 1, true); - collectedVehicle.Driver.Tasks.CruiseWithVehicle(5f); - } + //if (collectedVehicle.StoppedAtWaypoint) + //{ + // Logger.Log($"Unstucking {collectedVehicle.Vehicle.Model.Name}"); + // collectedVehicle.StoppedAtWaypoint = false; + // Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(collectedVehicle.Vehicle, 0f, 1, true); + // collectedVehicle.Driver.Tasks.CruiseWithVehicle(5f); + //} collectedVehicle.Driver.Tasks.Clear(); AssignTasksForDirectedDriver(acceptedDistance); LoopWhileDrivingToDirectedWaypoint(acceptedDistance); @@ -42,6 +43,7 @@ namespace SceneManager } if (collectedVehicle.Vehicle) { + collectedVehicle.Driver.Tasks.PerformDrivingManeuver(collectedVehicle.Vehicle, VehicleManeuver.GoForwardWithCustomSteeringAngle, 3).WaitForCompletion(); Logger.Log($"{collectedVehicle.Vehicle.Model.Name} directed task is complete, directed is now false"); } }