thegeneralist01/Scene-Manager-DevRepo
1
Fork 0
mirror of https://github.com/thegeneralist01/Scene-Manager-DevRepo synced 2026-01-11 23:50:29 +01:00
Code Issues Activity

Fixed vehicle being incorrectly dismissed from path when user dismissed them from waypoint

Browse source
This commit is contained in:
Rich Dunne 2020-09-25 15:43:01 -06:00
parent 35d7595f6a
commit 59d85e72a8
1 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
SceneManager/AITasking.cs
View file

@ -36,7 +36,7 @@ namespace SceneManager
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} all tasks complete."); Logger.Log($"{collectedVehicle.Vehicle.Model.Name} all tasks complete.");
if (!collectedVehicle.Dismissed) if (!collectedVehicle.Dismissed)
{ {
Logger.Log($"Dismissing {collectedVehicle.Vehicle.Model.Name}"); Logger.Log($"Dismissing {collectedVehicle.Vehicle.Model.Name} from path");
collectedVehicle.Dismiss(); collectedVehicle.Dismiss();
} }
@ -60,33 +60,35 @@ namespace SceneManager
var vehicle = collectedVehicle.Vehicle; var vehicle = collectedVehicle.Vehicle;
var driver = vehicle.Driver; var driver = vehicle.Driver;
for (int nextWaypoint = currentWaypoint.Number; nextWaypoint < waypoints.Count; nextWaypoint++) for (int currentWaypointTask = currentWaypoint.Number; currentWaypointTask < waypoints.Count; currentWaypointTask++)
{ {
if (!VehicleAndDriverAreValid(waypoints, nextWaypoint, collectedVehicle) || collectedVehicle.Dismissed) collectedVehicle.SkipWaypoint = false;
if (collectedVehicle.Dismissed)
{ {
Logger.Log($"Vehicle dismissed, return");
return; return;
} }
if (collectedVehicle.SkipWaypoint) //if (collectedVehicle.SkipWaypoint)
//{
// Logger.Log($"Vehicle still skipping waypoint");
// continue;
//}
if (waypoints.ElementAtOrDefault(currentWaypointTask) != null && !collectedVehicle.StoppedAtWaypoint)
{ {
continue; collectedVehicle.CurrentWaypoint = waypoints[currentWaypointTask];
} //Logger.Log($"{collectedVehicle.Vehicle.Model.Name} current waypoint: {collectedVehicle.CurrentWaypoint.Number}");
float acceptedDistance = GetAcceptedStoppingDistance(waypoints, currentWaypointTask);
if (waypoints.ElementAtOrDefault(nextWaypoint) != null && !collectedVehicle.StoppedAtWaypoint) Logger.Log($"{vehicle.Model.Name} is driving to waypoint {waypoints[currentWaypointTask].Number}");
if (waypoints[currentWaypointTask].DrivingFlag == VehicleDrivingFlags.IgnorePathFinding)
{ {
collectedVehicle.CurrentWaypoint = waypoints[nextWaypoint]; driver.Tasks.DriveToPosition(waypoints[currentWaypointTask].Position, waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)17040299, acceptedDistance);
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} current waypoint: {collectedVehicle.CurrentWaypoint.Number}");
float acceptedDistance = GetAcceptedStoppingDistance(waypoints, nextWaypoint);
Logger.Log($"{vehicle.Model.Name} is driving to waypoint {waypoints[nextWaypoint].Number}");
if (waypoints[nextWaypoint].DrivingFlag == VehicleDrivingFlags.IgnorePathFinding)
{
driver.Tasks.DriveToPosition(waypoints[nextWaypoint].Position, waypoints[nextWaypoint].Speed, (VehicleDrivingFlags)17040299, acceptedDistance);
} }
else else
{ {
driver.Tasks.DriveToPosition(waypoints[nextWaypoint].Position, waypoints[nextWaypoint].Speed, (VehicleDrivingFlags)263075, acceptedDistance); driver.Tasks.DriveToPosition(waypoints[currentWaypointTask].Position, waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)263075, acceptedDistance);
} }
LoopWhileDrivingToWaypoint(nextWaypoint, acceptedDistance); LoopWhileDrivingToWaypoint(currentWaypointTask, acceptedDistance);
if (!VehicleAndDriverAreValid(collectedVehicle)) if (!VehicleAndDriverAreValid(collectedVehicle))
{ {
@ -99,9 +101,9 @@ namespace SceneManager
continue; continue;
} }
if (!collectedVehicle.Dismissed && waypoints.ElementAtOrDefault(nextWaypoint) != null && waypoints[nextWaypoint].DrivingFlag == VehicleDrivingFlags.StopAtDestination) if (!collectedVehicle.Dismissed && waypoints.ElementAtOrDefault(currentWaypointTask) != null && waypoints[currentWaypointTask].DrivingFlag == VehicleDrivingFlags.StopAtDestination)
{ {
StopVehicleAtWaypoint(waypoints[nextWaypoint], collectedVehicle); StopVehicleAtWaypoint(waypoints[currentWaypointTask], collectedVehicle);
} }
if (!VehicleAndDriverAreValid(collectedVehicle) || collectedVehicle.Dismissed) if (!VehicleAndDriverAreValid(collectedVehicle) || collectedVehicle.Dismissed)