Merge pull request #19 from johnb432/dev

1.3.8.0

Author: johnb432

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

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));
             };

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;

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 {

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}

addons/inventory/stringtable.xml

@@ -1,38 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="AIMEE">
     <Package name="inventory">
-        <Key ID="STR_AIMEE_inventory_disassemble">
-            <English>Disassemble</English>
-            <Czech>Rozložit</Czech>
-            <French>Démonter</French>
-            <Spanish>Desmontar</Spanish>
-            <Italian>Disassemblare</Italian>
-            <Polish>Złóż</Polish>
-            <Portuguese>Desmontar</Portuguese>
-            <Russian>Разобрать</Russian>
-            <German>Demontieren</German>
-            <Korean>분해</Korean>
-            <Japanese>解体する</Japanese>
-            <Chinese>拆解</Chinese>
-            <Chinesesimp>拆卸</Chinesesimp>
-            <Turkish>Şunu sök</Turkish>
-        </Key>
-        <Key ID="STR_AIMEE_inventory_openBackpack">
-            <English>Open Backpack</English>
-            <Czech>Otevřít: Batoh</Czech>
-            <French>Ouvrir Sac à dos</French>
-            <Spanish>Abre Mochila</Spanish>
-            <Italian>Apri Zaino</Italian>
-            <Polish>Otwórz: Plecak</Polish>
-            <Portuguese>Abrir Mochila</Portuguese>
-            <Russian>Открыть Рюкзак</Russian>
-            <German>Rucksack öffnen</German>
-            <Korean>열기: 군장</Korean>
-            <Japanese>開ける：バックパック</Japanese>
-            <Chinese>開啟 背包</Chinese>
-            <Chinesesimp>打开 背包</Chinesesimp>
-            <Turkish>Şunu aç: Sırt çantası</Turkish>
-        </Key>
         <Key ID="STR_AIMEE_inventory_settingAssembleAction">
             <English>Enable static weapon assembly actions</English>
             <French>Permission des interactions de montage des armes lourdes</French>
@@ -88,16 +56,6 @@
             <French>Permission d'ouvrir des inventaires et sac-à-dos</French>
             <German>Inventar-/Rucksackinteraktion zulassen</German>
         </Key>
-        <Key ID="STR_AIMEE_inventory_settingOpenActionRange">
-            <English>Range of backpack inventory action</English>
-            <French>Distancer maximale de l'interaction d'ouverture</French>
-            <German>Reichweite der Inventar-/Rucksackinteraktion</German>
-        </Key>
-        <Key ID="STR_AIMEE_inventory_settingOpenActionRange_ToolTip">
-            <English>Sets the interaction range to opening backpacks and ground inventories.</English>
-            <French>Fixe la distance maximale de l'interaction d'ouverture des inventaires et des sac-à-dos.</French>
-            <German>Setzt die maximale Entfernung der Interaktion.</German>
-        </Key>
         <Key ID="STR_AIMEE_inventory_settingOpenAction_ToolTip">
             <English>Allows the player to open inventories using the ACE interaction menu.</English>
             <French>Permet au joueur d'ouvrir des inventaires avec une interaction ACE sur soi-même.</French>

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 3
-#define PATCHLVL 7
+#define PATCHLVL 8
 #define BUILD 0

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
 };

addons/vehicle_seats/config.cpp

@@ -8,6 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "AIMEE_main",
+            "AIMEE_vehicle_controls",
             "ace_interaction"
         };
         author = "johnb43";

addons/vehicle_seats/functions/fnc_eject.sqf

@@ -18,15 +18,15 @@
 
 params ["_unit", "_vehicle"];
 
-switch (_this call FUNC(canEject)) do {
+switch (call FUNC(canEject)) do {
     case EJECT_TYPE_JET: {
         [_vehicle] call BIS_fnc_PlaneEjection;
     };
     case EJECT_TYPE_CAR: {
         _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;