diff --git a/CHANGELOG.md b/CHANGELOG.md index 1717a35..c2b4c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Changelog for AIMEE 29.6.2025 + +1.3.8.0 +- Fixed some infantry reloading conditions. + # Changelog for AIMEE 9.2.2025 1.3.7.0 diff --git a/addons/change_ammo/CfgVehicles.hpp b/addons/change_ammo/CfgVehicles.hpp index 50e1ab8..8ba6b0e 100644 --- a/addons/change_ammo/CfgVehicles.hpp +++ b/addons/change_ammo/CfgVehicles.hpp @@ -17,6 +17,7 @@ class CfgVehicles { class GVAR(ammoClass) { condition = QUOTE(GVAR(settingAmmoClass) && {private _weaponState = weaponState _player; _weaponState select 5 <= 0 && {_weaponState select 6 <= 0}} && {!(_player call EFUNC(main,operatingUAV))} && {_player call CBA_fnc_canUseWeapon}); displayName = CQSTRING(STR_usract_reload_magazine); + exceptions[] = {"isNotInside", "isNotSwimming"}; icon = ICON_RELOAD_MAN; insertChildren = QUOTE(_player call FUNC(magazinesUnitMenus)); }; diff --git a/addons/inventory/CfgVehicles.hpp b/addons/inventory/CfgVehicles.hpp index 8c5690f..ca81ad9 100644 --- a/addons/inventory/CfgVehicles.hpp +++ b/addons/inventory/CfgVehicles.hpp @@ -111,7 +111,7 @@ class CfgVehicles { class ACE_MainActions { class GVAR(backpackAction) { - condition = QUOTE(!GVAR(settingBackpackAction) && GVAR(settingOpenAction) && {call ace_interaction_fnc_canOpenBackpack}); + condition = QUOTE(!GVAR(settingBackpackAction) && GVAR(settingOpenAction) && {isNull objectParent _target} && {call ace_interaction_fnc_canOpenBackpack}); displayName = "$STR_ACTION_OPEN_BAG"; exceptions[] = {"isNotSwimming"}; icon = ICON_INVENTORY; diff --git a/addons/inventory/functions/fnc_assemble.sqf b/addons/inventory/functions/fnc_assemble.sqf index 8da78fe..e295295 100644 --- a/addons/inventory/functions/fnc_assemble.sqf +++ b/addons/inventory/functions/fnc_assemble.sqf @@ -15,7 +15,7 @@ * Public: No */ -(_this call FUNC(locateBackpack)) params ["_base", "_weapon", "_weaponHolder", "_baseOnGround"]; +(call FUNC(locateBackpack)) params ["_base", "_weapon", "_weaponHolder", "_baseOnGround"]; // If the base is on the ground, switch it with the weapon on the player's back if (_baseOnGround) then { diff --git a/addons/inventory/functions/fnc_canAssemble.sqf b/addons/inventory/functions/fnc_canAssemble.sqf index 7d93def..b71c247 100644 --- a/addons/inventory/functions/fnc_canAssemble.sqf +++ b/addons/inventory/functions/fnc_canAssemble.sqf @@ -17,6 +17,6 @@ if (isNull (configOf backpackContainer _this >> "assembleInfo")) exitWith {false}; -(_this call FUNC(locateBackpack)) params ["_base", "_weapon"]; +(call FUNC(locateBackpack)) params ["_base", "_weapon"]; !isNull _base && {!isNull _weapon} diff --git a/addons/inventory/stringtable.xml b/addons/inventory/stringtable.xml index a7c8fd1..edd5802 100644 --- a/addons/inventory/stringtable.xml +++ b/addons/inventory/stringtable.xml @@ -1,38 +1,6 @@ - - Disassemble - Rozložit - Démonter - Desmontar - Disassemblare - Złóż - Desmontar - Разобрать - Demontieren - 분해 - 解体する - 拆解 - 拆卸 - Şunu sök - - - Open Backpack - Otevřít: Batoh - Ouvrir Sac à dos - Abre Mochila - Apri Zaino - Otwórz: Plecak - Abrir Mochila - Открыть Рюкзак - Rucksack öffnen - 열기: 군장 - 開ける：バックパック - 開啟 背包 - 打开 背包 - Şunu aç: Sırt çantası - Enable static weapon assembly actions Permission des interactions de montage des armes lourdes @@ -88,16 +56,6 @@ Permission d'ouvrir des inventaires et sac-à-dos Inventar-/Rucksackinteraktion zulassen - - Range of backpack inventory action - Distancer maximale de l'interaction d'ouverture - Reichweite der Inventar-/Rucksackinteraktion - - - Sets the interaction range to opening backpacks and ground inventories. - Fixe la distance maximale de l'interaction d'ouverture des inventaires et des sac-à-dos. - Setzt die maximale Entfernung der Interaktion. - Allows the player to open inventories using the ACE interaction menu. Permet au joueur d'ouvrir des inventaires avec une interaction ACE sur soi-même. diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 51a9c3c..17a8baf 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 7 +#define PATCHLVL 8 #define BUILD 0 diff --git a/addons/vehicle_controls/functions/fnc_canManual.sqf b/addons/vehicle_controls/functions/fnc_canManual.sqf index 41a165e..272231e 100644 --- a/addons/vehicle_controls/functions/fnc_canManual.sqf +++ b/addons/vehicle_controls/functions/fnc_canManual.sqf @@ -25,7 +25,7 @@ if (getNumber (_config >> "enableManualFire") == 0 || {isPlayer gunner _vehicle} }; if (_vehicle isKindOf "Air" || {unitIsUAV _vehicle}) then { - _this call FUNC(isDriver) && {"true" configClasses (_config >> "Turrets") isNotEqualTo []} + call FUNC(isDriver) && {"true" configClasses (_config >> "Turrets") isNotEqualTo []} } else { _unit == commander _vehicle }; diff --git a/addons/vehicle_seats/config.cpp b/addons/vehicle_seats/config.cpp index 55e1064..a68fde6 100644 --- a/addons/vehicle_seats/config.cpp +++ b/addons/vehicle_seats/config.cpp @@ -8,6 +8,7 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "AIMEE_main", + "AIMEE_vehicle_controls", "ace_interaction" }; author = "johnb43"; diff --git a/addons/vehicle_seats/functions/fnc_eject.sqf b/addons/vehicle_seats/functions/fnc_eject.sqf index d63ac00..cff9a46 100644 --- a/addons/vehicle_seats/functions/fnc_eject.sqf +++ b/addons/vehicle_seats/functions/fnc_eject.sqf @@ -18,7 +18,7 @@ params ["_unit", "_vehicle"]; -switch (_this call FUNC(canEject)) do { +switch (call FUNC(canEject)) do { case EJECT_TYPE_JET: { [_vehicle] call BIS_fnc_PlaneEjection; }; @@ -26,7 +26,7 @@ switch (_this call FUNC(canEject)) do { _unit action ["Eject", _vehicle]; }; case EJECT_TYPE_FORCE: { - private _engineOn = _this call EFUNC(vehicle_controls,isDriver) && {isEngineOn _vehicle}; + private _engineOn = call EFUNC(vehicle_controls,isDriver) && {isEngineOn _vehicle}; moveOut _unit;