Arsenal - Add/Fix/Improve/Change numerous aspects

addons/arsenal/ACE_Arsenal_Sorts.hpp

@@ -4,7 +4,7 @@ class GVAR(sorts) {
         displayName = "";
         tabs[] = {{}, {}};
         statement = "";
-        condition = "true";
+        condition = QUOTE(true);
     };
 
     class ACE_alphabetically: sortBase {

addons/arsenal/ACE_Arsenal_Stats.hpp

@@ -8,20 +8,21 @@ class GVAR(stats) {
         showText = 0;
         barStatement = "";
         textStatement = "";
-        condition = "true";
+        condition = QUOTE(true);
         tabs[] = {{}, {}};
     };
     class ACE_bananaPotassium: statBase {
         scope = 2;
-        displayName= CSTRING(statPotassium);
+        displayName = CSTRING(statPotassium);
         showBar = 1;
         barStatement = "1";
         condition = QUOTE((configName (_this select 1)) == 'ACE_Banana');
         tabs[] = {{}, {7}};
     };
     class ACE_mass: statBase {
         scope = 2;
-        displayName= "$STR_a3_rscdisplayarsenal_stat_weight";
+        priority = 1.5;
+        displayName = "$STR_a3_rscdisplayarsenal_stat_weight";
         showText = 1;
         textStatement = QUOTE([ARR_2(_this select 0, _this select 1)] call FUNC(statTextStatement_mass));
         tabs[] = {{0,1,2,3,4,5,6,7,8,9,10,11,12,13,14}, {0,1,2,3,4,5,6,7}};
@@ -30,7 +31,7 @@ class GVAR(stats) {
         scope = 2;
         priority = 5;
         stats[] = {"reloadTime"};
-        displayName= "$STR_a3_rscdisplayarsenal_stat_rof";
+        displayName = "$STR_a3_rscdisplayarsenal_stat_rof";
         showBar = 1;
         showText = 1;
         barStatement = QUOTE([ARR_3((_this select 0) select 0, _this select 1, [ARR_2([ARR_2(-1.4, 0.31)], [ARR_2(1, 0.01)])])] call FUNC(statBarStatement_rateOfFIre));
@@ -50,7 +51,7 @@ class GVAR(stats) {
     };
     class ACE_maxZeroing: statBase {
         scope = 2;
-        priority = 3;
+        priority = 3.2;
         stats[] = {"maxZeroing"};
         displayName = "$STR_a3_rscdisplayarsenal_stat_range";
         showBar = 1;
@@ -59,11 +60,11 @@ class GVAR(stats) {
     };
     class ACE_impact: statBase {
         scope = 2;
-        priority = 2;
+        priority = 3.1;
         stats[] = {"hit", "initSpeed"};
         displayName = "$STR_a3_rscdisplayarsenal_stat_impact";
         showBar = 1;
-        barStatement = QUOTE([ARR_3(_this select 0, _this select 1, [ARR_3([ARR_2(0, 3.2)], [ARR_2(-1, 1100)], 2006)])] call FUNC(statBarStatement_impact));
+        barStatement = QUOTE([ARR_3(_this select 0, _this select 1, [ARR_2([ARR_2(0, 3.2)], [ARR_2(-1, 1100)])])] call FUNC(statBarStatement_impact));
         tabs[] = {{0,1,2}, {}};
     };
     class ACE_scopeMagnification: statBase {
@@ -76,7 +77,7 @@ class GVAR(stats) {
     };
     class ACE_scopeVisionMode: statBase {
         scope = 2;
-        priority = 1;
+        priority = 1.6;
         displayName = CSTRING(statVisionMode);
         showText = 1;
         textStatement = QUOTE(call FUNC(statTextStatement_scopeVisionMode));
@@ -125,7 +126,6 @@ class GVAR(stats) {
         displayName = CSTRING(StatExplosionTime);
         showText = 1;
         textStatement = QUOTE(call FUNC(statTextStatement_explosionTime));
-        condition = QUOTE(true);
         tabs[] = {{}, {5}};
     };
 };

addons/arsenal/XEH_PREP.hpp

@@ -15,6 +15,7 @@ PREP(attributeKeyDown);
 PREP(attributeLoad);
 PREP(attributeMode);
 PREP(attributeSelect);
+PREP(baseWeapon);
 PREP(buttonCargo);
 PREP(buttonClearAll);
 PREP(buttonExport);
@@ -34,7 +35,6 @@ PREP(fillLeftPanel);
 PREP(fillLoadoutsList);
 PREP(fillRightPanel);
 PREP(fillSort);
-PREP(getLoadout);
 PREP(handleLoadoutsSearchbar);
 PREP(handleMouse);
 PREP(handleScrollWheel);
@@ -59,8 +59,10 @@ PREP(open3DEN);
 PREP(openBox);
 PREP(portVALoadouts);
 PREP(removeBox);
+PREP(removeSort);
 PREP(removeStat);
 PREP(removeVirtualItems);
+PREP(replaceUniqueItemsLoadout);
 PREP(scanConfig);
 PREP(showItem);
 PREP(sortPanel);
@@ -85,5 +87,6 @@ PREP(statTextStatement_scopeVisionMode);
 PREP(statTextStatement_smokeChemTTL);
 PREP(updateCamPos);
 PREP(updateRightPanel);
+PREP(updateCurrentItemsList);
 PREP(updateUniqueItemsList);
 PREP(verifyLoadout);

addons/arsenal/XEH_postInit.sqf

@@ -9,97 +9,140 @@ GVAR(lastSearchTextRight) = "";
 GVAR(lastSearchTextLoadouts) = "";
 GVAR(lastSortLeft) = "";
 GVAR(lastSortRight) = "";
+GVAR(lastSortDirectionLeft) = DESCENDING;
+GVAR(lastSortDirectionRight) = DESCENDING;
 
-[QGVAR(initBox), {_this call FUNC(initBox)}] call CBA_fnc_addEventHandler;
-[QGVAR(removeBox), {_this call FUNC(removeBox)}] call CBA_fnc_addEventHandler;
+[QGVAR(initBox), LINKFUNC(initBox)] call CBA_fnc_addEventHandler;
+[QGVAR(removeBox), LINKFUNC(removeBox)] call CBA_fnc_addEventHandler;
 
 [QGVAR(broadcastFace), {
     params ["_unit", "_face"];
-
     _unit setFace _face;
 }] call CBA_fnc_addEventHandler;
 
 [QGVAR(broadcastVoice), {
     params ["_unit", "_voice"];
-
     _unit setSpeaker _voice;
 }] call CBA_fnc_addEventHandler;
 
 [QGVAR(loadoutUnshared), {
     params ["_contentPanelCtrl" , "_playerName", "_loadoutName"];
 
+    // If player is in arsenal in the shared tab and a loadout is unshared at the same time
     if (!isNil QGVAR(currentLoadoutsTab) && {GVAR(currentLoadoutsTab) == IDC_buttonSharedLoadouts}) then {
-
         private _dataToCheck = _playerName + _loadoutName;
 
-        for '_i' from 0 to (((lnbsize _contentPanelCtrl) select 0) - 1) do {
-            if ((_contentPanelCtrl lnbData [_i, 1]) == _dataToCheck) exitwith {_contentPanelCtrl lnbDeleteRow _i};
+        for "_lbIndex" from 0 to (lnbSize _contentPanelCtrl select 0) - 1 do {
+            if ((_contentPanelCtrl lnbData [_lbIndex, 1]) == _dataToCheck) exitWith {
+                _contentPanelCtrl lnbDeleteRow _lbIndex;
+            };
         };
     } else {
-
-        if (
-            profileName == _playerName &&
-            {!(isNil QGVAR(currentLoadoutsTab) && {GVAR(currentLoadoutsTab) == IDC_buttonMyLoadouts})}
-        ) then {
-
-            for '_i' from 0 to (((lnbsize _contentPanelCtrl) select 0) - 1) do {
-                if ((_contentPanelCtrl lnbText [_i, 1]) == _loadoutName) exitwith {
-                    _contentPanelCtrl lnbSetPicture [[_i, 0], QPATHTOF(data\iconPublicBlank.paa)];
-                    _contentPanelCtrl lnbSetValue [[_i, 0], 0];
+        if (profileName == _playerName && {!(isNil QGVAR(currentLoadoutsTab) && {GVAR(currentLoadoutsTab) == IDC_buttonMyLoadouts})}) then {
+            for "_lbIndex" from 0 to (lnbSize _contentPanelCtrl select 0) - 1 do {
+                if ((_contentPanelCtrl lnbText [_lbIndex, 1]) == _loadoutName) exitWith {
+                    _contentPanelCtrl lnbSetPicture [[_lbIndex, 0], QPATHTOF(data\iconPublicBlank.paa)];
+                    _contentPanelCtrl lnbSetValue [[_lbIndex, 0], 0];
                 };
             };
         };
     };
 }] call CBA_fnc_addEventHandler;
 
 [QGVAR(loadoutShared), {
-    params ["_contentPanelCtrl" ,"_loadoutArgs"];
+    params ["_contentPanelCtrl", "_loadoutArgs"];
     _loadoutArgs params ["_playerName", "_loadoutName", "_loadoutData"];
 
+    // If player is in arsenal in the shared tab and a loadout is shared at the same time
     if (!isNil QGVAR(currentLoadoutsTab) && {GVAR(currentLoadoutsTab) == IDC_buttonSharedLoadouts}) then {
+        private _curSelData = _contentPanelCtrl lnbData [lnbCurSelRow _contentPanelCtrl, 1];
 
-        private _curSelData =_contentPanelCtrl lnbData [(lnbCurSelRow _contentPanelCtrl), 1];
         ([_loadoutData] call FUNC(verifyLoadout)) params ["_extendedLoadout", "_nullItemsAmount", "_unavailableItemsAmount"];
+        _extendedLoadout params ["_loadout"];
 
         private _newRow = _contentPanelCtrl lnbAddRow [_playerName, _loadoutName];
+        private _cfgWeapons = configFile >> "CfgWeapons";
 
-        _extendedLoadout params ["_loadout"];
         ADD_LOADOUTS_LIST_PICTURES
 
         _contentPanelCtrl lnbSetData [[_newRow, 1], _playerName + _loadoutName];
 
+        // Set color of row, depending if items are unavailable/missing
         if (_nullItemsAmount > 0) then {
-
             _contentPanelCtrl lnbSetColor [[_newRow, 1], [1, 0, 0, 0.8]];
         } else {
-
             if (_unavailableItemsAmount > 0) then {
                 _contentPanelCtrl lnbSetColor [[_newRow, 1], [1, 1, 1, 0.25]];
             };
         };
 
+        // Sort loadouts alphabetically
         _contentPanelCtrl lnbSort [1, false];
 
         // Select previously selected loadout
-        for '_i' from 0 to (((lnbsize _contentPanelCtrl) select 0) - 1) do {
-            if ((_contentPanelCtrl lnbText [_i, 1]) == _curSelData) exitwith {_contentPanelCtrl lnbSetCurSelRow _i};
+        for "_lbIndex" from 0 to (lnbSize _contentPanelCtrl select 0) - 1 do {
+            if ((_contentPanelCtrl lnbText [_lbIndex, 1]) == _curSelData) exitWith {
+                _contentPanelCtrl lnbSetCurSelRow _lbIndex
+            };
         };
     };
 }] call CBA_fnc_addEventHandler;
 
 ["CBA_loadoutSet", {
     params ["_unit", "_loadout", "_extendedInfo"];
+
+    // Set face
     private _face = _extendedInfo getOrDefault [QGVAR(face), ""];
+
     if (_face != "") then {
-        _unit setFace _face;
+        if (isMultiplayer) then {
+            private _id = [QGVAR(broadcastFace), [_unit, _face], QGVAR(centerFace_) + netId _unit] call CBA_fnc_globalEventJIP;
+            [_id, _unit] call CBA_fnc_removeGlobalEventJIP;
+        } else {
+            _unit setFace _face;
+        };
     };
+
+    // Set voice
     private _voice = _extendedInfo getOrDefault [QGVAR(voice), ""];
+
     if (_voice != "") then {
-        _unit setSpeaker _voice;
+        if (isMultiplayer) then {
+            private _id = [QGVAR(broadcastVoice), [_unit, _voice], QGVAR(centerVoice_) + netId _unit] call CBA_fnc_globalEventJIP;
+            [_id, _unit] call CBA_fnc_removeGlobalEventJIP;
+        } else {
+            _unit setSpeaker _voice;
+        };
     };
+
+    // Set insignia
     private _insignia = _extendedInfo getOrDefault [QGVAR(insignia), ""];
+
     if (_insignia != "") then {
         _unit setVariable ["BIS_fnc_setUnitInsignia_class", nil];
-        [_unit, _insignia] call bis_fnc_setUnitInsignia;
+        [_unit, _insignia] call BIS_fnc_setUnitInsignia;
+    };
+}] call CBA_fnc_addEventHandler;
+
+["CBA_loadoutGet", {
+    params ["_unit", "_loadout", "_extendedInfo"];
+
+    // Set face if enabled
+    if (GVAR(loadoutsSaveFace)) then {
+        _extendedInfo set [QGVAR(face), face _unit];
+    };
+
+    // Set voice if enabled
+    if (GVAR(loadoutsSaveVoice)) then {
+        _extendedInfo set [QGVAR(voice), speaker _unit];
+    };
+
+    // Set insignia if enabled
+    if (GVAR(loadoutsSaveInsignia)) then {
+        private _insignia = _unit call BIS_fnc_getUnitInsignia;
+
+        if (_insignia != "") then {
+            _extendedInfo set [QGVAR(insignia), _insignia];
+        };
     };
 }] call CBA_fnc_addEventHandler;

addons/arsenal/XEH_preInit.sqf

@@ -8,20 +8,21 @@ PREP_RECOMPILE_START;
 PREP_RECOMPILE_END;
 
 // Arsenal
-[QGVAR(camInverted), "CHECKBOX", localize LSTRING(invertCameraSetting), localize LSTRING(settingCategory), false] call CBA_fnc_addSetting;
-[QGVAR(enableModIcons), "CHECKBOX", [LSTRING(modIconsSetting), LSTRING(modIconsTooltip)], localize LSTRING(settingCategory), true] call CBA_fnc_addSetting;
-[QGVAR(fontHeight), "SLIDER", [LSTRING(fontHeightSetting), LSTRING(fontHeightTooltip)], localize LSTRING(settingCategory), [1, 10, 4.5, 1]] call CBA_fnc_addSetting;
-[QGVAR(enableIdentityTabs), "CHECKBOX", localize LSTRING(enableIdentityTabsSettings), localize LSTRING(settingCategory), true, true] call CBA_fnc_addSetting;
+[QGVAR(camInverted), "CHECKBOX", LLSTRING(invertCameraSetting), LLSTRING(settingCategory), false] call CBA_fnc_addSetting;
+[QGVAR(enableModIcons), "CHECKBOX", [LSTRING(modIconsSetting), LSTRING(modIconsTooltip)], LLSTRING(settingCategory), true] call CBA_fnc_addSetting;
+[QGVAR(fontHeight), "SLIDER", [LSTRING(fontHeightSetting), LSTRING(fontHeightTooltip)], LLSTRING(settingCategory), [1, 10, 4.5, 1]] call CBA_fnc_addSetting;
+[QGVAR(enableIdentityTabs), "CHECKBOX", LLSTRING(enableIdentityTabsSettings), LLSTRING(settingCategory), true, true] call CBA_fnc_addSetting;
 
 // Arsenal loadouts
-[QGVAR(allowDefaultLoadouts), "CHECKBOX", [LSTRING(allowDefaultLoadoutsSetting), LSTRING(defaultLoadoutsTooltip)], [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], true, true] call CBA_fnc_addSetting;
-[QGVAR(allowSharedLoadouts), "CHECKBOX", localize LSTRING(allowSharingSetting), [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], true, true] call CBA_fnc_addSetting;
-[QGVAR(EnableRPTLog), "CHECKBOX", [LSTRING(printToRPTSetting), LSTRING(printToRPTTooltip)], [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], false, false] call CBA_fnc_addSetting;
+[QGVAR(allowDefaultLoadouts), "CHECKBOX", [LSTRING(allowDefaultLoadoutsSetting), LSTRING(defaultLoadoutsTooltip)], [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], true, true] call CBA_fnc_addSetting;
+[QGVAR(allowSharedLoadouts), "CHECKBOX", LLSTRING(allowSharingSetting), [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], true, true] call CBA_fnc_addSetting;
+[QGVAR(EnableRPTLog), "CHECKBOX", [LSTRING(printToRPTSetting), LSTRING(printToRPTTooltip)], [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], false, false] call CBA_fnc_addSetting;
 
-[QGVAR(loadoutsSaveFace), "CHECKBOX", localize LSTRING(loadoutsSaveFaceSetting), [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], false] call CBA_fnc_addSetting;
-[QGVAR(loadoutsSaveVoice), "CHECKBOX", localize LSTRING(loadoutsSaveVoiceSetting), [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], false] call CBA_fnc_addSetting;
-[QGVAR(loadoutsSaveInsignia), "CHECKBOX", localize LSTRING(loadoutsSaveInsigniaSetting), [localize LSTRING(settingCategory), localize LSTRING(loadoutSubcategory)], true] call CBA_fnc_addSetting;
+[QGVAR(loadoutsSaveFace), "CHECKBOX", LLSTRING(loadoutsSaveFaceSetting), [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], false] call CBA_fnc_addSetting;
+[QGVAR(loadoutsSaveVoice), "CHECKBOX", LLSTRING(loadoutsSaveVoiceSetting), [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], false] call CBA_fnc_addSetting;
+[QGVAR(loadoutsSaveInsignia), "CHECKBOX", LLSTRING(loadoutsSaveInsigniaSetting), [LLSTRING(settingCategory), LLSTRING(loadoutSubcategory)], true] call CBA_fnc_addSetting;
 
+// Arsenal events
 [QGVAR(statsToggle), {
     params ["_display", "_showStats"];
 
@@ -54,25 +55,25 @@ PREP_RECOMPILE_END;
     _this call FUNC(buttonStatsPage);
 }] call CBA_fnc_addEventHandler;
 
-
 [QGVAR(displayStats), {
     _this call FUNC(handleStats);
 }] call CBA_fnc_addEventHandler;
 
+// Compile sorts and stats
 call FUNC(compileStats);
 call FUNC(compileSorts);
 
 [QUOTE(ADDON), {!isNil QGVAR(camera)}] call CBA_fnc_registerFeatureCamera;
 
-// Compatibility with CBA scripted optics and dispoable framework
+// Compatibility with CBA scripted optics and disposable framework
 [QGVAR(displayOpened), {
-    "cba_optics_arsenalOpened" call CBA_fnc_localEvent;
-    "cba_disposable_arsenalOpened" call CBA_fnc_localEvent;
+    "CBA_optics_arsenalOpened" call CBA_fnc_localEvent;
+    "CBA_disposable_arsenalOpened" call CBA_fnc_localEvent;
 }] call CBA_fnc_addEventHandler;
 
 [QGVAR(displayClosed), {
-    "cba_optics_arsenalClosed" call CBA_fnc_localEvent;
-    "cba_disposable_arsenalClosed" call CBA_fnc_localEvent;
+    "CBA_optics_arsenalClosed" call CBA_fnc_localEvent;
+    "CBA_disposable_arsenalClosed" call CBA_fnc_localEvent;
 }] call CBA_fnc_addEventHandler;
 
 ADDON = true;

addons/arsenal/XEH_preStart.sqf

@@ -2,4 +2,12 @@
 
 #include "XEH_PREP.hpp"
 
+// Cache for FUNC(baseWeapon)
+uiNamespace setVariable [QGVAR(baseWeaponNameCache), createHashMap];
+
+// Caches for names, pictures, mod icons
+uiNamespace setVariable [QGVAR(addListBoxItemCache), createHashMap];
+uiNamespace setVariable [QGVAR(rightPanelCache), createHashMap];
+uiNamespace setVariable [QGVAR(sortCache), createHashMap];
+
 call FUNC(scanConfig);

addons/arsenal/config.cpp

@@ -8,7 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
         author = ECSTRING(common,ACETeam);
-        authors[] = {"alganthe", "mharis001", "Brett Mayson"};
+        authors[] = {"alganthe", "mharis001", "Brett Mayson", "johnb43"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };