population zones (i.e. whitelisting areas) + bugfix (#55)

* fix for no position found
* wait a few secs until server loop starts
	* `[thisTrigger] call grad_civs_fnc_addExclusionZone` <-give that a  chance to run before spawning the first civs
* add POPULATION_ZONES : whitelist populations zones, and restrict them with exclusion ones. default population zone is the whole map.
* be explicit about empty arrays (thx @diwako)

cfgFunctions.hpp

@@ -22,6 +22,9 @@ class grad_civs {
         class addExclusionZone {};
         class clearExclusionZones {};
         class getExclusionZones {};
+        class addPopulationZone {};
+        class clearPopulationZones {};
+        class getPopulationZones {};
         class populateArea {};
         class setBackpacks {};
         class setClothes {};
@@ -56,6 +59,7 @@ class grad_civs {
         class getGlobalCivs {};
         class isInHouse {};
         class nowPlusSeconds {};
+        class isInPopulatedZone {};
         class removeFromStateMachine {};
     };
 

functions/api/fn_addExclusionZone.sqf

@@ -8,6 +8,6 @@ if (isNull _trigger) exitWith {
     ERROR("got NULL instead of a trigger as parameter");
 };
 
-GRAD_CIVS_EXCLUSION_ZONES pushBack _trigger;
+GVAR(EXCLUSION_ZONES) pushBack _trigger;
 
 INFO_2("added exclusion zone %1 at %2", triggerArea _trigger, getPos _trigger);

functions/api/fn_addPopulationZone.sqf

@@ -0,0 +1,13 @@
+#include "..\..\component.hpp"
+
+_this params [
+    ["_trigger", objNull]
+];
+
+if (isNull _trigger) exitWith {
+    ERROR("got NULL instead of a trigger as parameter");
+};
+
+GVAR(POPULATION_ZONES) pushBack _trigger;
+
+INFO_2("added population zone %1 at %2", triggerArea _trigger, getPos _trigger);

functions/api/fn_clearExclusionZones.sqf

@@ -1,5 +1,5 @@
 #include "..\..\component.hpp"
 
-GRAD_CIVS_EXCLUSION_ZONES = [];
+GVAR(EXCLUSION_ZONES) = [];
 
 INFO("all exclusion zones removed");

functions/api/fn_clearPopulationZones.sqf

@@ -0,0 +1,5 @@
+#include "..\..\component.hpp"
+
+GVAR(POPULATION_ZONES) = [];
+
+INFO("all population zones removed");

functions/api/fn_getExclusionZones.sqf

@@ -1 +1,3 @@
-GRAD_CIVS_EXCLUSION_ZONES
+#include "..\..\component.hpp"
+
+GVAR(EXCLUSION_ZONES)

functions/api/fn_getPopulationZones.sqf

@@ -0,0 +1,3 @@
+#include "..\..\component.hpp"
+
+GVAR(POPULATION_ZONES)

functions/behaviour/fn_taskPatrolFindWaypoint.sqf

@@ -28,14 +28,17 @@ for "_i" from 1 to _maxTries do {
         _findWaterPos,
         _findRoadPos
     ] call FUNC(findRandomPos);
+    if (_searchPosition isEqualTo []) then {
+        _searchPosition = _position;
+    };
 
     _searchPosition = if (_findPosOfInterest && {80 > random 100}) then {
         [_searchPosition, false] call FUNC(findPositionOfInterest);
     } else {
         _searchPosition
     };
 
-    private _inAnyExclusionZone = [GRAD_CIVS_EXCLUSION_ZONES, {_searchPosition inArea (_this#0)}] call FUNC(arrayContains);
+    private _inAnyExclusionZone = [_searchPosition] call FUNC(isInPopulatedZone);
     if (!_inAnyExclusionZone) exitWith {
         LOG_1("position %1 is not in exclusionzone, return it", _searchPosition);
         _waypointPosition = _searchPosition;

functions/behaviour/fn_taskPatrolFindWaypoints.sqf

@@ -26,7 +26,7 @@ for [{_i=0}, {_i<_count}, {_i=_i+1}] do {
         _findWaterPos
     ] call FUNC(taskPatrolFindWaypoint);
 
-    if (count _nextWaypoint == 0) exitWith {
+    if (_nextWaypoint isEqualTo []) exitWith {
         WARNING_3("could not find more than %1 waypoints within %2m around %3", _i, _radius, _position)
     };
     LOG_1("waypoint #%1 found", _i);

functions/common/fn_findPositionOfInterest.sqf

@@ -21,7 +21,7 @@ private _position = if (count _buildingPositions > 0) then {selectRandom _buildi
 	[_searchPosition,[50,100],[0,360]] call FUNC(findRandomPos);
 };
 
-if (count _position == 0) then {
+if (_position isEqualTo []) then {
 	_position = _searchPosition;
 };
 

functions/common/fn_isInPopulatedZone.sqf

@@ -0,0 +1,16 @@
+#include "..\..\component.hpp"
+
+params [
+    ["_position", [0, 0, 0]]
+];
+
+private _inAnyPopulationZone = if (count GVAR(POPULATION_ZONES) == 0) then {
+    true
+} else {
+    [GVAR(POPULATION_ZONES), {_position inArea (_this#0)}] call FUNC(arrayContains)
+};
+if (!_inAnyPopulationZone) exitWith {false};
+
+private _inAnyExclusionZone = [GVAR(EXCLUSION_ZONES), {_position inArea (_this#0)}] call FUNC(arrayContains);
+
+!_inAnyExclusionZone

functions/init/fn_initConfig.sqf

@@ -68,4 +68,5 @@ missionNamespace setVariable ["GRAD_CIVS_SPAWNDISTANCEINVEHICLESMAX",_distances
 
 GRAD_CIVS_BUS_MEETNEIGHBOR_COOLDOWN = 150;
 GRAD_CIVS_CHAT_TIME = 20;
-GRAD_CIVS_EXCLUSION_ZONES = [];
+GVAR(EXCLUSION_ZONES) = [];
+GVAR(POPULATION_ZONES) = [];

functions/spawn/fn_createSideRoadVehicles.sqf

@@ -2,7 +2,7 @@
 
 params ["_locationPosition","_locationRadius","_amountFactor","_houseFactor","_minDistance","_maxAmount"];
 
-if (count GRAD_CIVS_VEHICLES == 0) exitWith {};
+if (GRAD_CIVS_VEHICLES isEqualTo []) exitWith {};
 private _vehiclePositions = [];
 
 //LOCAL FUNCTIONS ==============================================================

functions/spawn/fn_findSpawnPosition.sqf

@@ -57,7 +57,7 @@ private _result = {
                 [_allPlayers, _candidate, _minDistance] call grad_civs_fnc_isInDistanceFromOtherPlayers
             }
             && {
-                ({ _candidate inArea _x; } count GRAD_CIVS_EXCLUSION_ZONES) == 0
+                [_candidate] call FUNC(isInPopulatedZone)
             }
         ) exitWith {
             LOG_1("found spawn position %1", _candidate);

functions/spawn/fn_findSpawnRoadSegment.sqf

@@ -3,7 +3,7 @@
 
 params ["_allPlayers", "_minSpawnDistance", "_maxSpawnDistance", "_civilians"];
 
-if (count _allPlayers == 0) exitWith {LOG("_allPlayers is empty"); objNull};
+if (_allPlayers isEqualTo []) exitWith {LOG("_allPlayers is empty"); objNull};
 
 private _refPlayerPos = getPos (selectRandom _allPlayers);
 

functions/spawn/fn_serverLoop.sqf

@@ -18,7 +18,17 @@ private _mainLoop = {
 
     [] call grad_civs_fnc_spawnPass;
 };
-grad_civs_mainLoop = [_mainLoop, 2, []] call CBA_fnc_addPerFrameHandler;
+
+// wait a bit until the main loop starts. that way, exclusion zone trigger inits have a chance to run
+[
+    {
+        private _mainLoop = _this#0;
+        grad_civs_mainLoop = [_mainLoop, 2, []] call CBA_fnc_addPerFrameHandler;
+    },
+    [_mainLoop],
+    10
+] call CBA_fnc_waitAndExecute;
+
 
 grad_civs_debugLoop = [{
     params ["_args", "_handle"];

functions/spawn/fn_spawnPass.sqf

@@ -1,7 +1,7 @@
 #include "..\..\component.hpp"
 
 _allPlayers = allPlayers - (entities "HeadlessClient_F");
-if (count _allPlayers == 0) exitWith {};
+if (_allPlayers isEqualTo []) exitWith {};
 
 private _fps = diag_fps;
 if (_fps < GRAD_CIVS_MINFPS) exitWith {INFO_2("not spawning additional civs: less FPS than required (%1/%2)", _fps, GRAD_CIVS_MINFPS)};