From 36cc44271d2651874d679bed1971d3d91dff2456 Mon Sep 17 00:00:00 2001 From: Pixelated Grunt Date: Fri, 23 Aug 2024 22:40:13 +1000 Subject: [PATCH 1/3] Merge ESE changes from steam-7.8.8 branch --- addons/main/GUI/ESE.hpp | 11 +- addons/main/cfgFunctions.hpp | 4 +- .../GUI/ESE/fn_ESE_applyAttribute.sqf | 177 ++++++++++-------- .../GUI/ESE/fn_ESE_getConfigValues.sqf | 126 ++++++------- .../GUI/ESE/fn_ESE_loadAttributeValue.sqf | 112 ++++++----- .../GUI/ESE/fn_ESE_parseClipboardValues.sqf | 94 +++++----- addons/main/stringtable.xml | 12 +- 7 files changed, 290 insertions(+), 246 deletions(-) diff --git a/addons/main/GUI/ESE.hpp b/addons/main/GUI/ESE.hpp index 5437dc13..7a52953f 100644 --- a/addons/main/GUI/ESE.hpp +++ b/addons/main/GUI/ESE.hpp @@ -109,7 +109,8 @@ class ENH_ESE "SortbyClass", "SortbyCount", "SortbyMod", - "SortbyType" + "SortbyType", + "ImportFromClipboard" }; }; class FolderFilter @@ -269,6 +270,12 @@ class ENH_ESE action = "'type' call ENH_fnc_ESE_sort"; shortcuts[] = {DIK_5}; }; + class ImportFromClipboard + { + text = "$STR_ENH_MAIN_ESE_IMPORTFROMCLIPBOARD"; + action = "[false, [], true] call ENH_fnc_ESE_loadAttributeValue"; + shortcuts[] = {DIK_6}; + }; //Filter class ARs { @@ -479,4 +486,4 @@ class ENH_ESE onButtonClick = "0 spawn ENH_fnc_ESE_close"; }; }; -}; \ No newline at end of file +}; diff --git a/addons/main/cfgFunctions.hpp b/addons/main/cfgFunctions.hpp index 1a977586..9a1f88a3 100644 --- a/addons/main/cfgFunctions.hpp +++ b/addons/main/cfgFunctions.hpp @@ -97,12 +97,14 @@ class CfgFunctions class ESE_close; class ESE_export; class ESE_fullArsenal; + class ESE_getConfigValues; class ESE_handleTemplates; class ESE_lbAdd; class ESE_lnbAdd; class ESE_loadAttributeValue; class ESE_onModFilterChanged; class ESE_open; + class ESE_parseClipboardValues; class ESE_removeItem; class ESE_resetSearch; class ESE_resetStorage; @@ -249,4 +251,4 @@ class CfgFunctions // class testDisplays; // }; }; -}; \ No newline at end of file +}; diff --git a/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf b/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf index 052af012..723f02db 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf @@ -1,82 +1,95 @@ -/* - Author: R3vo - - Date: 2020-06-14 - - Description: - Used by the ENH_ESE GUI. Takes items from inventory list and applies the attribute. Can also only return the attribute value. - - Parameter(s): - 0: BOOLEAN - True to not set the attribute and only return the attribute value. Default: false - - Returns: - ARRAY, NOTHING: See Parameters -*/ - -#include "\x\enh\addons\main\script_component.hpp" - -disableSerialization; -params [["_return", false]]; -private _display = uiNamespace getVariable "ENH_Display_ESE"; -private _itemsHashMap = uiNamespace getVariable "ENH_ESE_itemsHashMap"; -private _ctrlInventory = CTRL(IDC_ESE_INVENTORYLIST); -private _rows = lnbSize _ctrlInventory select 0; - -private _weapons = []; -private _magazines = []; -private _items = []; -private _backpacks = []; - -private _weaponsAmount = []; -private _magazinesAmount = []; -private _itemsAmount = []; -private _backpacksAmount = []; - -for "_i" from 0 to _rows - 1 do -{ - private _configName = _ctrlInventory lnbData [_i, 0]; - private _amount = _ctrlInventory lnbValue [_i, 1]; - (_itemsHashMap getOrDefault [toLower _configName, []]) params ["", "", "", "", ["_category", ""], ["_specificType", ""]]; - switch (true) do - { - case (_category isEqualTo "Weapon"): - { - _weapons pushBack _configName; - _weaponsAmount pushBack _amount; - }; - case (_category in ["Mine", "Magazine"]): - { - _magazines pushBack _configName; - _magazinesAmount pushBack _amount; - }; - case (_category in ["Item", "Equipment"]): - { - if (_specificType isEqualTo "Backpack") then - { - _backpacks pushBack _configName; - _backpacksAmount pushBack _amount; - } - else - { - _items pushBack _configName; - _itemsAmount pushBack _amount; - }; - }; - }; -}; - -private _value = str -[ - [ - [_weapons, _weaponsAmount], - [_magazines, _magazinesAmount], - [_items, _itemsAmount], - [_backpacks, _backpacksAmount] - ], - _display getVariable ["ENH_ESE_IsVirtual", false] -]; - -if (_return) exitWith {_value}; -ENH_ESE_target set3DENAttribute ["ammoBox", _value]; - -["ENH_actionPerformed"] call BIS_fnc_3DENNotification; \ No newline at end of file +/* + Author: R3vo + + Date: 2020-06-14 + + Description: + Used by the ENH_ESE GUI. Takes items from inventory list and applies the attribute. Can also only return the attribute value. + + Parameter(s): + 0: BOOLEAN - True to not set the attribute and only return the attribute value. Default: false + 1: ARRAY - Items details. Same data structure as _itemsHashMap. + + Returns: + ARRAY, NOTHING: See Parameters +*/ + +#include "\3denEnhanced\defines\defineCommon.inc" +disableSerialization; +params [["_return", false], ["_itemsDetails", []]]; +private _display = uiNamespace getVariable "ENH_Display_ESE"; +private _ctrlInventory = CTRL(IDC_ESE_INVENTORYLIST); +private _rows = lnbSize _ctrlInventory select 0; + +private _weapons = []; +private _magazines = []; +private _items = []; +private _backpacks = []; + +private _weaponsAmount = []; +private _magazinesAmount = []; +private _itemsAmount = []; +private _backpacksAmount = []; + +private _itemsHashMap = uiNamespace getVariable "ENH_ESE_itemsHashMap"; + +private _rowCount = count _itemsDetails; +if (_rowCount > 0) then { + _itemsHashMap = _itemsDetails; + _rows = _rowCount +}; + +for "_i" from 0 to _rows - 1 do +{ + private "_configName"; + private _amount = 1; + if (_rowCount == 0) then { + _configName = _ctrlInventory lnbData [_i, 0]; + _amount = _ctrlInventory lnbValue [_i, 1] + } else { + _configName = (keys _itemsHashMap) select _i + }; + (_itemsHashMap getOrDefault [toLower _configName, []]) params ["", "", "", "", ["_category", ""], ["_specificType", ""]]; + switch (true) do + { + case (_category isEqualTo "Weapon"): + { + _weapons pushBack _configName; + _weaponsAmount pushBack _amount; + }; + case (_category in ["Mine", "Magazine"]): + { + _magazines pushBack _configName; + _magazinesAmount pushBack _amount; + }; + case (_category in ["Item", "Equipment"]): + { + if (_specificType isEqualTo "Backpack") then + { + _backpacks pushBack _configName; + _backpacksAmount pushBack _amount; + } + else + { + _items pushBack _configName; + _itemsAmount pushBack _amount; + }; + }; + }; +}; + +private _value = str +[ + [ + [_weapons, _weaponsAmount], + [_magazines, _magazinesAmount], + [_items, _itemsAmount], + [_backpacks, _backpacksAmount] + ], + _display getVariable ["ENH_ESE_IsVirtual", false] +]; + +if (_return) exitWith {_value}; +ENH_ESE_target set3DENAttribute ["ammoBox", _value]; + +["ENH_actionPerformed"] call BIS_fnc_3DENNotification; diff --git a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf index d7d3669a..ea34941c 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf @@ -1,63 +1,63 @@ -/* - Author: Pixelated_Grunt - - Date: 2024-08-20 - - Description: - Return all items configuration details. - - Parameter(s): - ARRAY - An array of class names or configs to get details for. - - Returns: - ARRAY - ARRAY of whitelisted items, HASHMAP of items with details, ARRAY of available addons -*/ - - -#include "\x\enh\addons\main\script_component.hpp" -#define TYPES_WHITELIST ["AssaultRifle", "MachineGun", "SniperRifle", "Shotgun", "SubmachineGun", "RocketLauncher", "Handgun", "Grenade", "Magazine",\ -"Mine", "AccessoryBipod", "AccessoryMuzzle", "AccessoryPointer", "AccessorySights", "Uniform", "Vest", "Backpack", "Headgear", "Glasses", "NVGoggles", "Item", "MissileLauncher"] - -params [["_input", [], []]]; - -private _addons = [["", localize "$STR_3DEN_ATTRIBUTES_DEFAULT_UNCHANGED_TEXT", ""]];//Everything -private _itemsHashMap = createHashMap; - -if (count _input > 0) then { - diag_log format["_input: (%1)", _input]; - _input apply - { - private _class = configName _x; - (_class call BIS_fnc_itemType) params ["_category", "_specificType"]; - if ((_category in TYPES_WHITELIST || _specificType in TYPES_WHITELIST && _specificType != "UnknownEquipment") && {if (isArray (_x >> "muzzles")) then {_class call BIS_fnc_baseWeapon == _class} else {true}}) then - { - //Modify some _specificTypes - if (_specificType == "MissileLauncher") then {_specificType = "RocketLauncher"};//Same type for all launchers - if (_specificType in ["Throw", "SmokeShell", "Flare"]) then {_specificType = "Grenade"};//Same type for all grenades, flares, chemlights, smoke - if (_specificType == "AccessoryBipod" && {_class isKindOf ["CBA_MiscItem", configFile >> "CfgWeapons"]}) then {_specificType = "Item"}; - - //Get the DLC, make sure it's a DLC and was not modified by a mod (CBA, ACE) - (_x call ENH_fnc_getConfigSourceAddon) params [["_addonClass", ""], ["_addonName", ""], ["_addonIcon", ""]]; - _addons pushBackUnique [_addonClass, _addonName, _addonIcon]; - - _itemsHashMap insert - [ - [ - toLower _class, //Make the key lowercase. Some configs don't use the proper casing (Thanks BI ;P) - [ - getText (_x >> "DisplayName"), - getText (_x >> "Picture"), - _addonClass, - _addonIcon, - _category, - _specificType, - getText (_x >> "descriptionShort") regexReplace ["", "\n"], - _class //Properly cased configname for displaying - ] - ] - ] - } - } -}; - -[TYPES_WHITELIST, _itemsHashMap, _addons] \ No newline at end of file +/* + Author: Pixelated_Grunt + + Date: 2024-08-20 + + Description: + Return all items configuration details. + + Parameter(s): + ARRAY - An array of class names or configs to get details for. + + Returns: + ARRAY - ARRAY of whitelisted items, HASHMAP of items with details, ARRAY of available addons +*/ + + +#include "\3denEnhanced\defines\defineCommon.inc" +#define TYPES_WHITELIST ["AssaultRifle", "MachineGun", "SniperRifle", "Shotgun", "SubmachineGun", "RocketLauncher", "Handgun", "Grenade", "Magazine",\ +"Mine", "AccessoryBipod", "AccessoryMuzzle", "AccessoryPointer", "AccessorySights", "Uniform", "Vest", "Backpack", "Headgear", "Glasses", "NVGoggles", "Item", "MissileLauncher"] + +params [["_input", [], []]]; + +private _addons = [["", localize "$STR_3DEN_ATTRIBUTES_DEFAULT_UNCHANGED_TEXT", ""]];//Everything +private _itemsHashMap = createHashMap; + +if (count _input > 0) then { + diag_log format["_input: (%1)", _input]; + _input apply + { + private _class = configName _x; + (_class call BIS_fnc_itemType) params ["_category", "_specificType"]; + if ((_category in TYPES_WHITELIST || _specificType in TYPES_WHITELIST && _specificType != "UnknownEquipment") && {if (isArray (_x >> "muzzles")) then {_class call BIS_fnc_baseWeapon == _class} else {true}}) then + { + //Modify some _specificTypes + if (_specificType == "MissileLauncher") then {_specificType = "RocketLauncher"};//Same type for all launchers + if (_specificType in ["Throw", "SmokeShell", "Flare"]) then {_specificType = "Grenade"};//Same type for all grenades, flares, chemlights, smoke + if (_specificType == "AccessoryBipod" && {_class isKindOf ["CBA_MiscItem", configFile >> "CfgWeapons"]}) then {_specificType = "Item"}; + + //Get the DLC, make sure it's a DLC and was not modified by a mod (CBA, ACE) + (_x call ENH_fnc_getConfigSourceAddon) params [["_addonClass", ""], ["_addonName", ""], ["_addonIcon", ""]]; + _addons pushBackUnique [_addonClass, _addonName, _addonIcon]; + + _itemsHashMap insert + [ + [ + toLower _class, //Make the key lowercase. Some configs don't use the proper casing (Thanks BI ;P) + [ + getText (_x >> "DisplayName"), + getText (_x >> "Picture"), + _addonClass, + _addonIcon, + _category, + _specificType, + getText (_x >> "descriptionShort") regexReplace ["", "\n"], + _class //Properly cased configname for displaying + ] + ] + ] + } + } +}; + +[TYPES_WHITELIST, _itemsHashMap, _addons] diff --git a/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf b/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf index 46ec4e00..c439f4b6 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf @@ -1,52 +1,60 @@ -/* - Author: R3vo - - Date: 2020-06-14 - - Description: - Used by the ENH_ESE GUI. Used to fill the inventory listbox with set attribute value. - - Parameter(s): - 0: BOOLEAN - Mode. False to load attribute value, true to insert external value - - Returns: - - -*/ - -#include "\x\enh\addons\main\script_component.hpp" -disableSerialization; - -params [["_loadAttribute", true], ["_attributeValue", []]]; - -private _display = uiNamespace getVariable "ENH_Display_ESE"; -private _ctrlInventory = CTRL(IDC_ESE_INVENTORYLIST); - -if (_loadAttribute) then -{ - _attributeValue = (ENH_ESE_target get3DENAttribute "ammoBox") # 0; -}; - -_attributeValue = parseSimpleArray _attributeValue;//Eden saves attributes as string -_attributeValue params ["_inventory", "_isVirtual"]; -_inventory params ["_weapons", "_magazines", "_items", "_backpacks"]; - -private _itemsHashMap = uiNamespace getVariable "ENH_ESE_itemsHashMap"; - -private _fnc_addItems = -{ - params ["_configNamesArray", "_amountsArray"]; - { - private _amount = _amountsArray param [_forEachIndex, 1];//If virtual inventory, then default to amount 1 - (_itemsHashMap get toLower _x) params ["_displayName", "_image", "", "_addonIcon", "", "_specificType", "_descriptionShort", "_configNameCaseSens"]; - [_ctrlInventory, _configNameCaseSens, _displayName, _image, _addonIcon, _amount, _configNameCaseSens + "\n" + _descriptionShort, _specificType] call ENH_fnc_ESE_lnbAdd; - } forEach _configNamesArray; -}; - -call ENH_fnc_ESE_clearInventory; - -_weapons call _fnc_addItems; -_magazines call _fnc_addItems; -_items call _fnc_addItems; -_backpacks call _fnc_addItems; - -[_isVirtual] call ENH_fnc_ESE_toggleVirtual; \ No newline at end of file +/* + Author: R3vo + + Date: 2020-06-14 + + Description: + Used by the ENH_ESE GUI. Used to fill the inventory listbox with set attribute value. + + Parameter(s): + 0: BOOLEAN - Mode. False to load attribute value, true to insert external value + 1: ARRAY - Attribute data to be applied + 2: BOOLEAN - True to get attribute vales from clipboard + + Returns: + - +*/ + +#include "\3denEnhanced\defines\defineCommon.inc" +disableSerialization; + +params [ + ["_loadAttribute", true], + ["_attributeValue", []], + ["_fromClipboard", false, [false]] +]; + +private _display = uiNamespace getVariable "ENH_Display_ESE"; +private _ctrlInventory = CTRL(IDC_ESE_INVENTORYLIST); + +if (_loadAttribute) then +{ + _attributeValue = (ENH_ESE_target get3DENAttribute "ammoBox") # 0 +} else { + if (_fromClipboard) then {_attributeValue = call ENH_fnc_ESE_parseClipboardValues} +}; + +_attributeValue = parseSimpleArray _attributeValue;//Eden saves attributes as string +_attributeValue params ["_inventory", "_isVirtual"]; +_inventory params ["_weapons", "_magazines", "_items", "_backpacks"]; + +private _itemsHashMap = uiNamespace getVariable "ENH_ESE_itemsHashMap"; + +private _fnc_addItems = +{ + params ["_configNamesArray", "_amountsArray"]; + { + private _amount = _amountsArray param [_forEachIndex, 1];//If virtual inventory, then default to amount 1 + (_itemsHashMap get toLower _x) params ["_displayName", "_image", "", "_addonIcon", "", "_specificType", "_descriptionShort", "_configNameCaseSens"]; + [_ctrlInventory, _configNameCaseSens, _displayName, _image, _addonIcon, _amount, _configNameCaseSens + "\n" + _descriptionShort, _specificType] call ENH_fnc_ESE_lnbAdd; + } forEach _configNamesArray; +}; + +call ENH_fnc_ESE_clearInventory; + +_weapons call _fnc_addItems; +_magazines call _fnc_addItems; +_items call _fnc_addItems; +_backpacks call _fnc_addItems; + +[_isVirtual] call ENH_fnc_ESE_toggleVirtual; diff --git a/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf b/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf index 13ca4246..2a035b7b 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf @@ -1,45 +1,49 @@ -/* - Author: Pixelated_Grunt - - Date: 2024-08-20 - - Description: - Used by the ENH_ESE GUI. Read and convert array from clipboard to inventory attributes. - - Parameter(s): - - - - Returns: - ARRAY - Result attributes that can be loaded into the inventory screen. Return all if failed. -*/ - - -#include "\x\enh\addons\main\script_component.hpp" -private _importList = call compile copyFromClipboard; // Is this safe? - -// Verify import list is in correct format -if (isNil "_importList" || {!(_importList isEqualType [])} || {!(_importList isEqualTypeAll "")}) exitWith { - playSound ["3DEN_notificationWarning", true]; - (ENH_ESE_target get3DENAttribute "ammoBox") # 0 -}; - -private _configs = _importList apply { - if (isClass(configFile >> "CfgWeapons" >> _x)) then { - configFile >> "CfgWeapons" >> _x - } else { - if (isClass(configFile >> "CfgMagazines" >> _x)) then { - configFile >> "CfgMagazines" >> _x - } else { - if (isClass(configFile >> "CfgGlasses" >> _x)) then { - configFile >> "CfgGlasses" >> _x - } else { - if (isClass(configFile >> "CfgVehicles" >> _x)) then { - configFile >> "CfgVehicles" >> _x - } - } - } - } -}; - -private _attributeValue = ([_configs] call ENH_fnc_ESE_getConfigValues) select 1; -[true, _attributeValue] call ENH_fnc_ESE_applyAttribute \ No newline at end of file +/* + Author: Pixelated_Grunt + + Date: 2024-08-20 + + Description: + Used by the ENH_ESE GUI. Read and convert array from clipboard to inventory attributes. + + Parameter(s): + - + + Returns: + ARRAY - Result attributes that can be loaded into the inventory screen. Return all if failed. +*/ + + +#include "\3denEnhanced\defines\defineCommon.inc" +private _importList = call compile copyFromClipboard; + +// Verify import list is in correct format +if (isNil "_importList" || {!(_importList isEqualType [])} || {!(_importList isEqualTypeAll "")}) exitWith { + playSound ["3DEN_notificationWarning", true]; + (ENH_ESE_target get3DENAttribute "ammoBox") # 0 +}; + +private _configs = _importList apply { + if (isClass(configFile >> "CfgWeapons" >> _x)) then { + configFile >> "CfgWeapons" >> _x + } else { + if (isClass(configFile >> "CfgMagazines" >> _x)) then { + configFile >> "CfgMagazines" >> _x + } else { + if (isClass(configFile >> "CfgGlasses" >> _x)) then { + configFile >> "CfgGlasses" >> _x + } else { + if (isClass(configFile >> "CfgVehicles" >> _x)) then { + configFile >> "CfgVehicles" >> _x + } + } + } + } +}; + +//private _configValues = ([_configs] call ENH_fnc_ESE_getConfigValues) select 1; +//private _attributeValue = [true, _configValues] call ENH_fnc_ESE_applyAttribute; +// +//_attributeValue +private _attributeValue = ([_configs] call ENH_fnc_ESE_getConfigValues) select 1; +[true, _attributeValue] call ENH_fnc_ESE_applyAttribute diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index c996ecb3..13ebf7f5 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -7043,6 +7043,16 @@ Ordina per Tipo Trier par type + + Import from Clipboard + Aus der Zwischenablage importieren + 從剪貼簿匯入 + 从剪贴板导入 + Importuj ze schowka + Importar desde el portapapeles + Importa dagli appunti + Importer depuis le Presse-papiers + Sort by Mod Nach Modifikation sortieren @@ -10309,4 +10319,4 @@ Condizione calcolata ripetutamente, deve restituire un'espressione booleana. Quando è vera, l'indicatore viene visualizzato. - \ No newline at end of file + From 95eade19059322dc1d7e280c7a1c4433e1b2e2f3 Mon Sep 17 00:00:00 2001 From: Pixelated Grunt Date: Fri, 23 Aug 2024 23:15:01 +1000 Subject: [PATCH 2/3] Fix wrong ID in display string and wrong include files --- addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf | 2 +- addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf | 2 +- addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf | 2 +- addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf | 2 +- addons/main/stringtable.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf b/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf index 723f02db..4b3170e5 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_applyAttribute.sqf @@ -14,7 +14,7 @@ ARRAY, NOTHING: See Parameters */ -#include "\3denEnhanced\defines\defineCommon.inc" +#include "\x\enh\addons\main\script_component.hpp" disableSerialization; params [["_return", false], ["_itemsDetails", []]]; private _display = uiNamespace getVariable "ENH_Display_ESE"; diff --git a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf index ea34941c..d2197afb 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_getConfigValues.sqf @@ -14,7 +14,7 @@ */ -#include "\3denEnhanced\defines\defineCommon.inc" +#include "\x\enh\addons\main\script_component.hpp" #define TYPES_WHITELIST ["AssaultRifle", "MachineGun", "SniperRifle", "Shotgun", "SubmachineGun", "RocketLauncher", "Handgun", "Grenade", "Magazine",\ "Mine", "AccessoryBipod", "AccessoryMuzzle", "AccessoryPointer", "AccessorySights", "Uniform", "Vest", "Backpack", "Headgear", "Glasses", "NVGoggles", "Item", "MissileLauncher"] diff --git a/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf b/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf index c439f4b6..00beb85c 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_loadAttributeValue.sqf @@ -15,7 +15,7 @@ - */ -#include "\3denEnhanced\defines\defineCommon.inc" +#include "\x\enh\addons\main\script_component.hpp" disableSerialization; params [ diff --git a/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf b/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf index 2a035b7b..197ece60 100644 --- a/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf +++ b/addons/main/functions/GUI/ESE/fn_ESE_parseClipboardValues.sqf @@ -14,7 +14,7 @@ */ -#include "\3denEnhanced\defines\defineCommon.inc" +#include "\x\enh\addons\main\script_component.hpp" private _importList = call compile copyFromClipboard; // Verify import list is in correct format diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index 13ebf7f5..a972e606 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -7043,7 +7043,7 @@ Ordina per Tipo Trier par type - + Import from Clipboard Aus der Zwischenablage importieren 從剪貼簿匯入 From bfcbff038311d7a92730cbc46222acb7a4395d35 Mon Sep 17 00:00:00 2001 From: Pixelated Grunt Date: Fri, 23 Aug 2024 23:37:16 +1000 Subject: [PATCH 3/3] Add missing separator --- addons/main/GUI/ESE.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/main/GUI/ESE.hpp b/addons/main/GUI/ESE.hpp index 7a52953f..dcbd9c5a 100644 --- a/addons/main/GUI/ESE.hpp +++ b/addons/main/GUI/ESE.hpp @@ -110,6 +110,7 @@ class ENH_ESE "SortbyCount", "SortbyMod", "SortbyType", + "Separator", "ImportFromClipboard" }; };