Merge branch 'v0.96.8' into scaling-economy-idea

CHANGELOG.md

@@ -15,6 +15,7 @@
 * Tweaked: Comments/structure of the config file. Also added some category prefix sorting to some config variables.
 * Tweaked: GM East enemy preset, lower the chance for unarmed BRDM.
 * Tweaked: Moved mission build tool into subdirectory
+* Tweaked: Loadouts now display alphabetically
 * Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total.
 * Fixed: Sector monitor got stuck after sector cap was reached until restarting the server.
 * Fixed: FOB truck got mass set, but should've just apply to FOB boxes.

Missionframework/scripts/client/actions/open_arsenal.sqf

@@ -35,6 +35,8 @@ if (KPLIB_ace && KPLIB_param_arsenalType) then {
     };
 };
 
+_loadouts_data sort true;
+
 waitUntil { dialog };
 
 if ( count _loadouts_data > 0 ) then {

Missionframework/scripts/client/misc/fn_initArsenal.sqf

@@ -67,12 +67,12 @@ if (KPLIB_param_useArsenalPreset) then {
     if !(configProperties [configFile >> "CBA_DisposableLaunchers"] isEqualTo []) then {
         private _disposableLaunchers = ["CBA_FakeLauncherMagazine"];
         {
-            private _loadedLauncher = cba_disposable_LoadedLaunchers getVariable _x;
+            private _loadedLauncher = cba_disposable_LoadedLaunchers get _x;
             if (!isNil "_loadedLauncher") then {
                 _disposableLaunchers pushBack _loadedLauncher;
             };
 
-            private _normalLauncher = cba_disposable_NormalLaunchers getVariable _x;
+            private _normalLauncher = cba_disposable_NormalLaunchers get _x;
             if (!isNil "_normalLauncher") then {
                 _normalLauncher params ["_loadedLauncher"];
                 _disposableLaunchers pushBack _loadedLauncher;
@@ -98,12 +98,12 @@ if (KPLIB_param_useArsenalPreset) then {
         // Handle CBA (MRT) Accessories, https://github.com/CBATeam/CBA_A3/wiki/Accessory-Functions
         private _itemCfg = configFile >> "CfgWeapons" >> _x;
         if (!isNull _itemCfg) then {
-            private _nextItem = getText (_cfg >> "MRT_SwitchItemPrevClass");
+            private _nextItem = getText (_itemCfg >> "MRT_SwitchItemPrevClass");
             if (_nextItem != "") then {
                 KPLIB_arsenalAllowedExtension pushBackUnique _nextItem;
             };
 
-            private _prevItem = getText (_cfg >> "MRT_SwitchItemNextClass");
+            private _prevItem = getText (_itemCfg >> "MRT_SwitchItemNextClass");
             if (_prevItem != "") then {
                 KPLIB_arsenalAllowedExtension pushBackUnique _prevItem;
             };