Prevent civilians from getting in police vehicles (#73)

ArmaForces · Mar 7, 2024 · fbd7a7f · fbd7a7f
1 parent 08382f6
commit fbd7a7f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/addons/civilian/functions/fnc_getNearestVehicle.sqf b/addons/civilian/functions/fnc_getNearestVehicle.sqf
@@ -5,6 +5,8 @@
  *
  * Arguments:
  * 0: Position <POSITION/OBJECT>
+ * 1: Search radius <NUMBER> (Optional)
+ * 2: Filter function returning true for valid vehicles <FUNC> (Optional)
  *
  * Return Value:
  * None
@@ -15,13 +17,14 @@
  * Public: No
  */
 
-params ["_pos", ["_radius", 500]];
+params ["_pos", ["_radius", 500], ["_filterFunction", {true}]];
 
 if (_pos isEqualType objNull) then {
     _pos = getPos _pos;
 };
 
-private _nearbyVehicles = _pos nearEntities [["Air", "Car", "Motorcycle", "Tank"], _radius];
+private _nearbyVehicles = _pos nearEntities [["Air", "Car", "Motorcycle", "Tank"], _radius]
+    select {[_x] call _filterFunction};
 
 private _nearestVehicle = [_nearbyVehicles, _pos] call BIS_fnc_nearestPosition;
 

diff --git a/addons/civilian_statemachine/functions/fnc_getNearestVehicle.sqf b/addons/civilian_statemachine/functions/fnc_getNearestVehicle.sqf
@@ -16,6 +16,17 @@
  * Public: No
  */
 
+#define DEFAULT_SEARCH_RADIUS 500
+
 params ["_group"];
 
-[position leader _group] call EFUNC(civilian,getNearestVehicle);
+private _filterFunction = {
+    params ["_vehicle"];
+
+    if (_vehicle getVariable [QEGVAR(police,isPoliceVehicle), false]) exitWith { false };
+    // TODO: Optionally filter for blacklisted areas
+
+    true
+};
+
+[position leader _group, DEFAULT_SEARCH_RADIUS, _filterFunction] call EFUNC(civilian,getNearestVehicle);
diff --git a/addons/police/functions/fnc_spawnVehicle.sqf b/addons/police/functions/fnc_spawnVehicle.sqf
@@ -75,4 +75,7 @@ if (_position isEqualTo []) exitWith {
 
 // Spawn vehicle
 INFO_2("Creating vehicle %1 at position %2",_vehicleClassname,str _position);
-[EFUNC(vehicles,createVehicle), [_vehicleClassname, _position, _direction, true, false, true]] call CBA_fnc_execNextFrame;
+[{
+    private _vehicle = _this call EFUNC(vehicles,createVehicle);
+    _vehicle setVariable [QGVAR(isPoliceVehicle), true, true];
+}, [_vehicleClassname, _position, _direction, true, false, true]] call CBA_fnc_execNextFrame;