diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fb78a9..1717a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Changelog for AIMEE 9.2.2025 + +1.3.7.0 +- Updated to work with ACE 3.19.0. + # Changelog for AIMEE 11.1.2025 1.3.6.0 diff --git a/addons/inventory/CfgVehicles.hpp b/addons/inventory/CfgVehicles.hpp index 48954e1..8c5690f 100644 --- a/addons/inventory/CfgVehicles.hpp +++ b/addons/inventory/CfgVehicles.hpp @@ -105,24 +105,17 @@ class CfgVehicles { class Man; class CAManBase: Man { class ACE_Actions { - class GVAR(backpackAction3D) { - condition = QUOTE(GVAR(settingBackpackAction) && GVAR(settingOpenAction) && {isNull objectParent _target} && {!isNull unitBackpack _target} && {(unitBackpack _target) call FUNC(hasInventory)}); - displayName = DEFAULT_TEXT; - distance = DISTANCE_INTERACTION_BACKPACK_3D; - exceptions[] = {"isNotSwimming"}; - icon = ICON_INVENTORY; - position = QUOTE(_target call FUNC(backpackPos)); - modifierFunction = QUOTE((_this select 3) set [ARR_2(1,FORMAT_1(localize 'STR_ACTION_OPEN_BAG',localize 'STR_BACKPACK_CONTAINER_NAME'))]); - statement = QPACTION('OpenBag',_target); + class ACE_OpenBackpack { + condition = QUOTE(GVAR(settingBackpackAction) && {call ace_interaction_fnc_canOpenBackpack}); }; class ACE_MainActions { class GVAR(backpackAction) { - condition = QUOTE(!GVAR(settingBackpackAction) && GVAR(settingOpenAction) && {isNull objectParent _target} && {!isNull unitBackpack _target} && {(unitBackpack _target) call FUNC(hasInventory)}); - displayName = DEFAULT_TEXT; + condition = QUOTE(!GVAR(settingBackpackAction) && GVAR(settingOpenAction) && {call ace_interaction_fnc_canOpenBackpack}); + displayName = "$STR_ACTION_OPEN_BAG"; exceptions[] = {"isNotSwimming"}; icon = ICON_INVENTORY; - modifierFunction = QUOTE((_this select 3) set [ARR_2(1,FORMAT_1(localize 'STR_ACTION_OPEN_BAG',localize 'STR_BACKPACK_CONTAINER_NAME'))]); + modifierFunction = QUOTE(call ace_interaction_fnc_modifyOpenBackpackAction); statement = QPACTION('OpenBag',_target); }; }; diff --git a/addons/inventory/XEH_preInit.sqf b/addons/inventory/XEH_preInit.sqf index 5cc9a79..d125f51 100644 --- a/addons/inventory/XEH_preInit.sqf +++ b/addons/inventory/XEH_preInit.sqf @@ -12,4 +12,10 @@ SETTING(settingAssembleAction,"CHECKBOX",true); SETTING(settingAssembleUavAction,"CHECKBOX",true); SETTING(settingExplosivesAction,"CHECKBOX",true); +// Get all mines/explosives if ACE explosives and ACE arsenal aren't loaded +// https://github.com/acemod/ACE3/pull/10660#issuecomment-2599466880 +if (uiNamespace isNil "ace_arsenal_putCache" && {!("ace_explosives" call ace_common_fnc_isModLoaded)}) then { + uiNamespace setVariable ["ace_arsenal_putCache", (compatibleMagazines "Put") createHashMapFromArray []]; +}; + ADDON = true; diff --git a/addons/inventory/functions/fnc_explosiveMenus.sqf b/addons/inventory/functions/fnc_explosiveMenus.sqf index 77ca2a8..735634d 100644 --- a/addons/inventory/functions/fnc_explosiveMenus.sqf +++ b/addons/inventory/functions/fnc_explosiveMenus.sqf @@ -15,7 +15,6 @@ * Public: No */ - // Returns case correct magazines private _magazines = (magazines [_this, false]) call CBA_fnc_getArrayElements; diff --git a/addons/main/CfgVersioning.hpp b/addons/main/CfgVersioning.hpp index d84cb87..0c73b62 100644 --- a/addons/main/CfgVersioning.hpp +++ b/addons/main/CfgVersioning.hpp @@ -3,7 +3,7 @@ class CfgSettings { class Versioning { class PREFIX { class Dependencies { - ACE[] = {"ace_main", {3, 16, 0}, "true"}; + ACE[] = {"ace_main", {3, 19, 0}, "true"}; CBA[] = {"cba_main", {3, 16, 0}, "true"}; }; }; diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index bc86f99..1b5490a 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -32,7 +32,6 @@ #define QPACTION(var1,var2) QUOTE(PACTION(var1,var2)) #define DEFAULT_TEXT "Standby..." -#define DISTANCE_INTERACTION_BACKPACK_3D 3 #define DISTANCE_INTERACTION_WEAPONHOLDER 4 #define GEAR_ERROR 0 @@ -102,11 +101,11 @@ #define ICON_GEAR "\A3\ui_f\data\igui\cfg\vehicletoggles\landinggeariconon_ca.paa" -#define ICON_LIGHTS_ON "A3\ui_f\data\igui\cfg\actions\ico_cpt_land_ON_ca" -#define ICON_LIGHTS_OFF "A3\ui_f\data\igui\cfg\actions\ico_cpt_land_OFF_ca" +#define ICON_LIGHTS_ON "A3\ui_f\data\igui\cfg\actions\ico_cpt_land_ON_ca.paa" +#define ICON_LIGHTS_OFF "A3\ui_f\data\igui\cfg\actions\ico_cpt_land_OFF_ca.paa" -#define ICON_COLLISION_LIGHTS_ON "A3\ui_f\data\igui\cfg\actions\ico_cpt_col_ON_ca" -#define ICON_COLLISION_LIGHTS_OFF "A3\ui_f\data\igui\cfg\actions\ico_cpt_col_OFF_ca" +#define ICON_COLLISION_LIGHTS_ON "A3\ui_f\data\igui\cfg\actions\ico_cpt_col_ON_ca.paa" +#define ICON_COLLISION_LIGHTS_OFF "A3\ui_f\data\igui\cfg\actions\ico_cpt_col_OFF_ca.paa" #define ICON_HOVER "\A3\ui_f\data\igui\cfg\actions\autohover_ca.paa" #define ICON_HOVER_CANCEL "\A3\ui_f\data\igui\cfg\actions\cancelhover_ca.paa" diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 6f61d0a..51a9c3c 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 3 -#define PATCHLVL 6 +#define PATCHLVL 7 #define BUILD 0