Merge branch 'master' into c4996

2024-08-30 18:23:18 +00:00 · 2016-04-08 07:33:21 -05:00 · 2016-04-08 07:33:21 -05:00 · 2f6b932511
commit 2f6b932511
parent f0f7f14093 f6567841a2
962 changed files with 13336 additions and 7158 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -0,0 +1,29 @@
+# Reporting an issue
+
+## Before reporting
+
+If you have found an issue with ACE3 please make sure that ACE3 really is the cause of the problem. To do this try to reproduce the issue with using only `@CBA_A3` and `@ace` on a newly created mission.
+
+Indicate if the issue appears on stable or development version. In case it is the development version, please also include the commit SHA-1 hash.
+
+**Please note:**
+- It's not a valid to simply remove <code>@ace</code> from the mod list to confirm that ACE3 is the culprit.
+- If the error happens when using a <b>third-party mod</b> contact the author of the appropriate mod and report the issue there.
+
+## Reporting the issue
+
+Head over to the [ACE3 GitHub issue tracker](https://github.com/acemod/ACE3/issues) and press the [New issue](https://github.com/acemod/ACE3/issues/new) button in the top right corner. Add a descriptive title and complete the issue template.
+
+A video of the issue might be helpful in resolving it faster.
+
+# Feature Requests
+
+## Background
+ACE2, AGM and CSE had a lot of features implemented or planned. All of them are or have been evaluated for inclusion in ACE3 itself, and we'd like to port the majority of them eventually. However, due to time constraints, we have managed to finish only a fraction of the job so far.
+
+Please refrain from making requests for any planned or existing features from either ACE2, AGM or CSE. Most of them are already being or have been considered for porting or a rewrite.
+
+## Requesting a feature
+In order to avoid duplicates and keep the issue tracker organized, we have created a common issue for [ACE3 Feature requests](https://github.com/acemod/ACE3/issues/3594). Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier.
+
+Following their approval, feature requests may be moved by moderators to a separate issue for further discussion.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -0,0 +1,23 @@
+**Arma 3 Version:** `x.xx` (stable / rc / dev)
+**CBA Version:** `2.x.x` (stable / dev + commit hash)
+**ACE3 Version:** `3.x.x` (stable / dev + commit hash)
+
+**Mods:**
+- `@CBA_A3`
+- `@ace`
+
+**Description:**
+- Add a detailed description of the error. This makes it easier for us to fix the issue.
+
+**Steps to reproduce:**
+- Add the steps needed to reproduce the issue.
+
+**Where did the issue occur?**
+- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal
+
+**Placed Modules:**
+- Add the list of modules you have placed on the map. Use 'None' if the error occurs without any modules.
+
+**RPT log file:**
+- Add a link ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3).
+- If possible at the time the bug is encountered, go to ACE Options and select "Debug To Clipboard", this will print extensive debug information to the RPT file.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,4 @@
+**When merged this pull request will:**
+- Describe what this pull request will do
+- Each change in a separate line
+- Respect the [Development Guidelines](http://ace3mod.com/wiki/development/)
--- a/.travis.yml
+++ b/.travis.yml
@ -12,6 +12,7 @@ before_script:
  fi
 script:
 - python3 tools/sqf_validator.py
+- python3 tools/config_style_checker.py
 - if [ -n "${GH_TOKEN}" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
    python3 tools/deploy.py;
  fi
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@ -14,7 +14,8 @@ Garth "L-H" de Wet <garthofhearts@gmail.com>
 Giallustio
 Glowbal
 Janus
-jokoho482 <jokoho482@gmail.com>`
+jokoho482 <jokoho482@gmail.com>
+Jonpas <jonpas33@gmail.com>
 Kieran
 NouberNou
 PabstMirror <pabstmirror@gmail.com>
@ -39,6 +40,7 @@ Alganthe <alganthe@live.fr>
 Anthariel <Contact@storm-simulation.com>
 Arkhir <wonsz666@gmail.com >
 Asgar Serran <piechottaf@web.de>
+BaerMitUmlaut
 Bamse <bamsis@gmail.com>
 Bla1337
 BlackPixxel <blackpixxel96@gmail.com>
@ -63,6 +65,7 @@ F3 Project <alanr@ferstaberinde.com>
 Falke75
 Ferenczi
 Ferenzi
+FFAAMOD <modffaa@gmail.com>
 Filip Basara <filip.basara93@googlemail.com>
 fr89k <kaschitoku@web.de>
 FreeZbe <freeseb@gmail.com>
@ -72,13 +75,13 @@ Gianmarco Varriale (TeamNuke) <admin@forhost.org>
 GieNkoV <gienkov.grzegorz@gmail.com>
 GitHawk <githawk@gmx.net>
 gpgpgpgp
+Grey-Soldierman <gungamer101@hotmail.com>
 Grzegorz
 Hamburger SV
 Harakhti <shadowdragonphd@gmail.com>
 havena <silveredenis@gmail.com>
 Hawkins
 Head <brobergsebastian@gmail.com>
-Jonpas <jonpas33@gmail.com>
 Karneck <dschultz26@hotmail.com>
 Kavinsky <nmunozfernandez@gmail.com>
 Kllrt <kllrtik@gmail.com>
@ -118,4 +121,3 @@ voiper
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Winter <simon@agius-muscat.net>
 zGuba
-Grey-Soldierman <gungamer101@hotmail.com>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,64 +0,0 @@
-# Reporting an issue
-
-## Before reporting
-
-If you have found an issue with ACE3 please make sure that ACE3 is really the cause of the problem. To do this try to reproduce the issue with using only `@CBA_A3` and `@ace` on a newly created mission.
-
-Indicate if the issue appears on stable or development version. In case it is the development version, please also include the commit SHA-1 hash.
-
-<div class="panel callout">
-    <h5>Please note:</h5>
-    <p>It's not a valid to simply remove <code>@ace</code> from the mod list to confirm that ACE3 is the culprit.</p>
-    <p>If the error happens when using a <b>third-party mod</b> contact the author of the appropriate mod and report the issue there.</p>
-</div>
-
-## Reporting the issue
-
-Head over to the [ACE3 GitHub issue tracker](https://github.com/acemod/ACE3/issues) and press the [New issue](https://github.com/acemod/ACE3/issues/new) button in the top right corner. Add a descriptive title and copy the following issue template in to the text area:
-
-```
-ACE3 Version: 3.x.x
-(indicate if stable or dev, if dev indicate the commit the version is based on)
-
-**Mods:**
-* `@CBA_A3`
-* `@ace`
-
-**Placed ACE3 Modules:**
-* *Add the list of modules you have placed on the map. Use 'None' if the error occurs without using any modules.*
-* You can also press the `Debug to` button in the ACE3 option menu (escape -> ACE3 options -> Debug to) and add a link (pastebin.com) to the results.
-
-**Description:**
-* Add a detailed description of the error. This makes it easier for us to fix the issue.*
-
-**Steps to reproduce:**
-* *Add the steps needed to reproduce the issue.*
-
-**Where did the issue occur?**
-* A possible answer might be "Multiplayer", "Editor" or "Singleplayer"*
-
-**RPT log file:**
-* Add a link (pastebin.com) to the client or server RPT file.*
-```
-
-A video of the issue might be helpful in resolving it faster.
-
-GitHub uses [Markdown](http://daringfireball.net/projects/markdown/syntax) to style the output. If you want to know more about it (e.g. how to [turn text bold](https://help.github.com/articles/markdown-basics/#styling-text), how to denote [code blocks](https://help.github.com/articles/markdown-basics/#inline-formats) or [inline code](https://help.github.com/articles/markdown-basics/#multiple-lines)) have a look at the [GitHub Markdown Documentation](https://help.github.com/articles/github-flavored-markdown).
-
-
-# Feature Requests
-
-## Background
-ACE2, AGM and CSE had a lot of features implemented or planned. All of them are or have been evaluated for inclusion in ACE3 itself, and we'd like to port the majority of them eventually. However, due to time constraints, we have managed to finish only a fraction of the job so far.
-
-Please refrain from making requests for any planned or existing features from either ACE2, AGM or CSE. Most of them are already being or have been considered for porting or a rewrite.
-
-## Requesting a feature
-In order to avoid duplicates and keep the issue tracker organized, we have created a common issue for [ACE3 Feature requests](https://github.com/acemod/ACE3/issues/414). Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier.
-
-Following their approval, feature requests may be moved by moderators to a separate issue for further discussion.
-
-# Regarding Pull Requests (PRs)
- You want to help but don't know where to start? Check the wiki entry for [setting up the development environment](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html)
- [Make sure to respect the file structure](http://ace3mod.com/wiki/development/modularity-and-pbo-structure.html)
- [Make sure to respect the coding guidelines](http://ace3mod.com/wiki/development/coding-guidelines.html)
--- a/README.md
+++ b/README.md
@ -4,10 +4,7 @@

 <p align="center">
    <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.4.2-blue.svg?style=flat-square" alt="ACE3 Version">
-    </a>
-    <a href="https://github.com/acemod/ACE3/releases/download/v3.4.2/ace3_3.4.2.zip">
-        <img src="https://img.shields.io/badge/Download-72.6_MB-green.svg?style=flat-square" alt="ACE3 Download">
+        <img src="https://img.shields.io/badge/Version-3.5.1-blue.svg?style=flat-square" alt="ACE3 Version">
    </a>
    <a href="https://github.com/acemod/ACE3/issues">
        <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">
@ -64,7 +61,6 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
 - Magazine repacking
 - Realistic weapon overheating mechanic
 - Combat deafness (temporary loss of hearing) simulation
- Improved ragdoll physics
 - Improved interactions for AARs and ammo bearers
 - Adjustable sniper scopes
 - No idle animation with lowered weapon
--- a/ace_advanced_ballistics.dll
+++ b/ace_advanced_ballistics.dll
--- a/ace_break_line.dll
+++ b/ace_break_line.dll
--- a/ace_clipboard.dll
+++ b/ace_clipboard.dll
--- a/ace_fcs.dll
+++ b/ace_fcs.dll
--- a/ace_medical.dll
+++ b/ace_medical.dll
--- a/ace_parse_imagepath.dll
+++ b/ace_parse_imagepath.dll
--- a/addons/advanced_ballistics/ACE_Settings.hpp
+++ b/addons/advanced_ballistics/ACE_Settings.hpp
@ -1,29 +1,34 @@
 class ACE_Settings {
    class GVAR(enabled) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(enabled_DisplayName);
        description = CSTRING(enabled_Description);
        typeName = "BOOL";
        value = 0;
    };
    class GVAR(simulateForSnipers) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(simulateForSnipers_DisplayName);
        description = CSTRING(simulateForSnipers_Description);
        typeName = "BOOL";
        value = 1;
    };
    class GVAR(simulateForGroupMembers) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(simulateForGroupMembers_DisplayName);
        description = CSTRING(simulateForGroupMembers_Description);
        typeName = "BOOL";
        value = 0;
    };
    class GVAR(simulateForEveryone) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(simulateForEveryone_DisplayName);
        description = CSTRING(simulateForEveryone_Description);
        typeName = "BOOL";
        value = 0;
    };
    class GVAR(disabledInFullAutoMode) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(disabledInFullAutoMod_DisplayName);
        description = CSTRING(disabledInFullAutoMod_Description);
        typeName = "BOOL";
@ -31,6 +36,7 @@ class ACE_Settings {
    };
    /* // TODO: We currently do not have firedEHs on vehicles
    class GVAR(vehicleGunnerEnabled) {
+        category = CSTRING(DisplayName);
        displayName = "Enabled For Vehicle Gunners";
        description = "Enables advanced ballistics for vehicle gunners";
        typeName = "BOOL";
@ -38,30 +44,35 @@ class ACE_Settings {
    };
    */
    class GVAR(ammoTemperatureEnabled) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(ammoTemperatureEnabled_DisplayName);
        description = CSTRING(ammoTemperatureEnabled_Description);
        typeName = "BOOL";
        value = 1;
    };
    class GVAR(barrelLengthInfluenceEnabled) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(barrelLengthInfluenceEnabled_DisplayName);
        description = CSTRING(barrelLengthInfluenceEnabled_Description);
        typeName = "BOOL";
        value = 1;
    };
    class GVAR(bulletTraceEnabled) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(bulletTraceEnabled_DisplayName);
        description = CSTRING(bulletTraceEnabled_Description);
        typeName = "BOOL";
        value = 1;
    };
    class GVAR(simulationInterval) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(simulationInterval_DisplayName);
        description = CSTRING(simulationInterval_Description);
        typeName = "SCALAR";
        value = 0.0;
    };
    class GVAR(simulationRadius) {
+        category = CSTRING(DisplayName);
        displayName = CSTRING(simulationRadius_DisplayName);
        description = CSTRING(simulationRadius_Description);
        typeName = "SCALAR";
--- a/addons/advanced_ballistics/CfgEventHandlers.hpp
+++ b/addons/advanced_ballistics/CfgEventHandlers.hpp
@ -1,3 +1,10 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE( call COMPILE_FILE(XEH_preInit) );
--- a/addons/advanced_ballistics/XEH_PREP.hpp
+++ b/addons/advanced_ballistics/XEH_PREP.hpp
@ -0,0 +1,14 @@
+
+PREP(calculateAmmoTemperatureVelocityShift);
+PREP(calculateAtmosphericCorrection);
+PREP(calculateBarrelLengthVelocityShift);
+PREP(calculateRetardation);
+PREP(calculateStabilityFactor);
+PREP(diagnoseWeapons);
+PREP(displayProtractor);
+PREP(handleFired);
+PREP(initializeTerrainExtension);
+PREP(initModuleSettings);
+PREP(readAmmoDataFromConfig);
+PREP(readWeaponDataFromConfig);
+PREP(handleFirePFH);
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@ -21,7 +21,6 @@ if (!GVAR(extensionAvailable)) exitWith {
    };
 };
 */
-[] call FUNC(initializeTerrainExtension);

 if (!hasInterface) exitWith {};

@ -29,10 +28,30 @@ if (!hasInterface) exitWith {};
    //If not enabled, dont't add PFEH
    if (!GVAR(enabled)) exitWith {};

+    //Run the terrain processor
+    [] call FUNC(initializeTerrainExtension);
+
    // Register fire event handler
    ["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
    ["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler);

-    [] call FUNC(updateTrajectoryPFH);
-
+    //Add warnings for missing compat PBOs (only if AB is on)
+    {
+        _x params ["_modPBO", "_compatPBO"];
+        if ((isClass (configFile >> "CfgPatches" >> _modPBO)) && {!isClass (configFile >> "CfgPatches" >> _compatPBO)}) then {
+            ACE_LOGWARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
+        };
+    } forEach [
+        ["RH_acc","ace_compat_rh_acc"],
+        ["RH_de_cfg","ace_compat_rh_de"],
+        ["RH_m4_cfg","ace_compat_rh_m4"],
+        ["RH_PDW","ace_compat_rh_pdw"],
+        ["RKSL_PMII","ace_compat_rksl_pm_ii"],
+        ["iansky_opt","ace_compat_sma3_iansky"],
+        ["R3F_Armes","ace_compat_r3f"]
+    ];
 }] call EFUNC(common,addEventHandler);
+
+#ifdef DEBUG_MODE_FULL
+    call FUNC(diagnoseWeapons);
+#endif
--- a/addons/advanced_ballistics/XEH_preInit.sqf
+++ b/addons/advanced_ballistics/XEH_preInit.sqf
@ -2,16 +2,6 @@

 ADDON = false;

-PREP(calculateAmmoTemperatureVelocityShift);
-PREP(calculateAtmosphericCorrection);
-PREP(calculateBarrelLengthVelocityShift);
-PREP(calculateRetardation);
-PREP(calculateStabilityFactor);
-PREP(displayProtractor);
-PREP(handleFired);
-PREP(initializeTerrainExtension);
-PREP(initModuleSettings);
-PREP(readAmmoDataFromConfig);
-PREP(readWeaponDataFromConfig);
-PREP(handleFirePFH);
+#include "XEH_PREP.hpp"
+
 ADDON = true;
--- a/addons/advanced_ballistics/XEH_preStart.sqf
+++ b/addons/advanced_ballistics/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
@ -22,6 +22,7 @@ private ["_muzzleVelocityTableCount", "_barrelLengthTableCount", "_lowerDataInde
    "_upperDataIndex", "_lowerBarrelLength", "_upperBarrelLength", "_lowerMuzzleVelocity",
    "_upperMuzzleVelocity", "_interpolationRatio"];
 params ["_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity"];
+TRACE_4("params",_barrelLength,_muzzleVelocityTable,_barrelLengthTable,_muzzleVelocity);

 // If barrel length is not defined, then there is no point in calculating muzzle velocity
 if (_barrelLength == 0) exitWith { 0 };
--- a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
+++ b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
@ -0,0 +1,59 @@
+/*
+ * Author: esteldunedain
+ *
+ * This function diagnoses all primary weapons to find cases in which the initial
+ * velocity of shots with and without AB significantly mismatch
+ *
+ * Arguments:
+ * None. Parameters inherited from EFUNC(common,firedEH)
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+#define DEBUG_MODE_FULL
+#include "script_component.hpp"
+
+private _cfgWeapons = configFile >> "CfgWeapons";
+for "_i" from 0 to (count _cfgWeapons)-1 do {
+    private _weaponConfig = _cfgWeapons select _i;
+    if (isClass _weaponConfig) then {
+        private _weapon = configName _weaponConfig;
+        private _weaponType = getNumber (_weaponConfig >> "Type");
+        if (_weaponType == 1) then {
+            // The weapon is a primary weapon
+
+            private _weaponInitSpeed = getNumber (_weaponConfig >> "initSpeed");
+            private _magazines = getArray (_weaponConfig >> "magazines");
+            {
+                private _magazine = _x;
+                private _magazineInitSpeed = getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
+                private _ammo = getText (configFile >> "CfgMagazines" >> _magazine >> "ammo");
+
+                // Vanilla initial speed --------------------------
+                private _vanillaInitialSpeed = _magazineInitSpeed;
+                if (_weaponInitSpeed > 0) then {
+                    _vanillaInitialSpeed = _weaponInitSpeed;
+                } else {
+                    if (_weaponInitSpeed < 0) then {
+                        _vanillaInitialSpeed = _vanillaInitialSpeed * (-_weaponInitSpeed);
+                    };
+                };
+                // --------------------------------------------------
+
+                // AB initial speed --------------------------------
+                // Get Weapon and Ammo Configurations
+                private _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
+                private _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
+                _AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable"];
+                _WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];
+
+                private _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _vanillaInitialSpeed] call FUNC(calculateBarrelLengthVelocityShift);
+                private _abInitialSpeed = _vanillaInitialSpeed + _barrelVelocityShift;
+                // --------------------------------------------------
+                diag_log text format ["ABDiagnose,%1,%2,%3,%4,%5,%6,%7",_weapon,_magazine,_ammo,_magazineInitSpeed,_weaponInitSpeed,_vanillaInitialSpeed,_abInitialSpeed];
+            } forEach _magazines;
+        };
+    };
+};
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@ -47,7 +47,7 @@ GVAR(Protractor) = true;
    __ctrl1 ctrlSetTextColor [1, 1, 1, 1];

    __ctrl2 ctrlSetScale 1;
-    __ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY + 0.001 - 0.0012 * (-58 max (asin((ACE_player weaponDirection currentWeapon ACE_player) select 2)) min 58), 0.2, 0.2 * 4/3];
+    __ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
    __ctrl2 ctrlCommit 0;
    __ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
    __ctrl2 ctrlSetTextColor [1, 1, 1, 1];
--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@ -24,7 +24,7 @@ _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
    #ifdef DEBUG_MODE_FULL
        systemChat "AdvancedBallistics: Terrain already initialized";
-    #endIf
+    #endif
 };

 _mapGrids = ceil(_mapSize / 50) + 1;
--- a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
@ -24,6 +24,7 @@
 */
 #include "script_component.hpp"

+TRACE_1("Reading Ammo Config",_this);
 private ["_ammo", "_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_result"];
 _ammoConfig = configFile >> "CfgAmmo" >> _this;

@ -49,6 +50,42 @@ _ammoTempMuzzleVelocityShifts = getArray(_ammoConfig >> "ACE_ammoTempMuzzleVeloc
 _muzzleVelocityTable = getArray(_ammoConfig >> "ACE_muzzleVelocities");
 _barrelLengthTable = getArray(_ammoConfig >> "ACE_barrelLengths");

+//Handle subsonic ammo that would have a huge muzzle velocity shift (when ballistic configs not explicitly defined)
+private _typicalSpeed = getNumber (_ammoConfig >> "typicalSpeed");
+if ((_typicalSpeed > 0) && {_typicalSpeed < 360}) then {
+    private _inheritedBarrelConfig = (!(_muzzleVelocityTable isEqualTo [])) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isEqualTo []};
+    private _inheritedTempConfig = (!(_ammoTempMuzzleVelocityShifts isEqualTo [])) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isEqualTo []};
+    TRACE_3("subsonic",_typicalSpeed,_inheritedBarrelConfig,_inheritedTempConfig);
+    if (_inheritedBarrelConfig || _inheritedTempConfig) then {
+        private _parentConfig = inheritsFrom _ammoConfig;
+        private _parentSpeed = getNumber (_parentConfig >> "typicalSpeed");
+        ACE_LOGWARNING_4("Subsonic Ammo %1 (%2 m/s) missing `ACE_muzzleVelocities` or `ACE_ammoTempMuzzleVelocityShifts` configs, attempting to use parent %3 (%4m/s)",_this,_typicalSpeed,configName _parentConfig, _parentSpeed);
+        if (_parentSpeed <= 0) exitWith {//Handle weird or null parent
+            _muzzleVelocityTable = [];
+            _ammoTempMuzzleVelocityShifts = [];
+        };
+        private _linearMuliplier = _typicalSpeed / _parentSpeed;
+        if (_inheritedBarrelConfig) then {
+            if (!((configProperties [_parentConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isEqualTo [])) then {
+                TRACE_2("Parent Has Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
+                { _muzzleVelocityTable set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _muzzleVelocityTable;
+            } else {
+                TRACE_2("Parent DOES NOT Have Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
+                _muzzleVelocityTable = [];
+            };
+        };
+        if (_inheritedTempConfig) then {
+            if (!((configProperties [_parentConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isEqualTo [])) then {
+                TRACE_2("Parent Has Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
+                { _ammoTempMuzzleVelocityShifts set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _ammoTempMuzzleVelocityShifts;
+            } else {
+                TRACE_2("Parent DOES NOT Have Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
+                _ammoTempMuzzleVelocityShifts = [];
+            };
+        };
+    };
+};
+
 _result = [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable];

 uiNamespace setVariable [format[QGVAR(%1), _this], _result];
--- a/addons/advanced_ballistics/stringtable.xml
+++ b/addons/advanced_ballistics/stringtable.xml
@ -35,6 +35,7 @@
            <French>Balistique avancée</French>
            <Hungarian>Fejlett ballisztika</Hungarian>
            <Russian>Продвинутая баллистика</Russian>
+            <Italian>Balistica Avanzata</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_enabled_DisplayName">
            <English>Advanced Ballistics</English>
@ -46,6 +47,7 @@
            <French>Balistique avancée</French>
            <Hungarian>Fejlett ballisztika</Hungarian>
            <Russian>Продвинутая баллистика</Russian>
+            <Italian>Balistica Avanzata</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_enabled_Description">
            <English>Enables advanced ballistics</English>
@ -57,6 +59,7 @@
            <French>Activer la balistique avancée</French>
            <Hungarian>Engedélyezi a fejlett ballisztikát</Hungarian>
            <Russian>Включает продвинутую баллистику</Russian>
+            <Italian>Abilita Balistica Avanzata</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_DisplayName">
            <English>Enabled For Snipers</English>
@ -68,6 +71,7 @@
            <French>Activer pour les snipers</French>
            <Hungarian>Mesterlövészeknek engedélyezve</Hungarian>
            <Russian>Включена для снайперов</Russian>
+            <Italian>Abilita per Tiratori Scelti</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_Description">
            <English>Enables advanced ballistics for non local snipers (when using high power optics)</English>
@ -79,6 +83,7 @@
            <French>Active la balistique avancée pour les snipers non locaux (en utilisant les optiques avancées)</French>
            <Hungarian>Engedélyezi a fejlett ballisztikát nem-helyi mesterlövészeknek (nagy-teljesítményű optika használatakor)</Hungarian>
            <Russian>Включает продвинутую баллистику для нелокальных снайперов (при использовании мощной оптики)</Russian>
+            <Italian>Abilita Balistica Avanzata per Tiratori Scelti non locali (con ottiche ad alto potenziale)</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_DisplayName">
            <English>Enabled For Group Members</English>
@ -87,9 +92,10 @@
            <German>Für Gruppenmitglieder aktiviert</German>
            <Czech>Povoleno pro členy skupiny</Czech>
            <Portuguese>Ativada para membros do grupo</Portuguese>
-            <French>Activer pour les membres groupés</French>
+            <French>Activer pour les membres du groupe</French>
            <Hungarian>Csoporttagoknak engedélyezve</Hungarian>
            <Russian>Включена для группы</Russian>
+            <Italian>Abilita per Membri del Gruppo</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_Description">
            <English>Enables advanced ballistics for non local group members</English>
@ -98,9 +104,10 @@
            <German>Aktiviert die erweiterte Ballistik für nicht lokale Gruppenmitglieder</German>
            <Czech>Aktivuje pokročilou balistiku pro nelokální členy skupiny</Czech>
            <Portuguese>Ativa balística avançada para membros de grupo não locais</Portuguese>
-            <French>Active la balistique avancée pour les membres groupés non locaux</French>
+            <French>Active la balistique avancée pour les membres du groupe non locaux</French>
            <Hungarian>Engedélyezi a fejlett ballisztikát nem-helyi csoporttagoknak</Hungarian>
            <Russian>Включает продвинутую баллистику для нелокальных членов группы</Russian>
+            <Italian>Abilita Balistica Avanzata per Membri non locali del Gruppo</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_DisplayName">
            <English>Enabled For Everyone</English>
@ -112,6 +119,7 @@
            <French>Activer pour tout le monde</French>
            <Hungarian>Mindenkinek engedélyezve</Hungarian>
            <Russian>Включена для всех</Russian>
+            <Italian>Abilita per tutti</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_Description">
            <English>Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)</English>
@ -120,9 +128,10 @@
            <German>Aktiviert die erweiterte Ballistik für alle nicht lokalen Spieler (das Aktivieren dieser Funktion kann zur Beeinträchtigung des Spielerlebnisses im Multiplayer führen)</German>
            <Czech>Aktivuje pokročilou balistiku pro všechny nelokální hráče (aktivace této možnosti způsobuje pokles FPS během velké přestřelky v multiplayeru)</Czech>
            <Portuguese>Ativa balística avançada para todos os jogadores não locais (ativando isso pode degradar a performance durante troca de tiros intensas no multiplayer)</Portuguese>
-            <French>Active la balistique avancé pour tous les joueurs non locaux (activer cette option peut avoir un impact sur les performance en multi durant les grands échanges de tirs)</French>
+            <French>Active la balistique avancée pour tous les joueurs non locaux (activer cette option peut avoir un impact sur les performance en multi durant les grands échanges de tirs)</French>
            <Hungarian>Engedélyezi a fejlett ballisztikát az összes nem-helyi játékosnak (ez a funkció leronthatja a teljesítményt intenzív többjátékos tűzharcok alatt)</Hungarian>
            <Russian>Включает продвинутую баллистику для всех нелокальных игроков (включение этой опции может снизить производительность при массовых перестрелках в мультиплеере)</Russian>
+            <Italian>Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe degradare le prestazioni durante scontri intensi in multiplayer)</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_DisplayName">
            <English>Always Enabled For Group Members</English>
@ -131,9 +140,10 @@
            <German>Für Gruppenmitglieder immer aktiviert</German>
            <Czech>Vždy povoleno pro členy skupiny</Czech>
            <Portuguese>Sempre ativada para membros do grupo</Portuguese>
-            <French>Toujours activer pour les membres groupés</French>
+            <French>Toujours activer pour les membres du groupe</French>
            <Hungarian>Mindig engedélyezve csoporttagoknak</Hungarian>
            <Russian>Всегда включена для членов группы</Russian>
+            <Italian>Sempre abilitato per Membri del Gruppo</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_Description">
            <English>Always enables advanced ballistics when a group member fires</English>
@ -145,6 +155,7 @@
            <French>Active tout le temps la balistique avancée quand un membre du groupe ouvre le feu</French>
            <Hungarian>Mindig engedélyezi a fejlett ballisztikát, ha egy csoporttag tüzel</Hungarian>
            <Russian>Всегда включает продвинутую баллистику когда стреляет член группы</Russian>
+            <Italian>Abilita sempre Balistica Avanzata quando un Membro del Gruppo spara</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_DisplayName">
            <English>Disabled In FullAuto Mode</English>
@ -156,6 +167,7 @@
            <French>Désactiver en mode rafale libre</French>
            <Hungarian>Automata módban letiltva</Hungarian>
            <Russian>Выкл. для автомат. режима</Russian>
+            <Italian>Disabilita in modalità di fuoco automatico</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_Description">
            <English>Disables the advanced ballistics during full auto fire</English>
@ -167,6 +179,7 @@
            <French>Désactive la balistique avancée pour les tirs en rafale libre</French>
            <Hungarian>Letiltja a fejlett ballisztikát automata tüzelés folyamán</Hungarian>
            <Russian>Выключает продвинутую баллистику при стрельбе в полностью автоматическом режиме</Russian>
+            <Italian>Disabilita Balistica Avanzata durante fuoco automatico</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
            <English>Enable Ammo Temperature Simulation</English>
@ -178,6 +191,7 @@
            <French>Activer la simulation de la température</French>
            <Hungarian>Lőszer-hő szimuláció engedélyezése</Hungarian>
            <Russian>Симуляция температуры для боеприпасов</Russian>
+            <Italian>Abilita simulazione della temperatura delle munizioni</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_Description">
            <English>Muzzle velocity varies with ammo temperature</English>
@ -189,6 +203,7 @@
            <French>La température de la munition influe sur la vélocité intiale</French>
            <Hungarian>A kezdősebesség a lőszer hőmérsékletétől függően változó</Hungarian>
            <Russian>Начальная скорость пули зависит от температуры</Russian>
+            <Italian>Velocità alla volata varia con la temperatura delle munizioni</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_DisplayName">
            <English>Enable Barrel Length Simulation</English>
@ -200,6 +215,7 @@
            <French>Activer la simulation de la longueur de canon</French>
            <Hungarian>Csőhossz-szimuláció engedélyezése</Hungarian>
            <Russian>Симуляция длины ствола</Russian>
+            <Italian>Abilita simulazione della lunghezza della canna</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_Description">
            <English>Muzzle velocity varies with barrel length</English>
@ -211,6 +227,7 @@
            <French>La longueur du canon influe sur la vélocité initale</French>
            <Hungarian>A kezdősebesség a cső hosszától függően változó</Hungarian>
            <Russian>Начальная скорость пули зависит от длины ствола</Russian>
+            <Italian>Velocità alla volata varia con la lunghezza della canna</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_DisplayName">
            <English>Enable Bullet Trace Effect</English>
@ -222,6 +239,7 @@
            <French>Activer l'effet traçante</French>
            <Hungarian>Nyomkövető-effekt engedélyezése</Hungarian>
            <Russian>Следы пуль</Russian>
+            <Italian>Abilita effetto di tracciatura dei proiettili</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_Description">
            <English>Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)</English>
@ -233,6 +251,7 @@
            <French>Active une tracante pour les munitions de gros calibre (seulement visible en utilisant des optiques avancées)</French>
            <Hungarian>Engedélyezi a nagy kaliberű lövedékek nyomának vizuális követését (csak nagy teljesítményű optikán keresztül látható)</Hungarian>
            <Russian>Включает эффект следов пуль для больших калибров (видны только через мощную оптику)</Russian>
+            <Italian>Abilita effetto di tracciatura per proiettili di alto calibro (visibile solo attraverso ottiche ad alto potenziale)</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_DisplayName">
            <English>Simulation Interval</English>
@ -244,6 +263,7 @@
            <French>Intervalle de simulation</French>
            <Hungarian>Szimuláció intervalluma</Hungarian>
            <Russian>Интервал симуляции</Russian>
+            <Italian>Intervallo Simulazione</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_Description">
            <English>Defines the interval between every calculation step</English>
@ -252,9 +272,10 @@
            <German>Legt das Intervall zwischen den Berechnungsschritten fest</German>
            <Czech>Určuje interval mezi každým výpočtem</Czech>
            <Portuguese>Define o intervalo entre cada cálculo</Portuguese>
-            <French>Défini un intervalle de calcul entre deux simulations</French>
+            <French>Définit un intervalle de calcul entre deux simulations</French>
            <Hungarian>Meghatározza a számítási lépések közötti időintervallumot</Hungarian>
            <Russian>Определяет временной интервал между вычислениями</Russian>
+            <Italian>Definisce l'intervallo tra ogni step di calcolo</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_DisplayName">
            <English>Simulation Radius</English>
@ -266,6 +287,7 @@
            <French>Rayon de simulation</French>
            <Hungarian>Szimuláció hatóköre</Hungarian>
            <Russian>Радиус симуляции</Russian>
+            <Italian>Raggio Simulazione</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_Description">
            <English>Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles</English>
@ -274,19 +296,22 @@
            <German>Gibt den Radius (in Metern) um den Spieler an, bei dem die erweiterte Ballistik auf Geschosse angewendet wird</German>
            <Czech>Určuje oblast kolem hráče (v metrech), kde je pokročilá balistika použita na projektil</Czech>
            <Portuguese>Define o raio ao redor do jogador (em metros) onde a balística avançada será aplicada aos projéteis</Portuguese>
-            <French>Défini le rayon autour du joueur (en mètres) d'application de la balistique avancée</French>
+            <French>Définit le rayon autour du joueur (en mètres) d'application de la balistique avancée</French>
            <Hungarian>Meghatározza a játékos körüli hatókört (méterben), ahol a lövedékek fejlett ballisztikát használnak</Hungarian>
            <Russian>Определяет радиус вокруг игрока (в метрах), в котором продвинутая баллистика применяется к снарядам</Russian>
+            <Italian>Definisce il raggio attorno al giocatore (in metri) per cui la Balistica Avanzata è applicata ai proiettili</Italian>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_Description">
            <English>This module enables advanced ballistics simulation - meaning the trajectory of projectiles is influenced by variables like air temperature, atmospheric pressure, humidity, gravity, the type of ammunition and the weapon from which it was fired.</English>
+            <German>Dieses Modul aktiviert die Erweiterte Ballisitk. Die Flugbahn eines Geschosses wird nun von Einflüssen wie z.B Temperatur, Luftdruck, Luftfeuchtigkeit, Schwerkraft, Geschossart sowie der Waffe aus dem es gefeuert wird, beeinflusst.</German>
            <Polish>Moduł ten pozwala aktywować zaawansowaną balistykę biorącą przy obliczeniach trajektorii lotu pocisku pod uwagę takie rzeczy jak temperatura powietrza, ciśnienie atmosferyczne, wilgotność powietrza, siły Coriolisa i Eotvosa, grawitację a także broń z jakiej wykonywany jest strzał oraz rodzaj amunicji. Wszystko to sprowadza się na bardzo dokładne odwzorowanie balistyki.</Polish>
            <Czech>Tento modul umožňuje aktivovat pokročilou balistiku, která vypočítává trajektorii kulky a bere do úvahy věci jako je teplota vzduchu, atmosférický tlak, vlhkost vzduchu, gravitaci, typ munice a zbraň, ze které je náboj vystřelen. To vše přispívá k velmi přesné balistice.</Czech>
            <Portuguese>Este módulo permite que você ative cálculos de balística avançada, fazendo a trajetória do projétil levar em consideração coisas como temperatura do ar, pressão atmosférica, umidade, força de Coriolis, a gravidade, o modelo da arma no qual o disparo é realizado e o tipo de munição. Tudo isso acrescenta-se a um balística muito precisa.</Portuguese>
-            <French>Ce module active la simulation de balistique avancée - ie les projectiles sont influencé par des varibles comme le vent, la température, la pression atmosphérique, l'humidité, la gravité, le type de munition et l'arme avec laquelles ils sont tirés</French>
+            <French>Ce module active la simulation de balistique avancée - ie les projectiles sont influencés par des varibles comme le vent, la température, la pression atmosphérique, l'humidité, la gravité, le type de munition et l'arme avec laquelle ils sont tirés.</French>
            <Hungarian>Ez a modul engedélyezi a fejlett ballisztikai szimulációt - a lövedékek röppályáját befolyásolni fogja a levegő hőmérséklete, légnyomás, páratartalom, gravitáció, a lövedék fajtája, valamint a fegyver, amiből kilőtték a lövedéket.</Hungarian>
            <Russian>Этот модуль включает симуляцию продвинутой баллистики - при этом на траекторию полета снаряда влияют различные параметры, такие как температура воздуха, атмосферное давление, влажность, гравитация, тип боеприпаса и оружия, из которого произвели выстрел.</Russian>
            <Spanish>Este módulo permite la simulación balística avanzada - es decir, la trayectoria de los proyectiles está influenciada por variables como la temperatura del aire, la presión atmosférica, la humedad, la gravedad, el tipo de municiones y el arma desde el que fue disparada.</Spanish>
+            <Italian>Questo modulo abilita la simulazione della Balistica Avanzata - cioè la traiettoria dei proiettili è influenzata da variabili come la temperatura dell'aria, pressione atmosferica, umidità, gravità, il tipo di munizione e l'arma da cui è sparata</Italian>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="Aircraft">
        <Key ID="STR_ACE_Aircraft_CMFlareLauncher_Burst_Name">
@ -7,7 +7,7 @@
            <Spanish>Ráfaga</Spanish>
            <Polish>Seria</Polish>
            <Czech>Dávka</Czech>
-            <French>Contre mesure</French>
+            <French>Contre mesures</French>
            <Russian>Очередь</Russian>
            <Hungarian>Sorozat</Hungarian>
            <Portuguese>Rajada</Portuguese>
@ -29,7 +29,7 @@
            <English>Open Cargo Door</English>
            <German>Laderampe öffnen</German>
            <Spanish>Abrir compuerta de carga</Spanish>
-            <French>Ourvir la rampe</French>
+            <French>Ouvrir la rampe</French>
            <Polish>Otwórz drzwi ładowni</Polish>
            <Czech>Otevřít nákladní prostor</Czech>
            <Hungarian>Rakodórámpa nyitása</Hungarian>
--- a/addons/apl/CfgEventHandlers.hpp
+++ b/addons/apl/CfgEventHandlers.hpp
@ -1,7 +0,0 @@
-/*
-class Extended_PreInit_EventHandlers {
-    class ADDON {
-        init = QUOTE(call COMPILE_FILE(XEH_preInit));
-    };
-};
-*/
--- a/addons/apl/config.cpp
+++ b/addons/apl/config.cpp
@ -11,5 +11,3 @@ class CfgPatches {
        VERSION_CONFIG;
    };
 };
-
-#include "CfgEventHandlers.hpp"
--- a/addons/atragmx/CfgEventHandlers.hpp
+++ b/addons/atragmx/CfgEventHandlers.hpp
@ -1,3 +1,10 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE( call COMPILE_FILE(XEH_preInit) );
--- a/addons/atragmx/XEH_PREP.hpp
+++ b/addons/atragmx/XEH_PREP.hpp
@ -0,0 +1,67 @@
+
+PREP(add_new_gun);
+PREP(calculate_range_card);
+PREP(calculate_solution);
+PREP(calculate_target_range_assist);
+PREP(calculate_target_solution);
+PREP(calculate_target_speed_assist);
+PREP(can_show);
+PREP(change_gun);
+PREP(change_target_slot);
+PREP(clear_user_data);
+PREP(create_dialog);
+PREP(cycle_gun_list);
+PREP(cycle_image_size_units);
+PREP(cycle_num_ticks_units);
+PREP(cycle_range_card_columns);
+PREP(cycle_scope_unit);
+PREP(cycle_target_size_units);
+PREP(cycle_target_speed_direction);
+PREP(delete_gun);
+PREP(init);
+PREP(parse_input);
+PREP(reset_relative_click_memory);
+PREP(restore_atmo_default);
+PREP(restore_user_data);
+PREP(save_gun);
+PREP(show_add_new_gun);
+PREP(show_atmo_env_data);
+PREP(show_gun_ammo_data);
+PREP(show_gun_list);
+PREP(show_main_page);
+PREP(show_range_card);
+PREP(show_range_card_setup);
+PREP(show_solution_setup);
+PREP(show_target_data);
+PREP(show_target_range_assist);
+PREP(show_target_speed_assist);
+PREP(show_target_speed_assist_timer);
+PREP(sord);
+PREP(store_user_data);
+PREP(target_speed_assist_timer);
+PREP(toggle_atmo_env_data);
+PREP(toggle_gun_ammo_data);
+PREP(toggle_gun_list);
+PREP(toggle_range_card);
+PREP(toggle_range_card_setup);
+PREP(toggle_solution_setup);
+PREP(toggle_target_data);
+PREP(toggle_target_range_assist);
+PREP(toggle_target_speed_assist);
+PREP(update_atmosphere);
+PREP(update_atmo_env_data);
+PREP(update_atmo_selection);
+PREP(update_gun);
+PREP(update_gun_ammo_data);
+PREP(update_inclination_angle);
+PREP(update_range_card);
+PREP(update_relative_click_memory);
+PREP(update_result);
+PREP(update_scope_unit);
+PREP(update_solution_setup);
+PREP(update_target);
+PREP(update_target_data);
+PREP(update_target_selection);
+PREP(update_unit_selection);
+PREP(update_zero_range);
+PREP(on_close_dialog);
--- a/addons/atragmx/XEH_preInit.sqf
+++ b/addons/atragmx/XEH_preInit.sqf
@ -2,71 +2,6 @@

 ADDON = false;

-PREP(add_new_gun);
-PREP(calculate_range_card);
-PREP(calculate_solution);
-PREP(calculate_target_range_assist);
-PREP(calculate_target_solution);
-PREP(calculate_target_speed_assist);
-PREP(can_show);
-PREP(change_gun);
-PREP(change_target_slot);
-PREP(clear_user_data);
-PREP(create_dialog);
-PREP(cycle_gun_list);
-PREP(cycle_image_size_units);
-PREP(cycle_num_ticks_units);
-PREP(cycle_range_card_columns);
-PREP(cycle_scope_unit);
-PREP(cycle_target_size_units);
-PREP(cycle_target_speed_direction);
-PREP(delete_gun);
-PREP(init);
-PREP(parse_input);
-PREP(reset_relative_click_memory);
-PREP(restore_atmo_default);
-PREP(restore_user_data);
-PREP(save_gun);
-PREP(show_add_new_gun);
-PREP(show_atmo_env_data);
-PREP(show_gun_ammo_data);
-PREP(show_gun_list);
-PREP(show_main_page);
-PREP(show_range_card);
-PREP(show_range_card_setup);
-PREP(show_solution_setup);
-PREP(show_target_data);
-PREP(show_target_range_assist);
-PREP(show_target_speed_assist);
-PREP(show_target_speed_assist_timer);
-PREP(sord);
-PREP(store_user_data);
-PREP(target_speed_assist_timer);
-PREP(toggle_atmo_env_data);
-PREP(toggle_gun_ammo_data);
-PREP(toggle_gun_list);
-PREP(toggle_range_card);
-PREP(toggle_range_card_setup);
-PREP(toggle_solution_setup);
-PREP(toggle_target_data);
-PREP(toggle_target_range_assist);
-PREP(toggle_target_speed_assist);
-PREP(update_atmosphere);
-PREP(update_atmo_env_data);
-PREP(update_atmo_selection);
-PREP(update_gun);
-PREP(update_gun_ammo_data);
-PREP(update_inclination_angle);
-PREP(update_range_card);
-PREP(update_relative_click_memory);
-PREP(update_result);
-PREP(update_scope_unit);
-PREP(update_solution_setup);
-PREP(update_target);
-PREP(update_target_data);
-PREP(update_target_selection);
-PREP(update_unit_selection);
-PREP(update_zero_range);
-PREP(on_close_dialog);
+#include "XEH_PREP.hpp"

 ADDON = true;
--- a/addons/atragmx/XEH_preStart.sqf
+++ b/addons/atragmx/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/atragmx/stringtable.xml
+++ b/addons/atragmx/stringtable.xml
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="ATragMX">
        <Key ID="STR_ACE_ATragMX_Name">
--- a/addons/attach/CfgEventHandlers.hpp
+++ b/addons/attach/CfgEventHandlers.hpp
@ -1,3 +1,10 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE(call COMPILE_FILE(XEH_preInit));
--- a/addons/attach/XEH_PREP.hpp
+++ b/addons/attach/XEH_PREP.hpp
@ -0,0 +1,10 @@
+
+PREP(attach);
+PREP(canAttach);
+PREP(canDetach);
+PREP(detach);
+PREP(getChildrenAttachActions);
+PREP(handleGetIn);
+PREP(handleGetOut);
+PREP(handleKilled);
+PREP(placeApprove);
--- a/addons/attach/XEH_preInit.sqf
+++ b/addons/attach/XEH_preInit.sqf
@ -2,14 +2,6 @@

 ADDON = false;

-PREP(attach);
-PREP(canAttach);
-PREP(canDetach);
-PREP(detach);
-PREP(getChildrenAttachActions);
-PREP(handleGetIn);
-PREP(handleGetOut);
-PREP(handleKilled);
-PREP(placeApprove);
+#include "XEH_PREP.hpp"

 ADDON = true;
--- a/addons/attach/XEH_preStart.sqf
+++ b/addons/attach/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@ -90,7 +90,7 @@
            <German>Leuchtstab befestigt</German>
            <Spanish>Barra de luz acoplada</Spanish>
            <Polish>Przyczepiono światło chemiczne</Polish>
-            <French>Chemlight attachée</French>
+            <French>Cyalume attachée</French>
            <Czech>Chemické světlo připnuto</Czech>
            <Portuguese>Chemlight Fixada</Portuguese>
            <Italian>Chemlight attaccata</Italian>
@ -102,7 +102,7 @@
            <German>Leuchtstab entfernt</German>
            <Spanish>Barra de luz quitada</Spanish>
            <Polish>Odczepiono światło chemiczne</Polish>
-            <French>Chemlight détachée</French>
+            <French>Cyalume détachée</French>
            <Czech>Chemické světlo odepnuto</Czech>
            <Portuguese>Chemlight Separada</Portuguese>
            <Italian>Chemlight staccata</Italian>
@ -138,7 +138,7 @@
            <German>Das IR-Stroboskop erlaubt es dir deine Position mit einem blinkenden Leuchtfeuer zu signalisieren, welches nur mit Nachtsichtgerät zu erkennen ist.</German>
            <Polish>Stroboskop światła podczerwieni umożliwia oznaczenie swojej pozycji pulsacyjnym światłem widocznym tylko przez optykę noktowizyjną i gogle noktowizyjne.</Polish>
            <Spanish>El Marcador IR permite señalizar su posisición a través de una baliza visible solo a través de dispositivos de visión nocturna. </Spanish>
-            <French>La balise IR permet de signaler votre position grace à un clignotement visible par des JVN.</French>
+            <French>La balise IR permet de signaler votre position grâce à un clignotement visible par des JVN.</French>
            <Czech>IR Značkovač je Infračerveně zářící stroboskop umožňující signalizaci vaší pozice díky blikajícímu světlu, které je vidět pouze při užití noktovizoru.</Czech>
            <Portuguese>O Marcador IV permite que você sinalize sua posição através de um pulso visível somente com equipamento de visão noturna.</Portuguese>
            <Italian>La Strobo IR è una luce stroboscopica che ti permette di segnalare la tua posizione grazie all'emissione di impulsi ad infrarossi visibili solo con i visori notturni.</Italian>
@ -206,4 +206,4 @@
            <Russian>%1&lt;br/&gt;отсоединен(-а)</Russian>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/backpacks/CfgEventHandlers.hpp
+++ b/addons/backpacks/CfgEventHandlers.hpp
@ -1,4 +1,10 @@

+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE(call COMPILE_FILE(XEH_preInit));
--- a/addons/backpacks/XEH_PREP.hpp
+++ b/addons/backpacks/XEH_PREP.hpp
@ -0,0 +1,4 @@
+
+PREP(backpackOpened);
+PREP(isBackpack);
+PREP(onOpenInventory);
--- a/addons/backpacks/XEH_preInit.sqf
+++ b/addons/backpacks/XEH_preInit.sqf
@ -2,8 +2,6 @@

 ADDON = false;

-PREP(backpackOpened);
-PREP(isBackpack);
-PREP(onOpenInventory);
+#include "XEH_PREP.hpp"

 ADDON = true;
--- a/addons/backpacks/XEH_preStart.sqf
+++ b/addons/backpacks/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/backpacks/functions/fnc_backpackOpened.sqf
+++ b/addons/backpacks/functions/fnc_backpackOpened.sqf
@ -30,7 +30,7 @@ private _sounds = [
 private _position = AGLToASL (_target modelToWorldVisual (_target selectionPosition "Spine3"));

 playSound3D [
-    _sounds select floor random count _sounds,
+    selectRandom _sounds,
    objNull,
    false,
    _position,
--- a/addons/backpacks/functions/fnc_isBackpack.sqf
+++ b/addons/backpacks/functions/fnc_isBackpack.sqf
@ -12,7 +12,7 @@
 */
 #include "script_component.hpp"

-params [["_backpack", objNull, [objNull]]];
+params [["_backpack", objNull, [objNull, ""]]];

 if (_backpack isEqualType objNull) then {
    _backpack = typeOf _backpack;
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@ -14,7 +14,6 @@ class CfgWeapons {
    class MMG_02_base_F;
    class Rifle_Base_F;
    class Rifle_Long_Base_F;
-    class WeaponSlotsInfo;
    class MuzzleSlot;
    
    /* Long Rifles */
@ -74,22 +73,12 @@ class CfgWeapons {
    };
    
    class DMR_01_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
        class Single: Mode_SemiAuto {
            dispersion = 0.0004; // radians. Equal to 1.375 MOA.
        };
    };
    
    class EBR_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
        class Single: Mode_SemiAuto {
            dispersion = 0.00029; // radians. Equal to 1.00 MOA.
        };
@ -101,13 +90,7 @@ class CfgWeapons {
    
    /* MX */
    
-    class arifle_MX_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
-    };
+    class arifle_MX_Base_F: Rifle_Base_F {};
    class arifle_MX_SW_F: arifle_MX_Base_F {
        magazines[] = {
            "100Rnd_65x39_caseless_mag_Tracer",
@ -120,13 +103,6 @@ class CfgWeapons {
        initSpeed = -1.0;
        ACE_barrelTwist=228.6;
        ACE_barrelLength=406.4;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                // Shit is broken again
-                //compatibleItems[] += {"ACE_muzzle_mzls_H"};
-                compatibleItems[] = {"muzzle_snds_H","muzzle_snds_H_SW","ACE_muzzle_mzls_H"};
-            };
-        };
    };
    class arifle_MXM_F: arifle_MX_Base_F {
        magazines[] = {
@ -150,13 +126,7 @@ class CfgWeapons {


    /* Katiba */
-    class arifle_katiba_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
-    };
+    class arifle_katiba_Base_F: Rifle_Base_F {};


    /* Other */
@ -167,42 +137,16 @@ class CfgWeapons {
            "ACE_200Rnd_65x39_cased_Box_Tracer_Dim"
        };
        initSpeed = -0.9763;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_H"};
-            };
-        };
        ACE_barrelTwist=177.8;
        ACE_barrelLength=317.5;
    };
    class LMG_Zafir_F: Rifle_Long_Base_F {
        initSpeed = -1.0;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_B"};
-            };
-        };
        ACE_barrelTwist=304.8;
        ACE_barrelLength=459.74;
    };
-
-
-    /* Assault Rifles */
-    class Tavor_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_L"};
-            };
-        };
-    };
-    class mk20_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_L"};
-            };
-        };
-    };
-
+    class Tavor_base_F: Rifle_Base_F {};
+    class mk20_base_F: Rifle_Base_F {};

    /* SMGs */
    class SDAR_base_F: Rifle_Base_F {
@ -219,93 +163,43 @@ class CfgWeapons {
            dispersion = 0.0008727; // radians. Equal to 3 MOA.
        };
    };
-    class pdw2000_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-    class SMG_01_Base: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-    class SMG_02_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-    
+    class pdw2000_base_F: Rifle_Base_F {};
+    class SMG_01_Base: Rifle_Base_F {};
+    class SMG_02_base_F: Rifle_Base_F {};
+
    /* Pistols */

    class Pistol;
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo;
-    };
+    class Pistol_Base_F: Pistol {};

    class hgun_P07_F: Pistol_Base_F {
        initSpeed = -0.9778;
        ACE_barrelTwist=254.0;
        ACE_barrelLength=101.6;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
    };

    class hgun_Rook40_F: Pistol_Base_F {
        initSpeed = -1.0;
        ACE_barrelTwist=254.0;
        ACE_barrelLength=111.76;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
    };

    class hgun_ACPC2_F: Pistol_Base_F {
        initSpeed = -1.0;
        ACE_barrelTwist=406.4;
        ACE_barrelLength=127.0;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
    };

    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
        initSpeed = -0.96;
        ACE_barrelTwist=406.4;
        ACE_barrelLength=114.3;
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
    };

    class hgun_Pistol_heavy_02_F: Pistol_Base_F {
        initSpeed = -0.92;
        ACE_barrelTwist=406.4;
        ACE_barrelLength=76.2;
-        /*
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-        */
    };
    class hgun_PDW2000_F: pdw2000_base_F {
        initSpeed = -1.157;
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@ -1602,6 +1602,7 @@
            <French>[ACE] Caisse de munitions</French>
            <Hungarian>[ACE] Lőszeres láda</Hungarian>
            <Russian>[ACE] Ящик с боеприпасами</Russian>
+            <Italian>[ACE] Cassa munizioni</Italian>
        </Key>
    </Package>
 </Project>
--- a/addons/captives/CfgEden.hpp
+++ b/addons/captives/CfgEden.hpp
@ -0,0 +1,30 @@
+class Cfg3DEN {
+    class Object {
+        class AttributeCategories {
+            class ace_attributes {
+                class Attributes {
+                    class ace_isHandcuffed {
+                        property = QUOTE(ace_isHandcuffed);
+                        control = "Checkbox";
+                        displayName = CSTRING(ModuleHandcuffed_DisplayName);
+                        tooltip = CSTRING(ModuleHandcuffed_Description);
+                        expression = QUOTE(if (_value) then {[ARR_3(objNull,[_this],true)] call FUNC(moduleHandcuffed)});
+                        typeName = "BOOL";
+                        condition = "objectBrain";
+                        defaultValue = false;
+                    };
+                    class ace_isSurrendered {
+                        property = QUOTE(ace_isSurrendered);
+                        control = "Checkbox";
+                        displayName = CSTRING(ModuleSurrender_DisplayName);
+                        tooltip = CSTRING(ModuleSurrender_Description);
+                        expression = QUOTE(if (_value) then {[ARR_3(objNull,[_this],true)] call FUNC(moduleSurrender)});
+                        typeName = "BOOL";
+                        condition = "objectBrain";
+                        defaultValue = false;
+                    };
+                };
+            };
+        };
+    };
+};
--- a/addons/captives/CfgEventHandlers.hpp
+++ b/addons/captives/CfgEventHandlers.hpp
@ -1,3 +1,10 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE(call COMPILE_FILE(XEH_preInit));
@ -9,6 +16,13 @@ class Extended_PostInit_EventHandlers {
        init = QUOTE(call COMPILE_FILE(XEH_postInit));
    };
 };
+
+class Extended_DisplayUnload_EventHandlers {
+    class RscDisplayCurator {
+        ADDON = QUOTE(call FUNC(handleZeusDisplayChanged));
+    };
+};
+
 //release escorted captive when entering a vehicle
 class Extended_GetIn_EventHandlers {
    class All {
--- a/addons/captives/XEH_PREP.hpp
+++ b/addons/captives/XEH_PREP.hpp
@ -0,0 +1,30 @@
+
+PREP(canApplyHandcuffs);
+PREP(canEscortCaptive);
+PREP(canFriskPerson);
+PREP(canLoadCaptive);
+PREP(canRemoveHandcuffs);
+PREP(canStopEscorting);
+PREP(canSurrender);
+PREP(canUnloadCaptive);
+PREP(doApplyHandcuffs);
+PREP(doEscortCaptive);
+PREP(doFriskPerson);
+PREP(doLoadCaptive);
+PREP(doRemoveHandcuffs);
+PREP(doUnloadCaptive);
+PREP(findEmptyNonFFVCargoSeat);
+PREP(handleGetIn);
+PREP(handleGetOut);
+PREP(handleOnUnconscious);
+PREP(handlePlayerChanged);
+PREP(handleRespawn);
+PREP(handleUnitInitPost);
+PREP(handleZeusDisplayChanged);
+PREP(moduleHandcuffed);
+PREP(moduleSettings);
+PREP(moduleSurrender);
+PREP(setHandcuffed);
+PREP(setSurrendered);
+PREP(vehicleCaptiveMoveIn);
+PREP(vehicleCaptiveMoveOut);
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@ -1,5 +1,11 @@
 #include "script_component.hpp"

+["SettingsInitialized", {
+    // Hold on a little bit longer to ensure anims will work
+    [{
+        GVAR(captivityEnabled) = true;
+    }, [], 0.05] call EFUNC(common,waitAndExecute);
+}] call EFUNC(common,addEventHandler);

 //Handles when someone starts escorting and then disconnects, leaving the captive attached
 //This is normaly handled by the PFEH in doEscortCaptive, but that won't be running if they DC
@ -18,7 +24,6 @@ if (isServer) then {
    }];
 };

-["zeusDisplayChanged",   {_this call FUNC(handleZeusDisplayChanged)}] call EFUNC(common,addEventHandler);
 ["playerChanged", {_this call FUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
 ["MoveInCaptive", {_this call FUNC(vehicleCaptiveMoveIn)}] call EFUNC(common,addEventHandler);
 ["MoveOutCaptive", {_this call FUNC(vehicleCaptiveMoveOut)}] call EFUNC(common,addEventHandler);
--- a/addons/captives/XEH_preInit.sqf
+++ b/addons/captives/XEH_preInit.sqf
@ -2,34 +2,8 @@

 ADDON = false;

-PREP(canApplyHandcuffs);
-PREP(canEscortCaptive);
-PREP(canFriskPerson);
-PREP(canLoadCaptive);
-PREP(canRemoveHandcuffs);
-PREP(canStopEscorting);
-PREP(canSurrender);
-PREP(canUnloadCaptive);
-PREP(doApplyHandcuffs);
-PREP(doEscortCaptive);
-PREP(doFriskPerson);
-PREP(doLoadCaptive);
-PREP(doRemoveHandcuffs);
-PREP(doUnloadCaptive);
-PREP(findEmptyNonFFVCargoSeat);
-PREP(handleGetIn);
-PREP(handleGetOut);
-PREP(handleOnUnconscious);
-PREP(handlePlayerChanged);
-PREP(handleRespawn);
-PREP(handleUnitInitPost);
-PREP(handleZeusDisplayChanged);
-PREP(moduleHandcuffed);
-PREP(moduleSettings);
-PREP(moduleSurrender);
-PREP(setHandcuffed);
-PREP(setSurrendered);
-PREP(vehicleCaptiveMoveIn);
-PREP(vehicleCaptiveMoveOut);
+#include "XEH_PREP.hpp"
+
+GVAR(captivityEnabled) = false;

 ADDON = true;
--- a/addons/captives/XEH_preStart.sqf
+++ b/addons/captives/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/captives/config.cpp
+++ b/addons/captives/config.cpp
@ -17,3 +17,4 @@ class CfgPatches {
 #include "CfgMoves.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
+#include "CfgEden.hpp"
--- a/addons/captives/functions/fnc_handleZeusDisplayChanged.sqf
+++ b/addons/captives/functions/fnc_handleZeusDisplayChanged.sqf
@ -17,15 +17,10 @@
 */
 #include "script_component.hpp"

-params ["_unit","_zeusIsOpen"];
-
-//set showHUD based on unit status:
-if (!_zeusIsOpen) then {
-    if ((_unit getVariable [QGVAR(isHandcuffed), false]) || {_unit getVariable [QGVAR(isSurrendering), false]}) then {
-        TRACE_1("Player Change (showHUD false)",_unit);
-        ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
-    } else {
-        TRACE_1("Player Change (showHUD true)",_unit);
-        ["captive", []] call EFUNC(common,showHud); //same as showHud true;
-    };
+if ((ACE_player getVariable [QGVAR(isHandcuffed), false]) || {ACE_player getVariable [QGVAR(isSurrendering), false]}) then {
+    TRACE_1("Player Change (showHUD false)",ACE_player);
+    ["captive", [false, false, false, false, false, false, false, false]] call EFUNC(common,showHud);
+} else {
+    TRACE_1("Player Change (showHUD true)",ACE_player);
+    ["captive", []] call EFUNC(common,showHud); //same as showHud true;
 };
--- a/addons/captives/functions/fnc_moduleHandcuffed.sqf
+++ b/addons/captives/functions/fnc_moduleHandcuffed.sqf
@ -1,6 +1,7 @@
 /*
 * Author: PabstMirror
 * Module Function to make a unit handcuffed (can be called from editor)
+ * Also used for threeden attribute expression with dummy Logic Object
 *
 * Arguments:
 * 0: The Module Logic <OBJECT>
@ -11,7 +12,7 @@
 * Nothing
 *
 * Example:
- * Called from module
+ * [objNull, [player], true] call ace_captives_fnc_moduleHandcuffed
 *
 * Public: No
 */
@ -28,8 +29,11 @@ if (!isServer) exitWith {};
 [{
    params ["_units"];
    {
+        TRACE_2("event",_x,local _x);
        ["SetHandcuffed", [_x], [_x, true]] call EFUNC(common,targetEvent);
    } forEach _units;
 }, [_units], 0.05] call EFUNC(common,waitAndExecute);

-deleteVehicle _logic;
+if (!isNull _logic) then {
+    deleteVehicle _logic;
+};
--- a/addons/captives/functions/fnc_moduleSurrender.sqf
+++ b/addons/captives/functions/fnc_moduleSurrender.sqf
@ -1,6 +1,7 @@
 /*
 * Author: PabstMirror
 * Module Function to make a unit surrender (can be called from editor)
+ * Also used for threeden attribute expression with dummy Logic Object
 *
 * Arguments:
 * 0: The Module Logic <OBJECT>
@ -11,7 +12,7 @@
 * Nothing
 *
 * Example:
- * Called from module
+ * [objNull, [player], true] call ace_captives_fnc_moduleSurrender
 *
 * Public: No
 */
@ -28,8 +29,11 @@ if (!isServer) exitWith {};
 [{
    params ["_units"];
    {
+        TRACE_2("event",_x,local _x);
        ["SetSurrendered", [_x], [_x, true]] call EFUNC(common,targetEvent);
    } forEach _units;
 }, [_units], 0.05] call EFUNC(common,waitAndExecute);

-deleteVehicle _logic;
+if (!isNull _logic) then {
+    deleteVehicle _logic;
+};
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@ -22,6 +22,18 @@ TRACE_2("params",_unit,_state);
 if (!local _unit) exitWith {
    ERROR("running setHandcuffed on remote unit");
 };
+
+if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
+    // It's to soon to call this function, delay it
+    if (EGVAR(common,settingsInitFinished)) then {
+        // Settings are already initialized, but the small wait isn't over
+        [DFUNC(setHandCuffed), _this, 0.05] call EFUNC(common,waitAndExecute);
+    } else {
+        // Settings are not initialized yet
+        [DFUNC(setHandCuffed), _this] call EFUNC(common,runAfterSettingsInit);
+    };
+};
+
 if ((_unit getVariable [QGVAR(isHandcuffed), false]) isEqualTo _state) exitWith {
    ERROR("setHandcuffed: current state same as new");
 };
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@ -23,6 +23,17 @@ if (!local _unit) exitWith {
    ERROR("running surrender on remote unit");
 };

+if !(missionNamespace getVariable [QGVAR(captivityEnabled), false]) exitWith {
+    // It's to soon to call this function, delay it
+    if (EGVAR(common,settingsInitFinished)) then {
+        // Settings are already initialized, but the small wait isn't over
+        [DFUNC(setSurrendered), _this, 0.05] call EFUNC(common,waitAndExecute);
+    } else {
+        // Settings are not initialized yet
+        [DFUNC(setSurrendered), _this] call EFUNC(common,runAfterSettingsInit);
+    };
+};
+
 if ((_unit getVariable [QGVAR(isSurrendering), false]) isEqualTo _state) exitWith {
    ERROR("Surrender: current state same as new");
 };
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@ -5,7 +5,7 @@
            <English>Take Prisoner</English>
            <German>Gefangen nehmen</German>
            <Spanish>Tomar prisionero</Spanish>
-            <French>Capturer le prisonnier</French>
+            <French>Prendre prisonnier</French>
            <Polish>Aresztuj</Polish>
            <Czech>Zajmout osobu</Czech>
            <Italian>Arresta il prigioniero</Italian>
@ -54,7 +54,7 @@
            <German>Du musst ihn zuerst gefangen nehmen.</German>
            <Spanish>Necesitas hacerle prisionero primero!</Spanish>
            <Polish>Najpierw musisz go aresztować!</Polish>
-            <French>Vous devez d'abord le capturer!</French>
+            <French>Vous devez d'abord le capturer !</French>
            <Czech>Musíš ho nejdříve zajmout!</Czech>
            <Italian>Prima devi arrestarlo!</Italian>
            <Portuguese>Você deve tomá-lo como prisioneiro primeiro!</Portuguese>
@ -112,7 +112,7 @@
        <Key ID="STR_ACE_Captives_FriskMenuHeader">
            <English>Inventory of frisked person</English>
            <German>Inventar der durchsuchten Person</German>
-            <French>Inventaire de la fouille</French>
+            <French>Inventaire de la personne fouillé</French>
            <Spanish>Inventario de la persona cacheada</Spanish>
            <Hungarian>Motozott személy felszerelése</Hungarian>
            <Czech>Inventář prohledávané osoby</Czech>
@ -124,7 +124,7 @@
        <Key ID="STR_ACE_Captives_FriskPerson">
            <English>Frisk person</English>
            <German>Person durchsuchen</German>
-            <French>Fouiller</French>
+            <French>Fouiller la personne</French>
            <Spanish>Cachear</Spanish>
            <Czech>Prohledávaná osoba</Czech>
            <Polish>Rewiduj osobę</Polish>
@ -147,7 +147,7 @@
        </Key>
        <Key ID="STR_ACE_Captives_StopSurrendering">
            <English>Stop Surrendering</English>
-            <French>Annuler la capitulation</French>
+            <French>Annuler la reddition</French>
            <German>Den Kampf erneut aufnehmen</German>
            <Spanish>Dejar de rendirse</Spanish>
            <Portuguese>Parar de se render</Portuguese>
@ -167,31 +167,41 @@
            <French>Faire capituler l'unité</French>
            <Hungarian>Egység kapitulálása</Hungarian>
            <Russian>Заставить юнита сдаться</Russian>
+            <Italian>Fai arrendere l'unità</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSurrender_Description">
-            <English>Sync a unit to make them surrender.&lt;br /&gt;Source: ace_captives</English>
-            <Polish>Zsynchronizuj z jednostką, aby skapitulowała.&lt;br /&gt;Źródło: ace_captives</Polish>
-            <Spanish>Sincroniza una unidad para hacer que se rinda.&lt;br /&gt;Fuente: ace_captives</Spanish>
-            <German>Einheit synchronisieren, um sie kapitulieren zu lassen.&lt;br /&gt;Quelle: ace_captives</German>
-            <Czech>Synchronizuj s jednotkou, která se má vzdát.&lt;br /&gt;Zdroj: ace_captives</Czech>
-            <Portuguese>Sincroniza uma unidade para fazer com que ela se renda. &lt;br/&gt;Fonte: ace_captives</Portuguese>
-            <French>Synchronise une unité pour la rendre captive. &lt;br/&gt;Source: ace_captives</French>
-            <Hungarian>Egység szinkronizálása, hogy kapituláljon.&lt;br /&gt;Forrás: ace_captives</Hungarian>
-            <Russian>Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.&lt;br /&gt;Источник: ace_captives</Russian>
+            <English>Sync a unit to make them surrender.</English>
+            <Polish>Zsynchronizuj z jednostką, aby skapitulowała.</Polish>
+            <Spanish>Sincroniza una unidad para hacer que se rinda.</Spanish>
+            <German>Einheit synchronisieren, um sie kapitulieren zu lassen.</German>
+            <Czech>Synchronizuj s jednotkou, která se má vzdát.</Czech>
+            <Portuguese>Sincroniza uma unidade para fazer com que ela se renda.</Portuguese>
+            <French>Synchronise une unité pour la rendre captive.</French>
+            <Hungarian>Egység szinkronizálása, hogy kapituláljon.</Hungarian>
+            <Russian>Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.</Russian>
+            <Italian>Sincronizza una unità per farla arrendere.</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleHandcuffed_DisplayName">
            <English>Make Unit Handcuffed</English>
+            <German>Einheit in Handschellen legen</German>
            <Polish>Skuj jednostkę</Polish>
            <Portuguese>Fazer unidade algemada</Portuguese>
            <Russian>Связать юнита</Russian>
            <Czech>Spoutat jednotku</Czech>
+            <Italian>Metti manette all'unità</Italian>
+            <Spanish>Hacer que la unidad esté esposada</Spanish>
+            <French>Rend une unité captive</French>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleHandcuffed_Description">
-            <English>Sync a unit to make them handcuffed.&lt;br /&gt;Source: ace_captives</English>
-            <Polish>Zsynchronizuj z jednostką, aby została skuta.&lt;br /&gt;Źródło: ace_captives</Polish>
-            <Portuguese>Sincronizar uma unidade para deixá-la algemada.&lt;br/&gt;Source: ace_captives</Portuguese>
-            <Russian>Синхронизируйте с юнитами, чтобы сделать их связанными.&lt;br /&gt;Источник: ace_captives</Russian>
-            <Czech>Synchronizovat s jednotkou, která má být v poutech.&lt;br /&gt;Zdroj: ace_captives</Czech>
+            <English>Sync a unit to make them handcuffed.</English>
+            <German>Synchronisiere eine Einheit um sie in Handschellen zu legen.</German>
+            <Polish>Zsynchronizuj z jednostką, aby została skuta.</Polish>
+            <Portuguese>Sincronizar uma unidade para deixá-la algemada.</Portuguese>
+            <Russian>Синхронизируйте с юнитами, чтобы сделать их связанными.</Russian>
+            <Czech>Synchronizovat s jednotkou, která má být v poutech.</Czech>
+            <Italian>Sincronizza un'unità per metterle le manette.</Italian>
+            <Spanish>Sincroniza una unidad para hacer que esté esposada.</Spanish>
+            <French>Synchronisez une unité pour la rendre captive.</French>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_DisplayName">
            <English>Captives Settings</English>
@ -200,9 +210,10 @@
            <Czech>Nastavení zajatce</Czech>
            <German>Gefangenen-Einstellungen</German>
            <Portuguese>Ajustes de prisioneiros</Portuguese>
-            <French>Options de capitulation</French>
+            <French>Options de reddition</French>
            <Hungarian>Fogoly-beállítások</Hungarian>
            <Russian>Настройки пленения</Russian>
+            <Italian>Impostazioni Prigionieri</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_Description">
            <English>Controls settings for surrender and cable ties</English>
@ -211,9 +222,10 @@
            <Czech>Toto kontroluje nastavení kapitulace a pout</Czech>
            <German>Einstellungen zur Kapitulation und Kabelbindern</German>
            <Portuguese>Controla as configurações de rendição e abraçadeiras</Portuguese>
-            <French>Contrôle les paramètres de la rédition et des Serflex</French>
+            <French>Contrôle les paramètres de la reddition et des Serflex</French>
            <Hungarian>Szabályozza a kapituláció és bilincselés beállításait</Hungarian>
            <Russian>Управляет настройками сдачи в плен и связывания</Russian>
+            <Italian>Controlla le impostazioni per la resa e le manette</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_handcuffSide_name">
            <English>Can handcuff own side</English>
@ -222,9 +234,10 @@
            <Czech>Může spoutat spolubojovníky</Czech>
            <German>Kann Kameraden fesseln</German>
            <Portuguese>Pode algemar o próprio lado</Portuguese>
-            <French>Peut libérer sa propre faction</French>
+            <French>Peut capturer sa propre faction</French>
            <Hungarian>Saját oldal megbilincselhető</Hungarian>
            <Russian>Связать союзника</Russian>
+            <Italian>Puoi ammanettare unità alleate</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_handcuffSide_description">
            <English>Can players cabletie units on their own side</English>
@ -236,6 +249,7 @@
            <French>Les joueurs peuvent utiliser les Serflex sur leur propre camp</French>
            <Hungarian>A játékosok megkötözhetik-e a saját oldalukon lévő egységeket</Hungarian>
            <Russian>Разрешить игрокам связывать юнитов своей стороны</Russian>
+            <Italian>I giocatori possono ammanettare unità alleate</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_allowSurrender_name">
            <English>Allow surrendering</English>
@ -244,9 +258,10 @@
            <Czech>Povolit vzdávání</Czech>
            <German>Kapitulation erlauben</German>
            <Portuguese>Permite rendição</Portuguese>
-            <French>Permettre la capitulation</French>
+            <French>Permettre la reddition</French>
            <Hungarian>Kapituláció engedélyezése</Hungarian>
            <Russian>Сдаться в плен</Russian>
+            <Italian>Permetti Resa</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_allowSurrender_description">
            <English>Players can surrender after holstering their weapon</English>
@ -258,6 +273,7 @@
            <French>Les joueurs peuvent se rendre après avoir rangé leur arme</French>
            <Hungarian>A játékosok megadhatják magukat a fegyverük elrakása után</Hungarian>
            <Russian>Игроки могут сдаться в плен после того, как уберут оружие</Russian>
+            <Italian>I giocatori possono arrendersi dopo aver messo via le proprie armi</Italian>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_name">
            <English>Require surrendering</English>
@ -267,6 +283,8 @@
            <Russian>Требовать пленения</Russian>
            <Spanish>Requiere rendición</Spanish>
            <Czech>Vzdávání vyžadováno</Czech>
+            <Italian>Richiedi Resa</Italian>
+            <French>Requiert la reddition</French>
        </Key>
        <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_description">
            <English>Require Players to surrender before they can be arrested</English>
@ -276,6 +294,8 @@
            <Russian>Требуется, чтобы игрок сдался в плен прежде, чем его можно будет связать</Russian>
            <Spanish>Requiere que los Jugadores se rindan antes de arrestarlos</Spanish>
            <Czech>Vyžaduje, aby se hráč nejdříve vzdal, poté může být spoután</Czech>
+            <Italian>I giocatori devono arrendersi prima che possano essere arrestati</Italian>
+            <French>Requiert la capitulation des joueurs avant qu'ils ne puissent être arrêtés</French>
        </Key>
        <Key ID="STR_ACE_Captives_SurrenderOnly">
            <English>Surrendering only</English>
@ -285,6 +305,8 @@
            <Russian>Только сдавшийся в плен</Russian>
            <Spanish>Solo rendición</Spanish>
            <Czech>Pouze vzdávání</Czech>
+            <Italian>Solo Resa</Italian>
+            <French>Reddition seulement</French>
        </Key>
        <Key ID="STR_ACE_Captives_SurrenderOrNoWeapon">
            <English>Surrendering or No weapon</English>
@ -294,6 +316,8 @@
            <Russian>Сдавшийся или безоружный</Russian>
            <Spanish>Rendición o desarme</Spanish>
            <Czech>Vzdávání nebo beze zbraně</Czech>
+            <Italian>Resa o senza armi</Italian>
+            <French>Capitulation ou desarmé</French>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/cargo/CfgEventHandlers.hpp
+++ b/addons/cargo/CfgEventHandlers.hpp
@ -1,3 +1,10 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE(call COMPILE_FILE(XEH_preInit));
@ -50,6 +57,16 @@ class Extended_InitPost_EventHandlers {
            init = QUOTE(_this call DFUNC(initObject); _this call DFUNC(initVehicle));
        };
    };
+    class PlasticCase_01_base_F {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject); _this call DFUNC(initVehicle));
+        };
+    };
+    class MetalCase_01_base_F {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject); _this call DFUNC(initVehicle));
+        };
+    };
    class RoadCone_F {
        class ADDON {
            init = QUOTE(_this call DFUNC(initObject); _this call DFUNC(initVehicle));
@ -95,4 +112,9 @@ class Extended_InitPost_EventHandlers {
            init = QUOTE(_this call DFUNC(initObject));
        };
    };
+    class Land_PortableLight_single_F {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject));
+        };
+    };
 };
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@ -1,3 +1,6 @@
+
+class CBA_Extended_EventHandlers;
+
 class CfgVehicles {
    class Logic;
    class Module_F: Logic {
@ -45,7 +48,7 @@ class CfgVehicles {
                description = CSTRING(MakeLoadable_description);
                typeName = "BOOL";
                defaultValue = 1;
-            };            
+            };
            class setSize {
                displayName = CSTRING(makeLoadable_setSize_displayName);
                typeName = "NUMBER";
@ -53,7 +56,7 @@ class CfgVehicles {
            };
        };
        class ModuleDescription: ModuleDescription {
-            description = CSTRING(module_MakeLoadable_description);
+            description = CSTRING(makeLoadable_description);
            sync[] = {"AnyStaticObject"};
        };
    };
@ -191,12 +194,69 @@ class CfgVehicles {
        GVAR(hasCargo) = 1;
    };

-    class Heli_Transport_02_base_F;
-    class I_Heli_Transport_02_F : Heli_Transport_02_base_F {
+    class Helicopter_Base_H;
+    class Heli_Light_01_base_F: Helicopter_Base_H {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    class Heli_Light_02_base_F: Helicopter_Base_H {
+        GVAR(space) = 4;
+    };
+
+    class Helicopter_Base_F;
+    class Heli_light_03_base_F: Helicopter_Base_F {
+        GVAR(space) = 4;
+    };
+
+    class Heli_Transport_01_base_F: Helicopter_Base_H {
+        GVAR(space) = 8;
+    };
+
+    class Heli_Transport_02_base_F: Helicopter_Base_H {
+        GVAR(space) = 20;
+    };
+
+    class Heli_Transport_03_base_F: Helicopter_Base_H {
+        GVAR(space) = 40;
+    };
+
+    class Heli_Transport_04_base_F: Helicopter_Base_H {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    class O_Heli_Transport_04_box_F: Heli_Transport_04_base_F {
        GVAR(space) = 20;
        GVAR(hasCargo) = 1;
    };

+    class O_Heli_Transport_04_repair_F: Heli_Transport_04_base_F {
+        GVAR(space) = 12;
+        GVAR(hasCargo) = 1;
+    };
+
+    class O_Heli_Transport_04_ammo_F: Heli_Transport_04_base_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
+    };
+
+    class O_Heli_Transport_04_fuel_F: Heli_Transport_04_base_F {};
+
+    class O_Heli_Transport_04_medevac_F: Heli_Transport_04_base_F {
+        GVAR(space) = 8;
+        GVAR(hasCargo) = 1;
+    };
+
+    class Heli_Attack_01_base_F: Helicopter_Base_F {
+        GVAR(space) = 0;
+        GVAR(hasCargo) = 0;
+    };
+
+    class Heli_Attack_02_base_F: Helicopter_Base_F {
+        GVAR(space) = 4;
+    };
+
    // jets
    class Plane: Air {
        GVAR(space) = 0;
@ -204,7 +264,6 @@ class CfgVehicles {
    };

    // autonomus
-    class Helicopter_Base_F;
    class UAV_01_base_F: Helicopter_Base_F {
        GVAR(space) = 0;
        GVAR(hasCargo) = 0;
@ -253,6 +312,7 @@ class CfgVehicles {

    // Ammo boxes
    class ThingX;
+    class Items_base_F;
    class ReammoBox_F: ThingX {
        GVAR(size) = 2; // 1 = small, 2 = large
        GVAR(canLoad) = 1;
@ -268,6 +328,30 @@ class CfgVehicles {
        GVAR(size) = 6;
    };

+    class Slingload_base_F: ReammoBox_F {};
+    class CargoNet_01_base_F: Slingload_base_F { //Slingload pallets
+        GVAR(size) = 6;
+    };
+    class Slingload_01_Base_F: Slingload_base_F { //Huron 20ft containers
+        GVAR(canLoad) = 0;
+    };
+
+    //Plastic and metal case
+    class PlasticCase_01_base_F: Items_base_F {
+        GVAR(size) = 1; // 1 = small, 2 = large
+        GVAR(canLoad) = 1;
+    };
+    class Land_PlasticCase_01_large_F: PlasticCase_01_base_F {
+        GVAR(size) = 2; // 1 = small, 2 = large
+    };
+    class MetalCase_01_base_F: Items_base_F {
+        GVAR(size) = 1; // 1 = small, 2 = large
+        GVAR(canLoad) = 1;
+    };
+    class Land_MetalCase_01_large_F: MetalCase_01_base_F {
+        GVAR(size) = 2; // 1 = small, 2 = large
+    };
+
    // objects
    class RoadCone_F: ThingX {
        GVAR(size) = 1;
@ -277,14 +361,16 @@ class CfgVehicles {
        GVAR(size) = 2;
    };

-
    class Scrapyard_base_F;
    class Land_PaperBox_closed_F: Scrapyard_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 10;
        GVAR(hasCargo) = 1;
        GVAR(size) = 11;
        GVAR(canLoad) = 1;
-        XEH_ENABLED;

        class ACE_Actions {
            class ACE_MainActions {
@ -316,163 +402,253 @@ class CfgVehicles {
        };
    };
    class Cargo10_base_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 14;
        GVAR(size) = 15;
-        XEH_ENABLED;
    };
    class Land_Cargo20_blue_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_brick_red_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_cyan_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_grey_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_light_blue_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_light_green_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_military_green_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };

    class Ruins_F;
    class Land_Cargo20_military_ruins_F: Ruins_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };

    class Land_Cargo20_orange_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_red_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_sand_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_vr_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_white_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };
    class Land_Cargo20_yellow_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 49;
        GVAR(size) = 50;
-        XEH_ENABLED;
    };

    class Land_Cargo40_blue_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_brick_red_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_cyan_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_grey_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_light_blue_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_light_green_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_military_green_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };

    class Land_Cargo40_military_ruins_F: Ruins_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };

    class Land_Cargo40_orange_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_red_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_sand_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_vr_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_white_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };
    class Land_Cargo40_yellow_F: Cargo_base_F {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 99;
        GVAR(size) = 100;
-        XEH_ENABLED;
    };

    // small
    class Land_CargoBox_V1_F: ThingX {
+        class EventHandlers {
+            class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers {};
+        };
+
        GVAR(space) = 7;
        GVAR(hasCargo) = 1;
        GVAR(size) = 7;
-        XEH_ENABLED;

        class ACE_Actions {
            class ACE_MainActions {
@ -485,4 +661,10 @@ class CfgVehicles {
            };
        };
    };
+
+    class Lamps_base_F;
+    class Land_PortableLight_single_F: Lamps_base_F {
+        GVAR(size) = 1;
+        GVAR(canLoad) = 1;
+    };
 };
--- a/addons/cargo/XEH_PREP.hpp
+++ b/addons/cargo/XEH_PREP.hpp
@ -0,0 +1,20 @@
+
+PREP(addCargoItem);
+PREP(canLoad);
+PREP(canLoadItemIn);
+PREP(canUnloadItem);
+PREP(findNearestVehicle);
+PREP(getCargoSpaceLeft);
+PREP(getSizeItem);
+PREP(handleDestroyed);
+PREP(initObject);
+PREP(initVehicle);
+PREP(loadItem);
+PREP(makeLoadable);
+PREP(moduleMakeLoadable);
+PREP(moduleSettings);
+PREP(onMenuOpen);
+PREP(startLoadIn);
+PREP(startUnload);
+PREP(unloadItem);
+PREP(validateCargoSpace);
--- a/addons/cargo/XEH_postInit.sqf
+++ b/addons/cargo/XEH_postInit.sqf
@ -3,7 +3,7 @@
 ["AddCargoByClass", {_this call FUNC(addCargoItem)}] call EFUNC(common,addEventHandler);

 ["LoadCargo", {
-    (_this select 0) params ["_item","_vehicle"];
+    params ["_item", "_vehicle"];
    TRACE_2("LoadCargo EH",_item,_vehicle);

    private _loaded = [_item, _vehicle] call FUNC(loadItem);
@ -22,9 +22,9 @@
 }] call EFUNC(common,addEventHandler);

 ["UnloadCargo", {
-    (_this select 0) params ["_item","_vehicle", ["_unloader", objNull]];
+    params ["_item", "_vehicle", ["_unloader", objNull]];
    TRACE_3("UnloadCargo EH",_item,_vehicle,_unloader);
-    
+
    private _unloaded = [_item, _vehicle, _unloader] call FUNC(unloadItem); //returns true if sucessful

    private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item};
@ -43,3 +43,10 @@

    // TOOO maybe drag/carry the unloaded item?
 }] call EFUNC(common,addEventHandler);
+
+["ServerUnloadCargo", {
+    params ["_item", "_emptyPosAGL"];
+
+    _item hideObjectGlobal false;
+    _item setPosASL (AGLtoASL _emptyPosAGL);
+}] call EFUNC(common,addEventHandler);
--- a/addons/cargo/XEH_preInit.sqf
+++ b/addons/cargo/XEH_preInit.sqf
@ -2,25 +2,7 @@

 ADDON = false;

-PREP(addCargoItem);
-PREP(canLoad);
-PREP(canLoadItemIn);
-PREP(canUnloadItem);
-PREP(findNearestVehicle);
-PREP(getCargoSpaceLeft);
-PREP(getSizeItem);
-PREP(handleDestroyed);
-PREP(initObject);
-PREP(initVehicle);
-PREP(loadItem);
-PREP(makeLoadable);
-PREP(moduleMakeLoadable);
-PREP(moduleSettings);
-PREP(onMenuOpen);
-PREP(startLoadIn);
-PREP(startUnload);
-PREP(unloadItem);
-PREP(validateCargoSpace);
+#include "XEH_PREP.hpp"

 GVAR(initializedItemClasses) = [];
 GVAR(initializedVehicleClasses) = [];
--- a/addons/cargo/XEH_preStart.sqf
+++ b/addons/cargo/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/cargo/functions/fnc_startLoadIn.sqf
+++ b/addons/cargo/functions/fnc_startLoadIn.sqf
@ -37,7 +37,13 @@ private _return = false;
 if ([_object, _vehicle] call FUNC(canLoadItemIn)) then {
    private _size = [_object] call FUNC(getSizeItem);

-    [5 * _size, [_object,_vehicle], "LoadCargo", {}, localize LSTRING(LoadingItem)] call EFUNC(common,progressBar);
+    [
+        5 * _size,
+        [_object,_vehicle],
+        {["LoadCargo", _this select 0] call EFUNC(common,localEvent)},
+        {},
+        localize LSTRING(LoadingItem)
+    ] call EFUNC(common,progressBar);
    _return = true;
 } else {
    private _displayName = getText (configFile >> "CfgVehicles" >> typeOf _object >> "displayName");
--- a/addons/cargo/functions/fnc_startUnload.sqf
+++ b/addons/cargo/functions/fnc_startUnload.sqf
@ -34,7 +34,15 @@ private _item = _loaded select _selected; //This can be an object or a classname
 if ([_item, GVAR(interactionVehicle), ACE_player] call FUNC(canUnloadItem)) then {
    private _size = [_item] call FUNC(getSizeItem);

-    [5 * _size, [_item, GVAR(interactionVehicle), ACE_player], "UnloadCargo", {}, localize LSTRING(UnloadingItem), {true}, ["isNotSwimming"]] call EFUNC(common,progressBar);
+    [
+        5 * _size,
+        [_item, GVAR(interactionVehicle), ACE_player],
+        {["UnloadCargo", _this select 0] call EFUNC(common,localEvent)},
+        {},
+        localize LSTRING(UnloadingItem),
+        {true},
+        ["isNotSwimming"]
+    ] call EFUNC(common,progressBar);
 } else {
    private _itemClass = if (_item isEqualType "") then {_item} else {typeOf _item};
    private _displayName = getText (configFile >> "CfgVehicles" >> _itemClass >> "displayName");
--- a/addons/cargo/functions/fnc_unloadItem.sqf
+++ b/addons/cargo/functions/fnc_unloadItem.sqf
@ -50,8 +50,9 @@ _vehicle setVariable [QGVAR(space), (_space + _itemSize), true];

 if (_item isEqualType objNull) then {
    detach _item;
-    _item setPosASL (AGLtoASL _emptyPosAGL);
-    ["hideObjectGlobal", [_item, false]] call EFUNC(common,serverEvent);
+    // hideObjectGlobal must be executed before setPos to ensure light objects are rendered correctly
+    // do both on server to ensure they are executed in the correct order
+    ["ServerUnloadCargo", [_item, _emptyPosAGL]] call EFUNC(common,serverEvent);
 } else {
    private _newItem = createVehicle [_item, _emptyPosAGL, [], 0, ""];
    _newItem setPosASL (AGLtoASL _emptyPosAGL);
--- a/addons/cargo/menu.hpp
+++ b/addons/cargo/menu.hpp
@ -33,7 +33,7 @@ class GVAR(menu) {
            w = "13 * (((safezoneW / safezoneH) min 1.2) / 40)";
            h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
            style = ST_LEFT + ST_SHADOW;
-            font = "PuristaMedium";
+            font = "RobotoCondensed";
            SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
            colorText[] = {0.95, 0.95, 0.95, 0.75};
            colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"};
@ -67,7 +67,7 @@ class GVAR(menu) {
            colorSelectBackground[] = {0.3, 0.3, 0.3, 1.0};
            colorSelectBackground2[] = {0.3, 0.3, 0.3, 1.0};
        };
-        class btnUnload: ACE_gui_buttonBase {
+        class btnCancel: ACE_gui_buttonBase {
            text = "Cancel";
            idc = 11;
            x = "13.1 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
@ -93,7 +93,7 @@ class GVAR(menu) {
            periodOver = 1;
            action = QUOTE(closeDialog 0);
        };
-        class btnCancel: btnUnload {
+        class btnUnload: btnCancel {
            text = CSTRING(unloadObject);
            idc = 12;
            x = "20.9 * (((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX + (safezoneW - ((safezoneW / safezoneH) min 1.2))/2)";
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@ -9,6 +9,8 @@
            <Russian>Загрузить</Russian>
            <Czech>Naložit</Czech>
            <Spanish>Cargar</Spanish>
+            <Italian>Carica</Italian>
+            <French>Charger</French>
        </Key>
        <Key ID="STR_ACE_Cargo_unloadObject">
            <English>Unload</English>
@ -18,6 +20,8 @@
            <Russian>Выгрузить</Russian>
            <Czech>Vyložit</Czech>
            <Spanish>Descargar</Spanish>
+            <Italian>Scarica</Italian>
+            <French>Décharger</French>
        </Key>
        <Key ID="STR_ACE_Cargo_openMenu">
            <English>Cargo</English>
@ -27,6 +31,8 @@
            <Russian>Грузовой отсек</Russian>
            <Czech>Náklad</Czech>
            <Spanish>Carga</Spanish>
+            <Italian>Cargo</Italian>
+            <French>Cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_cargoMenu">
            <English>Cargo Menu</English>
@ -36,6 +42,8 @@
            <Russian>Грузовой отсек</Russian>
            <Czech>Menu nákladu</Czech>
            <Spanish>Menu de carga</Spanish>
+            <Italian>Menù Cargo</Italian>
+            <French>Menu de cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_labelSpace">
            <English>Cargo space left: %1</English>
@ -45,6 +53,8 @@
            <Russian>Осталось мест: %1</Russian>
            <Czech>Zbývající prostor: %1</Czech>
            <Spanish>Espacio de carga restante: %1</Spanish>
+            <Italian>Spazio cargo rimanente: %1</Italian>
+            <French>Espace de cargaison restant : %1</French>
        </Key>
        <Key ID="STR_ACE_Cargo_ModuleSettings_enable">
            <English>Enable Cargo</English>
@ -54,6 +64,8 @@
            <Russian>Включить модуль перевозки грузов</Russian>
            <Czech>Povolit náklad</Czech>
            <Spanish>Habilitar carga</Spanish>
+            <Italian>Abilita Cargo</Italian>
+            <French>Activer la cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_ModuleSettings_enable_Description">
            <English>Enable the load in cargo module</English>
@ -63,6 +75,8 @@
            <Russian>Включает модуль погрузки и перевозки грузов</Russian>
            <Spanish>Habilitar la carga en el módulo de carga</Spanish>
            <Czech>Umožňuje naložit předměty do nákladového prostoru vozidla</Czech>
+            <Italian>Abilita il modulo di caricamento in cargo</Italian>
+            <French>Activer le chargement dans le module de cargaison.</French>
        </Key>
        <Key ID="STR_ACE_Cargo_SettingsModule_DisplayName">
            <English>Cargo Settings</English>
@ -72,6 +86,8 @@
            <Russian>Перевозка грузов</Russian>
            <Czech>Nastavení nákladu</Czech>
            <Spanish>Ajustes de carga</Spanish>
+            <Italian>Impostazioni Cargo</Italian>
+            <French>Réglages de cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_SettingsModule_Description">
            <English>Configure the cargo module settings</English>
@ -81,6 +97,8 @@
            <Russian>Конфигурирует настройки модуля перевозки грузов</Russian>
            <Spanish>Configure los ajustes del módulo de carga</Spanish>
            <Czech>Konfigurace nákladního modulu</Czech>
+            <Italian>Configura le impostazioni del modulo cargo</Italian>
+            <French>Configurer les réglages du module de cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_LoadedItem">
            <English>%1&lt;br/&gt;loaded into&lt;br/&gt;%2</English>
@ -108,40 +126,71 @@
        </Key>
        <Key ID="STR_ACE_Cargo_LoadingItem">
            <English>Loading Cargo</English>
+            <German>Belade</German>
            <Portuguese>Carregando carga</Portuguese>
            <Polish>Ładowanie cargo</Polish>
            <Czech>Nakládám</Czech>
            <Russian>Погрузка</Russian>
+            <Italian>Caricando</Italian>
+            <Spanish>Cargando</Spanish>
+            <French>Chargement de la cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_UnloadingItem">
            <English>Unloading Cargo</English>
+            <German>Entlade</German>
            <Portuguese>Descarregando carga</Portuguese>
            <Polish>Rozładowywanie cargo</Polish>
            <Czech>Vykládám</Czech>
            <Russian>Выгрузка</Russian>
+            <Italian>Scaricando</Italian>
+            <Spanish>Descargando</Spanish>
+            <French>Déchargement de la cargaison</French>
        </Key>
        <Key ID="STR_ACE_Cargo_LoadingFailed">
            <English>%1&lt;br/&gt;could not be loaded</English>
+            <German>%1&lt;br/&gt;konnte nicht eingeladen werden</German>
            <Portuguese>%1&lt;br/&gt;não pode ser carregado</Portuguese>
            <Polish>%1&lt;br/&gt;nie mógł zostać załadowany</Polish>
            <Czech>%1&lt;br/&gt;nemůže být naloženo</Czech>
            <Russian>%1&lt;br/&gt;не может быть погружен</Russian>
+            <Italian>%1&lt;br/&gt;non può essere caricato</Italian>
+            <Spanish>%1&lt;br/&gt;no pudo ser cargado</Spanish>
+            <French>%1&lt;br /&gt; n'a pas pu être chargé</French>
        </Key>
        <Key ID="STR_ACE_Cargo_UnloadingFailed">
            <English>%1&lt;br/&gt;could not be unloaded</English>
+            <German>%1&lt;br/&gt;konnte nicht entladen werden</German>
            <Portuguese>%1&lt;br/&gt;não pode ser descarregado</Portuguese>
            <Polish>%1&lt;br/&gt;nie mógł zostać rozładowany</Polish>
            <Czech>%1&lt;br/&gt;nemůže být vyloženo</Czech>
            <Russian>%1&lt;br/&gt;не может быть выгружен</Russian>
+            <Italian>%1&lt;br/&gt;non può essere scaricato</Italian>
+            <Spanish>%1&lt;br/&gt;no pudo ser descargado</Spanish>
+            <French>%1&lt;br /&gt; n'a pas pu être déchargé</French>
        </Key>
        <Key ID="STR_ACE_Cargo_makeLoadable_displayName">
            <English>Make Object Loadable</English>
+            <German>Füge Objekt zum Frachtsystem hinzu</German>
+            <Polish>Ustaw jako ładowalny</Polish>
+            <Italian>Rendi oggetto caricabile</Italian>
+            <Spanish>Hacer objeto cargable</Spanish>
+            <French>Rendre l'objet chargeable</French>
        </Key>
        <Key ID="STR_ACE_Cargo_makeLoadable_description">
            <English>Sets the synced object as loadable by the cargo system.</English>
+            <German>Das synchronisierte Objekt wird dem Frachtsystem hinzugefügt und ist be- und entladbar.</German>
+            <Polish>Ustawia zsynchronizowany obiekt jako możliwy do załadowania poprzez system cargo</Polish>
+            <Italian>Imposta l'oggetto sincronizzato come caricabile dal sistema cargo</Italian>
+            <Spanish>Sincronizar un objecto para hacerlo cargable.</Spanish>
+            <French>Rend l'objet synchronisé comme chargeable par le système de cargaison.</French>
        </Key>
        <Key ID="STR_ACE_Cargo_makeLoadable_setSize_displayName">
            <English>Object's Size</English>
+            <German>Objektgröße</German>
+            <Polish>Rozmiar obiektu</Polish>
+            <Italian>Dimensioni dell'oggetto</Italian>
+            <Spanish>Tamaño del objeto</Spanish>
+            <French>Taille de l'objet</French>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/common/CfgEden.hpp
+++ b/addons/common/CfgEden.hpp
@ -0,0 +1,11 @@
+class Cfg3DEN {
+    class Object {
+        class AttributeCategories {
+            class ace_attributes {
+                displayName = CSTRING(Options);
+                collapsed = 1;
+                class Attributes {};
+            };
+        };
+    };
+};
--- a/addons/common/CfgEventHandlers.hpp
+++ b/addons/common/CfgEventHandlers.hpp
@ -1,4 +1,10 @@

+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
 class Extended_PreInit_EventHandlers {
    class ADDON {
        init = QUOTE(call COMPILE_FILE(XEH_preInit));
@ -13,6 +19,12 @@ class Extended_PostInit_EventHandlers {
    };
 };

+class Extended_DisplayLoad_EventHandlers {
+    class RscDisplayMission {
+        ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDisplayLoad));
+    };
+};
+
 class Extended_InitPost_EventHandlers {
    class All {
        class GVAR(executePersistent) {
@ -21,7 +33,7 @@ class Extended_InitPost_EventHandlers {
    };
    class CAManBase {
        class GVAR(setName) {
-            init = QUOTE(if (local (_this select 0)) then {_this call FUNC(setName)};);
+            init = QUOTE(if (local (_this select 0)) then {[ARR_2(FUNC(setName),_this)] call FUNC(execNextFrame)};);
        };
        class GVAR(muteUnit) {
            init = QUOTE(_this call FUNC(muteUnitHandleInitPost));
--- a/addons/common/CfgLocationTypes.hpp
+++ b/addons/common/CfgLocationTypes.hpp
@ -5,7 +5,7 @@ class CfgLocationTypes {
    class ACE_HashLocation {
        color[] = {0,0,0,0};
        drawStyle = "bananas";
-        font = "PuristaMedium";
+        font = "RobotoCondensed";
        importance = 5;
        name = "HashLocation";
        shadow = 0;
--- a/addons/common/HintConfig.hpp
+++ b/addons/common/HintConfig.hpp
@ -25,7 +25,7 @@ class RscTitles {
                y = safeZoneY + 0.2 * safezoneH;
                w = 0.2 * safeZoneW;
                h = 0.1 * SafeZoneH;
-                font = "PuristaMedium";
+                font = "RobotoCondensed";
            };
        };
    };
--- a/addons/common/RscInfoType.hpp
+++ b/addons/common/RscInfoType.hpp
@ -1,7 +1,7 @@

 class RscInGameUI {
    class RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])]         call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Any')])]         call FUNC(localEvent););
    };

    class RscUnitInfoNoHUD {
@ -9,19 +9,19 @@ class RscInGameUI {
    };

    class RscUnitInfoSoldier: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSoldier',     _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Soldier')])]     call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgSoldier',     _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Soldier')])]     call FUNC(localEvent););
    };

    class RscUnitInfoTank: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgVehicle',     _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Vehicle')])]     call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgVehicle',     _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Vehicle')])]     call FUNC(localEvent););
    };
    
    class RscUnitInfoAirNoWeapon: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgAircraft',    _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])]    call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgAircraft',    _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])]    call FUNC(localEvent););
    };

    class RscUnitInfoAir: RscUnitInfoAirNoWeapon {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgAircraft',    _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])]    call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgAircraft',    _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Aircraft')])]    call FUNC(localEvent););
    };

    class RscUnitInfo_AH64D_gunner {
@ -33,11 +33,11 @@ class RscInGameUI {
    };

    class RscUnitInfoSubmarine: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgSubmarine',   _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Submarine')])]   call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgSubmarine',   _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Submarine')])]   call FUNC(localEvent););
    };

    class RscUnitInfoShip: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgShip',        _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Ship')])]        call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgShip',        _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Ship')])]        call FUNC(localEvent););
    };

    class RscWeaponEmpty {
@ -97,7 +97,7 @@ class RscInGameUI {
    };

    class RscUnitInfoParachute: RscUnitInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; uiNamespace setVariable [ARR_2('ACE_dlgParachute',   _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Parachute')])]   call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscUnitInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgParachute',   _this select 0)]; [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Parachute')])]   call FUNC(localEvent););
    };

    class RscUnitVehicle {
@ -112,25 +112,3 @@ class RscInGameUI {
        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscStaminaBar"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2(QUOTE(QGVAR(dlgStaminaBar)),_this select 0)]);
    };
 };
-
-class RscDisplayInventory {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayInventory"",'IGUI')] call compile preprocessfilelinenumbers ""A3\ui_f\scripts\initDisplay.sqf""; [ARR_2('inventoryDisplayLoaded', _this)] call FUNC(localEvent););
-};
-
-// map
-class RscDisplayMainMap {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call    (uinamespace getVariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'Ingame')])] call FUNC(localEvent););
-};
-
-class RscDisplayGetReady: RscDisplayMainMap {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call    (uinamespace getVariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'Briefing')])] call FUNC(localEvent););
-};
-
-class RscDisplayServerGetReady: RscDisplayGetReady {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call    (uinamespace getVariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'ServerBriefing')])] call FUNC(localEvent););
-};
-
-
-class RscDisplayClientGetReady: RscDisplayGetReady {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDiary"",'GUI')] call    (uinamespace getVariable 'BIS_fnc_initDisplay'); uiNamespace setVariable [ARR_2('ACE_dlgMap', _this select 0)]; [ARR_2('mapDisplayLoaded', [ARR_2(_this select 0, 'ClientBriefing')])] call FUNC(localEvent););
-};
--- a/addons/common/XEH_PREP.hpp
+++ b/addons/common/XEH_PREP.hpp
@ -0,0 +1,280 @@
+
+PREP(addCanInteractWithCondition);
+PREP(addLineToDebugDraw);
+PREP(addSetting);
+PREP(addToInventory);
+PREP(assignedItemFix);
+PREP(assignObjectsInList);
+PREP(ambientBrightness);
+PREP(ASLToPosition);
+PREP(binarizeNumber);
+PREP(blurScreen);
+PREP(cachedCall);
+PREP(canGetInPosition);
+PREP(canInteractWith);
+PREP(changeProjectileDirection);
+PREP(checkFiles);
+PREP(checkPBOs);
+PREP(claim);
+PREP(codeToString);
+PREP(createOrthonormalReference);
+PREP(currentChannel);
+PREP(debug);
+PREP(debugModule);
+PREP(defineVariable);
+PREP(deviceKeyFindValidIndex);
+PREP(deviceKeyRegisterNew);
+PREP(disableAI);
+PREP(disableUserInput);
+PREP(displayIcon);
+PREP(displayText);
+PREP(displayTextPicture);
+PREP(displayTextStructured);
+PREP(doAnimation);
+PREP(dropBackpack);
+PREP(endRadioTransmission);
+PREP(eraseCache);
+PREP(errorMessage);
+PREP(execNextFrame);
+PREP(execPersistentFnc);
+PREP(execRemoteFnc);
+PREP(executePersistent);
+PREP(filter);
+PREP(findUnloadPosition);
+PREP(firedEH);
+PREP(fixCollision);
+PREP(fixFloating);
+PREP(fixLoweredRifleAnimation);
+PREP(fixPosition);
+PREP(getAllDefinedSetVariables);
+PREP(getAllGear);
+PREP(getDeathAnim);
+PREP(getCaptivityStatus);
+PREP(getDefaultAnim);
+PREP(getDefinedVariable);
+PREP(getDefinedVariableDefault);
+PREP(getDefinedVariableInfo);
+PREP(getFirstObjectIntersection);
+PREP(getFirstTerrainIntersection);
+PREP(getForceWalkStatus);
+PREP(getGunner);
+PREP(getInPosition);
+PREP(getMapGridData);
+PREP(getMapGridFromPos);
+PREP(getMapPosFromGrid);
+PREP(getMarkerType);
+PREP(getMGRSdata);
+PREP(getName);
+PREP(getNumberFromMissionSQM);
+PREP(getNumberMagazinesIn);
+PREP(getPitchBankYaw);
+PREP(getSettingData);
+PREP(getStaminaBarControl);
+PREP(getStringFromMissionSQM);
+PREP(getTargetAzimuthAndInclination);
+PREP(getTargetDistance);
+PREP(getTargetObject);
+PREP(getTurnedOnLights);
+PREP(getTurretDirection);
+PREP(getUavControlPosition);
+PREP(getVehicleCargo);
+PREP(getVehicleCodriver);
+PREP(getVersion);
+PREP(getWeaponAzimuthAndInclination);
+PREP(getWeaponIndex);
+PREP(getWeaponState);
+PREP(getWindDirection);
+PREP(getZoom);
+PREP(goKneeling);
+PREP(hadamardProduct);
+PREP(handleModifierKey);
+PREP(handleModifierKeyUp);
+PREP(handleScrollWheel);
+PREP(hasItem);
+PREP(hasMagazine);
+PREP(headBugFix);
+PREP(hideUnit);
+PREP(insertionSort);
+PREP(interpolateFromArray);
+PREP(inTransitionAnim);
+PREP(isAutoWind);
+PREP(isAwake);
+PREP(isEngineer);
+PREP(isEOD);
+PREP(isFeatureCameraActive);
+PREP(isInBuilding);
+PREP(isModLoaded);
+PREP(isPlayer);
+PREP(isUnderwater);
+PREP(lightIntensityFromObject);
+PREP(loadPerson);
+PREP(loadPersonLocal);
+PREP(loadSettingsFromProfile);
+PREP(loadSettingsOnServer);
+PREP(loadSettingsLocalizedText);
+PREP(map);
+PREP(moduleCheckPBOs);
+PREP(moduleLSDVehicles);
+PREP(muteUnit);
+PREP(muteUnitHandleInitPost);
+PREP(muteUnitHandleRespawn);
+PREP(numberToDigits);
+PREP(numberToDigitsString);
+PREP(numberToString);
+PREP(onAnswerRequest);
+PREP(owned);
+PREP(parseList);
+PREP(player);
+PREP(playerSide);
+PREP(positionToASL);
+PREP(progressBar);
+PREP(readSettingFromModule);
+PREP(readSettingsFromParamsArray);
+PREP(receiveRequest);
+PREP(removeCanInteractWithCondition);
+PREP(removeSpecificMagazine);
+PREP(requestCallback);
+PREP(resetAllDefaults);
+PREP(restoreVariablesJIP);
+PREP(runAfterSettingsInit);
+PREP(sanitizeString);
+PREP(sendRequest);
+PREP(serverLog);
+PREP(setAllGear);
+PREP(setApproximateVariablePublic);
+PREP(setCaptivityStatus);
+PREP(setDefinedVariable);
+PREP(setDisableUserInputStatus);
+PREP(setForceWalkStatus);
+PREP(setHearingCapability);
+PREP(setName);
+PREP(setParameter);
+PREP(setPitchBankYaw);
+PREP(setProne);
+PREP(setSetting);
+PREP(setSettingFromConfig);
+PREP(setVariableJIP);
+PREP(setVariablePublic);
+PREP(setVolume);
+PREP(showHud);
+PREP(statusEffect_addType);
+PREP(statusEffect_get);
+PREP(statusEffect_localEH);
+PREP(statusEffect_resetVariables);
+PREP(statusEffect_respawnEH);
+PREP(statusEffect_sendEffects);
+PREP(statusEffect_set);
+PREP(stringCompare);
+PREP(stringToColoredText);
+PREP(stringRemoveWhiteSpace);
+PREP(switchToGroupSide);
+PREP(throttledPublicVariable);
+PREP(toBin);
+PREP(toBitmask);
+PREP(toHex);
+PREP(toNumber);
+PREP(unhideUnit);
+PREP(uniqueElements);
+PREP(unloadPerson);
+PREP(unloadPersonLocal);
+PREP(unmuteUnit);
+PREP(useItem);
+PREP(useMagazine);
+PREP(waitAndExecute);
+PREP(waitUntilAndExecute);
+PREP(waveHeightAt);
+
+PREP(translateToWeaponSpace);
+PREP(translateToModelSpace);
+
+// Model and drawing helpers
+PREP(worldToScreenBounds);
+
+// config items
+PREP(getConfigType);
+PREP(getItemType);
+PREP(getWeaponType);
+PREP(getWeaponModes);
+PREP(getWeaponMuzzles);
+
+// config objects
+PREP(getConfigTypeObject);
+PREP(getConfigGunner);
+PREP(getConfigCommander);
+PREP(getSelectionsWithoutHitPoints);
+PREP(getReflectorsWithSelections);
+PREP(getLightProperties);
+PREP(getLightPropertiesWeapon);
+PREP(getVehicleCrew);
+PREP(getVehicleUAVCrew);
+
+// turrets
+PREP(getTurrets);
+PREP(getTurretIndex);
+PREP(getTurretConfigPath);
+PREP(getTurretGunner);
+PREP(getTurretCommander);
+PREP(getTurretCopilot);
+PREP(getDoorTurrets);
+PREP(getTurretsFFV);
+PREP(getTurretsOther);
+PREP(hasHatch);
+
+// missing inventory commands
+PREP(binocularMagazine);
+PREP(removeBinocularMagazine);
+
+// ACE_Debug
+PREP(getChildren);
+PREP(getDisplayConfigName);
+PREP(monitor);
+PREP(showUser);
+
+PREP(dumpPerformanceCounters);
+PREP(dumpArray);
+
+PREP(globalEvent);
+PREP(_handleNetEvent);
+PREP(addEventHandler);
+PREP(objectEvent);
+PREP(targetEvent);
+PREP(serverEvent);
+PREP(localEvent);
+PREP(removeEventHandler);
+PREP(removeAlLEventHandlers);
+
+// Synchronized Events
+PREP(syncedEventPFH);
+PREP(addSyncedEventHandler);
+PREP(removeSyncedEventHandler);
+PREP(requestSyncedEvent);
+PREP(syncedEvent);
+
+PREP(_handleSyncedEvent);
+PREP(_handleRequestSyncedEvent);
+PREP(_handleRequestAllSyncedEvents);
+
+// other eventhandlers
+PREP(addActionEventHandler);
+PREP(addActionMenuEventHandler);
+PREP(addScrollWheelEventHandler);
+PREP(addMapMarkerCreatedEventHandler);
+
+PREP(removeActionEventHandler);
+PREP(removeActionMenuEventHandler);
+PREP(removeScrollWheelEventHandler);
+PREP(removeMapMarkerCreatedEventHandler);
+
+// hashes
+PREP(hashCreate);
+PREP(hashSet);
+PREP(hashGet);
+PREP(hashHasKey);
+PREP(hashRem);
+PREP(hashListCreateList);
+PREP(hashListCreateHash);
+PREP(hashListSelect);
+PREP(hashListSet);
+PREP(hashListPush);
+
+PREP(timePFH);
--- a/addons/common/XEH_missionDisplayLoad.sqf
+++ b/addons/common/XEH_missionDisplayLoad.sqf
@ -0,0 +1,4 @@
+#include "script_component.hpp"
+
+call COMPILE_FILE(init_handleScrollWheel);
+call COMPILE_FILE(init_handleModifierKey);
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@ -149,6 +149,11 @@ if (isServer) then {
 ["setSpeaker", {(_this select 0) setSpeaker (_this select 1)}] call FUNC(addEventhandler);
 ["selectLeader", {(_this select 0) selectLeader (_this select 1)}] call FUNC(addEventHandler);
 ["setVelocity", {(_this select 0) setVelocity (_this select 1)}] call FUNC(addEventHandler);
+["playMove", {(_this select 0) playMove (_this select 1)}] call FUNC(addEventHandler);
+["playMoveNow", {(_this select 0) playMoveNow (_this select 1)}] call FUNC(addEventHandler);
+["switchMove", {(_this select 0) switchMove (_this select 1)}] call FUNC(addEventHandler);
+["setVectorDirAndUp", {(_this select 0) setVectorDirAndUp (_this select 1)}] call FUNC(addEventHandler);
+["setVanillaHitPointDamage", {(_this select 0) setHitPointDamage (_this select 1)}] call FUNC(addEventHandler);

 if (isServer) then {
    ["hideObjectGlobal", {(_this select 0) hideObjectGlobal (_this select 1)}] call FUNC(addEventHandler);
@ -251,7 +256,7 @@ call FUNC(checkFiles);
        // Publish all settings data after all configs and modules are read
        publicVariable QGVAR(settings);
    };
-    
+
    // Load user settings from profile
    if (hasInterface) then {
        call FUNC(loadSettingsFromProfile);
@ -290,31 +295,6 @@ if (!hasInterface) exitWith {};

 call FUNC(assignedItemFix);

-GVAR(ScrollWheelFrame) = diag_frameno;
-
-["mainDisplayLoaded", {
-    [{
-        call FUNC(handleScrollWheelInit);
-        call FUNC(handleModifierKeyInit);
-    }, [], 0.1] call FUNC(waitAndExecute); // needs delay, otherwise doesn't work without pressing "RESTART" in editor once. Tested in 1.52RC
-}] call FUNC(addEventHandler);
-
-// add PFH to execute event that fires when the main display (46) is created
-private _fnc_initMainDisplayCheck = {
-    [{
-        if !(isNull findDisplay 46) then {
-            // Raise ACE event locally
-            ["mainDisplayLoaded", [findDisplay 46]] call FUNC(localEvent);
-            [_this select 1] call CBA_fnc_removePerFrameHandler;
-        };
-    }, 0, []] call CBA_fnc_addPerFrameHandler;
-};
-
-call _fnc_initMainDisplayCheck;
-
-// repeat this every time a savegame is loaded
-addMissionEventHandler ["Loaded", _fnc_initMainDisplayCheck];
-
 // @todo remove?
 enableCamShake true;

@ -341,17 +321,6 @@ enableCamShake true;
 // Set up numerous eventhanders for player controlled units
 //////////////////////////////////////////////////

-//CBA has events for zeus's display onLoad and onUnload (Need to delay a frame for display to be ready)
-private _zeusDisplayChangedFNC = {
-    [{
-        private _data = !(isNull findDisplay 312);
-        ["zeusDisplayChanged", [ACE_player, _data]] call FUNC(localEvent);
-    }, []] call FUNC(execNextFrame);
-};
-["CBA_curatorOpened", _zeusDisplayChangedFNC] call CBA_fnc_addEventHandler;
-["CBA_curatorClosed", _zeusDisplayChangedFNC] call CBA_fnc_addEventHandler;
-
-
 // default variables
 GVAR(OldPlayerVehicle) = vehicle objNull;
 GVAR(OldPlayerTurret) = [objNull] call FUNC(getTurretIndex);
@ -363,12 +332,6 @@ GVAR(OldVisibleMap) = false;
 GVAR(OldInventoryDisplayIsOpen) = nil; //@todo check this
 GVAR(OldIsCamera) = false;

-// clean up playerChanged eventhandler from preinit and put it in the same PFH as the other events to reduce overhead and guarantee advantageous execution order
-if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
-    [GVAR(PreInit_playerChanged_PFHID)] call CBA_fnc_removePerFrameHandler;
-    GVAR(PreInit_playerChanged_PFHID) = nil;
-};
-
 // PFH to raise varios events
 [{
    BEGIN_COUNTER(stateChecker);
@ -441,14 +404,6 @@ if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
        ["visibleMapChanged", [ACE_player, _data]] call FUNC(localEvent);
    };

-    // "inventoryDisplayChanged" event
-    _data = !(isNull findDisplay 602);
-    if !(_data isEqualTo GVAR(OldInventoryDisplayIsOpen)) then {
-        // Raise ACE event locally
-        GVAR(OldInventoryDisplayIsOpen) = _data;
-        ["inventoryDisplayChanged", [ACE_player, _data]] call FUNC(localEvent);
-    };
-
    // "activeCameraChanged" event
    _data = call FUNC(isfeatureCameraActive);
    if !(_data isEqualTo GVAR(OldIsCamera)) then {
@ -476,11 +431,18 @@ if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
    };
 }] call FUNC(addEventhandler);

+["useItem", DFUNC(useItem)] call FUNC(addEventHandler);
+

 //////////////////////////////////////////////////
 // Add various canInteractWith conditions
 //////////////////////////////////////////////////

+["isNotDead", {
+    params ["_unit", "_target"];
+    alive _unit
+}] call FUNC(addCanInteractWithCondition);
+
 ["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);

 ["isNotInside", {
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@ -3,304 +3,22 @@

 ADDON = false;

-PREP(addCanInteractWithCondition);
-PREP(addLineToDebugDraw);
-PREP(addSetting);
-PREP(addToInventory);
-PREP(assignedItemFix);
-PREP(assignObjectsInList);
-PREP(ambientBrightness);
-PREP(ASLToPosition);
-PREP(binarizeNumber);
-PREP(blurScreen);
-PREP(cachedCall);
-PREP(canGetInPosition);
-PREP(canInteractWith);
-PREP(canUseWeapon);
-PREP(changeProjectileDirection);
-PREP(checkFiles);
-PREP(checkPBOs);
-PREP(claim);
-PREP(codeToLetter);
-PREP(codeToString);
-PREP(createOrthonormalReference);
-PREP(currentChannel);
-PREP(debug);
-PREP(debugModule);
-PREP(defineVariable);
-PREP(deviceKeyFindValidIndex);
-PREP(deviceKeyRegisterNew);
-PREP(disableAI);
-PREP(disableUserInput);
-PREP(displayIcon);
-PREP(displayText);
-PREP(displayTextPicture);
-PREP(displayTextStructured);
-PREP(doAnimation);
-PREP(dropBackpack);
-PREP(endRadioTransmission);
-PREP(eraseCache);
-PREP(errorMessage);
-PREP(execNextFrame);
-PREP(execPersistentFnc);
-PREP(execRemoteFnc);
-PREP(executePersistent);
-PREP(filter);
-PREP(findUnloadPosition);
-PREP(firedEH);
-PREP(fixCollision);
-PREP(fixFloating);
-PREP(fixLoweredRifleAnimation);
-PREP(fixPosition);
-PREP(getAllDefinedSetVariables);
-PREP(getAllGear);
-PREP(getDeathAnim);
-PREP(getCaptivityStatus);
-PREP(getDefaultAnim);
-PREP(getDefinedVariable);
-PREP(getDefinedVariableDefault);
-PREP(getDefinedVariableInfo);
-PREP(getFirstObjectIntersection);
-PREP(getFirstTerrainIntersection);
-PREP(getForceWalkStatus);
-PREP(getGunner);
-PREP(getInPosition);
-PREP(getMapGridData);
-PREP(getMapGridFromPos);
-PREP(getMapPosFromGrid);
-PREP(getMarkerType);
-PREP(getMGRSdata);
-PREP(getName);
-PREP(getNumberFromMissionSQM);
-PREP(getNumberMagazinesIn);
-PREP(getPitchBankYaw);
-PREP(getSettingData);
-PREP(getStaminaBarControl);
-PREP(getStringFromMissionSQM);
-PREP(getTargetAzimuthAndInclination);
-PREP(getTargetDistance);
-PREP(getTargetObject);
-PREP(getTurnedOnLights);
-PREP(getTurretDirection);
-PREP(getUavControlPosition);
-PREP(getVehicleCargo);
-PREP(getVehicleCodriver);
-PREP(getVersion);
-PREP(getWeaponAzimuthAndInclination);
-PREP(getWeaponIndex);
-PREP(getWeaponState);
-PREP(getWindDirection);
-PREP(getZoom);
-PREP(goKneeling);
-PREP(hadamardProduct);
-PREP(handleModifierKey);
-PREP(handleModifierKeyUp);
-PREP(handleModifierKeyInit);
-PREP(handleScrollWheel);
-PREP(handleScrollWheelInit);
-PREP(hasItem);
-PREP(hasMagazine);
-PREP(headBugFix);
-PREP(hideUnit);
-PREP(inheritsFrom);
-PREP(insertionSort);
-PREP(interpolateFromArray);
-PREP(inTransitionAnim);
-PREP(inWater);
-PREP(isAlive);
-PREP(isAutoWind);
-PREP(isAwake);
-PREP(isEngineer);
-PREP(isEOD);
-PREP(isFeatureCameraActive);
-PREP(isInBuilding);
-PREP(isModLoaded);
-PREP(isPlayer);
-PREP(isTurnedOut);
-PREP(isUnderwater);
-PREP(letterToCode);
-PREP(lightIntensityFromObject);
-PREP(loadPerson);
-PREP(loadPersonLocal);
-PREP(loadSettingsFromProfile);
-PREP(loadSettingsOnServer);
-PREP(loadSettingsLocalizedText);
-PREP(map);
-PREP(moduleCheckPBOs);
-PREP(moduleLSDVehicles);
-PREP(muteUnit);
-PREP(muteUnitHandleInitPost);
-PREP(muteUnitHandleRespawn);
-PREP(numberToDigits);
-PREP(numberToDigitsString);
-PREP(numberToString);
-PREP(onAnswerRequest);
-PREP(owned);
-PREP(parseList);
-PREP(player);
-PREP(playerSide);
-PREP(positionToASL);
-PREP(progressBar);
-PREP(readSettingFromModule);
-PREP(readSettingsFromParamsArray);
-PREP(receiveRequest);
-PREP(removeCanInteractWithCondition);
-PREP(removeSpecificMagazine);
-PREP(requestCallback);
-PREP(resetAllDefaults);
-PREP(restoreVariablesJIP);
-PREP(runAfterSettingsInit);
-PREP(sanitizeString);
-PREP(selectWeaponMode);
-PREP(sendRequest);
-PREP(serverLog);
-PREP(setAllGear);
-PREP(setApproximateVariablePublic);
-PREP(setCaptivityStatus);
-PREP(setDefinedVariable);
-PREP(setDisableUserInputStatus);
-PREP(setForceWalkStatus);
-PREP(setHearingCapability);
-PREP(setName);
-PREP(setParameter);
-PREP(setPitchBankYaw);
-PREP(setProne);
-PREP(setSetting);
-PREP(setSettingFromConfig);
-PREP(setVariableJIP);
-PREP(setVariablePublic);
-PREP(setVolume);
-PREP(sortAlphabeticallyBy);
-PREP(showHud);
-PREP(statusEffect_addType);
-PREP(statusEffect_get);
-PREP(statusEffect_localEH);
-PREP(statusEffect_resetVariables);
-PREP(statusEffect_respawnEH);
-PREP(statusEffect_sendEffects);
-PREP(statusEffect_set);
-PREP(stringCompare);
-PREP(stringToColoredText);
-PREP(stringRemoveWhiteSpace);
-PREP(switchToGroupSide);
-PREP(throttledPublicVariable);
-PREP(toBin);
-PREP(toBitmask);
-PREP(toHex);
-PREP(toNumber);
-PREP(unhideUnit);
-PREP(uniqueElements);
-PREP(uniqueElementsOnly);
-PREP(unloadPerson);
-PREP(unloadPersonLocal);
-PREP(unmuteUnit);
-PREP(useItem);
-PREP(useMagazine);
-PREP(waitAndExecute);
-PREP(waitUntilAndExecute);
-PREP(waveHeightAt);
-
-PREP(translateToWeaponSpace);
-PREP(translateToModelSpace);
-
-// Model and drawing helpers
-PREP(worldToScreenBounds);
-
-// config items
-PREP(getConfigType);
-PREP(getItemType);
-PREP(getWeaponType);
-PREP(getWeaponModes);
-PREP(getWeaponMuzzles);
-
-// config objects
-PREP(getConfigTypeObject);
-PREP(getConfigGunner);
-PREP(getConfigCommander);
-PREP(getHitPoints);
-PREP(getHitPointsWithSelections);
-PREP(getSelectionsWithoutHitPoints);
-PREP(getReflectorsWithSelections);
-PREP(getLightProperties);
-PREP(getLightPropertiesWeapon);
-PREP(getVehicleCrew);
-PREP(getVehicleUAVCrew);
-
-// turrets
-PREP(getTurrets);
-PREP(getTurretIndex);
-PREP(getTurretConfigPath);
-PREP(getTurretGunner);
-PREP(getTurretCommander);
-PREP(getTurretCopilot);
-PREP(getDoorTurrets);
-PREP(getTurretsFFV);
-PREP(getTurretsOther);
-PREP(hasHatch);
-
-// missing inventory commands
-PREP(binocularMagazine);
-PREP(removeBinocularMagazine);
-
-// ACE_Debug
-PREP(exportConfig);
-PREP(getChildren);
-PREP(getDisplayConfigName);
-PREP(monitor);
-PREP(showUser);
-
-PREP(dumpPerformanceCounters);
-PREP(dumpArray);
-
-// ACE_CuratorFix
-PREP(addCuratorUnloadEventhandler);
-PREP(fixCrateContent);
+#include "XEH_PREP.hpp"

 //ACE events global variables
-GVAR(events) = [[],[]];
+GVAR(eventsLocation) = createLocation ["ACE_HashLocation", [-10000,-10000,-10000], 0, 0];
+GVAR(eventsLocation) setText QGVAR(eventsLocation);

-PREP(globalEvent);
-PREP(_handleNetEvent);
-PREP(addEventHandler);
-PREP(targetEvent);
-PREP(serverEvent);
-PREP(localEvent);
-PREP(removeEventHandler);
-PREP(removeAlLEventHandlers);
+// backwards comp
+DFUNC(canUseWeapon) = {
+    ACE_DEPRECATED("ace_common_fnc_canUseWeapon","3.7.0","CBA_fnc_canUseWeapon");
+    _this call CBA_fnc_canUseWeapon;
+};

-// Synchronized Events
-PREP(syncedEventPFH);
-PREP(addSyncedEventHandler);
-PREP(removeSyncedEventHandler);
-PREP(requestSyncedEvent);
-PREP(syncedEvent);
-
-PREP(_handleSyncedEvent);
-PREP(_handleRequestSyncedEvent);
-PREP(_handleRequestAllSyncedEvents);
-
-// other eventhandlers
-PREP(addActionEventHandler);
-PREP(addActionMenuEventHandler);
-PREP(addScrollWheelEventHandler);
-PREP(addMapMarkerCreatedEventHandler);
-
-PREP(removeActionEventHandler);
-PREP(removeActionMenuEventHandler);
-PREP(removeScrollWheelEventHandler);
-PREP(removeMapMarkerCreatedEventHandler);
-
-// hashes
-PREP(hashCreate);
-PREP(hashSet);
-PREP(hashGet);
-PREP(hashHasKey);
-PREP(hashRem);
-PREP(hashListCreateList);
-PREP(hashListCreateHash);
-PREP(hashListSelect);
-PREP(hashListSet);
-PREP(hashListPush);
+DFUNC(selectWeaponMode) = {
+    ACE_DEPRECATED("ace_common_fnc_selectWeaponMode","3.7.0","CBA_fnc_selectWeapon");
+    _this call CBA_fnc_selectWeapon;
+};

 GVAR(syncedEvents) = HASH_CREATE;
 GVAR(showHudHash) = [] call FUNC(hashCreate);
@ -329,29 +47,12 @@ GVAR(statusEffect_Names) = [];
 GVAR(statusEffect_isGlobal) = [];

 //////////////////////////////////////////////////
-// Set up PlayerChanged eventhandler for pre init
+// Set up PlayerChanged eventhandler for pre init (EH is installed in postInit)
 //////////////////////////////////////////////////

 ACE_player = objNull;
 uiNamespace setVariable ["ACE_player", objNull];

-// @todo check if this can be removed
-if (hasInterface) then {
-    // PFH to update the ACE_player variable
-    GVAR(PreInit_playerChanged_PFHID) = [{
-        if !(ACE_player isEqualTo (call FUNC(player))) then {
-            private _oldPlayer = ACE_player;
-
-            ACE_player = call FUNC(player);
-            uiNamespace setVariable ["ACE_player", ACE_player];
-
-            // Raise ACE event
-            ["playerChanged", [ACE_player, _oldPlayer]] call FUNC(localEvent);
-        };
-    }, 0, []] call CBA_fnc_addPerFrameHandler;
-};
-
-
 //////////////////////////////////////////////////
 // Time handling
 //////////////////////////////////////////////////
@ -364,7 +65,6 @@ ACE_gameTime = time;
 ACE_pausedTime = 0;
 ACE_virtualPausedTime = 0;

-PREP(timePFH);
 [FUNC(timePFH), 0, []] call CBA_fnc_addPerFrameHandler;

 // Init toHex
--- a/addons/common/XEH_preStart.sqf
+++ b/addons/common/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/common/config.cpp
+++ b/addons/common/config.cpp
@ -8,7 +8,7 @@ class CfgPatches {
        requiredAddons[] = {"ace_main","ace_modules"};
        author[] = {"KoffeinFlummi"};
        authorUrl = "https://github.com/KoffeinFlummi/";
-        VERSION_CONFIG;
+        VERSION_CONFIG_COMMON;
    };
 };

@ -24,6 +24,7 @@ class CfgPatches {
 #include "CfgMoves.hpp"
 #include "CfgVoice.hpp"
 #include "CfgUnitInsignia.hpp"
+#include "CfgEden.hpp"

 class ACE_Rsc_Display_Base {
    idd = -1;
@ -79,20 +80,12 @@ class CfgUIGrids {
                displayName = "ACE Hint";
                description = "Textual in game feedback to the player.";
                preview = "\a3\Ui_f\data\GUI\Cfg\UIGrids\grid_hint_ca.paa";
-                saveToProfile[] = {0,1};                
+                saveToProfile[] = {0,1};
            };
        };
    };
 };

-/*
-// check dll
-class RscStandardDisplay;
-class RscDisplayMain: RscStandardDisplay {
-    onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscDisplayMain"",'GUI')] call  (uinamespace getVariable 'BIS_fnc_initDisplay'); [ARR_5('header','tail',{0},{},_this select 0)] call COMPILE_FILE(functions\fnc_errorMessage));
-};
-*/
-
 class ACE_Extensions {
    extensions[] = {};
 };
--- a/addons/common/define.hpp
+++ b/addons/common/define.hpp
@ -80,7 +80,7 @@
 // Listbox styles
 #define LB_TEXTURES       0x10
 #define LB_MULTI          0x20
-#define FontCSE       "PuristaMedium"
+#define FONT_ACE       "RobotoCondensed"

 class ACE_gui_backgroundBase {
  type = CT_STATIC;
@ -88,7 +88,7 @@ class ACE_gui_backgroundBase {
  style = ST_PICTURE;
  colorBackground[] = {0,0,0,0};
  colorText[] = {1, 1, 1, 1};
-  font = FontCSE;
+  font = FONT_ACE;
  text = "";
  sizeEx = 0.032;
 };
@ -125,7 +125,7 @@ class ACE_gui_editBase
    text = "";
    size = 0.2;
    style = "0x00 + 0x40";
-    font = "PuristaMedium";
+    font = "RobotoCondensed";
    shadow = 2;
    sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
    colorDisabled[] =
@ -189,19 +189,19 @@ class ACE_gui_buttonBase {
  animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
  animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
  period = 0.5;
-  font = FontCSE;
+  font = FONT_ACE;
  soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
  soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
  soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
  soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
  class Attributes {
-    font = FontCSE;
+    font = FONT_ACE;
    color = "#E5E5E5";
    align = "center";
    shadow = "true";
  };
  class AttributesImage {
-    font = FontCSE;
+    font = FONT_ACE;
    color = "#E5E5E5";
    align = "left";
    shadow = "true";
@ -229,7 +229,7 @@ class ACE_gui_staticBase {
  w = 0.183825;
  h = 0.104575;
  style = ST_LEFT;
-  font = FontCSE;
+  font = FONT_ACE;
  sizeEx = 0.03921;
  colorText[] = {0.95, 0.95, 0.95, 1.0};
  colorBackground[] = {0, 0, 0, 0};
@ -240,7 +240,7 @@ class RscListBox;
 class ACE_gui_listBoxBase : RscListBox{
  type = CT_LISTBOX;
  style = ST_MULTI;
-  font = FontCSE;
+  font = FONT_ACE;
  sizeEx = 0.03921;
  color[] = {1, 1, 1, 1};
  colorText[] = {0.543, 0.5742, 0.4102, 1.0};
@ -295,7 +295,7 @@ class ACE_gui_listNBox {
  style =ST_MULTI;
  w = 0.4;
  h = 0.4;
-  font = FontCSE;
+  font = FONT_ACE;
  sizeEx = 0.031;

  autoScrollSpeed = -1;
@ -375,7 +375,7 @@ class ACE_gui_comboBoxBase: RscCombo {
 arrowEmpty = "";
 arrowFull = "";
 wholeHeight = 0.45;
- font = FontCSE;
+ font = FONT_ACE;
 sizeEx = 0.031;
 soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
 soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
@ -463,22 +463,22 @@ class ACE_gui_mapBase {
 colorGrid[] = {0.1,0.1,0.1,0.6};
 colorGridMap[] = {0.1,0.1,0.1,0.6};
 colorText[] = {1, 1, 1, 0.85};
-font = "PuristaMedium";
+font = "RobotoCondensed";
 sizeEx = 0.0270000;
 stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
 stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
 onMouseButtonClick = "";
 onMouseButtonDblClick = "";

- fontLabel = "PuristaMedium";
+ fontLabel = "RobotoCondensed";
 sizeExLabel = "(     (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
 fontGrid = "TahomaB";
 sizeExGrid = 0.02;
 fontUnits = "TahomaB";
 sizeExUnits = "(     (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
- fontNames = "PuristaMedium";
+ fontNames = "RobotoCondensed";
 sizeExNames = "(     (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
- fontInfo = "PuristaMedium";
+ fontInfo = "RobotoCondensed";
 sizeExInfo = "(      (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
 fontLevel = "TahomaB";
 sizeExLevel = 0.02;
@ -493,7 +493,7 @@ onMouseButtonDblClick = "";
  y = "SafeZoneY + safezoneH - 4.5 *          (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
  w = "10 *           (     ((safezoneW / safezoneH) min 1.2) / 40)";
  h = "3.5 *          (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-  font = "PuristaMedium";
+  font = "RobotoCondensed";
  sizeEx = "(     (     (     ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
  colorBackground[] = {1,1,1,0.5};
  color[] = {0,0,0,1};
@ -787,4 +787,4 @@ onMouseButtonDblClick = "";
 };
 };

-#endif
+#endif
--- a/addons/common/functions/fnc__handleNetEvent.sqf
+++ b/addons/common/functions/fnc__handleNetEvent.sqf
@ -16,12 +16,9 @@ params ["_eventType", "_event"];

 if (_eventType == "ACEg") then {
    _event params ["_eventName", "_eventArgs"];
-    GVAR(events) params ["_eventNames"];

-    private _eventIndex = _eventNames find _eventName;
-
-    if (_eventIndex != -1) then {
-        private _events = (GVAR(events) select 1) select _eventIndex;
+    private _eventFunctions = GVAR(eventsLocation) getVariable _eventName;
+    if (!isNil "_eventFunctions") then {

        #ifdef DEBUG_EVENTS
            ACE_LOGINFO_1("* Net Event %1",_eventName);
@ -35,7 +32,7 @@ if (_eventType == "ACEg") then {
                    ACE_LOGINFO_1("    ID: %1",_forEachIndex);
                #endif
            };
-        } forEach _events;
+        } forEach _eventFunctions;
    };
 };

--- a/addons/common/functions/fnc_addActionEventHandler.sqf
+++ b/addons/common/functions/fnc_addActionEventHandler.sqf
@ -45,7 +45,7 @@ if (_actionID == -1) then {
    private _addAction = call compile format [
        "[
            '',
-            {if (inputAction '%1' == 0) exitWith {}; {if (_this call (_x select 0)) then {_this call (_x select 1)}} forEach (((_this select 0) getVariable '%2') select 1 select 2)},
+            {[{if (inputAction '%1' == 0) exitWith {}; {if (_this call (_x select 0)) then {_this call (_x select 1)}} forEach (((_this select 0) getVariable '%2') select 1 select 2)}, _this] call CBA_fnc_directCall},
            nil,
            -1,
            false,
--- a/addons/common/functions/fnc_addActionMenuEventHandler.sqf
+++ b/addons/common/functions/fnc_addActionMenuEventHandler.sqf
@ -52,7 +52,7 @@ _actionIDs pushBack _id;
 private _addAction = call compile format [
    "[
        '%2',
-        {if (inputAction '%1' == 0) then {if (_this call (%3 select 2)) then {_this call (%3 select 3)}} else {_this call (%3 select 1)}},
+        {[{if (inputAction '%1' == 0) then {if (_this call (%3 select 2)) then {_this call (%3 select 3)}} else {_this call (%3 select 1)}}, _this] call CBA_fnc_directCall},
        nil,
        %4,
        false,
--- a/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf
+++ b/addons/common/functions/fnc_addCuratorUnloadEventhandler.sqf
@ -1,22 +0,0 @@
-/*
- * Author: commy2
- *
- * Arguments:
- * Display where the Unload event was added <DISPLAY>
- *
- * Return Value:
- * None
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-disableSerialization;
-
-private _dlg = ctrlParent _this;
-
-_dlg displayAddEventHandler ["unload", {
-    if (_this select 1 == 1) then {
-        [missionnamespace getVariable ["BIS_fnc_initCuratorAttributes_target", objNull]] call FUNC(fixCrateContent);
-    };
-}];
--- a/addons/common/functions/fnc_addEventHandler.sqf
+++ b/addons/common/functions/fnc_addEventHandler.sqf
@ -15,18 +15,11 @@

 params ["_eventName", "_eventCode"];

-GVAR(events) params ["_eventNames"];
+private _eventFunctions = GVAR(eventsLocation) getVariable _eventName;

-private _eventFunctions = [];
-private _eventIndex = _eventNames find _eventName;
-
-if (_eventIndex != -1) then {
-    _eventFunctions = (GVAR(events) select 1) select _eventIndex;
-} else {
-    private _eventNameCount = count _eventNames;
-
-    _eventNames set [_eventNameCount, _eventName];
-    (GVAR(events) select 1) set [_eventNameCount, _eventFunctions];
+if (isNil "_eventFunctions") then {
+    _eventFunctions = [];
+    GVAR(eventsLocation) setVariable [_eventName, _eventFunctions];
 };

 _eventFunctions pushBack _eventCode // Return event function count
--- a/addons/common/functions/fnc_addScrollWheelEventHandler.sqf
+++ b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf
@ -15,6 +15,8 @@

 params ["_statement"];

+ACE_DEPRECATED("ace_common_fnc_addScrollWheelEventHandler", "3.8.0", "'MouseZChanged' Display EventHandler");
+
 if (_statement isEqualType "") then {
    _statement = compile _statement;
 };
--- a/addons/common/functions/fnc_canInteractWith.sqf
+++ b/addons/common/functions/fnc_canInteractWith.sqf
@ -16,7 +16,7 @@

 params ["_unit", "_target", ["_exceptions", []]];

-_exceptions = [_exceptions, {toLower _this}] call FUNC(map);
+_exceptions = _exceptions apply {toLower _x};

 private _owner = _target getVariable [QGVAR(owner), objNull];

--- a/addons/common/functions/fnc_canUseWeapon.sqf
+++ b/addons/common/functions/fnc_canUseWeapon.sqf
@ -1,23 +0,0 @@
-/*
- * Author: commy2
- * Check if the unit can use a Weapon.
- * Returns true if the unit is on foot or in a FFV position.
- *
- * Arguments:
- * 0: The Unit <OBJECT>
- *
- * Return Value:
- * Can the Unit use Weapons <BOOL>
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-params [["_unit", objNull, [objNull]]];
-
-if (_unit == vehicle _unit) exitWith {true};
-
-private _config = configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _unit;
-
-isClass _config
-&& {getNumber (_config >> "canPullTrigger") == 1}
--- a/addons/common/functions/fnc_checkFiles.sqf
+++ b/addons/common/functions/fnc_checkFiles.sqf
@ -19,10 +19,22 @@ private _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "version

 ACE_LOGINFO_1("ACE is version %1.",_version);

+//CBA Versioning check - close main display if using incompatible version
+private _cbaVersionAr = getArray (configFile >> "CfgPatches" >> "cba_main" >> "versionAr");
+private _cbaRequiredAr = (getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA")) select 1;
+ACE_LOGINFO_2("CBA is version %1 [min required %2]",_cbaVersionAr,_cbaRequiredAr);
+if ([_cbaRequiredAr, _cbaVersionAr] call cba_versioning_fnc_version_compare) then {
+    private _errorMsg = format ["CBA Version [%1] is outdated [required %2]", _cbaVersionAr, _cbaRequiredAr];
+    ACE_LOGERROR(_errorMsg);
+    if (hasInterface) then {
+        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+    };
+};
+
 //private _addons = activatedAddons; // broken with High-Command module, see #2134
 private _addons = "true" configClasses (configFile >> "CfgPatches");//
-_addons = [_addons, {toLower configName _this}] call FUNC(map);//
-_addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter);
+_addons = _addons apply {toLower configName _x};//
+_addons = _addons select {_x find "ace_" == 0};

 {
    if (getText (configFile >> "CfgPatches" >> _x >> "versionStr") != _version) then {
@ -63,7 +75,7 @@ _addons = [_addons, {_this find "ace_" == 0}] call FUNC(filter);
 ///////////////
 if (isMultiplayer) then {
    // don't check optional addons
-    _addons = [_addons, {getNumber (configFile >> "CfgPatches" >> _this >> "ACE_isOptional") != 1}] call FUNC(filter);
+    _addons = _addons select {getNumber (configFile >> "CfgPatches" >> _x >> "ACE_isOptional") != 1};

    if (isServer) then {
        // send servers version of ACE to all clients
--- a/addons/common/functions/fnc_codeToLetter.sqf
+++ b/addons/common/functions/fnc_codeToLetter.sqf
@ -1,19 +0,0 @@
-/*
- * Author: commy2
- * Converts some keys to an Arma Dik Code.
- *
- * Arguments:
- * 0: Key <STRING>
- *
- * Return Value:
- * Dik Code <NUMBER>
- *
- * Public: Yes
- *
- * Deprecated
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_codeToLetter","3.5.0","-");
-
-["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] select ([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] find (_this select 0)) + 1
--- a/addons/common/functions/fnc_codeToString.sqf
+++ b/addons/common/functions/fnc_codeToString.sqf
@ -12,12 +12,11 @@
 */
 #include "script_component.hpp"

-params ["_function"];
+params ["_code"];
+if (_code isEqualType "") exitWith {_code};

-if (_function isEqualType "") exitWith {_function};
+_code = str(_code);
+_code = _code select [1, count _code - 2];

-_function = toArray str _function;
-_function deleteAt 0;
-_function deleteAt (count _function - 1);
+_code

-toString _function // return
--- a/addons/common/functions/fnc_doAnimation.sqf
+++ b/addons/common/functions/fnc_doAnimation.sqf
@ -1,6 +1,5 @@
 /*
 * Author: commy2
- *
 * Execute an animation. This is used to not break things like the unconsciousness animation.
 *
 * Arguments:
@ -10,15 +9,20 @@
 *     0 = PlayMove
 *     1 = PlayMoveNow
 *     2 = SwitchMove (no transitional animation, doesn't overwrite priority 1)
+ * 3: Force overwritting unconscious (default: false) <BOOL>
 *
 * Return Value:
 * None
 *
+ * Example:
+ * [player, "AmovPercMstpSnonWnonDnon_exerciseKata", 1] call ace_common_fnc_doAnimation
+ *
 * Public: Yes
 */
 #include "script_component.hpp"

 params ["_unit", "_animation", ["_priority", 0], ["_force", false]];
+TRACE_4("params",_unit,_animation,_priority,_force);

 // don't overwrite more important animations
 if (_unit getVariable ["ACE_isUnconscious", false] && {(_animation != "Unconscious")} && {!_force}) exitWith {};
@ -33,36 +37,38 @@ if (_animation == "") then {

 //if (_animation == animationState _unit) exitWith {};

+TRACE_2("",local _unit,vehicle _unit);
 switch (_priority) do {
    case 0: {
        if (_unit == vehicle _unit) then {
-            [_unit, format ["{_this playMove '%1'}", _animation], _unit] call FUNC(execRemoteFnc);
+            ["playMove", _unit, [_unit, _animation]] call FUNC(objectEvent);
        } else {
            // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
-            [_unit, format ["{_this playMove '%1'}", _animation]] call FUNC(execRemoteFnc);
+            ["playMove", [_unit, _animation]] call FUNC(globalEvent);
        };
    };
    case 1: {
        if (_unit == vehicle _unit) then {
-            [_unit, format ["{_this playMoveNow '%1'}", _animation], _unit] call FUNC(execRemoteFnc);
+            ["playMoveNow", _unit, [_unit, _animation]] call FUNC(objectEvent);
        } else {
-          // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
-            [_unit, format ["{_this playMoveNow '%1'}", _animation]] call FUNC(execRemoteFnc);
+            // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
+            ["playMoveNow", [_unit, _animation]] call FUNC(globalEvent);
        };
    };
    case 2: {
        // try playMoveNow first
        if (_unit == vehicle _unit) then {
-            [_unit, format ["{_this playMoveNow '%1'}", _animation], _unit] call FUNC(execRemoteFnc);
+            ["playMoveNow", _unit, [_unit, _animation]] call FUNC(objectEvent);
        } else {
-          // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
-            [_unit, format ["{_this playMoveNow '%1'}", _animation]] call FUNC(execRemoteFnc);
+            // Execute on all machines. PlayMove and PlayMoveNow are bugged: They have no global effects when executed on remote machines inside vehicles.
+            ["playMoveNow", [_unit, _animation]] call FUNC(globalEvent);
        };

        // if animation doesn't respond, do switchMove
        if (animationState _unit != _animation) then {
+            TRACE_1("did not respond to playMoveNow",animationState _unit);
            // Execute on all machines. SwitchMove has local effects.
-            [_unit, format ["{_this switchMove '%1'}", _animation]] call FUNC(execRemoteFnc);
+            ["switchMove", [_unit, _animation]] call FUNC(globalEvent);
        };
    };
    default {};
--- a/addons/common/functions/fnc_execPersistentFnc.sqf
+++ b/addons/common/functions/fnc_execPersistentFnc.sqf
@ -17,6 +17,8 @@
 */
 #include "script_component.hpp"

+ACE_DEPRECATED("ace_common_fnc_execPersistentFnc","3.7.0","ace_common_fnc_globalEvent");
+
 GVAR(remoteFnc) = _this;

 params ["_arguments", "_function", "_unit", "_name"];
--- a/addons/common/functions/fnc_execRemoteFnc.sqf
+++ b/addons/common/functions/fnc_execRemoteFnc.sqf
@ -20,6 +20,8 @@
 */
 #include "script_component.hpp"

+ACE_DEPRECATED("ace_common_fnc_execRemoteFnc","3.7.0","ace_common_fnc_globalEvent");
+
 GVAR(remoteFnc) = _this;

 params ["_arguments", "_function", ["_unit", 2]];
--- a/addons/common/functions/fnc_exportConfig.sqf
+++ b/addons/common/functions/fnc_exportConfig.sqf
@ -1,71 +0,0 @@
-/*
- * Author: commy2
- * Export Config Entrys to RPT logs
- *
- * Arguments:
- * Config Path <CONFIG>
- *
- * Return Value:
- * None
- *
- * Example:
- * [configFile >> "CfgAmmo"] call ace_common_fnc_exportConfig;
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-private _fnc_logEntries = {
-    params ["_c", "_d"];
-
-    private _p = inheritsFrom _c;
-
-    private _t = format [["class %1: %2 {", "class %1 {"] select (configName _p == ""), configName _c, configName _p];
-    for "_a" from 1 to _d do {
-        _t = "  " + _t;
-    };
-    diag_log text _t;
-
-    private _e = [];
-    for "_i" from 0 to (count _c - 1) do {
-        private _e1 = _c select _i;
-
-        private _e2 = switch (true) do {
-            case (isNumber _e1): {getNumber _e1};
-            case (isText _e1): {getText _e1};
-            case (isArray _e1): {getArray _e1};
-            case (isClass _e1): {[_e1, _d + 1] call _fnc_logEntries; false};
-        };
-
-        if (!(_e2 isEqualType false)) then {
-            if (_e2 isEqualType []) then {
-                _e2 = toArray str _e2;
-                {
-                    if (_x == toArray "[" select 0) then {
-                        _e2 set [_forEachIndex, toArray "{" select 0];
-                    };
-                    if (_x == toArray "]" select 0) then {
-                        _e2 set [_forEachIndex, toArray "}" select 0];
-                    };
-                } forEach _e2;
-                _e2 = toString _e2;
-                _t = format ["%1[] = %2;", configName _e1, _e2];
-            } else {
-                _t = format ["%1 = %2;", configName _e1, str _e2];
-            };
-            for "_a" from 0 to _d do {
-                _t = "  " + _t;
-            };
-            diag_log text _t;
-        };
-    };
-
-    _t = "};";
-    for "_a" from 1 to _d do {
-        _t = "  " + _t;
-    };
-    diag_log text _t;
-    diag_log text "";
-};
-
-[_this, 0] call _fnc_logEntries;
--- a/addons/common/functions/fnc_filter.sqf
+++ b/addons/common/functions/fnc_filter.sqf
@ -9,15 +9,16 @@
 * Return Value:
 * Final array
 *
- * Usage:
- * [[0,1,2,3,4], {_this > 2}] call FUNC(filter) ==> [3,4]
- *
 * Public: Yes
+ *
+ * Deprecated
 */
 #include "script_component.hpp"

 params [["_array", [], [[]]], ["_code", {}, [{}]]];

+ACE_DEPRECATED("ace_common_fnc_filter","3.7.0","select CODE");
+
 private _result = [];

 {
--- a/addons/common/functions/fnc_fixCrateContent.sqf
+++ b/addons/common/functions/fnc_fixCrateContent.sqf
@ -1,43 +0,0 @@
-/*
- * Author: commy2
- * Fixes zeus placed crates containing buged mine detectors and ace items.
- *
- * Arguments:
- * 0: Crate <OBJECT>
- *
- * Return Value:
- * None
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-params ["_crate"];
-
-// get all weapons inside the crate
-private _weapons = weaponCargo _crate;
-private _items = [];
-
-// if the "weapon" is supposed to be an item, move those from the weapon array to the item array
-{
-    if (getText (configFile >> "CfgWeapons" >> _x >> "simulation") == "ItemMineDetector") then {
-        _weapons set [_forEachIndex, ""];
-        _items pushBack _x;
-    };
-} forEach _weapons;
-
-_weapons = _weapons - [""];
-
-// exit now if everything is fine
-if (count _items == 0) exitWith {};
-
-// otherwise clear weapon cargo and re-add items and weapons
-clearWeaponCargoGlobal _crate;
-
-{
-    _crate addWeaponCargoGlobal [_x, 1];
-} forEach _weapons;
-
-{
-    _crate addItemCargoGlobal [_x, 1];
-} forEach _items;
--- a/addons/common/functions/fnc_fixPosition.sqf
+++ b/addons/common/functions/fnc_fixPosition.sqf
@ -16,6 +16,16 @@
 // setVectorUp requires local object
 if (!local _this) exitWith {};

+if ((getText (configFile >> "CfgVehicles" >> (typeOf _this) >> "simulation")) == "house") then {
+    //Houses don't have gravity/physics, so make sure they are not floating
+    private _posAbove = (getPos _this) select 2;
+    TRACE_2("house",_this,_posAbove);
+    if (_posAbove > 0.1) then {
+        private _newPosASL = (getPosASL _this) vectorDiff [0,0,_posAbove];
+        _this setPosASL _newPosASL;
+    };
+};
+
 private _position = getPos _this;

 // don't place the object below the ground
--- a/Show More
+++ b/Show More