yiss

gruppe-adler · Apr 3, 2020 · 972aa17 · 972aa17
1 parent 4514ac7
commit 972aa17
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 21 deletions.
diff --git a/functions/api/fn_addPopulationZone.sqf b/functions/api/fn_addPopulationZone.sqf
@@ -1,13 +1,7 @@
 #include "..\..\component.hpp"
 
-_this params [
-    ["_trigger", objNull]
-];
+params ["_area"];
 
-if (isNull _trigger) exitWith {
-    ERROR("got NULL instead of a trigger as parameter");
-};
+GVAR(POPULATION_ZONES) pushBack _area;
 
-GVAR(POPULATION_ZONES) pushBack _trigger;
-
-INFO_2("added population zone %1 at %2", triggerArea _trigger, getPos _trigger);
+INFO_1("added population zone %1", _area);
diff --git a/functions/init/fn_initPlayer.sqf b/functions/init/fn_initPlayer.sqf
@@ -6,14 +6,15 @@ params [
 if (_mode == "postInit" && {([missionConfigFile >> "cfgGradCivs", "autoInit", 0] call BIS_fnc_returnConfigEntry) != 1}) exitWith {INFO("autoInit disabled, not running initPlayer right now...")};
 
 if (hasInterface) then {
-    if (isNil "GRAD_CIVS_DEBUG_CIVSTATE") then {missionNamespace setVariable ["GRAD_CIVS_DEBUG_CIVSTATE",([missionConfigFile >> "cfgGradCivs","debugCivState",0] call BIS_fnc_returnConfigEntry) == 1]};
-    if (isNil "GRAD_CIVS_INFOCHANNEL") then {GRAD_CIVS_INFOCHANNEL = 0;};
+    if (isNil QGVAR(DEBUG_CIVSTATE)) then {missionNamespace setVariable [QGVAR(DEBUG_CIVSTATE),([missionConfigFile >> "cfgGradCivs","debugCivState",0] call BIS_fnc_returnConfigEntry) == 1]};
+    if (isNil QGVAR(INFOCHANNEL)) then {GRAD_CIVS_INFOCHANNEL = 0;};
 
-    [] call grad_civs_fnc_playerLoop;
-    [] call grad_civs_fnc_registerAceInteractionHandler;
+    [] call FUNC(playerLoop);
+    [] call FUNC(registerAceInteractionHandler);
+    [] call FUNC(setupZeusModules);
     if (GRAD_CIVS_DEBUG_CIVSTATE) then {
-        [] call grad_civs_fnc_showWhatTheyThink;
-        [] call FUNC(setupZeusModules);
-        [{!isNull (findDisplay 12)}, {[] call grad_civs_fnc_mapMarkers}, []] call CBA_fnc_waitUntilAndExecute;
+        [] call FUNC(showWhatTheyThink);
+
+        [{!isNull (findDisplay 12)}, {[] call FUNC(mapMarkers)}, []] call CBA_fnc_waitUntilAndExecute;
     };
 };
diff --git a/functions/player/fn_setupZeusModules.sqf b/functions/player/fn_setupZeusModules.sqf
@@ -14,11 +14,38 @@
         private _distances = _areaMarkersAtPos apply { (markerPos _x) distance _clickPos };
         private _minDistanceAndIndex = _distances call CBA_fnc_findMin;
 
-        if (isNil "_minValueAndIndex") exitWith {
-            [format["no area marker at position %1", _clickPos]] call FUNC(showCivHint);
+        if (isNil "_minDistanceAndIndex") exitWith {
+            systemChat format["no area marker at position %1", _clickPos];
         };
         private _marker = _areaMarkersAtPos select (_minDistanceAndIndex#1);
 
-        [_marker] call FUNC(addExclusionZone)
+        [_marker] call FUNC(addExclusionZone);
+        _marker setMarkerBrushLocal "BORDER";
+        _marker setMarkerColorLocal "ColorUNKNOWN";
+    }
+] call zen_custom_modules_fnc_register;
+
+["GRAD-CIVS","ADD POPULATION ZONE (click within existing area marker!)",
+    {
+        params [
+            ["_clickPos", [0, 0, 0]]
+        ];
+        private _areaMarkersAtPos = allMapMarkers select {
+            (["RECTANGLE", "ELLIPSE"] find (markerShape _x)) > -1
+        } select {
+            _clickPos inArea _x
+        };
+
+        private _distances = _areaMarkersAtPos apply { (markerPos _x) distance _clickPos };
+        private _minDistanceAndIndex = _distances call CBA_fnc_findMin;
+
+        if (isNil "_minDistanceAndIndex") exitWith {
+            systemChat format["no area marker at position %1", _clickPos];
+        };
+        private _marker = _areaMarkersAtPos select (_minDistanceAndIndex#1);
+
+        [_marker] call FUNC(addPopulationZone);
+        _marker setMarkerBrushLocal "BORDER";
+        _marker setMarkerColorLocal "ColorCIV";
     }
 ] call zen_custom_modules_fnc_register;
diff --git a/functions/player/fn_showCivHint.sqf b/functions/player/fn_showCivHint.sqf
@@ -11,5 +11,5 @@ if (_structured == "") then {
 if (GRAD_CIVS_INFOCHANNEL == 0) then {
     systemChat _plain;
 } else {
-    player customChat [GRAD_CIVS_INFOCHANNEL, _plain] ;
+    player customChat [GRAD_CIVS_INFOCHANNEL, _plain];
 };
diff --git a/functions/spawn/fn_createInfoChannel.sqf b/functions/spawn/fn_createInfoChannel.sqf
@@ -1,5 +1,5 @@
 #include "..\..\component.hpp"
 
-ASSERT_SERVER("");
+ASSERT_SERVER("radio channel must be created on server");
 
 radioChannelCreate [[0.96, 0.34, 0.13, 0.8], "grad-civs info", "%CHANNEL_LABEL:", [], true];