Radio - Replace inventory PFH with CBA loadout handler

addons/ace_interact/XEH_postInitClient.sqf

@@ -8,6 +8,7 @@ if (!hasInterface) exitWith {};
 
 ["ace_arsenal_displayClosed", {
     EGVAR(sys_core,arsenalOpen) = false;
+    [] call DFUNC(monitorRadiosHandler);
 }] call CBA_fnc_addEventHandler;
 
 ["ace_arsenal_rightPanelFilled", {

addons/api/CfgFunctions.hpp

@@ -29,7 +29,6 @@ class CfgFunctions {
 
             PATHTO_FNC(filterUnitLoadout);
 
-            PATHTO_FNC(setItemRadioReplacement);
             PATHTO_FNC(getDisplayName);
 
             PATHTO_FNC(setGlobalVolume);

addons/api/XEH_PREP.hpp

@@ -1,2 +1,5 @@
 // Helpers
 PREP(mapChannelFieldName);
+
+// Obsolete
+OBSOLETE_SYS(FUNC(setItemRadioReplacement),{params ['_radioType']; [QEGVAR(sys_radio,defaultItemRadioType), _radioType, 1, "mission"] call CBA_settings_fnc_set;});

addons/api/fnc_basicMissionSetup.sqf

@@ -82,14 +82,15 @@ private _addRadios = {
     _player setVariable [QGVAR(basicMissionSetup), true, true];
 
     private _cleanRadioList = [];
-    if !("ACRE_PRC343" in _defaultRadios) then {
+    private _defaultRadio = QEGVAR(sys_radio,defaultItemRadioType) call CBA_settings_fnc_get;
+    if !(_defaultRadio in _defaultRadios) then {
         [_player, "ItemRadio"] call EFUNC(sys_core,removeGear);
-        [_player, "ACRE_PRC343"] call EFUNC(sys_core,removeGear);
+        [_player, _defaultRadio] call EFUNC(sys_core,removeGear);
         _cleanRadioList = _defaultRadios;
     } else {
         private _countDefaultRadios = 0;
         {
-            if (_x == "ACRE_PRC343") then {
+            if (_x == _defaultRadio) then {
                 _countDefaultRadios = _countDefaultRadios + 1;
                 if (_countDefaultRadios > 1) then {
                     _cleanRadioList pushBack _x;

addons/api/fnc_getAllRadios.sqf

@@ -16,25 +16,4 @@
  * Public: Yes
  */
 
-// Return cached if already ran
-if (!isNil QGVAR(allRadios)) exitWith {
-    GVAR(allRadios)
-};
-
-// Compile and cache for later calls
-private _classes = [];
-private _names = [];
-{
-    private _isRadio = getNumber (_x >> "type") == ACRE_COMPONENT_RADIO;
-    private _hasComponents = !(getArray (_x >> "defaultComponents") isEqualTo []); // Only non-base classes have that
-    private _name = getText (_x >> "name");
-
-    // Has name and isAcre, assume valid radio class
-    if (_isRadio && {_hasComponents} && {_name != ""}) then {
-        _classes pushBack (configName _x);
-        _names pushBack _name;
-    };
-} forEach ("true" configClasses (configFile >> "CfgAcreComponents"));
-
-GVAR(allRadios) = [_classes, _names];
-GVAR(allRadios)
+[] call EFUNC(sys_core,getAllRadios)

addons/sys_core/XEH_PREP.hpp

@@ -7,6 +7,7 @@ PREP(canUnderstand);
 PREP(cycleLanguage);
 PREP(findOcclusion);
 PREP(getAlive);
+PREP(getAllRadios);
 PREP(getClientIdLoop);
 PREP(getCompartment);
 PREP(getGear);

addons/sys_core/fnc_arsenalClose.sqf

@@ -31,3 +31,5 @@ private _weapons = [acre_player] call EFUNC(sys_core,getGear);
 ACRE_ARSENAL_RADIOS = [];
 GVAR(arsenalRadios) = [];
 GVAR(arsenalOpen) = false;
+
+[] call EFUNC(sys_radio,monitorRadiosHandler);

addons/sys_core/fnc_getAllRadios.sqf

@@ -0,0 +1,40 @@
+#include "script_component.hpp"
+/*
+ * Author: ACRE2Team
+ * Returns all radios defined in CfgAcreRadios. Caches result for future calls.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * 1: Radio Class Names <ARRAY>
+ * 2: Radio Display Names <ARRAY>
+ *
+ * Example:
+ * [] call acre_sys_core_fnc_getAllRadios;
+ *
+ * Public: No
+ */
+
+// Return cached if already ran
+if (!isNil QGVAR(allRadios)) exitWith {
+    GVAR(allRadios)
+};
+
+// Compile and cache for later calls
+private _classes = [];
+private _names = [];
+{
+    private _isRadio = getNumber (_x >> "type") == ACRE_COMPONENT_RADIO;
+    private _hasComponents = !(getArray (_x >> "defaultComponents") isEqualTo []); // Only non-base classes have that
+    private _name = getText (_x >> "name");
+
+    // Has name and isAcre, assume valid radio class
+    if (_isRadio && {_hasComponents} && {_name != ""}) then {
+        _classes pushBack (configName _x);
+        _names pushBack _name;
+    };
+} forEach ("true" configClasses (configFile >> "CfgAcreComponents"));
+
+GVAR(allRadios) = [_classes, _names];
+GVAR(allRadios)

addons/sys_gui/fnc_inventoryListMouseUp.sqf

@@ -23,4 +23,5 @@ params ["", "_button"];
 if (_button == 1) then {
     LOG("inventoryListMouseUp");
     ACRE_HOLD_OFF_ITEMRADIO_CHECK = false;
+    [] call EFUNC(sys_radio,monitorRadiosHandler);
 };

addons/sys_radio/XEH_PREP.hpp

@@ -1,5 +1,5 @@
 PREP(monitorRadios);
-PREP(monitorRadiosPFH);
+PREP(monitorRadiosHandler);
 PREP(setActiveRadio);
 
 PREP(openRadio);

addons/sys_radio/XEH_preInit.sqf

@@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+#include "initSettings.sqf"
+
 // Define caches to save repetitive config lookups.
 GVAR(radioUniqueCache) = HASH_CREATE;
 GVAR(radioBaseClassCache) = HASH_CREATE;
@@ -30,13 +32,6 @@ if (hasInterface) then {
 
     DVAR(ACRE_ACTIVE_RADIO) = "";
     DVAR(ACRE_SPECTATOR_RADIOS) = [];
-
-    // this isn't used anymore i do not think?
-    // acre_player setVariable [QGVAR(currentRadioList), []];
-
-    if (isNil QGVAR(defaultItemRadioType)) then {
-        GVAR(defaultItemRadioType) = "ACRE_PRC343";
-    };
 };
 
 ADDON = true;

addons/sys_radio/fnc_monitorRadios.sqf

@@ -1,7 +1,7 @@
 #include "script_component.hpp"
 /*
  * Author: ACRE2Team
- * Sets up the per frame event handler for monitoring the local player inventory for changes.
+ * Sets up the CBA loadout event handler for monitoring the local player inventory for changes.
  *
  * Arguments:
  * None
@@ -22,5 +22,9 @@ GVAR(requestingNewId) = false;
 LOG("Monitor Inventory Starting");
 
 [{ACRE_DATA_SYNCED && {(!isNil "ACRE_SERVER_INIT")} && {time >= 1}},{
-    [DFUNC(monitorRadiosPFH), 0.25, []] call CBA_fnc_addPerFrameHandler;
+    [
+        "loadout",
+        DFUNC(monitorRadiosHandler),
+        true
+    ] call CBA_fnc_addPlayerEventHandler;
 },[]] call CBA_fnc_waitUntilAndExecute;

addons/sys_radio/fnc_monitorRadiosPFH.sqf → addons/sys_radio/fnc_monitorRadiosHandler.sqf

@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [] call acre_sys_radio_fnc_monitorRadiosPFH
+ * [] call acre_sys_radio_fnc_monitorRadiosHandler
  *
  * Public: No
  */
@@ -46,19 +46,28 @@ private _currentUniqueItems = [];
     if (GVAR(requestingNewId)) exitWith { };
     private _radio = _x;
     private _hasUnique = _radio call EFUNC(sys_radio,isBaseClassRadio);
-    if (_hasUnique || {_radio == "ItemRadio"}) then {
 
-        GVAR(requestingNewId) = true;
-        if (_radio == "ItemRadio") then {
+    if (_radio == "ItemRadio") then {
+        if (GVAR(defaultItemRadioType) != "") then {
+            // Replace vanilla radio item
             _radio = GVAR(defaultItemRadioType);
+            GVAR(requestingNewId) = true;
             [acre_player, "ItemRadio", _radio] call EFUNC(sys_core,replaceGear);
+            ["acre_getRadioId", [acre_player, _radio, QGVAR(returnRadioId)]] call CALLSTACK(CBA_fnc_serverEvent);
+            TRACE_1("Getting ID for", _radio);
+        } else {
+            // Vanilla radio item replacement disabled, simply remove it.
+            [acre_player, "ItemRadio"] call EFUNC(sys_core,removeGear);
+        };
+    } else {
+        if (_hasUnique) then {
+            GVAR(requestingNewId) = true;
+            ["acre_getRadioId", [acre_player, _radio, QGVAR(returnRadioId)]] call CALLSTACK(CBA_fnc_serverEvent);
+            TRACE_1("Getting ID for", _radio);
         };
-        TRACE_1("Getting ID for", _radio);
-
-        ["acre_getRadioId", [acre_player, _radio, QGVAR(returnRadioId)]] call CALLSTACK(CBA_fnc_serverEvent);
     };
-    private _isUnique = _radio call EFUNC(sys_radio,isUniqueRadio);
-    if (_isUnique) then {
+
+    if (_radio call EFUNC(sys_radio,isUniqueRadio)) then {
         if !([_radio] call EFUNC(sys_data,isRadioInitialized)) then {
             WARNING_1("%1 was found in personal inventory but is uninitialized! Trying to collect new ID.",_radio);
             private _baseRadio = BASECLASS(_radio);

addons/sys_radio/initSettings.sqf

@@ -0,0 +1,19 @@
+private _allRadios = [] call EFUNC(sys_core,getAllRadios);
+private _radioClasses = [""] + _allRadios # 0;
+private _radioNames = [localize "str_a3_cfgglasses_none0"] + _allRadios # 1;
+
+[
+    QGVAR(defaultItemRadioType),
+    "LIST",
+    [
+        LLSTRING(DefaultItemRadioType_DisplayName),
+        LLSTRING(DefaultItemRadioType_Description)
+    ],
+    "ACRE2",
+    [
+        _radioClasses,
+        _radioNames,
+        (_radioClasses find "ACRE_PRC343") max 0
+    ],
+    true
+] call CBA_fnc_addSetting;

addons/sys_radio/stringtable.xml

@@ -144,5 +144,11 @@
             <Chinesesimp>设定无线电为1%</Chinesesimp>
             <Portuguese>Rádio configurado a %1</Portuguese>
         </Key>
+        <Key ID="STR_ACRE_sys_radio_DefaultItemRadioType_DisplayName">
+            <English>Vanilla radio item replacement</English>
+        </Key>
+        <Key ID="STR_ACRE_sys_radio_DefaultItemRadioType_Description">
+            <English>ItemRadio inventory items will be replaced with this type of radio.</English>
+        </Key>
     </Package>
 </Project>