Arsenal - Improved sorting, insignia detection, identity info verification and minor cleanup

addons/arsenal/XEH_preInit.sqf

@@ -91,5 +91,4 @@ private _insigniaCondition = toString {
     GVAR(insigniaCache) set [_x, 2];
 } forEach (_insigniaCondition configClasses (missionConfigFile >> "CfgUnitInsignia"));
 
-
 ADDON = true;

addons/arsenal/functions/fnc_addListBoxItem.sqf

@@ -6,7 +6,7 @@
  *
  * Arguments:
  * 0: Config category, must be "CfgWeapons", "CfgVehicles", "CfgMagazines", "CfgVoice" or "CfgUnitInsignia" <STRING>
- * 1: Classname <STRING>
+ * 1: Classname (must be in config case) <STRING>
  * 2: Panel control <CONTROL>
  * 3: Name of the picture entry in that Cfg class <STRING> (default: "picture")
  * 4: Config root <NUMBER> (default: 0 -> configFile)
@@ -42,7 +42,7 @@ if (_skip) then {
 
 if (_skip) exitWith {};
 
-// Sanitise key, as it's public; If not in cache, find info and cache it for later use
+// If not in cache, find info and cache it for later use
 ((uiNamespace getVariable QGVAR(addListBoxItemCache)) getOrDefaultCall [_configCategory + _className + str _configRoot, {
     // Get classname (config case), display name, picture and DLC
     private _configPath = ([configFile, campaignConfigFile, missionConfigFile] select _configRoot) >> _configCategory >> _className;

addons/arsenal/functions/fnc_fillLeftPanel.sqf

@@ -113,6 +113,21 @@ private _selectedItem = if (_idxVirt != -1) then { // Items
                 ["CfgUnitInsignia", _x, _ctrlPanel, "texture", _y] call FUNC(addListBoxItem);
             } forEach GVAR(insigniaCache);
 
+            // If the current insignia is not in the arsenal, add it manually
+            if (GVAR(currentInsignia) != "" && {!(GVAR(currentInsignia) in GVAR(insigniaCache))}) then {
+                // Check for correct config: First mission, then campaign and finally regular config
+                // Ref fnc_addListBoxItem, 0/nil = configFile, 1 = campaignConfigFile, 2 = missionConfigFile
+                private _index = 3;
+
+                {
+                    _index = _index - 1;
+
+                    if (!isNull (_x >> "CfgUnitInsignia" >> GVAR(currentInsignia))) exitWith {};
+                } forEach [missionConfigFile, campaignConfigFile, configFile];
+
+                ["CfgUnitInsignia", GVAR(currentInsignia), _ctrlPanel, "texture", _index] call FUNC(addListBoxItem);
+            };
+
             GVAR(currentInsignia)
         };
         // Unknown

addons/arsenal/functions/fnc_onSelChangedLeft.sqf

@@ -683,14 +683,19 @@ switch (GVAR(currentLeftPanel)) do {
 
         TOGGLE_RIGHT_PANEL_HIDE
 
-        private _unitInsigniaConfig = configFile >> "CfgUnitInsignia" >> _item;
+        // Check for correct config: First mission, then campaign and finally regular config
+        private _itemCfg = missionConfigFile >> "CfgUnitInsignia" >> _item;
 
-        // Display new items's info on the bottom right
-        if (isNull _unitInsigniaConfig) then {
-            [_display, _control, _curSel, missionConfigFile >> "CfgUnitInsignia" >> _item] call FUNC(itemInfo);
-        } else {
-            [_display, _control, _curSel, _unitInsigniaConfig] call FUNC(itemInfo);
+        if (isNull _itemCfg) then {
+            _itemCfg = campaignConfigFile >> "CfgUnitInsignia" >> _item;
+        };
+
+        if (isNull _itemCfg) then {
+            _itemCfg = configFile >> "CfgUnitInsignia" >> _item;
         };
+
+        // Display new items's info on the bottom right
+        [_display, _control, _curSel, _itemCfg] call FUNC(itemInfo);
     };
 };
 

addons/arsenal/functions/fnc_sortPanel.sqf

@@ -15,6 +15,10 @@
 
 params ["_control"];
 
+// https://community.bistudio.com/wiki/toString, see comment
+// However, using 55295 did not work as expected, 55291 was found by trial and error
+#define HIGHEST_VALUE_CHAR 55291
+
 // When filling the sorting panel, FUNC(sortPanel) is called twice, so ignore first call
 if (GVAR(ignoreFirstSortPanelCall)) exitWith {
     GVAR(ignoreFirstSortPanelCall) = false;
@@ -29,6 +33,7 @@ private _sortDirectionCtrl = _display displayCtrl ([IDC_sortLeftTabDirection, ID
 private _cfgMagazines = configFile >> "CfgMagazines";
 private _cfgFaces = configFile >> "CfgFaces";
 private _cfgUnitInsignia = configFile >> "CfgUnitInsignia";
+private _cfgUnitInsigniaCampaign = campaignConfigFile >> "CfgUnitInsignia";
 private _cfgUnitInsigniaMission = missionConfigFile >> "CfgUnitInsignia";
 
 if (_rightSort) then {
@@ -126,7 +131,6 @@ private _selected = if (_right) then {
     _panel lbData _curSel
 };
 
-private _originalNames = createHashMap;
 private _item = "";
 private _quantity = "";
 private _itemCfg = configNull;
@@ -136,12 +140,8 @@ private _fillerChar = toString [1];
 
 private _magazineMiscItems = uiNamespace getVariable QGVAR(magazineMiscItems);
 private _sortCache = uiNamespace getVariable QGVAR(sortCache);
-
-private _faceCache = if (_cfgClass == _cfgFaces) then {
-    uiNamespace getVariable [QGVAR(faceCache), createHashMap]
-} else {
-    createHashMap
-};
+private _faceCache = uiNamespace getVariable QGVAR(faceCache);
+private _insigniaCache = uiNamespace getVariable QGVAR(insigniaCache);
 
 private _countColumns = if (_right) then {
     count lnbGetColumnsPosition _panel
@@ -150,9 +150,9 @@ private _countColumns = if (_right) then {
 };
 
 private _for = if (_right) then {
-    for '_i' from 0 to (lnbSize _panel select 0) - 1
+    for "_i" from 0 to (lnbSize _panel select 0) - 1
 } else {
-    for '_i' from 0 to (lbSize _panel) - 1
+    for "_i" from 0 to (lbSize _panel) - 1
 };
 
 _for do {
@@ -163,6 +163,14 @@ _for do {
         _panel lbData _i
     };
 
+    // Check if entry is "Empty"
+    if (!_right && {(_panel lbValue _i) == -1}) then {
+        // Set to lowest/highest lexicographical value, so that "Empty" is always at the top
+        _panel lbSetTextRight [_i, ["", toString [HIGHEST_VALUE_CHAR, HIGHEST_VALUE_CHAR, HIGHEST_VALUE_CHAR, HIGHEST_VALUE_CHAR, HIGHEST_VALUE_CHAR]] select (_sortDirection == ASCENDING)];
+
+        continue;
+    };
+
     // Get item's count
     _quantity = if (_right) then {
         parseNumber (_panel lnbText [_i, 2])
@@ -179,18 +187,22 @@ _for do {
     _itemCfg = if !(_cfgClass in [_cfgFaces, _cfgUnitInsignia]) then {
         _cfgClass >> _item
     } else {
-        // If insignia, check both config and mission file
+        // If insignia, check for correct config: First mission, then campaign and finally regular config
         if (_cfgClass == _cfgUnitInsignia) then {
-            _itemCfg = _cfgClass >> _item;
+            _itemCfg = _cfgUnitInsigniaMission >> _item;
 
             if (isNull _itemCfg) then {
-                _itemCfg = _cfgUnitInsigniaMission >> _item;
+                _itemCfg = _cfgUnitInsigniaCampaign >> _item;
+            };
+
+            if (isNull _itemCfg) then {
+                _itemCfg = _cfgUnitInsignia >> _item;
             };
 
             _itemCfg
         } else {
             // If face, check correct category
-            _cfgClass >> (_faceCache get _item) param [2, "Man_A3"] >> _item
+            _cfgClass >> (_faceCache getOrDefault [_item, []]) param [2, "Man_A3"] >> _item
         };
     };
 
@@ -216,55 +228,47 @@ _for do {
         _value
     }, true];
 
-    // Save the current row's item's name in a cache and set text to it's sorting value
+    // Set the right text temporarily, so it can be used for sorting
     if (_right) then {
-        _name = _panel lnbText [_i, 1];
-        _originalNames set [_item, _name];
-
         // Use value, display name and classname to sort, which means a fixed alphabetical order is guaranteed
-        // Filler char has lowest lexicographical order possible
-        _panel lnbSetText [[_i, 1], format ["%1%2%4%3", _value, _name, _item, _fillerChar]];
+        // Filler char has lowest lexicographical value possible
+        _panel lnbSetTextRight [[_i, 1], format ["%1%2%4%3", _value, _panel lnbText [_i, 1], _item, _fillerChar]];
     } else {
         if (_item != "") then {
-            _name = _panel lbText _i;
-            _originalNames set [_item, _name];
-
             // Use value, display name and classname to sort, which means a fixed alphabetical order is guaranteed
-            // Filler char has lowest lexicographical order possible
-            _panel lbSetText [_i, format ["%1%2%4%3", _value, _name, _item, _fillerChar]];
+            // Filler char has lowest lexicographical value possible
+            _panel lbSetTextRight [_i, format ["%1%2%4%3", _value, _panel lbText _i, _item, _fillerChar]];
         };
     };
 };
 
-// Sort alphabetically, find the previously selected item, select it again and reset text to original text
+// Sort alphabetically, find the previously selected item and select it again
 if (_right) then {
-    _panel lnbSort [1, _sortDirection == ASCENDING];
+    [_panel, 1] lnbSortBy ["TEXT", _sortDirection == ASCENDING, false, true, false];
 
     _for do {
-        _item = _panel lnbData [_i, 0];
-
-        _panel lnbSetText [[_i, 1], _originalNames get _item];
+        // Remove sorting text, as it blocks the item name otherwise
+        _panel lnbSetTextRight [[_i, 1], ""];
 
-        // Set selection after text, otherwise item info box on the right side shows invalid name
-        if (_curSel != -1 && {_item == _selected}) then {
+        if (_curSel != -1 && {(_panel lnbData [_i, 0]) == _selected}) then {
             _panel lnbSetCurSelRow _i;
 
             // To avoid unnecessary checks after previsouly selected item was found
             _curSel = -1;
         };
     };
 } else {
-    lbSort [_panel, ["DESC", "ASC"] select _sortDirection];
+    _panel lbSortBy ["TEXT", _sortDirection == ASCENDING, false, true, false];
 
     _for do {
         _item = _panel lbData _i;
 
         // Check if valid item (problems can be caused when searching)
         if (_item != "") then {
-            _panel lbSetText [_i, _originalNames get _item];
+            // Remove sorting text, as it blocks the item name otherwise
+            _panel lbSetTextRight [_i, ""];
         };
 
-        // Set selection after text, otherwise item info box on the right side shows invalid name
         if (_curSel != -1 && {_item == _selected}) then {
             _panel lbSetCurSel _i;
 

addons/arsenal/ui/RscAttributes.hpp

@@ -564,6 +564,7 @@ class GVAR(display) {
             colorSelect[] = {1,1,1,1};
             colorSelect2[] = {1,1,1,1};
             colorPictureRightSelected[] = {1,1,1,1};
+            colorTextRight[] = {0.5, 0.5, 0.5, 0};
             onLBSelChanged = QUOTE(_this call FUNC(onSelChangedLeft));
             onLBDblClick = QUOTE(_this call FUNC(onPanelDblClick));
             onSetFocus = QUOTE(GVAR(leftTabFocus) = true);
@@ -594,6 +595,7 @@ class GVAR(display) {
             colorSelect[] = {1,1,1,1};
             colorSelect2[] = {1,1,1,1};
             colorPictureRightSelected[] = {1,1,1,1};
+            colorTextRight[] = {0.5, 0.5, 0.5, 0};
             columns[] = {0.07, 0.15, 0.75};
             idcLeft = IDC_arrowMinus;
             idcRIght = IDC_arrowPlus;