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 new DismissOption for directed vehicles. Refactored for Path object now handling lists of vehicle collection. Dismiss From World now works on uncollected vehicles.

Browse source
This commit is contained in:
Rich Dunne 2020-10-17 07:10:47 -06:00
parent 80a3007896
commit 497e0c423f
1 changed files with 69 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

86
SceneManager/Menus/PathMainMenu.cs
View file

@ -13,7 +13,8 @@ namespace SceneManager
FromPath = 0, FromPath = 0,
FromWaypoint = 1, FromWaypoint = 1,
FromWorld = 2, FromWorld = 2,
FromPlayer = 3 FromPlayer = 3,
FromDirected = 4
} }
static class PathMainMenu static class PathMainMenu
@ -130,7 +131,7 @@ namespace SceneManager
void RemoveVehiclesFromPath() void RemoveVehiclesFromPath()
{ {
//Game.LogTrivial($"Removing all vehicles on the path"); //Game.LogTrivial($"Removing all vehicles on the path");
var pathVehicles = VehicleCollector.collectedVehicles.Where(cv => cv.Path.Number == path.Number).ToList(); var pathVehicles = path.CollectedVehicles.Where(cv => cv.Path.Number == path.Number).ToList();
foreach (CollectedVehicle cv in pathVehicles.Where(cv => cv != null && cv.Vehicle && cv.Driver)) foreach (CollectedVehicle cv in pathVehicles.Where(cv => cv != null && cv.Vehicle && cv.Driver))
{ {
if (cv.StoppedAtWaypoint) if (cv.StoppedAtWaypoint)
@ -148,8 +149,9 @@ namespace SceneManager
cv.Vehicle.Dismiss(); cv.Vehicle.Dismiss();
//Game.LogTrivial($"{cv.vehicle.Model.Name} cleared from path {cv.path}"); //Game.LogTrivial($"{cv.vehicle.Model.Name} cleared from path {cv.path}");
VehicleCollector.collectedVehicles.Remove(cv); path.CollectedVehicles.Remove(cv);
} }
path.CollectedVehicles.Clear();
} }
void RemoveBlipsAndYieldZones() void RemoveBlipsAndYieldZones()
@ -227,7 +229,7 @@ namespace SceneManager
{ {
DeletePath(paths[i], Delete.All); DeletePath(paths[i], Delete.All);
} }
disableAllPaths.Checked = false;
paths.Clear(); paths.Clear();
BuildPathMenu(); BuildPathMenu();
pathMainMenu.Visible = true; pathMainMenu.Visible = true;
@ -238,21 +240,48 @@ namespace SceneManager
if (selectedItem == directDriver) if (selectedItem == directDriver)
{ {
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(16).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).FirstOrDefault(); var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(16).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).FirstOrDefault();
var path = paths[directDriver.Index];
var collectedVehicle = path.CollectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault();
var waypoints = path.Waypoints;
var firstWaypoint = waypoints.First();
var nearestWaypoint = waypoints.Where(wp => wp.Position.DistanceTo2D(nearbyVehicle.FrontPosition) < wp.Position.DistanceTo2D(nearbyVehicle.RearPosition)).OrderBy(wp => wp.Position.DistanceTo2D(nearbyVehicle)).FirstOrDefault();
if (nearbyVehicle) if (nearbyVehicle)
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault(); var nearbyVehiclePath = paths.Where(p => p.CollectedVehicles.Any(v => v.Vehicle == nearbyVehicle)).FirstOrDefault();
var path = paths[directDriver.Index]; if(nearbyVehiclePath != null)
var waypoints = path.Waypoints; {
var firstWaypoint = waypoints.First(); var nearbyCollectedVehicle = nearbyVehiclePath.CollectedVehicles.Where(v => v.Vehicle == nearbyVehicle).FirstOrDefault();
var nearestWaypoint = waypoints.Where(wp => wp.Position.DistanceTo2D(nearbyVehicle.FrontPosition) < wp.Position.DistanceTo2D(nearbyVehicle.RearPosition)).OrderBy(wp => wp.Position.DistanceTo2D(nearbyVehicle)).FirstOrDefault(); if (nearbyCollectedVehicle != null)
{
nearbyCollectedVehicle.Dismiss(DismissOption.FromDirected, path);
if (directOptions.SelectedItem == "First waypoint")
{
GameFiber.StartNew(() =>
{
AITasking.AssignWaypointTasks(nearbyCollectedVehicle, path, firstWaypoint);
});
}
else
{
if (nearestWaypoint != null)
{
GameFiber.StartNew(() =>
{
AITasking.AssignWaypointTasks(nearbyCollectedVehicle, path, nearestWaypoint);
});
}
}
return;
}
}
// The vehicle should only be added to the collection when it's not null AND if the selected item is First Waypoint OR if the selected item is nearestWaypoint AND nearestWaypoint is not null // The vehicle should only be added to the collection when it's not null AND if the selected item is First Waypoint OR if the selected item is nearestWaypoint AND nearestWaypoint is not null
if (collectedVehicle == null && directOptions.SelectedItem == "First waypoint" || (directOptions.SelectedItem == "Nearest waypoint" && nearestWaypoint != null)) if (collectedVehicle == null && directOptions.SelectedItem == "First waypoint" || (directOptions.SelectedItem == "Nearest waypoint" && nearestWaypoint != null))
{ {
Game.LogTrivial($"[Direct Driver] Adding {nearbyVehicle.Model.Name} to collection."); Game.LogTrivial($"[Direct Driver] Adding {nearbyVehicle.Model.Name} to collection.");
VehicleCollector.collectedVehicles.Add(new CollectedVehicle(nearbyVehicle, path)); path.CollectedVehicles.Add(new CollectedVehicle(nearbyVehicle, path));
collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault(); collectedVehicle = path.CollectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault();
//Logger.Log($"Collected vehicle is {collectedVehicle.Vehicle.Model.Name}"); //Logger.Log($"Collected vehicle is {collectedVehicle.Vehicle.Model.Name}");
} }
@ -289,12 +318,7 @@ namespace SceneManager
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(16).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).FirstOrDefault(); var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(16).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).FirstOrDefault();
if (nearbyVehicle) if (nearbyVehicle)
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault(); if (!paths.Any() && dismissDriver.Index == (int)DismissOption.FromWorld)
if(collectedVehicle != null)
{
collectedVehicle.Dismiss((DismissOption)dismissDriver.Index);
}
else if(dismissDriver.Index == (int)DismissOption.FromWorld)
{ {
Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world"); Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world");
while (nearbyVehicle && nearbyVehicle.HasOccupants) while (nearbyVehicle && nearbyVehicle.HasOccupants)
@ -309,6 +333,34 @@ namespace SceneManager
{ {
nearbyVehicle.Delete(); nearbyVehicle.Delete();
} }
return;
}
foreach(Path path in paths)
{
var collectedVehicle = path.CollectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).FirstOrDefault();
if (collectedVehicle != null)
{
collectedVehicle.Dismiss((DismissOption)dismissDriver.Index);
break;
}
else if (dismissDriver.Index == (int)DismissOption.FromWorld)
{
Game.LogTrivial($"Dismissed {nearbyVehicle.Model.Name} from the world");
while (nearbyVehicle && nearbyVehicle.HasOccupants)
{
foreach (Ped occupant in nearbyVehicle.Occupants)
{
occupant.Delete();
}
GameFiber.Yield();
}
if (nearbyVehicle)
{
nearbyVehicle.Delete();
}
break;
}
} }
} }
} }