fix Curator and 3DEN cargo attributes (#1140)

* repair test * with is broken in scheduled * repair curator ammo box preload * repair 3den ammo box preload
CBATeam · May 8, 2019 · 8a559b3 · 8a559b3
1 parent 4a49178
commit 8a559b3
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/addons/ui/fnc_preload3DEN.sqf b/addons/ui/fnc_preload3DEN.sqf
@@ -113,6 +113,13 @@ private _magazinesLists = [];
                     _muzzleConfig = _weaponConfig >> _x;
                 };
 
+                private _compatibleMagazines = getArray (_muzzleConfig >> "magazines");
+                {
+                    {
+                        _compatibleMagazines append getArray _x;
+                    } forEach configProperties [configFile >> "CfgMagazineWells" >> _x, "isArray _x"];
+                } foreach getArray (_muzzleConfig >> "magazineWell");
+
                 {
                     private _item = toLower _x;
 
@@ -131,7 +138,7 @@ private _magazinesLists = [];
                             _magazines pushBack _item;
                         };
                     };
-                } forEach getArray (_muzzleConfig >> "magazines");
+                } forEach _compatibleMagazines;
             } forEach getArray (_weaponConfig >> "muzzles");
         };
     };
@@ -179,10 +186,6 @@ private _listHeadgear = _list select 10;
     };
 } forEach ("true" configClasses (configFile >> "CfgGlasses"));
 
-{
-    _x sort true;
-} forEach _list;
-
 _itemTypes call CBA_fnc_deleteNamespace;
 
 true
diff --git a/addons/ui/fnc_preloadCurator.sqf b/addons/ui/fnc_preloadCurator.sqf
@@ -112,9 +112,9 @@ private _magazinesLists = [];
                 };
 
                 _listItem pushBack [
-                    _item,
                     _displayName,
                     _displayNameShort,
+                    _item,
                     getText (_weaponConfig >> "picture"),
                     parseNumber (getNumber (_weaponConfig >> "type") in [4096, 131072]),
                     false
@@ -130,6 +130,13 @@ private _magazinesLists = [];
                         _muzzleConfig = _weaponConfig >> _x;
                     };
 
+                    private _compatibleMagazines = getArray (_muzzleConfig >> "magazines");
+                    {
+                        {
+                            _compatibleMagazines append getArray _x;
+                        } forEach configProperties [configFile >> "CfgMagazineWells" >> _x, "isArray _x"];
+                    } foreach getArray (_muzzleConfig >> "magazineWell");
+
                     {
                         private _item = toLower _x;
 
@@ -140,9 +147,9 @@ private _magazinesLists = [];
                                 private _displayName = getText (_magazineConfig >> "displayName");
 
                                 _listItem pushBack [
-                                    _item,
                                     _displayName,
                                     _displayName,
+                                    _item,
                                     getText (_magazineConfig >> "picture"),
                                     2,
                                     _item in _magazines
@@ -151,7 +158,7 @@ private _magazinesLists = [];
                                 _magazines pushBack _item;
                             };
                         };
-                    } forEach getArray (_muzzleConfig >> "magazines");
+                    } forEach _compatibleMagazines;
                 } forEach getArray (_weaponConfig >> "muzzles");
             };
         };
@@ -177,9 +184,9 @@ private _magazinesLists = [];
                 private _displayName = getText (_weaponConfig >> "displayName");
 
                 (_addonList select _index) pushBack [
-                    _item,
                     _displayName,
                     _displayName,
+                    _item,
                     getText (_weaponConfig >> "picture"),
                     3,
                     false

diff --git a/addons/ui/test_preload.sqf b/addons/ui/test_preload.sqf
@@ -1,20 +1,34 @@
 #include "script_component.hpp"
 // execVM "\x\cba\addons\ui\test_preload.sqf";
 
+if (!canSuspend) exitWith {
+    execVM __FILE__;
+};
+
 isNil {
     with uiNamespace do {
         // 3DEN
         TEST_DEFINED(QFUNC(preload3DEN),"");
 
         AmmoBox_list = nil;
         ["onLoad", [controlNull]] call compile preprocessFile "\a3\3den\UI\Attributes\AmmoBox.sqf";
+    };
+};
+
+waitUntil {!isNil {uiNamespace getVariable "AmmoBox_list"}};
+
+isNil {
+    with uiNamespace do {
         private _vanilla = AmmoBox_list;
 
         AmmoBox_list = nil;
         call FUNC(preload3DEN);
         private _cba = AmmoBox_list;
 
-        TEST_TRUE(_vanilla isEqualTo _cba,QFUNC(preload3DEN));
+        TEST_TRUE([_vanilla] isEqualTo [_cba],QFUNC(preload3DEN));
+        if !([_vanilla] isEqualTo [_cba]) then {
+            copyToClipboard ("3DEN" + endl + str _vanilla + endl + str _cba);
+        };
 
         // Curator
         TEST_DEFINED(QFUNC(preloadCurator),"");
@@ -40,6 +54,9 @@ isNil {
         ["onLoad", [displayNull], objNull] call compile preprocessFile "\a3\ui_f_curator\UI\RscCommon\RscAttributeInventory.sqf";
         _cba = RscAttributeInventory_list;
 
-        TEST_TRUE(_vanilla isEqualTo _cba,QFUNC(preloadCurator));
+        TEST_TRUE([_vanilla] isEqualTo [_cba],QFUNC(preloadCurator));
+        if !([_vanilla] isEqualTo [_cba]) then {
+            copyToClipboard ("Curator" + endl + str _vanilla + endl + str _cba);
+        };
     };
 };