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 CollectedPed object

Browse source
This commit is contained in:
Rich Dunne 2021-05-01 13:12:24 -06:00
parent 93951b3e28
commit 25acb3f66f
7 changed files with 490 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SceneManager/Utils/DirectDriver.cs
View file

@ -49,14 +49,14 @@ namespace SceneManager.Utils
internal static void Direct(Vehicle nearbyVehicle, Path path, Waypoint targetWaypoint)
{
var nearbyVehiclesPath = PathManager.Paths.FirstOrDefault(p => p.CollectedVehicles.Any(v => v.Vehicle == nearbyVehicle));
var nearbyVehiclesPath = PathManager.Paths.FirstOrDefault(p => p.CollectedPeds.Any(v => v.CurrentVehicle == nearbyVehicle));
if(nearbyVehiclesPath == null)
{
Game.LogTrivial($"Nearby vehicle does not belong to any path.");
}
var collectedVehicleOnThisPath = path.CollectedVehicles.FirstOrDefault(v => v.Vehicle == nearbyVehicle);
var nearbyCollectedVehicleOtherPath = nearbyVehiclesPath?.CollectedVehicles.FirstOrDefault(v => v.Vehicle == nearbyVehicle);
var collectedVehicleOnThisPath = path.CollectedPeds.FirstOrDefault(v => v.CurrentVehicle == nearbyVehicle);
var nearbyCollectedVehicleOtherPath = nearbyVehiclesPath?.CollectedPeds.FirstOrDefault(p => p.CurrentVehicle == nearbyVehicle);
if (collectedVehicleOnThisPath == null)
{
Game.LogTrivial($"Nearby vehicle does not belong to this path.");
@ -66,12 +66,12 @@ namespace SceneManager.Utils
nearbyCollectedVehicleOtherPath.Dismiss(Dismiss.FromDirected, path);
}
Game.LogTrivial($"[Direct Driver] Adding {nearbyVehicle.Model.Name} to directed path.");
path.CollectedVehicles.Add(collectedVehicleOnThisPath = new CollectedVehicle(nearbyVehicle, path));
collectedVehicleOnThisPath.Directed = true;
collectedVehicleOnThisPath.Driver.Tasks.Clear();
path.CollectedPeds.Add(collectedVehicleOnThisPath = new CollectedPed(nearbyVehicle.Driver, path, targetWaypoint) { Directed = true });
//collectedVehicleOnThisPath.Directed = true;
collectedVehicleOnThisPath.Tasks.Clear();
}
GameFiber.StartNew(() => collectedVehicleOnThisPath.AssignWaypointTasks(path, targetWaypoint));
//GameFiber.StartNew(() => collectedVehicleOnThisPath.AssignWaypointTasks(path, targetWaypoint));
}
}
}