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

Added more null ref checks. Refactored initial task assignment to take into account whether a vehicle was Directed

Browse source
This commit is contained in:
Rich Dunne 2020-09-20 12:58:32 -06:00
parent fb433612a3
commit 5ad6e61973
1 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
SceneManager/AITasking.cs
View file

@ -13,23 +13,20 @@ namespace SceneManager
return;
}
if (currentWaypoint != null)
if (currentWaypoint != null && collectedVehicle.Directed)
{
float acceptedDistance = GetAcceptedStoppingDistance(waypoints, waypoints.IndexOf(currentWaypoint));
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} distance to collection waypoint: {collectedVehicle.Vehicle.DistanceTo2D(currentWaypoint.Position)}");
if(collectedVehicle.Vehicle.DistanceTo2D(currentWaypoint.Position) > (currentWaypoint.CollectorRadius + 0.5))
{
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} is driving to waypoint {currentWaypoint.Number}");
collectedVehicle.Driver.Tasks.DriveToPosition(currentWaypoint.Position, currentWaypoint.Speed, (VehicleDrivingFlags)263075, acceptedDistance);
LoopWhileDrivingToWaypoint(acceptedDistance);
}
if(currentWaypoint.DrivingFlag == VehicleDrivingFlags.StopAtDestination)
if (currentWaypoint.DrivingFlag == VehicleDrivingFlags.StopAtDestination)
{
StopVehicleAtWaypoint(currentWaypoint, collectedVehicle);
}
}
DriveVehicleToNextWaypoint(collectedVehicle, waypoints, currentWaypoint);
if (!VehicleAndDriverNullChecks(collectedVehicle))
@ -39,6 +36,7 @@ namespace SceneManager
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} all tasks complete.");
if (!collectedVehicle.Dismissed)
{
Logger.Log($"Dismissing {collectedVehicle.Vehicle.Model.Name}");
collectedVehicle.Dismiss();
}
@ -54,7 +52,7 @@ namespace SceneManager
private static void DriveVehicleToNextWaypoint(CollectedVehicle collectedVehicle, List<Waypoint> waypoints, Waypoint currentWaypoint)
{
if (!VehicleAndDriverNullChecks(collectedVehicle))
if (!VehicleAndDriverNullChecks(collectedVehicle) || currentWaypoint == null || currentWaypoint.Path == null)
{
return;
}
@ -72,6 +70,7 @@ namespace SceneManager
if (waypoints.ElementAtOrDefault(nextWaypoint) != null && !collectedVehicle.StoppedAtWaypoint)
{
collectedVehicle.CurrentWaypoint = waypoints[nextWaypoint];
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}");
@ -85,6 +84,11 @@ namespace SceneManager
}
LoopWhileDrivingToWaypoint(nextWaypoint, acceptedDistance);
if (!VehicleAndDriverNullChecks(collectedVehicle))
{
return;
}
if (collectedVehicle.SkipWaypoint)
{
collectedVehicle.SkipWaypoint = false;
@ -101,12 +105,16 @@ namespace SceneManager
return;
}
driver.Tasks.PerformDrivingManeuver(collectedVehicle.Vehicle, VehicleManeuver.GoForwardWithCustomSteeringAngle, 3).WaitForCompletion();
if (driver)
{
driver.Tasks.Clear();
}
}
}
void LoopWhileDrivingToWaypoint(int nextWaypoint, float acceptedDistance)
{
//Logger.Log($"Dismissed: {collectedVehicle.Dismissed} SkipWaypoint: {collectedVehicle.SkipWaypoint}");
while (VehicleAndDriverNullChecks(collectedVehicle) && !collectedVehicle.Dismissed && !collectedVehicle.SkipWaypoint && waypoints.ElementAtOrDefault(nextWaypoint) != null && vehicle.FrontPosition.DistanceTo2D(waypoints[nextWaypoint].Position) > acceptedDistance)
{
//Logger.Log($"Looping while {collectedVehicle.Vehicle.Model.Name} drives to waypoint {waypoints[nextWaypoint].Number} ({collectedVehicle.Vehicle.DistanceTo2D(waypoints[nextWaypoint].Position)}m away from collector radius {waypoints[nextWaypoint].CollectorRadius})");
@ -128,7 +136,7 @@ namespace SceneManager
dist = (waypoints[nextWaypoint].Speed * waypoints[nextWaypoint].Speed) / (250 * 0.8f);
}
var acceptedDistance = MathHelper.Clamp(dist, 2, 10);
Logger.Log($"Accepted distance: {acceptedDistance}");
//Logger.Log($"Accepted distance: {acceptedDistance}");
return acceptedDistance;
}
@ -188,14 +196,11 @@ namespace SceneManager
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} stopping at waypoint.");
Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(collectedVehicle.Vehicle, stoppingDistance, -1, true);
collectedVehicle.StoppedAtWaypoint = true;
collectedVehicle.Driver.Tasks.Clear();
while (currentWaypoint != null && VehicleAndDriverNullChecks(collectedVehicle) && collectedVehicle.StoppedAtWaypoint)
{
GameFiber.Yield();
}
Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(collectedVehicle.Vehicle, 1f, 1, true);
}
}
}