From 82955dd7cbb0c2938b2dffde9dffb80ef9b8fea5 Mon Sep 17 00:00:00 2001 From: Josuan Albin Date: Sat, 4 Nov 2017 02:00:59 +0100 Subject: [PATCH] Change defaultLoadoutsList export format and add a 3DEN check for it's default value --- addons/arsenal/functions/fnc_buttonExport.sqf | 5 +++-- addons/arsenal/functions/fnc_onArsenalOpen.sqf | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/arsenal/functions/fnc_buttonExport.sqf b/addons/arsenal/functions/fnc_buttonExport.sqf index c24fc36105..03aa37c65e 100644 --- a/addons/arsenal/functions/fnc_buttonExport.sqf +++ b/addons/arsenal/functions/fnc_buttonExport.sqf @@ -13,11 +13,11 @@ if (GVAR(shiftState)) then { switch true do { case (_index == -1): { - "ace_clipboard" callExtension (format ["GVAR(defaultLoadoutsList) = [%1", endl]); + "ace_clipboard" callExtension (format ["[%1", endl]); }; case (_index == _listLength): { - "ace_clipboard" callExtension "];;"; + "ace_clipboard" callExtension "];"; }; default { @@ -37,3 +37,4 @@ if (GVAR(shiftState)) then { [_display, "Current loadout exported to clipboard"] call FUNC(message); }; + diff --git a/addons/arsenal/functions/fnc_onArsenalOpen.sqf b/addons/arsenal/functions/fnc_onArsenalOpen.sqf index c7ae1c1ad6..e65f7a4e92 100644 --- a/addons/arsenal/functions/fnc_onArsenalOpen.sqf +++ b/addons/arsenal/functions/fnc_onArsenalOpen.sqf @@ -21,7 +21,12 @@ if (isNil QGVAR(sharedLoadoutsVars)) then { }; if (isNil QGVAR(defaultLoadoutsList)) then { - GVAR(defaultLoadoutsList) = []; + + if (is3DEN) then { + GVAR(defaultLoadoutsList) = (QGVAR(DummyCategory) get3DENMissionAttribute QGVAR(DefaultLoadoutsListAttribute)); + } else { + GVAR(defaultLoadoutsList) = []; + }; }; if (isNil QGVAR(virtualItems)) then {