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

Removed unused Redirected property

Browse source
This commit is contained in:
Rich Dunne 2020-08-25 20:56:15 -06:00
parent 82d1e5293c
commit a052aefc8a
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SceneManager/Menus/PathMainMenu.cs
View file

@ -270,7 +270,7 @@ namespace SceneManager
} }
else else
{ {
VehicleCollector.collectedVehicles.Add(nearbyVehicle.LicensePlate, new CollectedVehicle(nearbyVehicle, nearbyVehicle.LicensePlate, paths[directDriver.Index].Waypoints[0].Path, paths[directDriver.Index].Waypoints.Count, 1, false, false, true)); VehicleCollector.collectedVehicles.Add(nearbyVehicle.LicensePlate, new CollectedVehicle(nearbyVehicle, nearbyVehicle.LicensePlate, paths[directDriver.Index].Waypoints[0].Path, paths[directDriver.Index].Waypoints.Count, 1, false, false));
Game.LogTrivial($"[Direct Driver] {nearbyVehicle.Model.Name} not in collection, adding to collection for path {paths[directDriver.Index].PathNum} 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].PathNum} with {paths[directDriver.Index].Waypoints.Count} waypoints");
if (directOptions.SelectedItem == "First waypoint") if (directOptions.SelectedItem == "First waypoint")

12
SceneManager/Object Classes/CollectedVehicle.cs
View file

@ -12,9 +12,8 @@ namespace SceneManager
public bool TasksAssigned { get; private set; } public bool TasksAssigned { get; private set; }
public bool DismissNow { get; private set; } public bool DismissNow { get; private set; }
public bool StoppedAtWaypoint { get; private set; } public bool StoppedAtWaypoint { get; private set; }
public bool Redirected { get; private set; }
public CollectedVehicle(Vehicle vehicle, string licensePlate, int path, int totalWaypoints, int currentWaypoint, bool tasksAssigned, bool dismissNow, bool redirected) public CollectedVehicle(Vehicle vehicle, string licensePlate, int path, int totalWaypoints, int currentWaypoint, bool tasksAssigned, bool dismissNow)
{ {
Vehicle = vehicle; Vehicle = vehicle;
LicensePlate = licensePlate; LicensePlate = licensePlate;
@ -23,10 +22,9 @@ namespace SceneManager
CurrentWaypoint = currentWaypoint; CurrentWaypoint = currentWaypoint;
TasksAssigned = tasksAssigned; TasksAssigned = tasksAssigned;
DismissNow = dismissNow; DismissNow = dismissNow;
Redirected = redirected;
} }
public void AssignPropertiesFromDirectedTask(int pathNum, int totalPathWaypoints, int currentWaypoint, bool tasksAssigned, bool dismiss, bool stoppedAtWaypoint)//, bool redirected) public void AssignPropertiesFromDirectedTask(int pathNum, int totalPathWaypoints, int currentWaypoint, bool tasksAssigned, bool dismiss, bool stoppedAtWaypoint)
{ {
Path = pathNum; Path = pathNum;
TotalWaypoints = totalPathWaypoints; TotalWaypoints = totalPathWaypoints;
@ -34,7 +32,6 @@ namespace SceneManager
TasksAssigned = tasksAssigned; TasksAssigned = tasksAssigned;
DismissNow = dismiss; DismissNow = dismiss;
StoppedAtWaypoint = stoppedAtWaypoint; StoppedAtWaypoint = stoppedAtWaypoint;
//Redirected = redirected;
} }
public void SetCurrentWaypoint(int currentWaypoint) public void SetCurrentWaypoint(int currentWaypoint)
@ -56,10 +53,5 @@ namespace SceneManager
{ {
StoppedAtWaypoint = stoppedAtWaypoint; StoppedAtWaypoint = stoppedAtWaypoint;
} }
public void SetRedirected(bool redirected)
{
Redirected = redirected;
}
} }
} }

2
SceneManager/VehicleCollector.cs
View file

@ -100,7 +100,7 @@ namespace SceneManager
private static CollectedVehicle AddVehicleToCollection(Path path, Waypoint waypoint, Vehicle v) private static CollectedVehicle AddVehicleToCollection(Path path, Waypoint waypoint, Vehicle v)
{ {
var collectedVehicle = new CollectedVehicle(v, v.LicensePlate, path.PathNum, path.Waypoints.Count, waypoint.Number, true, false, false); var collectedVehicle = new CollectedVehicle(v, v.LicensePlate, path.PathNum, path.Waypoints.Count, waypoint.Number, true, false);
collectedVehicles.Add(v.LicensePlate, collectedVehicle); collectedVehicles.Add(v.LicensePlate, collectedVehicle);
Game.LogTrivial($"[WaypointVehicleCollector] Added {v.Model.Name} to collection from path {path.PathNum}, waypoint {waypoint.Number}."); Game.LogTrivial($"[WaypointVehicleCollector] Added {v.Model.Name} to collection from path {path.PathNum}, waypoint {waypoint.Number}.");
return collectedVehicle; return collectedVehicle;