[Feature] - Improve ceasefire side relations

components/ceasefire/fn_ceasefire.sqf

@@ -32,14 +32,29 @@ if (!isServer) exitWith {};
 
 
 // Set up some variables
+if (isNil "cafe_ceasefire_active") then {cafe_ceasefire_active = false};
 if (isNil "cafe_ceasefire_server_EH") then {cafe_ceasefire_server_EH = -1};
+if (isNil "cafe_ceasefire_server_sideRelations") then {cafe_ceasefire_server_sideRelations = []};
+private _ceasefireStateChanged = (cafe_ceasefire_active != _enabled);
+
 cafe_ceasefire_active = _enabled;
 cafe_ceasefire_endTime = [-1, CBA_missionTime + _duration] select (_duration > 0);
 
 
 
 
 
+// Define some macros
+#define MACRO_FNC_ALLSIDERELATIONS(THISSIDE)				 \
+	[THISSIDE, [east,       THISSIDE getFriend east]],		 \
+	[THISSIDE, [resistance, THISSIDE getFriend resistance]],	 \
+	[THISSIDE, [west,       THISSIDE getFriend west]],		 \
+	[THISSIDE, [civilian,   THISSIDE getFriend civilian]]
+
+
+
+
+
 // Relay the ceasefire to all clients (JIP compatible)
 [_enabled, cafe_ceasefire_endTime, _justification] remoteExecCall ["f_fnc_client_ceasefire", 0, "cafe_ceasefire"];
 publicVariable "cafe_ceasefire_active";
@@ -48,6 +63,41 @@ publicVariable "cafe_ceasefire_active";
 
 
 
+if (_ceasefireStateChanged) then {
+
+	// Enforce the ceasefire via side relations
+	if (_enabled) then {
+
+		cafe_ceasefire_server_sideRelations = [
+			MACRO_FNC_ALLSIDERELATIONS(east),
+			MACRO_FNC_ALLSIDERELATIONS(resistance),
+			MACRO_FNC_ALLSIDERELATIONS(west),
+			MACRO_FNC_ALLSIDERELATIONS(civilian)
+		];
+
+		private _allSides = [east, resistance, west, civilian];
+		private "_sideX";
+		{
+			_sideX = _x;
+			{
+				_sideX setFriend [_x, 1];
+			} forEach _allSides;
+		} forEach _allSides;
+
+	// Otherwise, restore the previous side relations
+	} else {
+
+		{
+			_x params ["_side", "_state"];
+			_side setFriend _state;
+		} forEach cafe_ceasefire_server_sideRelations;
+	};
+};
+
+
+
+
+
 // Keep track of the countdown
 removeMissionEventHandler ["EachFrame", cafe_ceasefire_server_EH];
 
@@ -62,6 +112,12 @@ if (_duration > 0) then {
 			cafe_ceasefire_server_EH = -1;
 			cafe_ceasefire_active = false;
 
+			// Restore the previous side relations
+			{
+				_x params ["_side", "_state"];
+				_side setFriend _state;
+			} forEach cafe_ceasefire_server_sideRelations;
+
 			[false] remoteExecCall ["f_fnc_client_ceasefire", 0, "cafe_ceasefire"];
 			publicVariable "cafe_ceasefire_active";
 		};

configuration/zeusSpawner/unitPresets.hpp

@@ -82,7 +82,7 @@ class CA_ZeusUI_Units
 
 		class AMV_7_Reinforcements
 		{
-			unitName = "AMV-7 Marshall + Squad 6x"
+			unitName = "AMV-7 Marshall + Squad 6x";
 			vehicle = "B_APC_Wheeled_01_cannon_F";
 			units[] = {"crew", "crew", "crew"};
 			reinforcements[] = {"ftl", "ar", "aar", "lat", "rif", "mk"}; // When defined, this group spawns in the cargo space of the vehicle. The vehicle gets a TR unload waypoint and a RTB waypoint (only if it's unarmed), the group a Move waypoint. The vehicle will also despawn on RTB. If the vehicle is a Heli, it will spawn flying and always RTB