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

Updated references based on CollectedVehicle refactor.

Browse source
This commit is contained in:
Rich Dunne 2020-09-07 20:27:22 -06:00
parent 27d4b5c39a
commit 8fb6f33ffb
1 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

48
SceneManager/Menus/PathMainMenu.cs
View file

@ -20,7 +20,6 @@ namespace SceneManager
public static UIMenuListScrollerItem<string> dismissDriver { get; private set; } public static UIMenuListScrollerItem<string> dismissDriver { get; private set; }
public static UIMenuCheckboxItem disableAllPaths { get; private set; } public static UIMenuCheckboxItem disableAllPaths { get; private set; }
//private static List<int> pathsNum = new List<int>();
private static List<string> dismissOptions = new List<string>() { "From path", "From waypoint", "From position" }; private static List<string> dismissOptions = new List<string>() { "From path", "From waypoint", "From position" };
public enum Delete public enum Delete
{ {
@ -114,15 +113,15 @@ namespace SceneManager
// Before deleting a path, we need to dismiss any vehicles controlled by that path and remove the vehicles from ControlledVehicles // Before deleting a path, we need to dismiss any vehicles controlled by that path and remove the vehicles from ControlledVehicles
//Game.LogTrivial($"Deleting path {index+1}"); //Game.LogTrivial($"Deleting path {index+1}");
Game.LogTrivial($"Deleting path {path.Number}"); Game.LogTrivial($"Deleting path {path.Number}");
var pathVehicles = VehicleCollector.collectedVehicles.Where(cv => cv.Path == path.Number).ToList(); var pathVehicles = VehicleCollector.collectedVehicles.Where(cv => cv.Path.Number == path.Number).ToList();
Game.LogTrivial($"Removing all vehicles on the path"); Game.LogTrivial($"Removing all vehicles on the path");
foreach (CollectedVehicle cv in pathVehicles.Where(cv => cv.Vehicle && cv.Vehicle.Driver)) foreach (CollectedVehicle cv in pathVehicles.Where(cv => cv.Vehicle && cv.Vehicle.Driver))
{ {
cv.SetDismissNow(true); cv.StoppedAtWaypoint = false;
cv.Vehicle.Driver.Tasks.Clear(); cv.Driver.Tasks.Clear();
cv.Vehicle.Driver.Dismiss(); cv.Driver.Dismiss();
cv.Vehicle.Driver.IsPersistent = false; cv.Driver.IsPersistent = false;
cv.Vehicle.Dismiss(); cv.Vehicle.Dismiss();
cv.Vehicle.IsPersistent = false; cv.Vehicle.IsPersistent = false;
@ -230,7 +229,6 @@ namespace SceneManager
{ {
Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} already in collection. Clearing tasks."); Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} already in collection. Clearing tasks.");
nearbyVehicle.Driver.Tasks.Clear(); nearbyVehicle.Driver.Tasks.Clear();
//VehicleCollector.collectedVehicles[nearbyVehicle].AssignPropertiesFromDirectedTask(pathNum, totalPathWaypoints, 1, tasksAssigned: false, dismiss: true, stoppedAtWaypoint: false);
if (directOptions.SelectedItem == "First waypoint") if (directOptions.SelectedItem == "First waypoint")
{ {
@ -249,7 +247,7 @@ namespace SceneManager
} }
else else
{ {
VehicleCollector.collectedVehicles.Add(new CollectedVehicle(nearbyVehicle, nearbyVehicle.LicensePlate, paths[directDriver.Index].Waypoints[0].Path, paths[directDriver.Index].Waypoints.Count, 1, false, false)); VehicleCollector.collectedVehicles.Add(new CollectedVehicle(nearbyVehicle, paths[directDriver.Index], paths[directDriver.Index].Waypoints.Count, 1, false));
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle; var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle) as CollectedVehicle;
Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} not in collection, adding to collection for path {paths[directDriver.Index].Number} with {paths[directDriver.Index].Waypoints.Count} waypoints"); Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} not in collection, adding to collection for path {paths[directDriver.Index].Number} with {paths[directDriver.Index].Waypoints.Count} waypoints");
@ -277,7 +275,7 @@ namespace SceneManager
{ {
Game.LogTrivial($"{nearbyVehicle.Model.Name} stopping at waypoint."); Game.LogTrivial($"{nearbyVehicle.Model.Name} stopping at waypoint.");
nearbyVehicle.Driver.Tasks.PerformDrivingManeuver(VehicleManeuver.GoForwardStraightBraking); nearbyVehicle.Driver.Tasks.PerformDrivingManeuver(VehicleManeuver.GoForwardStraightBraking);
collectedVehicle.SetStoppedAtWaypoint(true); collectedVehicle.StoppedAtWaypoint = true;
} }
} }
Game.LogTrivial($"{nearbyVehicle.Model.Name} all tasks complete."); Game.LogTrivial($"{nearbyVehicle.Model.Name} all tasks complete.");
@ -308,7 +306,7 @@ namespace SceneManager
{ {
Game.LogTrivial($"{nearbyVehicle.Model.Name} stopping at waypoint."); Game.LogTrivial($"{nearbyVehicle.Model.Name} stopping at waypoint.");
nearbyVehicle.Driver.Tasks.PerformDrivingManeuver(VehicleManeuver.GoForwardStraightBraking); nearbyVehicle.Driver.Tasks.PerformDrivingManeuver(VehicleManeuver.GoForwardStraightBraking);
collectedVehicle.SetStoppedAtWaypoint(true); collectedVehicle.StoppedAtWaypoint = true;
} }
} }
Game.LogTrivial($"{nearbyVehicle.Model.Name} all tasks complete."); Game.LogTrivial($"{nearbyVehicle.Model.Name} all tasks complete.");
@ -319,22 +317,22 @@ namespace SceneManager
} }
} }
// Needs refactor
if (selectedItem == dismissDriver) if (selectedItem == dismissDriver)
{ {
var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(1).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).SingleOrDefault(); var nearbyVehicle = Game.LocalPlayer.Character.GetNearbyVehicles(1).Where(v => v != Game.LocalPlayer.Character.CurrentVehicle && v.VehicleAndDriverValid()).SingleOrDefault();
if (nearbyVehicle) if (nearbyVehicle)
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).First();
switch (dismissDriver.Index) switch (dismissDriver.Index)
{ {
case 0: case 0:
Game.LogTrivial($"Dismiss from path"); Game.LogTrivial($"Dismiss from path");
if (nearbyVehicle.IsInCollectedVehicles()) if (nearbyVehicle.IsInCollectedVehicles())
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).First();
if (collectedVehicle != null) if (collectedVehicle != null)
{ {
collectedVehicle.SetDismissNow(true); collectedVehicle.StoppedAtWaypoint = false;
collectedVehicle.SetStoppedAtWaypoint(false);
collectedVehicle.Vehicle.Driver.Tasks.Clear(); collectedVehicle.Vehicle.Driver.Tasks.Clear();
collectedVehicle.Vehicle.Driver.Dismiss(); collectedVehicle.Vehicle.Driver.Dismiss();
collectedVehicle.Vehicle.IsSirenOn = false; collectedVehicle.Vehicle.IsSirenOn = false;
@ -351,17 +349,15 @@ namespace SceneManager
Game.LogTrivial($"Dismiss from waypoint"); Game.LogTrivial($"Dismiss from waypoint");
if (nearbyVehicle.IsInCollectedVehicles()) if (nearbyVehicle.IsInCollectedVehicles())
{ {
var collectedVehicle = VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle == nearbyVehicle).First();
if (collectedVehicle != null) if (collectedVehicle != null)
{ {
collectedVehicle.SetStoppedAtWaypoint(false); collectedVehicle.StoppedAtWaypoint = false;
collectedVehicle.Vehicle.Driver.Tasks.Clear(); collectedVehicle.Vehicle.Driver.Tasks.Clear();
collectedVehicle.Vehicle.Driver.Dismiss(); collectedVehicle.Vehicle.Driver.Dismiss();
collectedVehicle.Vehicle.IsSirenOn = false; collectedVehicle.Vehicle.IsSirenOn = false;
if (collectedVehicle.CurrentWaypoint == collectedVehicle.TotalWaypoints && !collectedVehicle.StoppedAtWaypoint) if (collectedVehicle.CurrentWaypoint == collectedVehicle.Path.Waypoints.Count && !collectedVehicle.StoppedAtWaypoint)
{ {
collectedVehicle.SetDismissNow(true);
Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from final waypoint and ultimately the path"); Game.LogTrivial($"Dismissed driver of {collectedVehicle.Vehicle.Model.Name} from final waypoint and ultimately the path");
} }
else else
@ -380,23 +376,23 @@ namespace SceneManager
Game.LogTrivial($"Dismiss from position"); Game.LogTrivial($"Dismiss from position");
if (nearbyVehicle.IsInCollectedVehicles()) if (nearbyVehicle.IsInCollectedVehicles())
{ {
nearbyVehicle.Driver.Tasks.Clear(); if(collectedVehicle != null)
nearbyVehicle.Driver.Dismiss(); {
nearbyVehicle.IsSirenOn = false; collectedVehicle.StoppedAtWaypoint = false;
Game.LogTrivial($"Dismissed driver of {nearbyVehicle.Model.Name} (in collection)"); collectedVehicle.Driver.Tasks.Clear();
collectedVehicle.Driver.Dismiss();
collectedVehicle.Vehicle.IsSirenOn = false;
Game.LogTrivial($"Dismissed driver of {nearbyVehicle.Model.Name} from position (in collection)");
}
} }
else else
{ {
nearbyVehicle.Driver.Tasks.Clear(); nearbyVehicle.Driver.Tasks.Clear();
nearbyVehicle.Driver.Dismiss(); nearbyVehicle.Driver.Dismiss();
nearbyVehicle.IsSirenOn = false; nearbyVehicle.IsSirenOn = false;
Game.LogTrivial($"Dismissed driver of {nearbyVehicle.Model.Name} (was not in collection)"); Game.LogTrivial($"Dismissed driver of {nearbyVehicle.Model.Name} from position (was not in collection)");
} }
break; break;
default:
Game.LogTrivial($"dismissDriver index was unexpected");
break;
} }
} }
else else