From 8baf70831c7fcb239dcd84306156628c017c2cbe Mon Sep 17 00:00:00 2001 From: Rich Dunne Date: Thu, 26 Nov 2020 07:37:46 -0700 Subject: [PATCH] Renamed some methods to improve clarity --- SceneManager/Object Classes/Path.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SceneManager/Object Classes/Path.cs b/SceneManager/Object Classes/Path.cs index 7c62061..e13410b 100644 --- a/SceneManager/Object Classes/Path.cs +++ b/SceneManager/Object Classes/Path.cs @@ -147,7 +147,7 @@ namespace SceneManager { foreach (Vehicle v in World.GetAllVehicles()) { - if (IsNearWaypoint(v, waypoint) && IsValidForCollection(v)) + if (VehicleIsNearWaypoint(v, waypoint) && VehicleIsValidForCollection(v)) { CollectedVehicle newCollectedVehicle = AddVehicleToCollection(v); GameFiber AssignTasksFiber = new GameFiber(() => newCollectedVehicle.AssignWaypointTasks(this, waypoint)); @@ -181,14 +181,14 @@ namespace SceneManager return collectedVehicle; } - bool IsNearWaypoint(Vehicle v, Waypoint wp) + bool VehicleIsNearWaypoint(Vehicle v, Waypoint wp) { return v.FrontPosition.DistanceTo2D(wp.Position) <= wp.CollectorRadius && Math.Abs(wp.Position.Z - v.Position.Z) < 3; } - bool IsValidForCollection(Vehicle v) + bool VehicleIsValidForCollection(Vehicle v) { - if (v && v != Game.LocalPlayer.Character.CurrentVehicle && v != Game.LocalPlayer.Character.LastVehicle && (v.IsCar || v.IsBike || v.IsBicycle || v.IsQuadBike) && !v.IsSirenOn && v.IsEngineOn && v.IsOnAllWheels && v.Speed > 1 && !CollectedVehicles.Any(cv => cv?.Vehicle == v)) + if (v && v != Game.LocalPlayer.Character.LastVehicle && (v.IsCar || v.IsBike || v.IsBicycle || v.IsQuadBike) && !v.IsSirenOn && v.IsEngineOn && v.IsOnAllWheels && v.Speed > 1 && !CollectedVehicles.Any(cv => cv?.Vehicle == v)) { var vehicleCollectedOnAnotherPath = PathMainMenu.paths.Any(p => p.Number != Number && p.CollectedVehicles.Any(cv => cv.Vehicle == v)); if (vehicleCollectedOnAnotherPath)