[Release] Stage 1.6.0 Release

components/aceActions/fn_addSquadManagerActionsToClass.sqf

@@ -96,48 +96,6 @@ _createSquadNode =
         _children pushBack [_action, [], _target];
 
 
-        // Update group radio channels
-        _action =
-        [
-            "CAFE_SetSquadChannels",
-            "Set Squad Radio Channels",
-            "\A3\ui_f\data\igui\cfg\simpleTasks\types\radio_ca.paa",
-            {[_player, true] spawn f_fnc_updateGroupRadioChannels;},
-            {(leader group _player) isEqualTo _player},
-            {},
-            [],
-            "",
-            20,
-            [false,false,false,false,false],
-            {}
-        ];
-
-        _action call ace_interact_menu_fnc_createAction;
-
-        _children pushBack [_action, [], _target];
-
-
-        // Get group radio channels
-        _action =
-        [
-            "CAFE_GetSquadChannels",
-            "Get Squad Radio Channels",
-            "\A3\ui_f\data\igui\cfg\simpleTasks\types\radio_ca.paa",
-            {[_player, "always"] spawn f_fnc_setupRadioChannels;},
-            {true},
-            {},
-            [],
-            "",
-            20,
-            [false,false,false,false,false],
-            {}
-        ];
-
-        _action call ace_interact_menu_fnc_createAction;
-
-        _children pushBack [_action, [], _target];
-
-
         _children
 
     };

components/ceasefire/config/rscCeasefire.hpp

@@ -79,7 +79,7 @@ class CAFE_RscCeasefire {
 				class Countdown : CAFE_Ceasefire_RscText {
 					idc = MACRO_IDC_CF_COUNTDOWN;
 					text = "00:00";
-					font = "EtelkaMonospaceProBold";
+					font = "EtelkaMonospacePro";
 					SizeEx = 0.025 * safeZoneW;
 					x = MACRO_POS_CF_ICON_WIDTH * safeZoneW;
 					y = MACRO_POS_CF_HEIGHT * 0.3 * safeZoneW;

components/functions.hpp

@@ -20,7 +20,7 @@ class F
 #include "mapClick\functions.hpp"
 #include "miscClient\functions.hpp"
 #include "miscShared\functions.hpp"
-#include "radios\functions.hpp"
+#include "radio\functions.hpp"
 #include "respawn\functions.hpp"
 #include "spawnNpcs\functions.hpp"
 #include "squadMarkers\functions.hpp"
@@ -66,3 +66,13 @@ class ace_gunbag
 		class hasGunbag{};
 	};
 };
+
+
+class acre_ace_interact
+{
+	class overrides
+	{
+    	file = "components\radio\acre";
+		class radioListChildrenActions{};
+	}
+}

components/gearScript/events.txt

@@ -0,0 +1,106 @@
+
+GEARSCRIPT EVENTS - Index:
+
+    CA_PreGearscriptCrate_Local
+    CA_PostGearscriptCrate_Local
+    CA_PreGearscriptUnit_Local
+    CA_PostGearscriptUnit_Local
+
+
+---------------------------
+CA_PreGearscriptCrate_Local
+---------------------------
+
+    Local event which runs just before a crate is gearscripted.  Runs local to the crate.
+    Allows modification of the crate contents by altering the provided crate array.
+    Prior-registered handlers may alter the contents that reach your handler.  Be aware of this while writing your handler.
+    The contents can also be empty if the gearscript was not created correctly, or it was simply created empty.
+
+    The crate array format is:
+    [
+        [
+            "itemKind",
+            [
+                "ItemClassName",
+                Amount (int)
+            ]
+        ],
+        ...
+    ]
+
+    Example call site:
+    ["CA_PreGearscriptCrate_Local", [_typeOfUnit, _unit, _faction, +_crateArray]] call CBA_fnc_localEvent;
+
+    _typeOfUnit - String
+        Name of crate type, eg. "crate_small" etc.
+
+    _unit - Object
+        The crate which will be gearscripted.
+
+    _faction - String
+        The faction that the crate contents come from.
+
+    _crateArray - Array
+        The contents which will be placed into the crate.
+        This will be a copy of the original array.  This allows you to modify the contents.
+        This array is passed by-reference into each handler, so gradual alterations can be performed.
+        If you want to cancel the crate being gearscripted, return an empty array from the handler.
+
+
+---------------------------
+CA_PostGearscriptCrate_Local
+---------------------------
+
+    Identical to the CA_PreGearscriptCrate_Local event, but runs just after the crate is gearscripted.
+    This event cannot be used to modify the loadout.
+
+
+---------------------------
+CA_PreGearscriptUnit_Local
+---------------------------
+
+    Local event which runs just before a unit is gearscripted.  Runs local to the unit.
+    Allows modification of the unit's loadout by altering the provided loadout array.
+    Prior-registered handlers may alter the loadout that reach your handler.  Be aware of this while writing your handler.
+    The contents can also be empty if the gearscript was not created correctly, or it was simply created empty.
+
+    This event can also be called by a unit being re-gearscripted.  In this case, the _extendedArray will always be empty.  See 'f_fnc_reapplyGear' for context.
+
+    The loadout format is a Unit Loadout Array:
+    https://community.bistudio.com/wiki/Unit_Loadout_Array
+
+    The extended array will be the CBA Extended Loadout add-on array, which will normall take the format of:
+    [["key", (value)], ...]
+
+    If there is no extended array, it will default to an empty array.  This can be used to pass info to further handlers.
+
+    Example call site:
+    ["CA_PreGearscriptUnit_Local", [_typeOfUnit, _unit, _faction, _loadout, _extendedArray]] call CBA_fnc_localEvent;
+
+    _typeOfUnit - String
+        Name of unit type, eg. "rif" etc.
+
+    _unit - Object
+        The unit which will be gearscripted.
+
+    _faction - String
+        The faction that the loadout came from.
+
+    _loadout - Array
+        The loadout which will be given to the unit.
+        This will be a copy of the original array.  This allows you to modify the contents.
+        This array is passed by-reference into each handler, so gradual alterations can be performed.
+        If you want to cancel the unit being gearscripted, return an empty array from the handler.  
+
+    _extendedArray - Array
+        The extended-info array from a CBA Extended Loadout.
+        This array can contain arbitrary info, but it generally looks like the example above.
+        This array is passed by-reference into each handler, so gradual alterations can be performed.
+
+
+---------------------------
+CA_PostGearscriptUnit_Local
+---------------------------
+
+    Identical to the CA_PreGearscriptUnit_Local event, but runs just after the unit is gearscripted.
+    This event cannot be used to modify the loadout.

components/gearScript/fn_addGogglesEventHandler.sqf

@@ -0,0 +1,36 @@
+if (hasInterface) then
+{
+    f_arr_playerGogglesCache = [""];
+
+    // Attempt to get player's chosen goggles by checking the value each frame until the gearscript occurs.  
+    // If something appears, we figure it's the player's choice.  This isn't a great way to do it but it's what we've got.
+    [] spawn
+    {
+        waitUntil
+        {
+            if (missionNamespace getVariable ["f_var_firstPlayerLoadout", false]) exitWith {true};
+
+            private _goggles = goggles player;
+            f_arr_playerGogglesCache pushBackUnique _goggles;
+
+            _goggles IsNotEqualTo "";
+        };
+
+        f_var_playerGoggles = f_arr_playerGogglesCache select -1;
+    };
+
+    [
+        "CA_PreGearscriptUnit_Local", 
+        {
+            params ["_typeOfUnit", "_unit", "_faction", "_loadout", "_extendedArray"];
+
+            f_var_firstPlayerLoadout = true;
+
+            if ((_unit isEqualTo player) and {!isNil 'f_var_playerGoggles'}) then
+            {
+                _loadout set [7, f_var_playerGoggles];
+            };
+        }
+
+    ] call CBA_fnc_addEventHandler;
+};

components/gearScript/fn_addMaxLoadEventHandler.sqf

@@ -0,0 +1,56 @@
+if (hasInterface) then
+{
+    [
+        "CA_PostGearscriptUnit_Local", 
+        {
+            params ["_typeOfUnit", "_unit", "_faction", "_loadout", "_extendedArray"];
+
+            if (_unit isNotEqualTo player) exitWith {};
+
+            private _maxLoads = [0,0,0];
+
+            private _uniform = uniformContainer _unit;
+            if !(isNull _uniform) then
+            {
+                private _uniformLoad = loadAbs _uniform;
+                private _uniformMaxLoad = maxLoad _uniform;
+
+                if (_uniformLoad > _uniformMaxLoad) then
+                {
+                    _maxLoads set [0, _uniformLoad];
+                };
+            };
+
+            private _vest = vestContainer _unit;
+            if !(isNull _vest) then
+            {
+                private _vestLoad = loadAbs _vest;
+                private _vestMaxLoad = maxLoad _vest;
+
+                if (_vestLoad > _vestMaxLoad) then
+                {
+                    _maxLoads set [1, _vestLoad];
+                };
+            };
+
+            private _backpack = backpackContainer _unit;
+            if !(isNull _backpack) then
+            {
+                private _backpackLoad = loadAbs _backpack;
+                private _backpackMaxLoad = maxLoad _backpack;
+
+                if (_backpackLoad > _backpackMaxLoad) then
+                {
+                    _maxLoads set [2, _backpackLoad];
+                };
+            };
+
+            if (_maxLoads isNotEqualTo [0,0,0]) then
+            {
+                [_unit, _maxLoads] remoteExecCall ["f_fnc_alterUnitMaxLoads", 2];
+            };
+
+        }
+
+    ] call CBA_fnc_addEventHandler;
+};

components/gearScript/fn_alterUnitMaxLoads.sqf

@@ -0,0 +1,22 @@
+params ["_unit", "_maxLoads"];
+
+if (_maxLoads isEqualTo [0,0,0]) exitWith {};
+
+private _uniformLoad = _maxLoads#0;
+private _vestLoad = _maxLoads#1;
+private _backpackLoad = _maxLoads#2;
+
+if (_uniformLoad > 0) then
+{
+    (uniformContainer _unit) setMaxLoad _uniformLoad;
+};
+
+if (_vestLoad > 0) then
+{
+    (vestContainer _unit) setMaxLoad _vestLoad;
+};
+
+if (_backpackLoad > 0) then
+{
+    (backpackContainer _unit) setMaxLoad _backpackLoad;
+};