Radio - Replace inventory PFH with CBA loadout handler

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_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;

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(api,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>