Territory warning icons limited to friendly territories only

A3Wasteland · Jan 23, 2019 · ad01ff1 · ad01ff1
1 parent 1bb7150
commit ad01ff1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/server/default_config.sqf b/server/default_config.sqf
@@ -146,7 +146,7 @@ A3W_vehicleLoot = 2;               // Level of loot added to vehicles (0 = none,
 // Territory settings
 A3W_territoryCaptureTime = 3*60;   // Time in seconds needed to capture a territory
 A3W_territoryPayroll = 1;          // Periodically reward sides and indie groups based on how many territories they own (0 = no, 1 = yes)
-A3W_territoryWarningIcons = 0;     // Show exclamation marks on map for territories where enemies are present (0 = no, 1 = yes)
+A3W_territoryWarningIcons = 0;     // Show exclamation marks on map for friendly territories where enemies are present (0 = no, 1 = yes)
 A3W_payrollInterval = 30*60;       // Delay in seconds between each payroll
 A3W_payrollAmount = 100;           // Amount of money rewarded per territory on each payroll
 

diff --git a/territory/client/setupCaptureTriggers.sqf b/territory/client/setupCaptureTriggers.sqf
@@ -49,7 +49,7 @@ _warningIcons = ["A3W_territoryWarningIcons"] call isConfigOn;
 			_warnTrig = createTrigger ["EmptyDetector", markerPos _marker, false];
 			_warnTrig setTriggerArea [_markerSize select 0, _markerSize select 1, markerDir _marker, markerShape _marker == "RECTANGLE"];
 			_warnTrig setTriggerActivation ["ANYPLAYER", "PRESENT", true];
-			_warnTrig setTriggerStatements ["{isPlayer _x && {!([_x, player] call A3W_fnc_isFriendly) && (_x modelToWorld [0,0,0]) select 2 <= 250}} count thisList > 0", _onEnter, _onExit];
+			_warnTrig setTriggerStatements [format ["_ownerTeam = missionNamespace getVariable ['%1_team', sideUnknown]; _friendlyTerr = if (_ownerTeam isEqualType sideUnknown) then { _ownerTeam == playerSide } else { [_ownerTeam, player] call A3W_fnc_isFriendly }; _friendlyTerr && {thisList findIf {isPlayer _x && {([_x, player] call A3W_fnc_isFriendly) && (_x modelToWorld [0,0,0]) select 2 <= 250}} != -1}", _marker], _onEnter, _onExit];
 		};
 	};
 } forEach allMissionObjects "EmptyDetector";
diff --git a/territory/client/updateTerritoryMarkers.sqf b/territory/client/updateTerritoryMarkers.sqf
@@ -41,6 +41,8 @@ if (_team isEqualType grpNull && {(side _team) in [BLUFOR,OPFOR]}) then
 			_marker setMarkerColorLocal ([_team, false] call A3W_fnc_getTeamMarkerColor);
 			_marker setMarkerBrushLocal MARKER_BRUSH_OTHER;
 		};
+
+		missionNamespace setVariable [_marker + "_team", _team, false];
 	}
 	else
 	{
@@ -56,5 +58,7 @@ if (_team isEqualType grpNull && {(side _team) in [BLUFOR,OPFOR]}) then
 			_marker setMarkerColorLocal ([_team, false] call A3W_fnc_getTeamMarkerColor);
 			_marker setMarkerBrushLocal MARKER_BRUSH_OTHER;
 		};
+
+		missionNamespace setVariable [_marker + "_team", _team, false];
 	};
 } forEach _territories;