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

Renamed some methods to improve clarity

Browse source
This commit is contained in:
Rich Dunne 2020-11-26 07:37:46 -07:00
parent 4969ebd7a3
commit 8baf70831c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SceneManager/Object Classes/Path.cs
View file

@ -147,7 +147,7 @@ namespace SceneManager
{ {
foreach (Vehicle v in World.GetAllVehicles()) foreach (Vehicle v in World.GetAllVehicles())
{ {
if (IsNearWaypoint(v, waypoint) && IsValidForCollection(v)) if (VehicleIsNearWaypoint(v, waypoint) && VehicleIsValidForCollection(v))
{ {
CollectedVehicle newCollectedVehicle = AddVehicleToCollection(v); CollectedVehicle newCollectedVehicle = AddVehicleToCollection(v);
GameFiber AssignTasksFiber = new GameFiber(() => newCollectedVehicle.AssignWaypointTasks(this, waypoint)); GameFiber AssignTasksFiber = new GameFiber(() => newCollectedVehicle.AssignWaypointTasks(this, waypoint));
@ -181,14 +181,14 @@ namespace SceneManager
return collectedVehicle; 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; 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)); var vehicleCollectedOnAnotherPath = PathMainMenu.paths.Any(p => p.Number != Number && p.CollectedVehicles.Any(cv => cv.Vehicle == v));
if (vehicleCollectedOnAnotherPath) if (vehicleCollectedOnAnotherPath)