Merge pull request #150 from Theseus-Aegis/armoryInsignias

Add Armory Insignias

addons/armory/functions/fnc_dialogControl.sqf

@@ -44,7 +44,7 @@ if (_requestedMenu == "main") exitWith {
 [false] call FUNC(dialogControl_main);
 
 // Set Title
-ctrlSetText [TITLE, format[QUOTE(PATHTOF(UI\titleCategory_%1.paa)), _requestedMenu]];
+ctrlSetText [TITLE, format [QUOTE(PATHTOF(UI\titleCategory_%1.paa)), _requestedMenu]];
 
 // Show List
 [_requestedMenu] call FUNC(dialogControl_list);

addons/armory/functions/fnc_dialogControl_amountSelection.sqf

@@ -21,7 +21,7 @@ TRACE_1("Amount of selected item",_quantity);
 lbClear DROPDOWNAMOUNT;
 
 for "_x" from 1 to (parseNumber _quantity) do {
-    lbAdd [DROPDOWNAMOUNT, str(_x)];
+    lbAdd [DROPDOWNAMOUNT, str _x];
 };
 
 // Set initial value to 1 (will not fire onLBSelChanged)

addons/armory/functions/fnc_dialogControl_main.sqf

@@ -30,7 +30,7 @@ params ["_show"];
     MAINPIC7, MAINBTN7,
     MAINPIC8, MAINBTN8,
     //MAINPIC9, MAINBTN9,
-    //MAINPIC10, MAINBTN10,
+    MAINPIC10, MAINBTN10,
     //MAINPIC11, MAINBTN11,
     MAINPIC12, MAINBTN12
 ];
@@ -76,9 +76,9 @@ CTRL(MAINBTN8) ctrlSetTooltip localize LSTRING(BtnApparelTooltip);
 buttonSetAction [MAINBTN9, QUOTE([''] call FUNC(dialogControl))];
 CTRL(MAINBTN9) ctrlSetTooltip "Access ";*/
 
-/*ctrlSetText [MAINPIC10, QUOTE(PATHTOF(UI\btnCategory_kits.paa))];
-buttonSetAction [MAINBTN10, QUOTE([''] call FUNC(dialogControl))];
-CTRL(MAINBTN10) ctrlSetTooltip "Access ";*/
+ctrlSetText [MAINPIC10, QUOTE(PATHTOF(UI\btnCategory_insignia.paa))];
+buttonSetAction [MAINBTN10, QUOTE(['insignia'] call FUNC(dialogControl))];
+CTRL(MAINBTN10) ctrlSetTooltip localize LSTRING(BtnInsigniasTooltip);
 
 /*ctrlSetText [MAINPIC11, QUOTE(PATHTOF(UI\btnCategory_locker.paa))];
 buttonSetAction [MAINBTN11, QUOTE([''] call FUNC(dialogControl))];

addons/armory/functions/fnc_dialogControl_populateList.sqf

@@ -26,6 +26,7 @@ lnbClear NLIST;
 private _rowNum = 0; // Needed for proper row images and data
 
 // Fill List
+_armoryData sort true; // Errors when used in combination with forEach
 {
     _x params ["_className", "_subCategory", "_description", "_quantity"];
 
@@ -36,7 +37,10 @@ private _rowNum = 0; // Needed for proper row images and data
         if (_configCfg == "") then {
             _configCfg = [_className] call ACE_Common_fnc_getConfigTypeObject;
         };
-        if (_configCfg == "") exitWith {ACE_LOGERROR_1("Config Type not found for classname: %1",_className)};
+        if (_configCfg == "") then {
+            _configCfg = ["", "CfgUnitInsignia"] select (isClass (configFile >> "CfgUnitInsignia" >> _className));
+        };
+        if (_configCfg == "") exitWith {ACE_LOGERROR_2("Config type not found for classname: %1, Config return: %2",_className,_configCfg)};
 
         // Check sub-category for proper listing
         if (_selectedSubCategory == "" || {_selectedSubCategory == _subCategory}) then {
@@ -50,15 +54,17 @@ private _rowNum = 0; // Needed for proper row images and data
                 _displayName = [_displayName, "..."] joinString "";
             };
 
-            lnbAddRow [NLIST, ["", _displayName, _quantity]];
+            private _quantityList = [_quantity, "∞"] select (_configCfg == "CfgUnitInsignia");
+            lnbAddRow [NLIST, ["", _displayName, _quantityList]];
             lbSetTooltip [NLIST, _rowNum, _tooltip];
 
             // Set hidden data with classname to displayName column and quantity to quantity column
             lnbSetData [NLIST, [_rowNum, 1], _className];
             lnbSetData [NLIST, [_rowNum, 2], _quantity];
 
             // Set picture
-            private _picture = getText (configFile >> _configCfg >> _className >> "picture");
+            private _pictureType = ["picture", "texture"] select (_configCfg == "CfgUnitInsignia");
+            private _picture = getText (configFile >> _configCfg >> _className >> _pictureType);
             lnbSetPicture [NLIST, [_rowNum, 0], _picture];
             _rowNum = _rowNum + 1;
         };

addons/armory/functions/fnc_getDataVanilla.sqf

@@ -84,5 +84,18 @@ if (_selectedCategory == "wearable") then {
         ["G_Bandanna_Shades", "Goggles", "Blabla, this item, blabla", "4"]
     ];
 };
+if (_selectedCategory == "insignia") then {
+    /*_armoryData = [
+        // Classname, Subcategory, Description, Quantity
+        ["Curator", "Insignia", "Blabla, this item, blabla", "1"],
+        ["MANW", "Insignia", "Blabla, this item, blabla", "1"],
+        ["BI", "Insignia", "Blabla, this item, blabla", "1"]
+    ];*/
+    private _config = configFile >> "CfgUnitInsignia";
+    for "_x" from 0 to (count _config - 1) do {
+        private _configName = configName (_config select _x);
+        _armoryData pushBack [_configName, "Insignia", "Insignia", "1"];
+    };
+};
 
 _armoryData

addons/armory/functions/fnc_sendData.sqf

@@ -24,6 +24,11 @@ private _selectedItem = lnbData [NLIST, [lnbCurSelRow NLIST, 1]]; // ClassName
 private _selectedAmount = lbText [DROPDOWNAMOUNT, lbCurSel CTRL(DROPDOWNAMOUNT)]; // Quantity
 private _object = ACE_player getVariable [QGVAR(object), objNull];
 
+// Insignia application
+if (isClass (configFile >> "CfgUnitInsignia" >> _selectedItem)) exitWith {
+    [ACE_player, _selectedItem] call BIS_fnc_setUnitInsignia;
+};
+
 TRACE_3("Send data",_type,_selectedItem,_selectedAmount);
 
 // Exit if any variable is not set

addons/armory/stringtable.xml

@@ -89,6 +89,9 @@
             <English>Access Apparel</English>
             <German>Auf Bekleidung zugreifen</German>
         </Key>
+        <Key ID="STR_TAC_Armory_BtnInsigniasTooltip">
+            <English>Access Insignias</English>
+        </Key>
         <Key ID="STR_TAC_Armory_BtnStashTooltip">
             <English>Stash Container Contents</English>
             <German>Containerinhalt wegpacken</German>
@@ -110,4 +113,4 @@
             <German>Der Container ist voll! Schaffe Platz zum herausholen.</German>
         </Key>
     </Package>
-</Project>
+</Project>

addons/insignia/CfgEventHandlers.hpp

@@ -25,3 +25,11 @@ class Extended_Take_EventHandlers {
         };
     };
 };
+
+class Extended_InventoryOpened_EventHandlers {
+    class CAManBase {
+        class ADDON {
+            clientInventoryOpened = QUOTE(_this call FUNC(getInsignia));
+        };
+    };
+};

addons/insignia/XEH_PREP.hpp

@@ -1 +1,2 @@
+PREP(getInsignia);
 PREP(setInsignia);

addons/insignia/XEH_preInit.sqf

@@ -4,4 +4,6 @@ ADDON = false;
 
 #include "XEH_PREP.hpp"
 
+GVAR(activeInsignia) = QGVAR(logoStitch);
+
 ADDON = true;

addons/insignia/functions/fnc_getInsignia.sqf

@@ -0,0 +1,23 @@
+/*
+ * Author: Jonpas
+ * Gets insignia from a player if it's actual player (and not remote controlled or AI).
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [unit] call tac_insignia_fnc_getInsignia;
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_unit"];
+
+if (!local _unit || !(_unit == player)) exitWith {};
+
+GVAR(activeInsignia) = [_unit] call BIS_fnc_getUnitInsignia;
+TRACE_2("Insignia getted",_unit,GVAR(activeInsignia));

addons/insignia/functions/fnc_setInsignia.sqf

@@ -13,14 +13,11 @@
  *
  * Public: No
  */
-//#define DEBUG_MODE_FULL
 #include "script_component.hpp"
 
 params ["_unit"];
 
-if (local _unit && {_unit == player}) then {
-    [_unit, QGVAR(logoStitch)] call BIS_fnc_setUnitInsignia;
-    TRACE_2("Insignia added",_unit,player);
-} else {
-    TRACE_2("Insignia NOT added",_unit,player);
-};
+if (!local _unit || !(_unit == player)) exitWith {};
+
+[_unit, GVAR(activeInsignia)] call BIS_fnc_setUnitInsignia;
+TRACE_2("Insignia added",_unit,GVAR(activeInsignia));