Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
17 changes: 5 additions & 12 deletions addons/inventory/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
};
Expand Down
6 changes: 6 additions & 0 deletions addons/inventory/XEH_preInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
1 change: 0 additions & 1 deletion addons/inventory/functions/fnc_explosiveMenus.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
* Public: No
*/


// Returns case correct magazines
private _magazines = (magazines [_this, false]) call CBA_fnc_getArrayElements;

Expand Down
2 changes: 1 addition & 1 deletion addons/main/CfgVersioning.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"};
};
};
Expand Down
9 changes: 4 additions & 5 deletions addons/main/script_macros.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion addons/main/script_version.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define MAJOR 1
#define MINOR 3
#define PATCHLVL 6
#define PATCHLVL 7
#define BUILD 0