reworked edge-case items in replace_container

Author: OverlordZorn

addons/wardrobe/CfgWardrobe_Exceptions.hpp

@@ -0,0 +1,11 @@
+class GVAR(exceptions) {
+    class acex_intelitems_document {
+        code = QFUNC(exceptionsAceItems);
+        mode = "local";
+    };
+    class acex_intelitems_notepad: acex_intelitems_document {};
+    class acex_intelitems_photo: acex_intelitems_document {};
+    class ACE_SpareBarrel: acex_intelitems_document {
+        mode = "server";
+    };
+};

addons/wardrobe/XEH_PREP.hpp

@@ -4,12 +4,10 @@ PREP(addActionsIcon);
 PREP(addActionsName);
 PREP(canModifyTo);
 PREP(compareComponents);
+PREP(exceptionsAceItems);
 PREP(getAvailableItemVariants);
-PREP(getIndexFromMagID);
 PREP(getItemVariants);
 PREP(isModifiable);
 PREP(replace);
 PREP(replaceContainer);
 PREP(replaceOther);
-PREP(setIndexForMagID);
-PREP(spareBarrelUpdateMagIDs);

addons/wardrobe/XEH_postInit.sqf

@@ -10,4 +10,23 @@ PREP_RECOMPILE_END;
 
 missionNamespace setVariable [QGVAR(inProgress), false];
 
+// Cache Wardrobe Replace Exceptions
+private _map = createHashMap;
+{
+    _map set [
+        configName _x,
+        [
+            toLower getText (_x >> "mode"),
+            getText (_x >> "code") call CBA_fnc_convertStringCode
+        ]
+    ];
+} forEach ("true" configClasses (configFile >> QGVAR(exceptions)));
+GVAR(exceptions) = _map;
+
+[
+    QGVAR(exceptions),
+    { _this call (GVAR(exceptions) get (_this#0) select 1) }
+] call CBA_fnc_addEventHandler;
+
+
 ADDON = true;

addons/wardrobe/XEH_preInit.sqf

@@ -21,4 +21,6 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgSounds.hpp"
 #include "CfgVehicles.hpp"
+
 #include "CfgWardrobe.hpp"
+#include "CfgWardrobe_Exceptions.hpp"

addons/wardrobe/config.cpp

@@ -0,0 +1,50 @@
+#include "../script_component.hpp"
+
+/*
+ * Author: OverlordZorn
+ * Wardrobe ExceptionHandling Function for ACE Items (Intel and Sparebarrels).
+ *
+ * Arguments:
+ * 0: Magazine Classname <STRING>
+ * 1: old Magazine IDs as Strings <ARRAY>
+ * 2: new Magazine IDs as Strings <ARRAY>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_className, _oldMagIDs, _newMagIDs] call ace_wardrobe_fnc_exceptionsAceItems
+ *
+ * Public: No
+ */
+
+params ["_className", "_oldMagIDs", "_newMagIDs"];
+
+if (count _oldMagIDs != count _newMagIDs) exitWith { ERROR_1("Not Equal Number of magID's provided: %1",_this) };
+
+switch (_className) do {
+    case "acex_intelitems_document";
+    case "acex_intelitems_notepad";
+    case "acex_intelitems_photo": {
+        private _namespace = EGVAR(intelItems,intelMap);
+        {
+            private _oldMagID = _x;
+            private _newMagID = _newMagIDs select _forEachIndex;
+
+            private _intelID = _namespace getVariable [_oldMagID, -1];
+
+            if (_intelID == -1) then { continue };
+
+            _namespace setVariable [_newMagID, _intelID, true];
+        } forEach _oldMagIDs;
+    };
+
+    case "ACE_SpareBarrel": {
+        private _map = EGVAR(overheating,storedSpareBarrels);
+        {
+            private _oldID = _x;
+            if !(_oldID in _map) then { continue };
+            _map set [_newMagIDs # _forEachIndex , _map deleteAt _oldID];
+        } forEach _oldMagIDs;
+    };
+};

addons/wardrobe/functions/fnc_exceptionsAceItems.sqf

@@ -20,41 +20,46 @@
 
 params ["_player", "_classTarget", "_equipmentType"];
 
-toFixed 0;
-private _magazineDetails = (magazinesAmmoFull _player) apply { [_x#0, _x#-2, _x#6] };
-private _loadout = _player call CBA_fnc_getLoadout;
+private _allMags = (magazinesAmmoFull _player) apply { _x#0 };
 
-// handle special cases - pre replace
-// ace intel items
-INTEL_PRE(_document,acex_intelitems_document);
-INTEL_PRE(_notepad,acex_intelitems_notepad);
-INTEL_PRE(_photo,acex_intelitems_photo);
+// Identify Exceptions
+private _exceptions = []; // nested Array of [Classname, Array of old ID's, Array of new id's]
+{
+    private _className = _x;
+    if (_className in _allMags) then {
+        _exceptions pushBack [
+            _className,
+            [_player, _className] call CBA_fnc_getMagazineIndex,
+            []
+        ];
+    };
+} forEach keys GVAR(exceptions);
 
-// ace overheating
-private _spareBarrel = _magazineDetails findIf { _x#0 == "ACE_SpareBarrel" } > -1;
-if (_spareBarrel) then { _spareBarrel = [_player, "ACE_SpareBarrel"] call CBA_fnc_getMagazineIndex };
+private _loadout = _player call CBA_fnc_getLoadout;
 
-// replace wearable
+// Replace Wearable Container
 switch (_equipmentType) do {
     case "UNIFORM":  { _loadout # 0 # 3 set [0, _classTarget]; };
     case "VEST":     { _loadout # 0 # 4 set [0, _classTarget]; };
     case "BACKPACK": { _loadout # 0 # 5 set [0, _classTarget]; };
 };
 
-// apply new loadout
+// Apply new loadout
 [_player, _loadout] call CBA_fnc_setLoadout;
 
-// handle special cases - post replace
-// ace intel items
-INTEL_POST(_document,acex_intelitems_document);
-INTEL_POST(_notepad,acex_intelitems_notepad);
-INTEL_POST(_photo,acex_intelitems_photo);
+// Update Exceptions with new magID's
+{ _x set [ 2, [_player, _x#0] call CBA_fnc_getMagazineIndex ]; } forEach _exceptions;
+
+
+// Resolve Exceptions
+{
+    // ["_className", "_oldMagIDs", "_newMagIDs"];
+    switch (GVAR(exceptions) get (_x#0) select 0) do {
+        case "local": { [QGVAR(exceptions), _x] call CBA_fnc_localEvent; };
+        case "server": { [QGVAR(exceptions), _x] call CBA_fnc_serverEvent; };
+    };
+} forEach _exceptions;
 
-// ace overheating
-if (_spareBarrel isEqualType []) then {
-    private _newMagIDsSpareBarrel = [_player, "ACE_SpareBarrel"] call CBA_fnc_getMagazineIndex;
-    [QGVAR(updateMagIDs), [_spareBarrel, _newMagIDsSpareBarrel]] call CBA_fnc_serverEvent;
-};
 
 GVAR(inProgress) = false; // re-enable action
 

addons/wardrobe/functions/fnc_getIndexFromMagID.sqf

@@ -15,15 +15,6 @@ class EGVAR(wardrobe,base_U_jacket_open);\
 class EGVAR(wardrobe,base_U_jacket_closed)
 
 
-// REPLACE
-#define INTEL_PRE(varName,className)\
-private varName = _magazineDetails findIf { _x select 0 == QUOTE(className) } > -1;\
-if (varName) then { varName = [_player, QUOTE(className)] call CBA_fnc_getMagazineIndex apply { _x call FUNC(getIndexFromMagID) } }
-
-#define INTEL_POST(varName,className)\
-if (varName isEqualType []) then { { [_x, varName select _forEachIndex] call FUNC(setIndexForMagID); } forEach ( [_player, QUOTE(className)] call CBA_fnc_getMagazineIndex ); }
-
-
 // Config
 // Adjust Weight of CfgWeapons Wearables
 #define MASS(var)\