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

Commented out unnecessary logging for release

Browse source
This commit is contained in:
Rich Dunne 2020-10-15 14:52:50 -06:00
parent 8bbb30e072
commit 7ee307f8e6
6 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
SceneManager/AITasking.cs
View file

@ -70,7 +70,7 @@ namespace SceneManager
//Logger.Log($"{collectedVehicle.Vehicle.Model.Name} distance to collection waypoint: {collectedVehicle.Vehicle.DistanceTo2D(currentWaypoint.Position)}"); //Logger.Log($"{collectedVehicle.Vehicle.Model.Name} distance to collection waypoint: {collectedVehicle.Vehicle.DistanceTo2D(currentWaypoint.Position)}");
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} is driving to path {currentWaypoint.Path.Number} waypoint {currentWaypoint.Number} (directed)"); Logger.Log($"{collectedVehicle.Vehicle.Model.Name} is driving to path {currentWaypoint.Path.Number} waypoint {currentWaypoint.Number} (directed)");
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} Dismissed: {collectedVehicle.Dismissed}, Directed: {collectedVehicle.Directed}"); //Logger.Log($"{collectedVehicle.Vehicle.Model.Name} Dismissed: {collectedVehicle.Dismissed}, Directed: {collectedVehicle.Directed}");
collectedVehicle.Driver.Tasks.DriveToPosition(currentWaypoint.Position, currentWaypoint.Speed, (VehicleDrivingFlags)currentWaypoint.DrivingFlagType, acceptedDistance); collectedVehicle.Driver.Tasks.DriveToPosition(currentWaypoint.Position, currentWaypoint.Speed, (VehicleDrivingFlags)currentWaypoint.DrivingFlagType, acceptedDistance);
} }
@ -96,19 +96,19 @@ namespace SceneManager
var driver = vehicle.Driver; var driver = vehicle.Driver;
Logger.Log($"Preparing to run task loop for {collectedVehicle.Vehicle.Model.Name} on path {path.Number}"); Logger.Log($"Preparing to run task loop for {collectedVehicle.Vehicle.Model.Name} on path {path.Number}");
Logger.Log($"Current path: {collectedVehicle.Path.Number}, Current waypoint: {collectedVehicle.CurrentWaypoint.Number}"); //Logger.Log($"Current path: {collectedVehicle.Path.Number}, Current waypoint: {collectedVehicle.CurrentWaypoint.Number}");
for (int currentWaypointTask = currentWaypoint.Number; currentWaypointTask < path.Waypoints.Count; currentWaypointTask++) for (int currentWaypointTask = currentWaypoint.Number; currentWaypointTask < path.Waypoints.Count; currentWaypointTask++)
{ {
Logger.Log($"{collectedVehicle.Vehicle.Model.Name} in the task loop"); //Logger.Log($"{collectedVehicle.Vehicle.Model.Name} in the task loop");
Logger.Log($"Dismissed: {collectedVehicle.Dismissed}, Directed: {collectedVehicle.Directed}, StoppedAtWaypoint: {collectedVehicle.StoppedAtWaypoint}"); //Logger.Log($"Dismissed: {collectedVehicle.Dismissed}, Directed: {collectedVehicle.Directed}, StoppedAtWaypoint: {collectedVehicle.StoppedAtWaypoint}");
collectedVehicle.SkipWaypoint = false; collectedVehicle.SkipWaypoint = false;
if (collectedVehicle == null || collectedVehicle.Dismissed || collectedVehicle.Directed) if (collectedVehicle == null || !collectedVehicle.Vehicle || collectedVehicle.Dismissed || collectedVehicle.Directed)
{ {
Logger.Log($"Vehicle dismissed or null, return"); Logger.Log($"Vehicle dismissed, directed, or null, return");
return; return;
} }
if(collectedVehicle.Driver == null || !collectedVehicle.Vehicle.HasDriver || !collectedVehicle.Driver.IsAlive) if(collectedVehicle.Driver == null || !collectedVehicle.Driver || !collectedVehicle.Vehicle.HasDriver || !collectedVehicle.Driver.IsAlive || collectedVehicle.Vehicle.Driver == Game.LocalPlayer.Character)
{ {
Logger.Log($"{vehicle.Model.Name} does not have a driver/driver is null or driver is dead."); Logger.Log($"{vehicle.Model.Name} does not have a driver/driver is null or driver is dead.");
return; return;
@ -121,7 +121,7 @@ namespace SceneManager
float acceptedDistance = GetAcceptedStoppingDistance(path.Waypoints, currentWaypointTask); float acceptedDistance = GetAcceptedStoppingDistance(path.Waypoints, currentWaypointTask);
Logger.Log($"{vehicle.Model.Name} is driving to path {currentWaypoint.Path.Number} waypoint {path.Waypoints[currentWaypointTask].Number} (Stop: {currentWaypoint.IsStopWaypoint}, Driving flag: {currentWaypoint.DrivingFlagType})"); Logger.Log($"{vehicle.Model.Name} is driving to path {currentWaypoint.Path.Number} waypoint {path.Waypoints[currentWaypointTask].Number} (Stop: {currentWaypoint.IsStopWaypoint}, Driving flag: {currentWaypoint.DrivingFlagType})");
Logger.Log($"{vehicle.Model.Name} driver is persistent: {driver.IsPersistent}"); //Logger.Log($"{vehicle.Model.Name} driver is persistent: {driver.IsPersistent}");
driver.Tasks.DriveToPosition(path.Waypoints[currentWaypointTask].Position, path.Waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)path.Waypoints[currentWaypointTask].DrivingFlagType, acceptedDistance); driver.Tasks.DriveToPosition(path.Waypoints[currentWaypointTask].Position, path.Waypoints[currentWaypointTask].Speed, (VehicleDrivingFlags)path.Waypoints[currentWaypointTask].DrivingFlagType, acceptedDistance);
LoopWhileDrivingToWaypoint(currentWaypointTask, acceptedDistance); LoopWhileDrivingToWaypoint(currentWaypointTask, acceptedDistance);
@ -194,7 +194,7 @@ namespace SceneManager
collectedVehicle.Dismiss(); collectedVehicle.Dismiss();
return false; return false;
} }
if (!collectedVehicle.Driver || !collectedVehicle.Driver.IsAlive && !collectedVehicle.Dismissed) if (collectedVehicle.Driver == null || !collectedVehicle.Driver || !collectedVehicle.Driver.IsAlive && !collectedVehicle.Dismissed)
{ {
collectedVehicle.Dismiss(); collectedVehicle.Dismiss();
//Logger.Log($"{collectedVehicle.Vehicle.Model.Name} driver is null or dead"); //Logger.Log($"{collectedVehicle.Vehicle.Model.Name} driver is null or dead");

2
SceneManager/Menus/EditWaypointMenu.cs
View file

@ -250,7 +250,7 @@ namespace SceneManager
foreach (Waypoint wp in currentPath.Waypoints) foreach (Waypoint wp in currentPath.Waypoints)
{ {
wp.Number = currentPath.Waypoints.IndexOf(wp) + 1; wp.Number = currentPath.Waypoints.IndexOf(wp) + 1;
Logger.Log($"Waypoint at index {currentPath.Waypoints.IndexOf(wp)} is now waypoint #{wp.Number}"); //Logger.Log($"Waypoint at index {currentPath.Waypoints.IndexOf(wp)} is now waypoint #{wp.Number}");
} }
editWaypointMenu.Clear(); editWaypointMenu.Clear();

4
SceneManager/Menus/PathMainMenu.cs
View file

@ -207,7 +207,7 @@ namespace SceneManager
{ {
if (paths.ElementAtOrDefault(i) != null && paths[i].State == State.Creating) if (paths.ElementAtOrDefault(i) != null && paths[i].State == State.Creating)
{ {
Game.LogTrivial($"Resuming path {paths[i].Number}"); //Game.LogTrivial($"Resuming path {paths[i].Number}");
Game.DisplayNotification($"~o~Scene Manager\n~y~[Creating]~w~ Resuming path {paths[i].Number}"); Game.DisplayNotification($"~o~Scene Manager\n~y~[Creating]~w~ Resuming path {paths[i].Number}");
break; break;
} }
@ -263,7 +263,7 @@ namespace SceneManager
collectedVehicle.Directed = true; collectedVehicle.Directed = true;
collectedVehicle.Driver.Tasks.Clear(); collectedVehicle.Driver.Tasks.Clear();
Logger.Log($"Collected vehicle properties: Dismissed [{collectedVehicle.Dismissed}], Directed [{collectedVehicle.Directed}], StopppedAtWaypoint [{collectedVehicle.StoppedAtWaypoint}]"); //Logger.Log($"Collected vehicle properties: Dismissed [{collectedVehicle.Dismissed}], Directed [{collectedVehicle.Directed}], StopppedAtWaypoint [{collectedVehicle.StoppedAtWaypoint}]");
if (directOptions.SelectedItem == "First waypoint") if (directOptions.SelectedItem == "First waypoint")
{ {
GameFiber.StartNew(() => GameFiber.StartNew(() =>

7
SceneManager/Object Classes/CollectedVehicle.cs
View file

@ -19,7 +19,7 @@ namespace SceneManager
internal CollectedVehicle(Vehicle vehicle, Path path, Waypoint currentWaypoint) internal CollectedVehicle(Vehicle vehicle, Path path, Waypoint currentWaypoint)
{ {
Vehicle = vehicle; Vehicle = vehicle;
Driver = vehicle.Driver; Driver = Vehicle.Driver;
Path = path; Path = path;
CurrentWaypoint = currentWaypoint; CurrentWaypoint = currentWaypoint;
SetPersistence(); SetPersistence();
@ -38,7 +38,7 @@ namespace SceneManager
Vehicle.IsPersistent = true; Vehicle.IsPersistent = true;
Driver.IsPersistent = true; Driver.IsPersistent = true;
Driver.BlockPermanentEvents = true; Driver.BlockPermanentEvents = true;
Logger.Log($"{Vehicle.Model.Name} and driver are now persistent."); //Logger.Log($"{Vehicle.Model.Name} and driver are now persistent.");
} }
internal void Dismiss(DismissOption dismissOption = DismissOption.FromPath) internal void Dismiss(DismissOption dismissOption = DismissOption.FromPath)
@ -56,6 +56,7 @@ namespace SceneManager
if (dismissOption == DismissOption.FromPlayer) if (dismissOption == DismissOption.FromPlayer)
{ {
Dismissed = true;
if (Driver) if (Driver)
{ {
Driver.Dismiss(); Driver.Dismiss();
@ -71,7 +72,7 @@ namespace SceneManager
if(StoppedAtWaypoint) if(StoppedAtWaypoint)
{ {
Logger.Log($"Unstucking {Vehicle.Model.Name}"); //Logger.Log($"Unstucking {Vehicle.Model.Name}");
StoppedAtWaypoint = false; StoppedAtWaypoint = false;
Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(Vehicle, 0f, 1, true); Rage.Native.NativeFunction.Natives.x260BE8F09E326A20(Vehicle, 0f, 1, true);
Driver.Tasks.CruiseWithVehicle(5f); Driver.Tasks.CruiseWithVehicle(5f);

2
SceneManager/Object Classes/Waypoint.cs
View file

@ -79,7 +79,7 @@ namespace SceneManager
Blip.Color = Color.Green; Blip.Color = Color.Green;
foreach(CollectedVehicle cv in VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle && cv.Path == Path && cv.CurrentWaypoint == this && cv.StoppedAtWaypoint)) foreach(CollectedVehicle cv in VehicleCollector.collectedVehicles.Where(cv => cv.Vehicle && cv.Path == Path && cv.CurrentWaypoint == this && cv.StoppedAtWaypoint))
{ {
Logger.Log($"Setting StoppedAtWaypoint to false for {cv.Vehicle.Model.Name}"); // Logger.Log($"Setting StoppedAtWaypoint to false for {cv.Vehicle.Model.Name}");
cv.Dismiss(DismissOption.FromWaypoint); cv.Dismiss(DismissOption.FromWaypoint);
} }
} }

12
SceneManager/VehicleCollector.cs
View file

@ -72,7 +72,7 @@ namespace SceneManager
{ {
//SetVehicleAndDriverPersistence(vehicle); //SetVehicleAndDriverPersistence(vehicle);
CollectedVehicle newCollectedVehicle = AddVehicleToCollection(path, waypoint, vehicle); CollectedVehicle newCollectedVehicle = AddVehicleToCollection(path, waypoint, vehicle);
Logger.Log($"Vehicle's front position distance to waypoint: {vehicle.FrontPosition.DistanceTo2D(waypoint.Position)}, collector radius: {waypoint.CollectorRadius}"); //Logger.Log($"Vehicle's front position distance to waypoint: {vehicle.FrontPosition.DistanceTo2D(waypoint.Position)}, collector radius: {waypoint.CollectorRadius}");
GameFiber AssignTasksFiber = new GameFiber(() => AITasking.AssignWaypointTasks(newCollectedVehicle, path, waypoint)); GameFiber AssignTasksFiber = new GameFiber(() => AITasking.AssignWaypointTasks(newCollectedVehicle, path, waypoint));
AssignTasksFiber.Start(); AssignTasksFiber.Start();
} }
@ -88,7 +88,7 @@ namespace SceneManager
{ {
var collectedVehicle = new CollectedVehicle(v, path, waypoint); var collectedVehicle = new CollectedVehicle(v, path, waypoint);
collectedVehicles.Add(collectedVehicle); collectedVehicles.Add(collectedVehicle);
Logger.Log($"Added {v.Model.Name} to collection from path {path.Number}, waypoint {waypoint.Number}."); Logger.Log($"Added {v.Model.Name} to collection from path {path.Number} waypoint {waypoint.Number}.");
return collectedVehicle; return collectedVehicle;
} }
@ -109,12 +109,12 @@ namespace SceneManager
} }
if(v && v.Driver) if(v && v.Driver)
{ {
var driverBlip = v.Driver.AttachBlip(); //var driverBlip = v.Driver.AttachBlip();
driverBlip.Color = Color.Green; //driverBlip.Color = Color.Green;
driverBlip.Scale = 0.25f; //driverBlip.Scale = 0.25f;
v.Driver.IsPersistent = true; v.Driver.IsPersistent = true;
v.Driver.BlockPermanentEvents = true; v.Driver.BlockPermanentEvents = true;
Logger.Log($"A missing driver was created for {v.Model.Name}."); //Logger.Log($"A missing driver was created for {v.Model.Name}.");
} }
else else
{ {