From 36fe3df8205013033a16db62f85500869fc82467 Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Tue, 24 Sep 2024 18:29:27 -0400 Subject: [PATCH 1/3] fix undefined var (#962) --- Missionframework/scripts/client/misc/fn_initArsenal.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index 8d1fe70f2..dbc820de7 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/Missionframework/scripts/client/misc/fn_initArsenal.sqf @@ -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; }; From ab1930e212c605aa72458e5d88fcb3d74ee2470d Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:28:47 -0500 Subject: [PATCH 2/3] Fix Arsenal CBA Disposibles (#977) --- Missionframework/scripts/client/misc/fn_initArsenal.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Missionframework/scripts/client/misc/fn_initArsenal.sqf b/Missionframework/scripts/client/misc/fn_initArsenal.sqf index dbc820de7..3a97d66e1 100644 --- a/Missionframework/scripts/client/misc/fn_initArsenal.sqf +++ b/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; From a9f8b24f677710d32878c16f5d64e016c1f9348a Mon Sep 17 00:00:00 2001 From: some-evil-kitty <106408180+some-evil-kitty@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:38:05 -0500 Subject: [PATCH 3/3] Sort Loadouts Alphabetically (#979) * sort loadouts data * Update CHANGELOG.md * move sort out of if statement no need to write it down twice --- CHANGELOG.md | 1 + Missionframework/scripts/client/actions/open_arsenal.sqf | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3661d5ff1..f10870e6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,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. diff --git a/Missionframework/scripts/client/actions/open_arsenal.sqf b/Missionframework/scripts/client/actions/open_arsenal.sqf index 31108de99..c1fb69ac4 100644 --- a/Missionframework/scripts/client/actions/open_arsenal.sqf +++ b/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 {