Merge branch 'master' into mapOpenCloseEvents

2024-08-30 18:23:18 +00:00 · 2015-08-29 16:43:24 -05:00 · 2015-08-29 16:43:24 -05:00 · f67809b18c
commit f67809b18c
parent 4e3bbfac16 22f8b2e8c2
459 changed files with 7813 additions and 4457 deletions
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@ -1,4 +1,4 @@
-# ACE 3 CONTRIBUTOR LIST
+# ACE3 CONTRIBUTOR LIST
 # If you contributed, but are not listed here, contact me:
 # koffeinflummi@gmail.com
 #
@ -14,6 +14,7 @@ Garth "L-H" de Wet <garthofhearts@gmail.com>
 Giallustio
 Glowbal
 Janus
+jokoho482 <jokoho482@gmail.com>`
 Kieran
 NouberNou
 PabstMirror <pabstmirror@gmail.com>
@ -50,6 +51,7 @@ Coren <coren4@gmail.com>
 Crusty
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
 Dimaslg <dimaslg@telecable.es>
+Drill <drill87@gmail.com>
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
 F3 Project <alanr@ferstaberinde.com>
@ -68,8 +70,7 @@ Hamburger SV
 Harakhti <shadowdragonphd@gmail.com>
 havena <silveredenis@gmail.com>
 Hawkins
-Head
-jokoho482 <jokoho482@gmail.com>`
+Head <brobergsebastian@gmail.com>
 Jonpas <jonpas33@gmail.com>
 Karneck <dschultz26@hotmail.com>
 Kavinsky <nmunozfernandez@gmail.com>
@ -81,6 +82,7 @@ Macusercom <macusercom@gmail.com>
 MarcBook
 meat <p.humberdroz@gmail.com>
 Michail Nikolaev
+MikeMatrix <m.braun92@gmail.com>
 nic547 <nic547@outlook.com>
 nikolauska <nikolauska1@gmail.com>
 nomisum <nomisum@gmail.com>
@ -106,5 +108,3 @@ Valentin Torikian <valentin.torikian@gmail.com>
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Winter <simon@agius-muscat.net>
 zGuba
-Drill <drill87@gmail.com>
-MikeMatrix <m.braun92@gmail.com>
--- a/README.md
+++ b/README.md
@ -3,75 +3,75 @@
 </p>
 <p align="center">
    <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.2.1-blue.svg" alt="ACE3 version">
+        <img src="https://img.shields.io/badge/Version-3.2.1-blue.svg" alt="ACE3 Version">
    </a>
    <a href="https://github.com/acemod/ACE3/releases/download/v3.2.1/ace3_3.2.1.zip">
-        <img src="http://img.shields.io/badge/Download-56.5_MB-green.svg" alt="ACE3 download">
+        <img src="http://img.shields.io/badge/Download-56.5_MB-green.svg" alt="ACE3 Download">
    </a>
    <a href="https://github.com/acemod/ACE3/issues">
-        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Issues" alt="ACE3 issues">
+        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Issues" alt="ACE3 Issues">
    </a>
-    <a href="http://forums.bistudio.com/showthread.php?191716-ACE3-A-collaborative-merger-between-AGM-CSE-and-ACE&p=2935435&viewfull=1#post2935435">
-        <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg" alt="BIF thread">
+    <a href="https://forums.bistudio.com/topic/181341-ace3-a-collaborative-merger-between-agm-cse-and-ace/?p=2859670">
+        <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg" alt="BIF Thread">
    </a>
    <a href="https://github.com/acemod/ACE3/blob/master/LICENSE">
-        <img src="http://img.shields.io/badge/License-GPLv2-red.svg" alt="ACE3 license">
+        <img src="http://img.shields.io/badge/License-GPLv2-red.svg" alt="ACE3 License">
    </a>
 </p>
-<p align="center"><sup><strong>Requires the latest version of <a href="http://www.armaholic.com/page.php?id=18767">CBA A3</a>. Visit us on <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="http://www.reddit.com/r/arma/search?q=ACE&restrict_sr=on&sort=new&t=all">Reddit</a></strong></sup></p>
+<p align="center"><sup><strong>Requires the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a>. Visit us on <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="http://www.reddit.com/r/arma/search?q=ACE&restrict_sr=on&sort=new&t=all">Reddit</a></strong></sup></p>

 **ACE3** is a joint effort by the teams behind **ACE2**, **AGM** and **CSE** to improve the realism and authenticity of Arma 3.

 The project is entirely **open-source** and all contributions are welcome. Feel free to maintain your own custom version, so long as the changes you make are open to the public in accordance with the GNU General Public License ([GPLv2](https://github.com/acemod/ACE3/blob/master/LICENSE)).

-The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those possibly in conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
+The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE3 by simply excluding any components they don't need, or those possibly in conflict with other mods. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.

 ### Core features
-* Brand new 3D interaction/action system
-* Performance and reliability framework
-* Focus on modularity and customization
-* New flexible client and server settings & configuration
-* Improved medical system with various levels (basic/advanced) focus on gameplay/realism
-* Proper & consistent network-synced weather
-* Wind and weather-based ballistics
-* Captivity system
-* Explosives system, including different trigger types
-* Map screen improvements – marker placement and map tools
-* Advanced missile guidance and laser designation
+- Brand new 3D interaction/action system
+- Performance and reliability framework
+- Focus on modularity and customization
+- New flexible client and server settings & configuration
+- Improved medical system with various levels (basic/advanced) focus on gameplay/realism
+- Proper & consistent network-synced weather
+- Wind and weather-based ballistics
+- Captivity system
+- Explosives system, including different trigger types
+- Map screen improvements – marker placement and map tools
+- Advanced missile guidance and laser designation

 #### Additional features
-* Carrying and dragging
-* Realistic names for vehicles and weapons
-* A fire control system (FCS) for armored vehicles and helicopters
-* Realistic ballistics/FCS calculated in C/C++ extensions
-* Backblast area and overpressure simulation
-* Disposable launchers
-* Realistic G-forces
-* Vehicle locking
-* Realistic night and thermal vision modes
-* 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
-* No talking player avatar
-* Jumping over obstacles, climbing over walls and cutting down fences
-* Vector, MicroDAGR and Kestrel devices<br>
+- Carrying and dragging
+- Realistic names for vehicles and weapons
+- A fire control system (FCS) for armored vehicles and helicopters
+- Realistic ballistics/FCS calculated in C/C++ extensions
+- Backblast area and overpressure simulation
+- Disposable launchers
+- Realistic G-forces
+- Vehicle locking
+- Realistic night and thermal vision modes
+- 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
+- No talking player avatar
+- Jumping over obstacles, climbing over walls and cutting down fences
+- Vector, MicroDAGR and Kestrel devices<br>
 ***and much more...***

 ### Guides & how-tos
 If you installed ACE3 but have trouble understanding how it all works, or where to start, read this first:
-* [Getting started](http://ace3mod.com/wiki/user/getting-started.html)
+- [Getting started](http://ace3mod.com/wiki/user/getting-started.html)

 #### Contributing
-You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. To contribute something to ACE, simply fork this repository and submit your pull requests for review by other collaborators. Remember to add yourself to the author array of any PBO you will be editing and the [`AUTHORS.txt`](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) file; including a valid email address.
+You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. To contribute something to ACE3, simply fork this repository and submit your pull requests for review by other collaborators. Remember to add yourself to the author array of any PBO you will be editing and the [`AUTHORS.txt`](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) file; including a valid email address.

 Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report a bug, propose a feature, or suggest changes to the existing ones. See also:
-* [How to report an issue](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
-* [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
+- [How to report an issue](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
+- [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)

 #### Testing & building
 To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or [with git](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build:
-* [Setting up the development environment](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
+- [Setting up the development environment](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – step-by-step instructions on how to properly setup and build a version of ACE3 for testing purposes.
--- a/addons/advanced_ballistics/README.md
+++ b/addons/advanced_ballistics/README.md
@ -3,8 +3,9 @@ ace_advanced_ballistics

 The Advanced Ballistics module introduces advanced external- and internal ballistics to the game.

+
 ## Maintainers

 The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
+- [Ruthberg](http://github.com/Ulteq)
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@ -6,9 +6,8 @@ GVAR(currentbulletID) = -1;

 GVAR(Protractor) = false;
 GVAR(ProtractorStart) = ACE_time;
-
+GVAR(allBullets) = [];
 GVAR(currentGrid) = 0;
-GVAR(initMessageEnabled) = false;

 GVAR(extensionAvailable) = true;
 /* @TODO: Remove this until versioning is in sync with cmake/build versioning
--- a/addons/advanced_ballistics/XEH_preInit.sqf
+++ b/addons/advanced_ballistics/XEH_preInit.sqf
@ -13,5 +13,5 @@ PREP(initializeTerrainExtension);
 PREP(initModuleSettings);
 PREP(readAmmoDataFromConfig);
 PREP(readWeaponDataFromConfig);
-
+PREP(handleFirePFH);
 ADDON = true;
--- a/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf
@ -8,29 +8,29 @@
 * 1: temperature - degrees celcius <NUMBER>
 *
 * Return Value:
- * 0: muzzle velocity shift - m/s <NUMBER>
+ * muzzle velocity shift - m/s <NUMBER>
 *
- * Return value:
- * None
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_muzzleVelocityShiftTable", "_temperature", "_muzzleVelocityShift", "_temperatureIndexA", "_temperatureIndexB", "_temperatureRatio"];
-_muzzleVelocityShiftTable = _this select 0;
-_temperature              = _this select 1;
+private ["_muzzleVelocityShiftTableUpperLimit", "_temperatureIndexFunction",
+    "_temperatureIndexA", "_temperatureIndexB", "_interpolationRatio"];
+params["_muzzleVelocityShiftTable", "_temperature"];

-if (count _muzzleVelocityShiftTable != 11) exitWith { 0 };
+// Check if muzzleVelocityShiftTable is Larger Than 11 Entrys
+_muzzleVelocityShiftTableUpperLimit = _muzzleVelocityShiftTable select 10;
+if (isNil "_muzzleVelocityShiftTableUpperLimit") exitWith { 0 };

-_temperatureIndexA = floor((_temperature + 15) / 5);
-_temperatureIndexA = 0 max _temperatureIndexA;
-_temperatureIndexA = _temperatureIndexA min 10;
+// Find exact data index required for given temperature
+_temperatureIndexFunction = (_temperature + 15) / 5;

-_temperatureIndexB = ceil((_temperature + 15) / 5);
-_temperatureIndexB = 0 max _temperatureIndexB;
-_temperatureIndexB = _temperatureIndexB min 10;
+// lower and upper data index used for interpolation
+_temperatureIndexA = (0 max (floor(_temperatureIndexFunction))) min 10;
+_temperatureIndexB = (0 max (ceil(_temperatureIndexFunction))) min 10;

-_temperatureRatio = ((_temperature + 15) / 5) - floor((_temperature + 15) / 5);
+// Interpolation ratio
+_interpolationRatio = _temperatureIndexFunction - floor(_temperatureIndexFunction);

-_muzzleVelocityShift = (_muzzleVelocityShiftTable select _temperatureIndexA) * (1 - _temperatureRatio) + (_muzzleVelocityShiftTable select _temperatureIndexB) * _temperatureRatio;
-
-_muzzleVelocityShift
+// Interpolation
+(_muzzleVelocityShiftTable select _temperatureIndexA) * (1 - _interpolationRatio) + (_muzzleVelocityShiftTable select _temperatureIndexB) * _interpolationRatio // Return
--- a/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf
@ -17,12 +17,9 @@
 */
 #include "script_component.hpp"

-private ["_ballisticCoefficient", "_temperature", "_pressure", "_relativeHumidity", "_atmosphereModel", "_airDensity"];
-_ballisticCoefficient = _this select 0;
-_temperature          = _this select 1; // in C
-_pressure             = _this select 2; // in hPa
-_relativeHumidity     = _this select 3; // as ratio 0-1
-_atmosphereModel      = _this select 4; // "ICAO" or "ASM"
+private "_airDensity";
+
+params ["_ballisticCoefficient", "_temperature"/*in C*/, "_pressure"/*in hPa*/, "_relativeHumidity"/*as ratio 0-1*/, "_atmosphereModel"/*"ICAO" or "ASM"*/];

 _airDensity = [_temperature, _pressure, _relativeHumidity] call EFUNC(weather,calculateAirDensity);

--- a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
@ -1,5 +1,5 @@
 /*
- * Author: Ruthberg
+ * Author: Ruthberg, MikeMatrix, joko // Jonas
 *
 * Calculates the muzzle velocity shift caused by different barrel lengths
 *
@ -10,46 +10,61 @@
 * 3: muzzle velocity - m/s <NUMBER>
 *
 * Return Value:
- * 0: muzzle velocity shift - m/s <NUMBER>
+ * muzzle velocity shift - m/s <NUMBER>
 *
- * Return value:
- * None
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity", "_lowerIndex", "_upperIndex", "_barrelLengthRatio", "_muzzleVelocityNew"];
-_barrelLength        = _this select 0;
-_muzzleVelocityTable = _this select 1;
-_barrelLengthTable   = _this select 2;
-_muzzleVelocity      = _this select 3;
+scopeName "main";

+private ["_muzzleVelocityTableCount", "_barrelLengthTableCount", "_lowerDataIndex",
+    "_upperDataIndex", "_lowerBarrelLength", "_upperBarrelLength", "_lowerMuzzleVelocity",
+    "_upperMuzzleVelocity", "_interpolationRatio"];
+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 };
-if (count _muzzleVelocityTable != count _barrelLengthTable) exitWith { 0 };
-if (count _muzzleVelocityTable == 0 || count _barrelLengthTable == 0) exitWith { 0 };
-if (count _muzzleVelocityTable == 1) exitWith { (_muzzleVelocityTable select 0) - _muzzleVelocity };

-_lowerIndex = 0;
-_upperIndex = (count _barrelLengthTable) - 1;
+_muzzleVelocityTableCount = count _muzzleVelocityTable;
+_barrelLengthTableCount = count _barrelLengthTable;

-if (_barrelLength <= (_barrelLengthTable select _lowerIndex)) exitWith { (_muzzleVelocityTable select _lowerIndex) - _muzzleVelocity };
-if (_barrelLength >= (_barrelLengthTable select _upperIndex)) exitWith { (_muzzleVelocityTable select _upperIndex) - _muzzleVelocity };
+// Exit if tables are different sizes, have no elements or have only one element
+if (_muzzleVelocityTableCount != _barrelLengthTableCount || _muzzleVelocityTableCount == 0 || _barrelLengthTableCount == 0) exitWith { 0 };
+if (_muzzleVelocityTableCount == 1) exitWith { (_muzzleVelocityTable select 0) - _muzzleVelocity };

-for "_i" from 0 to (count _barrelLengthTable) - 1 do {
-    if (_barrelLength >= _barrelLengthTable select _i) then {
-        _lowerIndex = _i;
-    };
-};
-for "_i" from (count _barrelLengthTable) - 1 to 0 step -1 do {
-    if (_barrelLength <= _barrelLengthTable select _i) then {
-        _upperIndex = _i;
+// If we have the precise barrel length value, return result immediately
+if (_barrelLength in _barrelLengthTable) exitWith {
+    (_muzzleVelocityTable select (_barrelLengthTable find _barrelLength)) - _muzzleVelocity
+};
+
+// Limit values to lower and upper bound of data we have available
+if (_barrelLength <= (_barrelLengthTable select 0)) exitWith { (_muzzleVelocityTable select 0) - _muzzleVelocity };
+if (_barrelLength >= (_barrelLengthTable select _barrelLengthTableCount - 1)) exitWith { (_muzzleVelocityTable select _barrelLengthTableCount - 1) - _muzzleVelocity };
+
+// Find closest bordering values for barrel length
+{
+    if (_barrelLength <= _x) then {
+        _upperDataIndex = _forEachIndex;
+        _lowerDataIndex = _upperDataIndex - 1;
+        breakTo "main";
    };
+} forEach _barrelLengthTable;
+
+// Worst case scenario
+if (isNil "_lowerDataIndex" || isNil "_upperDataIndex") exitWith {0};
+
+_lowerBarrelLength = _barrelLengthTable select _lowerDataIndex;
+_upperBarrelLength = _barrelLengthTable select _upperDataIndex;
+_lowerMuzzleVelocity = _muzzleVelocityTable select _lowerDataIndex;
+_upperMuzzleVelocity = _muzzleVelocityTable select _upperDataIndex;
+
+// Calculate interpolation ratio
+_interpolationRatio = if (abs (_lowerBarrelLength - _upperBarrelLength) > 0) then {
+    (_upperBarrelLength - _barrelLength) / (_upperBarrelLength - _lowerBarrelLength)
+} else {
+    0
 };

-_barrelLengthRatio = 0;
-if ((_barrelLengthTable select _upperIndex) - (_barrelLengthTable select _lowerIndex) > 0) then {
-    _barrelLengthRatio = ((_barrelLengthTable select _upperIndex) - _barrelLength) / ((_barrelLengthTable select _upperIndex) - (_barrelLengthTable select _lowerIndex));
-};
-
-_muzzleVelocityNew = (_muzzleVelocityTable select _lowerIndex) + ((_muzzleVelocityTable select _upperIndex) - (_muzzleVelocityTable select _lowerIndex)) * (1 - _barrelLengthRatio);
-
-_muzzleVelocityNew - _muzzleVelocity
+// Calculate interpolated muzzle velocity shift
+(_lowerMuzzleVelocity + ((_upperMuzzleVelocity - _lowerMuzzleVelocity) * (1 - _interpolationRatio))) - _muzzleVelocity // Return
--- a/addons/advanced_ballistics/functions/fnc_calculateRetardation.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateRetardation.sqf
@ -4,142 +4,129 @@
 * Calculates the retardation of the bullet
 *
 * Arguments:
- * 0: drag model - 1-7 <integer>
+ * 0: drag model - integer 1-7 <NUMBER>
 * 1: drag coefficient - bc <NUMBER>
 * 2: velocity - m/s <NUMBER>
 *
 * Return Value:
- * 0: retardation - m/(s^2) <NUMBER>
+ * retardation - m/(s^2) <NUMBER>
 *
- * Return value:
- * None
+ * Public: No
 */
 #include "script_component.hpp"

 // Source: GNU Exterior Ballistics

-private ["_dragModel", "_dragCoefficient", "_velocity", "_A", "_M", "_result"];
-_dragModel       = _this select 0;
-_dragCoefficient = _this select 1;
-_velocity        = (_this select 2) * 3.2808399;
-
-_A = -1;
-_M = -1;
-_result = 0;
+private ["_A", "_M"];
+params ["_dragModel", "_dragCoefficient", "_velocity"];
+_velocity = _velocity * 3.2808399;

 switch _dragModel do {
-    case 1:
-    {
-        switch true do {
-            case (_velocity > 4230) : { _A = 0.0001477404177730177; _M = 1.9565; };
-            case (_velocity > 3680) : { _A = 0.0001920339268755614; _M = 1.925 ; };
-            case (_velocity > 3450) : { _A = 0.0002894751026819746; _M = 1.875 ; };
-            case (_velocity > 3295) : { _A = 0.0004349905111115636; _M = 1.825 ; };
-            case (_velocity > 3130) : { _A = 0.0006520421871892662; _M = 1.775 ; };
-            case (_velocity > 2960) : { _A = 0.0009748073694078696; _M = 1.725 ; };
-            case (_velocity > 2830) : { _A = 0.001453721560187286; _M = 1.675 ; };
-            case (_velocity > 2680) : { _A = 0.002162887202930376; _M = 1.625 ; };
-            case (_velocity > 2460) : { _A = 0.003209559783129881; _M = 1.575 ; };
-            case (_velocity > 2225) : { _A = 0.003904368218691249; _M = 1.55  ; };
-            case (_velocity > 2015) : { _A = 0.003222942271262336; _M = 1.575 ; };
-            case (_velocity > 1890) : { _A = 0.002203329542297809; _M = 1.625 ; };
-            case (_velocity > 1810) : { _A = 0.001511001028891904; _M = 1.675 ; };
-            case (_velocity > 1730) : { _A = 0.0008609957592468259; _M = 1.75  ; };
-            case (_velocity > 1595) : { _A = 0.0004086146797305117; _M = 1.85  ; };
-            case (_velocity > 1520) : { _A = 0.0001954473210037398; _M = 1.95  ; };
-            case (_velocity > 1420) : { _A = 0.00005431896266462351; _M = 2.125 ; };
-            case (_velocity > 1360) : { _A = 0.000008847742581674416; _M = 2.375 ; };
-            case (_velocity > 1315) : { _A = 0.000001456922328720298; _M = 2.625 ; };
-            case (_velocity > 1280) : { _A = 0.0000002419485191895565; _M = 2.875 ; };
-            case (_velocity > 1220) : { _A = 0.00000001657956321067612; _M = 3.25  ; };
-            case (_velocity > 1185) : { _A = 0.0000000004745469537157371; _M = 3.75  ; };
-            case (_velocity > 1150) : { _A = 0.00000000001379746590025088; _M = 4.25  ; };
-            case (_velocity > 1100) : { _A = 0.0000000000004070157961147882; _M = 4.75  ; };
-            case (_velocity > 1060) : { _A = 0.00000000000002938236954847331; _M = 5.125 ; };
-            case (_velocity > 1025) : { _A = 0.00000000000001228597370774746; _M = 5.25  ; };
-            case (_velocity >  980) : { _A = 0.00000000000002916938264100495; _M = 5.125 ; };
-            case (_velocity >  945) : { _A = 0.0000000000003855099424807451; _M = 4.75  ; };
-            case (_velocity >  905) : { _A = 0.00000000001185097045689854; _M = 4.25  ; };
-            case (_velocity >  860) : { _A = 0.0000000003566129470974951; _M = 3.75  ; };
-            case (_velocity >  810) : { _A = 0.00000001045513263966272; _M = 3.25  ; };
-            case (_velocity >  780) : { _A = 0.0000001291159200846216; _M = 2.875 ; };
-            case (_velocity >  750) : { _A = 0.0000006824429329105383; _M = 2.625 ; };
-            case (_velocity >  700) : { _A = 0.000003569169672385163; _M = 2.375 ; };
-            case (_velocity >  640) : { _A = 0.00001839015095899579; _M = 2.125 ; };
-            case (_velocity >  600) : { _A = 0.00005711174688734240; _M = 1.950 ; };
-            case (_velocity >  550) : { _A = 0.00009226557091973427; _M = 1.875 ; };
-            case (_velocity >  250) : { _A = 0.00009337991957131389; _M = 1.875 ; };
-            case (_velocity >  100) : { _A = 0.00007225247327590413; _M = 1.925 ; };
-            case (_velocity >   65) : { _A = 0.00005792684957074546; _M = 1.975 ; };
-            case (_velocity >    0) : { _A = 0.00005206214107320588; _M = 2.000 ; };
+    case 1: {
+        call {
+            if (_velocity > 4230) exitWith { _A = 0.0001477404177730177; _M = 1.9565; };
+            if (_velocity > 3680) exitWith { _A = 0.0001920339268755614; _M = 1.925; };
+            if (_velocity > 3450) exitWith { _A = 0.0002894751026819746; _M = 1.875; };
+            if (_velocity > 3295) exitWith { _A = 0.0004349905111115636; _M = 1.825; };
+            if (_velocity > 3130) exitWith { _A = 0.0006520421871892662; _M = 1.775; };
+            if (_velocity > 2960) exitWith { _A = 0.0009748073694078696; _M = 1.725; };
+            if (_velocity > 2830) exitWith { _A = 0.001453721560187286; _M = 1.675; };
+            if (_velocity > 2680) exitWith { _A = 0.002162887202930376; _M = 1.625; };
+            if (_velocity > 2460) exitWith { _A = 0.003209559783129881; _M = 1.575; };
+            if (_velocity > 2225) exitWith { _A = 0.003904368218691249; _M = 1.55; };
+            if (_velocity > 2015) exitWith { _A = 0.003222942271262336; _M = 1.575; };
+            if (_velocity > 1890) exitWith { _A = 0.002203329542297809; _M = 1.625; };
+            if (_velocity > 1810) exitWith { _A = 0.001511001028891904; _M = 1.675; };
+            if (_velocity > 1730) exitWith { _A = 0.0008609957592468259; _M = 1.75; };
+            if (_velocity > 1595) exitWith { _A = 0.0004086146797305117; _M = 1.85; };
+            if (_velocity > 1520) exitWith { _A = 0.0001954473210037398; _M = 1.95; };
+            if (_velocity > 1420) exitWith { _A = 0.00005431896266462351; _M = 2.125; };
+            if (_velocity > 1360) exitWith { _A = 0.000008847742581674416; _M = 2.375; };
+            if (_velocity > 1315) exitWith { _A = 0.000001456922328720298; _M = 2.625; };
+            if (_velocity > 1280) exitWith { _A = 0.0000002419485191895565; _M = 2.875; };
+            if (_velocity > 1220) exitWith { _A = 0.00000001657956321067612; _M = 3.25; };
+            if (_velocity > 1185) exitWith { _A = 0.0000000004745469537157371; _M = 3.75; };
+            if (_velocity > 1150) exitWith { _A = 0.00000000001379746590025088; _M = 4.25; };
+            if (_velocity > 1100) exitWith { _A = 0.0000000000004070157961147882; _M = 4.75; };
+            if (_velocity > 1060) exitWith { _A = 0.00000000000002938236954847331; _M = 5.125; };
+            if (_velocity > 1025) exitWith { _A = 0.00000000000001228597370774746; _M = 5.25; };
+            if (_velocity >  980) exitWith { _A = 0.00000000000002916938264100495; _M = 5.125; };
+            if (_velocity >  945) exitWith { _A = 0.0000000000003855099424807451; _M = 4.75; };
+            if (_velocity >  905) exitWith { _A = 0.00000000001185097045689854; _M = 4.25; };
+            if (_velocity >  860) exitWith { _A = 0.0000000003566129470974951; _M = 3.75; };
+            if (_velocity >  810) exitWith { _A = 0.00000001045513263966272; _M = 3.25; };
+            if (_velocity >  780) exitWith { _A = 0.0000001291159200846216; _M = 2.875; };
+            if (_velocity >  750) exitWith { _A = 0.0000006824429329105383; _M = 2.625; };
+            if (_velocity >  700) exitWith { _A = 0.000003569169672385163; _M = 2.375; };
+            if (_velocity >  640) exitWith { _A = 0.00001839015095899579; _M = 2.125; };
+            if (_velocity >  600) exitWith { _A = 0.00005711174688734240; _M = 1.950; };
+            if (_velocity >  550) exitWith { _A = 0.00009226557091973427; _M = 1.875; };
+            if (_velocity >  250) exitWith { _A = 0.00009337991957131389; _M = 1.875; };
+            if (_velocity >  100) exitWith { _A = 0.00007225247327590413; _M = 1.925; };
+            if (_velocity >   65) exitWith { _A = 0.00005792684957074546; _M = 1.975; };
+            if (_velocity >    0) exitWith { _A = 0.00005206214107320588; _M = 2.000; };
        };
    };
-    case 2:
-    {
-        switch true do {
-            case (_velocity > 1674) : { _A = 0.0079470052136733; _M = 1.36999902851493; };
-            case (_velocity > 1172) : { _A = 0.00100419763721974; _M = 1.65392237010294; };
-            case (_velocity > 1060) : { _A = 0.0000000000000000000000715571228255369;  _M = 7.91913562392361; };
-            case (_velocity >  949) : { _A = 0.000000000139589807205091; _M = 3.81439537623717; };
-            case (_velocity >  670) : { _A = 0.000234364342818625; _M = 1.71869536324748; };
-            case (_velocity >  335) : { _A = 0.000177962438921838; _M = 1.76877550388679; };
-            case (_velocity >    0) : { _A = 0.0000518033561289704; _M = 1.98160270524632; };
+    case 2: {
+        call {
+            if (_velocity > 1674) exitWith { _A = 0.0079470052136733; _M = 1.36999902851493; };
+            if (_velocity > 1172) exitWith { _A = 0.00100419763721974; _M = 1.65392237010294; };
+            if (_velocity > 1060) exitWith { _A = 0.0000000000000000000000715571228255369; _M = 7.91913562392361; };
+            if (_velocity >  949) exitWith { _A = 0.000000000139589807205091; _M = 3.81439537623717; };
+            if (_velocity >  670) exitWith { _A = 0.000234364342818625; _M = 1.71869536324748; };
+            if (_velocity >  335) exitWith { _A = 0.000177962438921838; _M = 1.76877550388679; };
+            if (_velocity >    0) exitWith { _A = 0.0000518033561289704; _M = 1.98160270524632; };
        };
    };
-    case 5:
-    {
-        switch true do {
-            case (_velocity > 1730) : { _A = 0.00724854775171929; _M = 1.41538574492812; };
-            case (_velocity > 1228) : { _A = 0.0000350563361516117; _M = 2.13077307854948; };
-            case (_velocity > 1116) : { _A = 0.000000000000184029481181151; _M = 4.81927320350395; };
-            case (_velocity > 1004) : { _A = 0.000000000000000000000134713064017409; _M = 7.8100555281422 ; };
-            case (_velocity >  837) : { _A = 0.000000103965974081168; _M = 2.84204791809926; };
-            case (_velocity >  335) : { _A = 0.0001093015938698234; _M = 1.81096361579504; };
-            case (_velocity >    0) : { _A = 0.0000351963178524273; _M = 2.00477856801111; };
+    case 5: {
+        call {
+            if (_velocity > 1730) exitWith { _A = 0.00724854775171929; _M = 1.41538574492812; };
+            if (_velocity > 1228) exitWith { _A = 0.0000350563361516117; _M = 2.13077307854948; };
+            if (_velocity > 1116) exitWith { _A = 0.000000000000184029481181151; _M = 4.81927320350395; };
+            if (_velocity > 1004) exitWith { _A = 0.000000000000000000000134713064017409; _M = 7.8100555281422; };
+            if (_velocity >  837) exitWith { _A = 0.000000103965974081168; _M = 2.84204791809926; };
+            if (_velocity >  335) exitWith { _A = 0.0001093015938698234; _M = 1.81096361579504; };
+            if (_velocity >    0) exitWith { _A = 0.0000351963178524273; _M = 2.00477856801111; };
        };
    };
-    case 6:
-    {
-        switch true do {
-            case (_velocity > 3236) : { _A = 0.0455384883480781; _M = 1.15997674041274; };
-            case (_velocity > 2065) : { _A = 0.07167261849653769; _M = 1.10704436538885; };
-            case (_velocity > 1311) : { _A = 0.00166676386084348; _M = 1.60085100195952; };
-            case (_velocity > 1144) : { _A = 0.000000101482730119215; _M = 2.9569674731838 ; };
-            case (_velocity > 1004) : { _A = 0.00000000000000000431542773103552; _M = 6.34106317069757; };
-            case (_velocity >  670) : { _A = 0.0000204835650496866; _M = 2.11688446325998; };
-            case (_velocity >    0) : { _A = 0.0000750912466084823; _M = 1.92031057847052; };
+    case 6: {
+        call {
+            if (_velocity > 3236) exitWith { _A = 0.0455384883480781; _M = 1.15997674041274; };
+            if (_velocity > 2065) exitWith { _A = 0.07167261849653769; _M = 1.10704436538885; };
+            if (_velocity > 1311) exitWith { _A = 0.00166676386084348; _M = 1.60085100195952; };
+            if (_velocity > 1144) exitWith { _A = 0.000000101482730119215; _M = 2.9569674731838; };
+            if (_velocity > 1004) exitWith { _A = 0.00000000000000000431542773103552; _M = 6.34106317069757; };
+            if (_velocity >  670) exitWith { _A = 0.0000204835650496866; _M = 2.11688446325998; };
+            if (_velocity >    0) exitWith { _A = 0.0000750912466084823; _M = 1.92031057847052; };
        };
    };
-    case 7:
-    {
-        switch true do {
-            case (_velocity > 4200) : { _A = 0.00000000129081656775919; _M = 3.24121295355962; };
-            case (_velocity > 3000) : { _A = 0.0171422231434847; _M = 1.27907168025204; };
-            case (_velocity > 1470) : { _A = 0.00233355948302505; _M = 1.52693913274526; };
-            case (_velocity > 1260) : { _A = 0.000797592111627665; _M = 1.67688974440324; };
-            case (_velocity > 1110) : { _A = 0.00000000000571086414289273; _M = 4.3212826264889 ; };
-            case (_velocity >  960) : { _A = 0.0000000000000000302865108244904; _M = 5.99074203776707; };
-            case (_velocity >  670) : { _A = 0.00000752285155782535; _M = 2.1738019851075 ; };
-            case (_velocity >  540) : { _A = 0.0000131766281225189; _M = 2.08774690257991; };
-            case (_velocity >    0) : { _A = 0.0000134504843776525; _M = 2.08702306738884; };
+    case 7: {
+        call {
+            if (_velocity > 4200) exitWith { _A = 0.00000000129081656775919; _M = 3.24121295355962; };
+            if (_velocity > 3000) exitWith { _A = 0.0171422231434847; _M = 1.27907168025204; };
+            if (_velocity > 1470) exitWith { _A = 0.00233355948302505; _M = 1.52693913274526; };
+            if (_velocity > 1260) exitWith { _A = 0.000797592111627665; _M = 1.67688974440324; };
+            if (_velocity > 1110) exitWith { _A = 0.00000000000571086414289273; _M = 4.3212826264889; };
+            if (_velocity >  960) exitWith { _A = 0.0000000000000000302865108244904; _M = 5.99074203776707; };
+            if (_velocity >  670) exitWith { _A = 0.00000752285155782535; _M = 2.1738019851075; };
+            if (_velocity >  540) exitWith { _A = 0.0000131766281225189; _M = 2.08774690257991; };
+            if (_velocity >    0) exitWith { _A = 0.0000134504843776525; _M = 2.08702306738884; };
        };
    };
-    case 8:
-    {
-        switch true do {
-            case (_velocity > 3571) : { _A = 0.0112263766252305; _M = 1.33207346655961; };
-            case (_velocity > 1841) : { _A = 0.0167252613732636; _M = 1.28662041261785; };
-            case (_velocity > 1120) : { _A = 0.00220172456619625; _M = 1.55636358091189; };
-            case (_velocity > 1088) : { _A = 0.00000000000000020538037167098; _M = 5.80410776994789; };
-            case (_velocity >  976) : { _A = 0.00000000000592182174254121; _M = 4.29275576134191; };
-            case (_velocity >    0) : { _A = 0.000043917343795117; _M = 1.99978116283334; };
+    case 8: {
+        call {
+            if (_velocity > 3571) exitWith { _A = 0.0112263766252305; _M = 1.33207346655961; };
+            if (_velocity > 1841) exitWith { _A = 0.0167252613732636; _M = 1.28662041261785; };
+            if (_velocity > 1120) exitWith { _A = 0.00220172456619625; _M = 1.55636358091189; };
+            if (_velocity > 1088) exitWith { _A = 0.00000000000000020538037167098; _M = 5.80410776994789; };
+            if (_velocity >  976) exitWith { _A = 0.00000000000592182174254121; _M = 4.29275576134191; };
+            if (_velocity >    0) exitWith { _A = 0.000043917343795117; _M = 1.99978116283334; };
        };
    };
 };

-if (_A != -1 && _M != -1 && _velocity > 0 && _velocity < 10000) then {
-    _result = _A * (_velocity ^ _M) / _dragCoefficient;
-    _result = _result / 3.2808399;
+if (!isNil "_A" && !isNil "_M" && _velocity > 0 && _velocity < 10000) then {
+    (_A * (_velocity ^ _M) / _dragCoefficient) / 3.2808399
+} else {
+    0
 };
-
-_result
--- a/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf
@ -13,33 +13,23 @@
 * 6: barometric Pressure - hPA <NUMBER>
 *
 * Return Value:
- * 0: stability factor <NUMBER>
+ * stability factor <NUMBER>
 *
 * Public: No
 */
 #include "script_component.hpp"

-private ["_caliber", "_bulletLength", "_bulletMass", "_barrelTwist", "_muzzleVelocity", "_temperature", "_barometricPressure", "_l", "_t", "_stabilityFactor"];
-_caliber            = _this select 0;
-_bulletLength       = _this select 1;
-_bulletMass         = _this select 2;
-_barrelTwist        = _this select 3;
-_muzzleVelocity     = _this select 4;
-_temperature        = _this select 5;
-_barometricPressure = _this select 6;
+private ["_twist", "_length", "_stabilityFactor"];
+params ["_caliber", "_bulletLength", "_bulletMass", "_barrelTwist", "_muzzleVelocity", "_temperature", "_barometricPressure"];

 // Source: http://www.jbmballistics.com/ballistics/bibliography/articles/miller_stability_1.pdf
-_t = _barrelTwist / _caliber;
-_l = _bulletLength / _caliber;
+_twist = _barrelTwist / _caliber;
+_length = _bulletLength / _caliber;

-_stabilityFactor = 7587000 * _bulletMass / (_t^2 * _caliber^3 * _l * (1 + _l^2));
+_stabilityFactor = 7587000 * _bulletMass / (_twist^2 * _caliber^3 * _length * (1 + _length^2));

 if (_muzzleVelocity > 341.376) then {
-    _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 853.44) ^ (1/3);
+    (_stabilityFactor * (_muzzleVelocity / 853.44) ^ (1/3)) * KELVIN(_temperature) / KELVIN(15) * 1013.25 / _barometricPressure
 } else {
-    _stabilityFactor = _stabilityFactor * (_muzzleVelocity / 341.376) ^ (1/3);
+    (_stabilityFactor * (_muzzleVelocity / 341.376) ^ (1/3)) * KELVIN(_temperature) / KELVIN(15) * 1013.25 / _barometricPressure
 };
-
-_stabilityFactor = _stabilityFactor * KELVIN(_temperature) / KELVIN(15) * 1013.25 / _barometricPressure;
-
-_stabilityFactor
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@ -8,6 +8,8 @@
 *
 * Return value:
 * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

@ -15,8 +17,6 @@
 #define __ctrl1 (__dsp displayCtrl 132950)
 #define __ctrl2 (__dsp displayCtrl 132951)

-private ["_inclinationAngle", "_refPosition"];
-
 if (GVAR(Protractor)) exitWith {
    GVAR(Protractor) = false;
    1 cutText ["", "PLAIN"];
@ -32,30 +32,26 @@ EGVAR(weather,WindInfo) = false;
 GVAR(Protractor) = true;

 [{
+    params ["","_idPFH"];
    if !(GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player) exitWith {
        GVAR(Protractor) = false;
        1 cutText ["", "PLAIN"];
-        [_this select 1] call cba_fnc_removePerFrameHandler;
+        [_idPFH] call cba_fnc_removePerFrameHandler;
    };
-    
-    _refPosition = [SafeZoneX + 0.001, SafeZoneY + 0.001, 0.2, 0.2 * 4/3];
-    
-    _inclinationAngle = asin((ACE_player weaponDirection currentWeapon ACE_player) select 2);
-    _inclinationAngle = -58 max _inclinationAngle min 58;
-    
+
    1 cutRsc ["RscProtractor", "PLAIN", 1, false];
-    
+
    __ctrl1 ctrlSetScale 1;
    __ctrl1 ctrlCommit 0;
    __ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
    __ctrl1 ctrlSetTextColor [1, 1, 1, 1];
-    
+
    __ctrl2 ctrlSetScale 1;
-    __ctrl2 ctrlSetPosition [(_refPosition select 0), (_refPosition select 1) - 0.0012 * _inclinationAngle, (_refPosition select 2), (_refPosition select 3)];
+    __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 ctrlCommit 0;
    __ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
    __ctrl2 ctrlSetTextColor [1, 1, 1, 1];
-    
+
 }, 0.1, []] call CBA_fnc_addPerFrameHandler;

 true
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@ -0,0 +1,47 @@
+/*
+ * Author: Glowbal, Ruthberg, joko // Jonas
+ * Handle the PFH for Bullets
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+private "_deleted";
+
+
+
+_deleted = 0;
+
+{
+    private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];
+    _x params["_bullet","_caliber","_bulletTraceVisible","_index"];
+
+    _bulletVelocity = velocity _bullet;
+
+    _bulletSpeed = vectorMagnitude _bulletVelocity;
+
+    if (!alive _bullet || _bulletSpeed < 100) exitWith {
+        GVAR(allBullets) deleteAt (_forEachIndex - _deleted);
+        _deleted = _deleted + 1;
+    };
+
+    _bulletPosition = getPosASL _bullet;
+
+    if (_bulletTraceVisible && _bulletSpeed > 500) then {
+        drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
+    };
+
+    _aceTimeSecond = floor ACE_time;
+    call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
+} forEach GVAR(allBullets);
+
+if (GVAR(allBullets) isEqualTo []) then {
+    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    GVAR(BulletPFH) = nil;
+};
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@ -13,28 +13,28 @@
 * 6: projectile - Object of the projectile that was shot <OBJECT>
 *
 * Return Value:
- * Nothing
+ * None
 *
 * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_weapon", "_mode", "_ammo", "_magazine", "_caliber", "_bullet", "_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_bulletMass", "_bulletLength", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_stabilityFactor"];
-_unit     = _this select 0;
-_weapon   = _this select 1;
-_mode     = _this select 3;
-_ammo     = _this select 4;
-_magazine = _this select 5;
-_bullet   = _this select 6;
+// Early Quiting
+if (!hasInterface) exitWith {};
+if (!GVAR(enabled)) exitWith {};
+
+// Parameterization
+private ["_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_bulletMass", "_bulletLength", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletSpeed", "_bulletLength", "_barrelTwist", "_stabilityFactor"];
+params ["_unit", "_weapon", "", "_mode", "_ammo", "_magazine", "_bullet"];

 _abort = false;
-if (!hasInterface) exitWith {};
-if (!alive _bullet) exitWith {};
-if (!GVAR(enabled)) exitWith {};
-if (!([_unit] call EFUNC(common,isPlayer))) exitWith {};
-if (underwater _unit) exitWith {};
+
+
 if (!(_ammo isKindOf "BulletBase")) exitWith {};
+if (!alive _bullet) exitWith {};
+if (!([_unit] call EFUNC(common,isPlayer))) exitWith {};
 if (_unit distance ACE_player > GVAR(simulationRadius)) exitWith {};
+if (underwater _unit) exitWith {};
 if (!GVAR(simulateForEveryone) && !(local _unit)) then {
    // The shooter is non local
    _abort = true;
@ -53,39 +53,44 @@ if (!GVAR(simulateForEveryone) && !(local _unit)) then {
 if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; };

 if (_abort || !(GVAR(extensionAvailable))) exitWith {
-    if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
-        EGVAR(windDeflection,trackedBullets) pushBack [_bullet, getNumber(configFile >> "cfgAmmo" >> _ammo >> "airFriction")];
-    };
+    [_bullet, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")] call EFUNC(winddeflection,updateTrajectoryPFH);
 };

+// Get Weapon and Ammo Configurations
 _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
-if (isNil {_AmmoCacheEntry}) then {
+if (isNil "_AmmoCacheEntry") then {
     _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
 };
 _WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
-if (isNil {_WeaponCacheEntry}) then {
+if (isNil "_WeaponCacheEntry") then {
     _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
 };

+_AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable"];
+_WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];
+
+
 _bulletVelocity = velocity _bullet;
 _muzzleVelocity = vectorMagnitude _bulletVelocity;

 if (GVAR(barrelLengthInfluenceEnabled)) then {
-    _muzzleVelocityShift = [_WeaponCacheEntry select 2, _AmmoCacheEntry select 10, _AmmoCacheEntry select 11, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift);
-    if (_muzzleVelocityShift != 0) then {
-        _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift));
-        _bullet setVelocity _bulletVelocity;
-        _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
+    _barrelVelocityShift = uiNamespace getVariable [format [QGVAR(%1_muzzleVelocityShift),_weapon],nil];
+    if (isNil "_barrelVelocityShift") then {
+        _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift);
+        uiNamespace setVariable [format [QGVAR(%1_muzzleVelocityShift),_weapon],_muzzleVelocityShift];
    };
 };

 if (GVAR(ammoTemperatureEnabled)) then {
    _temperature = ((getPosASL _unit) select 2) call EFUNC(weather,calculateTemperatureAtHeight);
-    _muzzleVelocityShift = [_AmmoCacheEntry select 9, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift);
+    _temperatureVelocityShift = ([_ammoTempMuzzleVelocityShifts, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift));
+};
+
+if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
    if (_muzzleVelocityShift != 0) then {
+        _muzzleVelocity = _muzzleVelocity + (_barrelVelocityShift + _ammoTemperatureVelocityShift);
        _bulletVelocity = _bulletVelocity vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply (_muzzleVelocityShift));
        _bullet setVelocity _bulletVelocity;
-        _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
    };
 };

@ -102,43 +107,22 @@ if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {
    };
 };

-_caliber = _AmmoCacheEntry select 1;
-_bulletLength = _AmmoCacheEntry select 2;
-_bulletMass = _AmmoCacheEntry select 3;
-_barrelTwist = _WeaponCacheEntry select 0;
 _stabilityFactor = 1.5;
-
 if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) then {
-    _temperature = ((getPosASL _unit) select 2) call EFUNC(weather,calculateTemperatureAtHeight);
+    if (isNil "_temperature") then {
+        _temperature = ((getPosASL _unit) select 2) call EFUNC(weather,calculateTemperatureAtHeight);
+    };
    _barometricPressure = ((getPosASL _bullet) select 2) call EFUNC(weather,calculateBarometricPressure);
    _stabilityFactor = [_caliber, _bulletLength, _bulletMass, _barrelTwist, _muzzleVelocity, _temperature, _barometricPressure] call FUNC(calculateStabilityFactor);
 };

 GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;

-"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _AmmoCacheEntry select 0, _AmmoCacheEntry select 6, _AmmoCacheEntry select 7, _AmmoCacheEntry select 8, _AmmoCacheEntry select 5, _stabilityFactor, _WeaponCacheEntry select 1, _muzzleVelocity, _AmmoCacheEntry select 4, getPosASL _bullet, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, floor(ACE_time), ACE_time - floor(ACE_time)];
+_aceTimeSecond = floor ACE_time;
+"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _bullet, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, ACE_time - _aceTimeSecond];

-[{
-    private ["_args", "_index", "_bullet", "_caliber", "_bulletTraceVisible", "_bulletVelocity", "_bulletPosition"];
-    _args = _this select 0;
-    _bullet = _args select 0;
-    _caliber = _args select 1;
-    _bulletTraceVisible = _args select 2;
-    _index = _args select 3;
-    
-    _bulletVelocity = velocity _bullet;
-    _bulletPosition = getPosASL _bullet;
-    
-    _bulletSpeed = vectorMagnitude _bulletVelocity;
-    
-    if (!alive _bullet || _bulletSpeed < 100) exitWith {
-        [_this select 1] call cba_fnc_removePerFrameHandler;
-    };
-    
-    if (_bulletTraceVisible && _bulletSpeed > 500) then {
-        drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
-    };
+GVAR(allBullets) pushBack [_bullet, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];

-    call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, floor(ACE_time), ACE_time - floor(ACE_time)]);
-
-}, GVAR(simulationInterval), [_bullet, _caliber, _bulletTraceVisible, GVAR(currentbulletID)]] call CBA_fnc_addPerFrameHandler;
+if (isNil QGVAR(BulletPFH)) then {
+    GVAR(BulletPFH) = [FUNC(handleFirePFH), GVAR(simulationInterval), []] call CBA_fnc_addPerFrameHandler;
+};
--- a/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf
@ -8,17 +8,13 @@
 * 2: activated <BOOL>
 *
 * Return Value:
- * None <NIL>
+ * None
 *
 * Public: No
 */
-
 #include "script_component.hpp"

-private ["_logic", "_units", "_activated"];
-_logic = _this select 0;
-_units = _this select 1;
-_activated = _this select 2;
+params ["_logic","_units", "_activated"];

 if !(_activated) exitWith {};

--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@ -3,10 +3,10 @@
 * Initializes the advanced ballistics dll extension with terrain data
 *
 * Arguments:
- * Nothing
+ * None
 *
 * Return Value:
- * Nothing
+ * None
 *
 * Public: No
 */
@ -22,9 +22,9 @@ _initStartTime = ACE_time;
 _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");

 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
-    if (GVAR(initMessageEnabled)) then {
+    #ifdef DEBUG_MODE_FULL
        systemChat "AdvancedBallistics: Terrain already initialized";
-    };
+    #endIf
 };

 _mapGrids = ceil(_mapSize / 50) + 1;
@ -33,19 +33,16 @@ _gridCells = _mapGrids * _mapGrids;
 GVAR(currentGrid) = 0;

 [{
-    private ["_args", "_mapGrids", "_gridCells", "_initStartTime"];
-    _args = _this select 0;
-    _mapGrids = _args select 0;
-    _gridCells = _args select 1;
-    _initStartTime = _args select 2;
-    
+    params ["_args","_idPFH"];
+    _args params ["_mapGrids", "_gridCells", "_initStartTime"];
+
    if (GVAR(currentGrid) >= _gridCells) exitWith {
-        if (GVAR(initMessageEnabled)) then {
+        #ifdef DEBUG_MODE_FULL
            systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)];
-        };
-        [_this select 1] call cba_fnc_removePerFrameHandler;
+        #endif
+        [_idPFH] call cba_fnc_removePerFrameHandler;
    };
-    
+
    for "_i" from 1 to 50 do {
        _x = floor(GVAR(currentGrid) / _mapGrids) * 50;
        _y = (GVAR(currentGrid) - floor(GVAR(currentGrid) / _mapGrids) * _mapGrids) * 50;
@ -57,5 +54,5 @@ GVAR(currentGrid) = 0;
        GVAR(currentGrid) = GVAR(currentGrid) + 1;
        if (GVAR(currentGrid) >= _gridCells) exitWith {};
    };
-        
+
 }, 0, [_mapGrids, _gridCells, _initStartTime]] call CBA_fnc_addPerFrameHandler
--- a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
@ -4,61 +4,53 @@
 * Reads the ammo class config and updates the config cache
 *
 * Arguments:
- * 0: ammo - classname <string>
+ * ammo - classname <STRING>
 *
 * Return Value:
- * 0: [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable] <ARRAY>
+ * 0: _airFriction
+ * 1: _caliber
+ * 2: _bulletLength
+ * 3: _bulletMass
+ * 4: _transonicStabilityCoef
+ * 5: _dragModel
+ * 6: _ballisticCoefficients
+ * 7: _velocityBoundaries
+ * 8: _atmosphereModel
+ * 9: _ammoTempMuzzleVelocityShifts
+ * 10: _muzzleVelocityTable
+ * 11: _barrelLengthTable
 *
- * Return value:
- * None
+ * Public: No
 */
 #include "script_component.hpp"

 private ["_ammo", "_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_result"];
-_ammo = _this;
+_ammoConfig = configFile >> "CfgAmmo" >> _this;

-_airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction");
-_caliber = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_caliber");
-_bulletLength = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletLength");
-_bulletMass = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_bulletMass");
-_transonicStabilityCoef = 0.5;
-if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef")) then {
-    _transonicStabilityCoef = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_transonicStabilityCoef");
+_airFriction = getNumber(_ammoConfig >> "airFriction");
+_caliber = getNumber(_ammoConfig >> "ACE_caliber");
+_bulletLength = getNumber(_ammoConfig >> "ACE_bulletLength");
+_bulletMass = getNumber(_ammoConfig >> "ACE_bulletMass");
+_transonicStabilityCoef = getNumber(_ammoConfig >> "ACE_transonicStabilityCoef");
+if (_transonicStabilityCoef == 0) then {
+    _transonicStabilityCoef = 0.5;
 };
-_dragModel = 1;
-_ballisticCoefficients = [];
-_velocityBoundaries = [];
-_atmosphereModel = "ICAO";
-if (isNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel")) then {
-    _dragModel = getNumber(configFile >> "CfgAmmo" >> _ammo >> "ACE_dragModel");
-    if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then {
-        _dragModel = 1;
-    };
+_dragModel = getNumber(_ammoConfig >> "ACE_dragModel");
+if (_dragModel == 0 || !(_dragModel in [1, 2, 5, 6, 7, 8])) then {
+    _dragModel = 1;
 };
-if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients")) then {
-    _ballisticCoefficients = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ballisticCoefficients");
-};
-if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries")) then {
-    _velocityBoundaries = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_velocityBoundaries");
-};
-if (isText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere")) then {
-    _atmosphereModel = getText(configFile >> "CfgAmmo" >> _ammo >> "ACE_standardAtmosphere");
-};
-_ammoTempMuzzleVelocityShifts = [];
-if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts")) then {
-    _ammoTempMuzzleVelocityShifts = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_ammoTempMuzzleVelocityShifts");
-};
-_muzzleVelocityTable = [];
-_barrelLengthTable = [];
-if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocities")) then {
-    _muzzleVelocityTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_muzzleVelocities");
-};
-if (isArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths")) then {
-    _barrelLengthTable = getArray(configFile >> "CfgAmmo" >> _ammo >> "ACE_barrelLengths");
+_ballisticCoefficients = getArray(_ammoConfig >> "ACE_ballisticCoefficients");
+_velocityBoundaries = getArray(_ammoConfig >> "ACE_velocityBoundaries");
+_atmosphereModel = getText(_ammoConfig >> "ACE_standardAtmosphere");
+if (_atmosphereModel isEqualTo "") then {
+    _atmosphereModel = "ICAO";
 };
+_ammoTempMuzzleVelocityShifts = getArray(_ammoConfig >> "ACE_ammoTempMuzzleVelocityShifts");
+_muzzleVelocityTable = getArray(_ammoConfig >> "ACE_muzzleVelocities");
+_barrelLengthTable = getArray(_ammoConfig >> "ACE_barrelLengths");

 _result = [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable];

-uiNamespace setVariable [format[QGVAR(%1), _ammo], _result];
+uiNamespace setVariable [format[QGVAR(%1), _this], _result];

 _result
--- a/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf
@ -4,28 +4,28 @@
 * Reads the weapon class config and updates the config cache
 *
 * Arguments:
- * 0: weapon - classname <string>
+ * weapon - classname <STRING>
 *
 * Return Value:
- * 0: [_barrelTwist, _twistDirection, _barrelLength] <ARRAY>
+ * 0: _barrelTwist
+ * 1: _twistDirection
+ * 2: _barrelLength
 *
- * Return value:
- * None
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_weapon", "_barrelTwist", "_twistDirection", "_barrelLength", "_result"];
-_weapon = _this;
+private ["_weaponConfig", "_barrelTwist", "_twistDirection", "_barrelLength", "_result"];
+_weaponConfig = (configFile >> "CfgWeapons" >> _this);

-_barrelTwist = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelTwist");
+_barrelTwist = getNumber(_weaponConfig >> "ACE_barrelTwist");
 _twistDirection = 1;
-if (isNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection")) then {
-    _twistDirection = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_twistDirection");
-    if (_twistDirection != -1 && _twistDirection != 0 &&  _twistDirection != 1) then {
-        _twistDirection = 1;
-    };
+_twistDirection = getNumber(_weaponConfig >> "ACE_twistDirection");
+if !(_twistDirection in [-1, 0, 1]) then {
+    _twistDirection = 1;
 };
-_barrelLength = getNumber(configFile >> "CfgWeapons" >> _weapon >> "ACE_barrelLength");
+
+_barrelLength = getNumber(_weaponConfig >> "ACE_barrelLength");

 _result = [_barrelTwist, _twistDirection, _barrelLength];

--- a/addons/aircraft/README.md
+++ b/addons/aircraft/README.md
@ -1,9 +1,10 @@
 ace_aircraft
 ============

-Changes to air weaponry, flightmodels and HUDs.
+Changes to air weaponry, flight models and HUDs.
+
+- Contributions by Kimi (geraldbolso1899) for HUD updates

-* Contributations by Kimi (geraldbolso1899) for HUD updates

 ## Maintainers

@ -11,4 +12,4 @@ The people responsible for merging changes to this component or answering potent

 - [KoffeinFlummi](https://github.com/KoffeinFlummi)
 - [commy2](https://github.com/commy2)
- [jaynus](https://github.com/walterpearce)
+- [jaynus](https://github.com/walterpearce)
--- a/addons/apl/README.md
+++ b/addons/apl/README.md
@ -0,0 +1,11 @@
+ace_apl
+============
+
+Assets licensed under Arma Public License (APL).
+
+
+## Maintainers
+
+The people responsible for merging changes to this component or answering potential questions.
+
+- None
--- a/addons/atragmx/README.md
+++ b/addons/atragmx/README.md
@ -3,8 +3,9 @@ ace_atragmx

 ATragMX - Handheld ballistics calculator

+
 ## Maintainers

 The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
+- [Ruthberg](http://github.com/Ulteq)
--- a/addons/attach/CfgEventHandlers.hpp
+++ b/addons/attach/CfgEventHandlers.hpp
@ -8,3 +8,24 @@ class Extended_PostInit_EventHandlers {
        clientInit = QUOTE( call COMPILE_FILE(XEH_clientInit) );
    };
 };
+class Extended_GetIn_EventHandlers {
+    class All {
+        class ADDON {
+            getIn = QUOTE(_this call FUNC(handleGetIn));
+        };
+    };
+};
+class Extended_GetOut_EventHandlers {
+    class All {
+        class ADDON {
+            getOut = QUOTE(_this call FUNC(handleGetOut));
+        };
+    };
+};
+class Extended_Killed_EventHandlers {
+    class All {
+        class ADDON {
+            killed = QUOTE(_this call FUNC(handleKilled));
+        };
+    };
+};
--- a/addons/attach/README.md
+++ b/addons/attach/README.md
@ -2,7 +2,9 @@ ace_attach
 ==========

 Introducing the ability to attach various throwables to yourself or vehicles, to mark your position and assist in IFF.
-Adds item `ACE_IR_Strobe_Item`.
+
+#### Items Added:
+`ACE_IR_Strobe_Item`


 ## Maintainers
--- a/addons/attach/XEH_preInit.sqf
+++ b/addons/attach/XEH_preInit.sqf
@ -7,6 +7,9 @@ PREP(canAttach);
 PREP(canDetach);
 PREP(detach);
 PREP(getChildrenAttachActions);
+PREP(handleGetIn);
+PREP(handleGetOut);
+PREP(handleKilled);
 PREP(placeApprove);

 ADDON = true;
--- a/addons/attach/functions/fnc_attach.sqf
+++ b/addons/attach/functions/fnc_attach.sqf
@ -17,15 +17,14 @@
 */
 #include "script_component.hpp"

-private ["_itemVehClass", "_onAtachText", "_selfAttachPosition", "_attachedItem", "_tempObject", "_actionID", "_model"];
-params ["_attachToVehicle","_unit","_args"];
+params ["_attachToVehicle","_unit","_args", ["_silentScripted", false]];
 _args params [["_itemClassname","", [""]]];
-TRACE_3("params",_attachToVehicle,_unit,_itemClassname);
+TRACE_4("params",_attachToVehicle,_unit,_itemClassname,_silentScripted);
+
+private ["_itemVehClass", "_onAtachText", "_selfAttachPosition", "_attachedItem", "_tempObject", "_actionID", "_model"];

 //Sanity Check (_unit has item in inventory, not over attach limit)
-if ((_itemClassname == "") || {!(_this call FUNC(canAttach))}) exitWith {ERROR("Tried to attach, but check failed");};
-
-_selfAttachPosition = [_unit, [-0.05, 0, 0.12], "rightshoulder"];
+if ((_itemClassname == "") || {(!_silentScripted) && {!(_this call FUNC(canAttach))}}) exitWith {ERROR("Tried to attach, but check failed");};

 _itemVehClass = getText (configFile >> "CfgWeapons" >> _itemClassname >> "ACE_Attachable");
 _onAtachText = getText (configFile >> "CfgWeapons" >> _itemClassname >> "displayName");
@ -40,12 +39,13 @@ if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");};
 _onAtachText = format [localize LSTRING(Item_Attached), _onAtachText];

 if (_unit == _attachToVehicle) then {  //Self Attachment
-    _unit removeItem _itemClassname;  // Remove item
    _attachedItem = _itemVehClass createVehicle [0,0,0];
-    _attachedItem attachTo _selfAttachPosition;
-    [_onAtachText] call EFUNC(common,displayTextStructured);
-    _attachToVehicle setVariable [QGVAR(Objects), [_attachedItem], true];
-    _attachToVehicle setVariable [QGVAR(ItemNames), [_itemClassname], true];
+    _attachedItem attachTo [_unit, [-0.05, 0, 0.12], "rightshoulder"];
+    if (!_silentScripted) then {
+        _unit removeItem _itemClassname;  // Remove item
+        [_onAtachText] call EFUNC(common,displayTextStructured);
+    };
+    _unit setVariable [QGVAR(attached), [[_attachedItem, _itemClassname]], true];
 } else {
    GVAR(placeAction) = PLACE_WAITING;

--- a/addons/attach/functions/fnc_canAttach.sqf
+++ b/addons/attach/functions/fnc_canAttach.sqf
@ -17,14 +17,17 @@
 */
 #include "script_component.hpp"

-private ["_attachLimit", "_attachedObjects","_playerPos"];
 params ["_attachToVehicle","_player","_args"];
 _args params [["_itemClassname","", [""]]];
-TRACE_3("params",_attachToVehicle,_unit,_itemClassname);
+TRACE_3("params",_attachToVehicle,_player,_itemClassname);
+
+private ["_attachLimit", "_attachedObjects"];

 _attachLimit = [6, 1] select (_player == _attachToVehicle);
-_attachedObjects = _attachToVehicle getVariable [QGVAR(Objects), []];
+_attachedObjects = _attachToVehicle getVariable [QGVAR(attached), []];

-_playerPos = (ACE_player modelToWorldVisual (ACE_player selectionPosition "pilot"));
-
-(canStand _player) && {(_attachToVehicle distance _player) < 7} && {alive _attachToVehicle} && {(count _attachedObjects) < _attachLimit} && {_itemClassname in ((itemsWithMagazines _player) + [""])};
+((_player == _attachToVehicle) || {canStand _player}) &&
+{(_attachToVehicle distance _player) < 7} && 
+{alive _attachToVehicle} && 
+{(count _attachedObjects) < _attachLimit} && 
+{_itemClassname in ((itemsWithMagazines _player) + [""])};
--- a/addons/attach/functions/fnc_canDetach.sqf
+++ b/addons/attach/functions/fnc_canDetach.sqf
@ -16,25 +16,25 @@
 */
 #include "script_component.hpp"

-private ["_attachedObjects", "_inRange"];
 params ["_attachToVehicle", "_unit"];
 TRACE_2("params",_attachToVehicle,_unit);

-_attachedObjects = _attachToVehicle getVariable [QGVAR(Objects), []];
+_attachedList = _attachToVehicle getVariable [QGVAR(attached), []];
+if ((count _attachedList) == 0) exitWith {false};
+
+private ["_inRange"];

 _inRange = false;
-if (_unit == _attachToVehicle) then {
-    _inRange = count _attachedObjects > 0;
-} else {
-    //Scan if unit is within range (using 2d distance)
-    private ["_unitPos", "_objectPos"];
-    _unitPos = getPos _unit;
-    _unitPos set [2,0];
-    {
-        _objectPos = getPos _x;
-        _objectPos set [2, 0];
-        if (_objectPos distance _unitPos < 4) exitWith {_inRange = true};
-    } forEach _attachedObjects;
-};
+{
+    _x params ["_xObject"];
+    if (isNull _xObject) exitWith {
+        TRACE_1("Null attached",_x);
+        _attachedList deleteAt _forEachIndex;
+        _attachToVehicle setVariable [QGVAR(attached), _attachedList, true];
+    };
+    if (((getPos _unit) distance2d (getPos _xObject)) < 4) exitWith {_inRange = true};
+} forEach _attachedList;

-canStand _unit && {_inRange} && {alive _attachToVehicle}
+_inRange &&
+{(_unit == _attachToVehicle) || {canStand _unit}} &&
+{alive _attachToVehicle}
--- a/addons/attach/functions/fnc_detach.sqf
+++ b/addons/attach/functions/fnc_detach.sqf
@ -16,15 +16,12 @@
 */
 #include "script_component.hpp"

-private ["_attachedObjects", "_attachedItems", "_itemDisplayName",
-    "_attachedObject", "_attachedIndex", "_itemName", "_minDistance",
-    "_unitPos", "_objectPos"
-];
 params ["_attachToVehicle","_unit"],
 TRACE_2("params",_attachToVehicle,_unit);

-_attachedObjects = _attachToVehicle getVariable [QGVAR(Objects), []];
-_attachedItems = _attachToVehicle getVariable [QGVAR(ItemNames), []];
+private ["_attachedList", "_itemDisplayName", "_attachedObject", "_attachedIndex", "_itemName", "_minDistance"];
+
+_attachedList = _attachToVehicle getVariable [QGVAR(attached), []];

 _attachedObject = objNull;
 _attachedIndex = -1;
@ -32,18 +29,17 @@ _itemName = "";

 //Find closest attached object
 _minDistance = 1000;
-_unitPos = getPos _unit;
-_unitPos set [2,0];
+
 {
-    _objectPos = getPos _x;
-    _objectPos set [2, 0];
-    if (_objectPos distance _unitPos < _minDistance) then {
-        _minDistance = _objectPos distance _unitPos;
-        _attachedObject = _x;
-        _itemName = _attachedItems select _forEachIndex;
+    _x params ["_xObject", "_xItemName"];
+
+    if (((getPos _unit) distance2d (getPos _xObject)) < _minDistance) then {
+        _minDistance = ((getPos _unit) distance2d (getPos _xObject));
+        _attachedObject = _xObject;
+        _itemName = _xItemName;
        _attachedIndex = _forEachIndex;
    };
-} forEach _attachedObjects;
+} forEach _attachedList;

 // Check if unit has an attached item
 if (isNull _attachedObject || {_itemName == ""}) exitWith {ERROR("Could not find attached object")};
@ -68,10 +64,8 @@ if (toLower _itemName in ["b_ir_grenade", "o_ir_grenade", "i_ir_grenade"]) then
 };

 // Reset unit variables
-_attachedObjects deleteAt _attachedIndex;
-_attachedItems deleteAt _attachedIndex;
-_attachToVehicle setVariable [QGVAR(Objects), _attachedObjects, true];
-_attachToVehicle setVariable [QGVAR(ItemNames), _attachedItems, true];
+_attachedList deleteAt _attachedIndex;
+_attachToVehicle setVariable [QGVAR(attached), _attachedList, true];

 // Display message
 _itemDisplayName = getText (configFile >> "CfgWeapons" >> _itemName >> "displayName");
--- a/addons/attach/functions/fnc_handleGetIn.sqf
+++ b/addons/attach/functions/fnc_handleGetIn.sqf
@ -0,0 +1,38 @@
+/*
+ * Author: PabstMirror
+ * Handles when a unit gets in to a vehicle.
+ *
+ * Arguments:
+ * 0: vehicle <OBJECT>
+ * 1: dunno <OBJECT>
+ * 2: unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [car2, x, player] call ACE_attach_fnc_handleGetIn
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+if (!isServer) exitWith {};
+
+params ["", "", "_unit"];
+TRACE_1("params",_unit);
+
+private ["_attachedList"];
+
+_attachedList = _unit getVariable [QGVAR(attached), []];
+if ((count _attachedList) == 0) exitWith {};
+
+(_attachedList select 0) params ["_xObject"];
+if (!isNull _xObject) then {
+    detach _xObject;
+    _xObject setPos ((getPos _unit) vectorAdd [0, 0, -1000]);
+    [{deleteVehicle (_this select 0)}, [_xObject], 2] call EFUNC(common,waitAndExecute);
+    (_attachedList select 0) set [0, objNull];
+};
+
+_unit setVariable [QGVAR(attached), _attachedList, true];
--- a/addons/attach/functions/fnc_handleGetOut.sqf
+++ b/addons/attach/functions/fnc_handleGetOut.sqf
@ -0,0 +1,35 @@
+/*
+ * Author: PabstMirror
+ * Handles when a unit gets in to a vehicle.
+ *
+ * Arguments:
+ * 0: vehicle <OBJECT>
+ * 1: dunno <OBJECT>
+ * 2: unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [car2, x, player] call ACE_attach_fnc_handleGetOut
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+if (!isServer) exitWith {};
+
+params ["", "", "_unit"];
+TRACE_1("params",_unit);
+
+private ["_attachedList"];
+
+_attachedList = _unit getVariable [QGVAR(attached), []];
+if ((count _attachedList) == 0) exitWith {};
+
+(_attachedList select 0) params ["_xObject", "_xItemName"];
+if (isNull _xObject) then {
+    TRACE_1("null attached when exiting vehicle, scripted reattach",_xItemName);
+    _unit setVariable [QGVAR(attached), [], true];
+    [_unit, _unit, _xItemName, true] call FUNC(attach);
+};
--- a/addons/attach/functions/fnc_handleKilled.sqf
+++ b/addons/attach/functions/fnc_handleKilled.sqf
@ -0,0 +1,39 @@
+/*
+ * Author: PabstMirror
+ * Handles when vehicle or man is killed. 
+ * Note: Runs where unit is local.
+ *
+ * Arguments:
+ * 0: DeadVehicle <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [bob1] call ACE_attach_fnc_handleKilled
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_deadUnit"];
+TRACE_1("params",_deadUnit);
+
+private ["_attachedList"];
+
+_attachedList = _deadUnit getVariable [QGVAR(attached), []];
+
+if ((count _attachedList) == 0) exitWith {};
+
+{
+    _x params ["_xObject"];
+    TRACE_2("detaching",_xObject,_deadUnit);
+    detach _xObject;
+    //If it's a vehicle, also delete the attached
+    if (!(_deadUnit isKindOf "CAManBase")) then {
+        _xObject setPos ((getPos _deadUnit) vectorAdd [0, 0, -1000]);
+        [{deleteVehicle (_this select 0)}, [_xObject], 2] call EFUNC(common,waitAndExecute);
+    };
+} forEach _attachedList;
+
+_deadUnit setVariable [QGVAR(attached), nil, true];
--- a/addons/attach/functions/fnc_placeApprove.sqf
+++ b/addons/attach/functions/fnc_placeApprove.sqf
@ -25,7 +25,7 @@
 */
 #include "script_component.hpp"

-private ["_startingOffset", "_startDistanceFromCenter", "_closeInUnitVector", "_closeInMax", "_closeInMin", "_closeInDistance", "_endPosTestOffset", "_endPosTest", "_doesIntersect", "_startingPosShifted", "_startASL", "_endPosShifted", "_endASL", "_attachedObject", "_currentObjects", "_currentItemNames"];
+private ["_startingOffset", "_startDistanceFromCenter", "_closeInUnitVector", "_closeInMax", "_closeInMin", "_closeInDistance", "_endPosTestOffset", "_endPosTest", "_doesIntersect", "_startingPosShifted", "_startASL", "_endPosShifted", "_endASL", "_attachedObject", "_attachList"];

 params ["_unit", "_attachToVehicle", "_itemClassname", "_itemVehClass", "_onAtachText", "_startingPosition"];
 TRACE_6("params",_unit,_attachToVehicle,_itemClassname,_itemVehClass,_onAtachText,_startingPosition);
@ -87,12 +87,9 @@ _attachedObject attachTo [_attachToVehicle, _endPosTestOffset];
 //Remove Item from inventory
 _unit removeItem _itemClassname;

-//Add Object to ACE_AttachedObjects and ACE_AttachedItemNames
-_currentObjects = _attachToVehicle getVariable [QGVAR(Objects), []];
-_currentObjects pushBack _attachedObject;
-_attachToVehicle setVariable [QGVAR(Objects), _currentObjects, true];
-_currentItemNames = _attachToVehicle getVariable [QGVAR(ItemNames), []];
-_currentItemNames pushBack _itemClassname;
-_attachToVehicle setVariable [QGVAR(ItemNames), _currentItemNames, true];
+//Add Object to attached array
+_attachList = _attachToVehicle getVariable [QGVAR(attached), []];
+_attachList pushBack [_attachedObject, _itemClassname];
+_attachToVehicle setVariable [QGVAR(attached), _attachList, true];

 [_onAtachText] call EFUNC(common,displayTextStructured);
--- a/addons/attach/stringtable.xml
+++ b/addons/attach/stringtable.xml
@ -5,7 +5,7 @@
            <English>Attach item &gt;&gt;</English>
            <German>Gegenstand befestigen &gt;&gt;</German>
            <Spanish>Acoplar objeto &gt;&gt;</Spanish>
-            <Polish>Przyczep przedmiot &gt;&gt;</Polish>
+            <Polish>Przyczep &gt;&gt;</Polish>
            <French>Attacher l'objet &gt;&gt;</French>
            <Czech>Připnout předmět &gt;&gt;</Czech>
            <Portuguese>Fixar item &gt;&gt;</Portuguese>
@ -185,7 +185,7 @@
            <English>%1&lt;br/&gt;Attached</English>
            <German>%1&lt;br/&gt;befestigt</German>
            <Spanish>%1&lt;br/&gt;acoplada</Spanish>
-            <Polish>%1&lt;br/&gt;przyczepiono</Polish>
+            <Polish>Przyczepiono&lt;br/&gt;%1</Polish>
            <French>%1&lt;br/&gt;attachée</French>
            <Czech>%1&lt;br/&gt;Připnutý</Czech>
            <Portuguese>%1&lt;br/&gt;Fixada</Portuguese>
@ -197,7 +197,7 @@
            <English>%1&lt;br/&gt;Detached</English>
            <German>%1&lt;br/&gt;entfernt</German>
            <Spanish>%1&lt;br/&gt;quitada</Spanish>
-            <Polish>%1&lt;br/&gt;odczepiono</Polish>
+            <Polish>Odczepiono&lt;br/&gt;%1</Polish>
            <French>%1&lt;br/&gt;détachée</French>
            <Czech>%1&lt;br/&gt;Odepnutý</Czech>
            <Portuguese>%1&lt;br/&gt;Separada</Portuguese>
@ -206,4 +206,4 @@
            <Russian>%1&lt;br/&gt;отсоединен(-а)</Russian>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/backpacks/README.md
+++ b/addons/backpacks/README.md
@ -1,7 +1,8 @@
 ace_backpacks
 =================

-Adds indication when someone else opens your backpack (soundeffect / camShake).
+Adds indication when someone else opens your backpack (sound effect and camera shake).
+

 ## Maintainers

--- a/addons/ballistics/README.md
+++ b/addons/ballistics/README.md
@ -3,10 +3,11 @@ ace_ballistics

 Changes to weapon, magazine and ammunition values.

+
 ## Maintainers

 The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
+- [Ruthberg](http://github.com/Ulteq)
 - [KoffeinFlummi](https://github.com/KoffeinFlummi)
 - [commy2](https://github.com/commy2)
--- a/addons/captives/CfgMoves.hpp
+++ b/addons/captives/CfgMoves.hpp
@ -18,6 +18,11 @@ class CfgMovesBasic {
            default = "ACE_AmovPercMstpSsurWnonDnon";
            PutDown = "";
        };
+        class ACE_CivilHandCuffedFFVActions: ACE_CivilStandHandcuffedActions {
+            stop = "ACE_HandcuffedFFV";
+            StopRelaxed = "ACE_HandcuffedFFV";
+            default = "ACE_HandcuffedFFV";
+        };
    };
 };

@ -55,6 +60,14 @@ class CfgMovesMaleSdr: CfgMovesBasic {
            InterpolateTo[] = {"Unconscious",0.01,"ACE_AmovPercMstpSnonWnonDnon_AmovPercMstpScapWnonDnon",0.1};
        };

+        //Handcuffed-FFV:
+        class ACE_HandcuffedFFV: ACE_AmovPercMstpScapWnonDnon {
+            file = "\A3\cargoposes_F_heli\anim\passenger_flatground_3idleunarmed.rtm";
+            actions = "ACE_CivilHandCuffedFFVActions";
+            ConnectTo[] = {};
+        };
+
+
        //Surrender Anims:
        class ACE_AmovPercMstpSnonWnonDnon_AmovPercMstpSsurWnonDnon: CutSceneAnimationBase {
            actions = "ACE_CivilStandSurrenderActions";
--- a/addons/captives/CfgVehicles.hpp
+++ b/addons/captives/CfgVehicles.hpp
@ -12,17 +12,17 @@ class CfgVehicles {
                exceptions[] = {};
                icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
            };
-            class ACE_RemoveHandcuffs {
-                displayName = CSTRING(ReleaseCaptive);
-                selection = "righthand";
-                distance = 2;
-                condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs));
-                statement = QUOTE([ARR_2(_player, _target)] call FUNC(doRemoveHandcuffs));
-                exceptions[] = {};
-                icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
-            };

            class ACE_MainActions {
+                class ACE_RemoveHandcuffs {
+                    displayName = CSTRING(ReleaseCaptive);
+                    selection = "righthand";
+                    distance = 2;
+                    condition = QUOTE([ARR_2(_player, _target)] call FUNC(canRemoveHandcuffs));
+                    statement = QUOTE([ARR_2(_player, _target)] call FUNC(doRemoveHandcuffs));
+                    exceptions[] = {};
+                    icon = QUOTE(PATHTOF(UI\handcuff_ca.paa));
+                };
                class ACE_EscortCaptive {
                    displayName = CSTRING(EscortCaptive);
                    distance = 4;
@ -97,7 +97,7 @@ class CfgVehicles {
        };
    };

-#define MACRO_LOADUNLOADCAPTIVE \
+#define MACRO_LOADCAPTIVE \
        class ACE_Actions { \
            class ACE_MainActions { \
                class GVAR(LoadCaptive) { \
@ -113,27 +113,27 @@ class CfgVehicles {

    class LandVehicle;
    class Car: LandVehicle {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };
    class Tank: LandVehicle {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };

    class Air;
    class Helicopter: Air {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };
    class Plane: Air {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };

    class Ship;
    class Ship_F: Ship {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };

    class StaticWeapon: LandVehicle {
-        MACRO_LOADUNLOADCAPTIVE
+        MACRO_LOADCAPTIVE
    };

    class Box_NATO_Support_F;
--- a/addons/captives/README.md
+++ b/addons/captives/README.md
@ -1,10 +1,10 @@
 ace_captives
 ============

-Allows taking people captive/handcuffed
+Adds ability to handcuff and surrender.

-####Items:
-`ACE_CableTie` - adds ability to take someone captive
+#### Items Added:
+`ACE_CableTie`


 ## Maintainers
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@ -6,12 +6,11 @@

 if (isServer) then {
    addMissionEventHandler ["HandleDisconnect", {
-        PARAMS_1(_disconnectedPlayer);
+        params ["_disconnectedPlayer"];
        private "_escortedUnit";
        _escortedUnit = _disconnectedPlayer getVariable [QGVAR(escortedUnit), objNull];
        if ((!isNull _escortedUnit) && {(attachedTo _escortedUnit) == _disconnectedPlayer}) then {
            detach _escortedUnit;
-            //systemChat "debug: DC detach";
        };
        if (_disconnectedPlayer getVariable [QGVAR(isEscorting), false]) then {
            _disconnectedPlayer setVariable [QGVAR(isEscorting), false, true];
--- a/addons/captives/XEH_preInit.sqf
+++ b/addons/captives/XEH_preInit.sqf
@ -16,6 +16,7 @@ PREP(doFriskPerson);
 PREP(doLoadCaptive);
 PREP(doRemoveHandcuffs);
 PREP(doUnloadCaptive);
+PREP(findEmptyNonFFVCargoSeat);
 PREP(handleGetIn);
 PREP(handleGetOut);
 PREP(handleKilled);
--- a/addons/captives/functions/fnc_canLoadCaptive.sqf
+++ b/addons/captives/functions/fnc_canLoadCaptive.sqf
@ -11,28 +11,36 @@
 * The return value <BOOL>
 *
 * Example:
- * [player, bob] call ACE_captives_fnc_canLoadCaptive
+ * [player, bob, car] call ACE_captives_fnc_canLoadCaptive
 *
 * Public: No
 */
 #include "script_component.hpp"

-private ["_objects"];
 params ["_unit", "_target","_vehicle"];

-if (isNull _target) then {
-    _objects = attachedObjects _unit;
-    _objects = [_objects, {_this getVariable [QGVAR(isHandcuffed), false]}] call EFUNC(common,filter);
-    if ((count _objects) > 0) then {_target = _objects select 0;};
+if ((isNull _target) && {_unit getVariable [QGVAR(isEscorting), false]}) then {
+    //Looking at a vehicle while escorting, get target from attached objects:
+    {
+        if (_x getVariable [QGVAR(isHandcuffed), false]) exitWith {
+            _target = _x;
+        };
+    } forEach (attachedObjects _unit);
 };
+if ((isNull _target) || {(vehicle _target) != _target} || {!(_target getVariable [QGVAR(isHandcuffed), false])}) exitWith {false};

 if (isNull _vehicle) then {
-    _objects = nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10];
-    if ((count _objects) > 0) then {_vehicle = _objects select 0;};
+    //Looking at a captive unit, search for nearby vehicles with valid seats:
+    {
+        if ((_x emptyPositions "cargo") > 0) exitWith {
+            _vehicle = _x;
+        };
+    } forEach (nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10]);
+} else {
+    //We have a vehicle picked, make sure it has empty seats:
+    if ((_vehicle emptyPositions "cargo") == 0) then {
+        _vehicle = objNull;
+    };
 };

-(!isNull _target)
-&& {!isNull _vehicle}
-&& {_unit getVariable [QGVAR(isEscorting), false]}
-&& {_target getVariable [QGVAR(isHandcuffed), false]}
-&& {_vehicle emptyPositions "cargo" > 0}
+(!isNull _vehicle)
--- a/addons/captives/functions/fnc_canRemoveHandcuffs.sqf
+++ b/addons/captives/functions/fnc_canRemoveHandcuffs.sqf
@ -20,4 +20,5 @@ params ["_unit", "_target"];

 //Unit is handcuffed and not currently being escorted
 _target getVariable [QGVAR(isHandcuffed), false] &&
-{isNull (attachedTo _target)}
+{isNull (attachedTo _target)} &&
+{(vehicle _target) == _target}
--- a/addons/captives/functions/fnc_doEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_doEscortCaptive.sqf
@ -35,7 +35,9 @@ if (_state) then {
    nil, 20, false, true, "", QUOTE(!isNull (GETVAR(_target,QGVAR(escortedUnit),objNull)))];

    [{
-        EXPLODE_3_PVT((_this select 0),_unit,_target,_actionID);
+        params ["_args", "_pfID"];
+        _args params ["_unit", "_target", "_actionID"];
+        
        if (_unit getVariable [QGVAR(isEscorting), false]) then {
            if (!alive _target || {!alive _unit} || {!canStand _target} || {!canStand _unit} || {_target getVariable ["ACE_isUnconscious", false]} || {_unit getVariable ["ACE_isUnconscious", false]} || {!isNull (attachedTo _unit)}) then {
                _unit setVariable [QGVAR(isEscorting), false, true];
--- a/addons/captives/functions/fnc_doFriskPerson.sqf
+++ b/addons/captives/functions/fnc_doFriskPerson.sqf
@ -18,7 +18,6 @@

 private ["_weapon", "_listedItemClasses", "_actions", "_allGear"];

-PARAMS_2(_player,_unit);
 params ["_player", "_unit"];

 _weapon = currentWeapon _player;
--- a/addons/captives/functions/fnc_doLoadCaptive.sqf
+++ b/addons/captives/functions/fnc_doLoadCaptive.sqf
@ -1,6 +1,6 @@
 /*
 * Author: commy2
- * Unit loads the target object into a vehicle.
+ * Unit loads the target object into a vehicle. (logic same as canLoadCaptive)
 *
 * Arguments:
 * 0: Unit that wants to load a captive <OBJECT>
@ -17,24 +17,34 @@
 */
 #include "script_component.hpp"

-private "_objects";
-
 params ["_unit", "_target","_vehicle"];

-if (isNull _target) then {
-    _objects = attachedObjects _unit;
-    _objects = [_objects, {_this getVariable [QGVAR(isHandcuffed), false]}] call EFUNC(common,filter);
-    if ((count _objects) > 0) then {_target = _objects select 0;};
+if ((isNull _target) && {_unit getVariable [QGVAR(isEscorting), false]}) then {
+    //Looking at a vehicle while escorting, get target from attached objects:
+    {
+        if (_x getVariable [QGVAR(isHandcuffed), false]) exitWith {
+            _target = _x;
+        };
+    } forEach (attachedObjects _unit);
 };
-if (isNull _target) exitWith {};
+if ((isNull _target) || {(vehicle _target) != _target} || {!(_target getVariable [QGVAR(isHandcuffed), false])}) exitWith {ERROR("");};

 if (isNull _vehicle) then {
-    _objects = nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10];
-    if ((count _objects) > 0) then {_vehicle = _objects select 0;};
+    //Looking at a captive unit, search for nearby vehicles with valid seats:
+    {
+        // if (([_x] call FUNC(findEmptyNonFFVCargoSeat)) != -1) exitWith {
+        if ((_x emptyPositions "cargo") > 0) exitWith {
+            _vehicle = _x;
+        };
+    } forEach (nearestObjects [_unit, ["Car", "Tank", "Helicopter", "Plane", "Ship"], 10]);
+} else {
+    // if (([_vehicle] call FUNC(findEmptyNonFFVCargoSeat)) == -1) then {
+    if ((_vehicle emptyPositions "cargo") == 0) then {
+        _vehicle = objNull;
+    };
 };
-if (isNull _vehicle) exitWith {};

-if ((!isNil "_target") && {!isNil "_vehicle"}) then {
-    _unit setVariable [QGVAR(isEscorting), false, true];
-    ["MoveInCaptive", [_target], [_target, _vehicle]] call EFUNC(common,targetEvent);
-};
+if (isNull _vehicle) exitWith {ERROR("");};
+
+_unit setVariable [QGVAR(isEscorting), false, true];
+["MoveInCaptive", [_target], [_target, _vehicle]] call EFUNC(common,targetEvent);
--- a/addons/captives/functions/fnc_findEmptyNonFFVCargoSeat.sqf
+++ b/addons/captives/functions/fnc_findEmptyNonFFVCargoSeat.sqf
@ -0,0 +1,67 @@
+/*
+ * Author: PabstMirror
+ * Finds a free cargo seat, searching non FFV first
+ *
+ * Arguments:
+ * 0: The Vehicle <OBJECT>
+ *
+ * Return Value:
+ * ARRAY [seat index <NUMBER>, is FFV <BOOL>]
+ *
+ * Example:
+ * [car1] call ACE_captives_fnc_findEmptyNonFFVCargoSeat
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_vehicle"];
+TRACE_1("params", _vehicle);
+
+_vehicleConfig = configFile >> "CfgVehicles" >> (typeOf _vehicle);
+
+_proxyOrder = getArray (_vehicleConfig >> "getInProxyOrder");
+_transportSoldier = getNumber (_vehicleConfig >> "transportSoldier");
+_realCargoCount = if (isArray (_vehicleConfig >> "getInProxyOrder")) then {count _proxyOrder} else {_transportSoldier};
+
+//Find FFV turrets:
+_ffvCargoIndexes = [];
+{
+    _turretConfig = [_vehicleConfig, _x] call EFUNC(common,getTurretConfigPath);
+    _isCargoProxy = ((getText (_turretConfig >> "proxyType")) == "CPCargo") && {isNumber (_turretConfig >> "proxyIndex")};
+
+    if (_isCargoProxy) then {
+        _proxyCargoIndex = getNumber (_turretConfig >> "proxyIndex");
+        _cargoIndex = _proxyOrder find _proxyCargoIndex;
+        _ffvCargoIndexes pushBack _cargoIndex;
+    };
+} forEach (allTurrets [_vehicle, true]);
+
+//Find Empty Seats:
+_occupiedSeats = [];
+{
+    _x params ["", "", "_xIndex"];
+    if (_xIndex > -1) then {_occupiedSeats pushBack _xIndex;};
+} forEach (fullCrew _vehicle);
+
+TRACE_3("Searching for empty seat",_realCargoCount,_ffvCargoIndexes,_occupiedSeats);
+
+_emptyCargoSeatReturn = [-1, false];
+
+//First seach for non-ffv seats:
+for "_index" from 0 to (_realCargoCount - 1) do {
+    if ((!(_index in _ffvCargoIndexes)) && {!(_index in _occupiedSeats)}) exitWith {
+        _emptyCargoSeatReturn = [_index, false];
+    };
+};
+
+//Only use FFV if none found:
+if (_emptyCargoSeatReturn isEqualTo [-1, false]) then {
+    for "_index" from 0 to (_realCargoCount - 1) do {
+        if (!(_index in _occupiedSeats)) exitWith {
+            _emptyCargoSeatReturn = [_index, true];
+        };
+    };
+};
+
+_emptyCargoSeatReturn
--- a/addons/captives/functions/fnc_handleGetIn.sqf
+++ b/addons/captives/functions/fnc_handleGetIn.sqf
@ -4,8 +4,8 @@
 *
 * Arguments:
 * 0: _vehicle <OBJECT>
- * 2: dunno <OBJECT>
- * 1: _unit <OBJECT>
+ * 1: dunno <OBJECT>
+ * 2: _unit <OBJECT>
 *
 * Return Value:
 * The return value <BOOL>
@ -17,7 +17,8 @@
 */
 #include "script_component.hpp"

-params ["_vehicle", "_dontcare","_unit"];
+params ["_vehicle", "","_unit"];
+TRACE_2("params",_vehicle,_unit);

 if (local _unit) then {
    if (_unit getVariable [QGVAR(isEscorting), false]) then {
@ -27,4 +28,18 @@ if (local _unit) then {
    if (_unit getVariable [QGVAR(isSurrendering), false]) then {
        [_unit, false] call FUNC(setSurrender);
    };
+
+    if (_unit getVariable [QGVAR(isHandcuffed), false]) then {
+        //Need to force animation for FFV turrets
+        _turretPath = [];
+        {
+            _x params ["_xUnit", "", "", "_xTurretPath"];
+            if (_unit == _xUnit) exitWith {_turretPath = _xTurretPath};
+        } forEach (fullCrew (vehicle _unit));
+        if (!(_turretPath isEqualTo [])) then {
+            TRACE_1("Setting FFV Handcuffed Animation",_turretPath);
+            [_unit, "ACE_HandcuffedFFV", 2] call EFUNC(common,doAnimation);
+            [_unit, "ACE_HandcuffedFFV", 1] call EFUNC(common,doAnimation);
+        };
+    };
 };
--- a/addons/captives/functions/fnc_handleGetOut.sqf
+++ b/addons/captives/functions/fnc_handleGetOut.sqf
@ -4,8 +4,8 @@
 *
 * Arguments:
 * 0: _vehicle <OBJECT>
- * 2: dunno <OBJECT>
- * 1: _unit <OBJECT>
+ * 1: dunno <OBJECT>
+ * 2: _unit <OBJECT>
 *
 * Return Value:
 * The return value <BOOL>
@ -17,17 +17,21 @@
 */
 #include "script_component.hpp"

-params ["_vehicle", "_dontcare","_unit"];
+params ["_vehicle", "", "_unit"];
+TRACE_2("params",_vehicle,_unit);

 if ((local _unit) && {_unit getVariable [QGVAR(isHandcuffed), false]}) then {
    private ["_cargoIndex"];

    _cargoIndex = _unit getVariable [QGVAR(CargoIndex), -1];

-    //If captive was not "unloaded", then move them back into the vehicle.
-    if (_cargoIndex != -1) exitWith {
+    if (_cargoIndex != -1) then {
+        //If captive was not "unloaded", then move them back into the vehicle.
+        TRACE_1("forcing back into vehicle",_cargoIndex);
        _unit moveInCargo [_vehicle, _cargoIndex];
+    } else {
+        //Getting out of vehicle:
+        [_unit, "ACE_AmovPercMstpScapWnonDnon", 2] call EFUNC(common,doAnimation);
+        [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
    };
-
-    [_unit, "ACE_AmovPercMstpScapWnonDnon", 2] call EFUNC(common,doAnimation);
 };
--- a/addons/captives/functions/fnc_handleUnitInitPost.sqf
+++ b/addons/captives/functions/fnc_handleUnitInitPost.sqf
@ -18,7 +18,7 @@
 params ["_unit"];

 // prevent players from throwing grenades (added to all units)
-[_unit, "Throw", {((_this select 1) getVariable [QGVAR(isHandcuffed), false]) || {(_this select 1) getVariable [QGVAR(isSurrendering), false]}}, {}] call EFUNC(common,addActionEventhandler);
+// [_unit, "Throw", {systemChat "a"; ((_this select 1) getVariable [QGVAR(isHandcuffed), false]) || {(_this select 1) getVariable [QGVAR(isSurrendering), false]}; true}, {systemChat "b";}] call EFUNC(common,addActionEventhandler);

 if (local _unit) then {
    // reset status on mission start
--- a/addons/captives/functions/fnc_moduleSurrender.sqf
+++ b/addons/captives/functions/fnc_moduleSurrender.sqf
@ -26,11 +26,11 @@ if (!_activated) exitWith {};
 if (local _logic) then {
    //Modules run before postInit can instal the event handler, so we need to wait a little bit
    [{
-        PARAMS_1(_units);
+        params ["_units"];
        {
            ["SetSurrendered", [_x], [_x, true]] call EFUNC(common,targetEvent);
        } forEach _units;
-    }, [_units], 0.05, 0.05]call EFUNC(common,waitAndExecute);
+    }, [_units], 0.05]call EFUNC(common,waitAndExecute);

    deleteVehicle _logic;
 };
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@ -17,6 +17,7 @@
 #include "script_component.hpp"

 params ["_unit","_state"];
+TRACE_2("params",_unit,_state);

 if (!local _unit) exitwith {
    ERROR("running setHandcuffed on remote unit");
@ -43,24 +44,47 @@ if (_state) then {
    // fix anim on mission start (should work on dedicated servers)
    [{
        params ["_unit"];
-        if (_unit getVariable [QGVAR(isHandcuffed), false] && {vehicle _unit == _unit}) then {
+        if (!(_unit getVariable [QGVAR(isHandcuffed), false])) exitWith {};
+
+        if ((vehicle _unit) == _unit) then {
            [_unit] call EFUNC(common,fixLoweredRifleAnimation);
            [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
+        } else {
+            [_unit, "ACE_HandcuffedFFV", 2] call EFUNC(common,doAnimation);
+            [_unit, "ACE_HandcuffedFFV", 1] call EFUNC(common,doAnimation);
+        };

-            //Adds an animation changed eh
-            //If we get a change in animation then redo the animation (handles people vaulting to break the animation chain)
-            private "_animChangedEHID";
-            _animChangedEHID = _unit addEventHandler ["AnimChanged", {
-                PARAMS_2(_unit,_newAnimation);
+        //Adds an animation changed eh
+        //If we get a change in animation then redo the animation (handles people vaulting to break the animation chain)
+        private "_animChangedEHID";
+
+        _animChangedEHID = _unit addEventHandler ["AnimChanged", {
+            params ["_unit", "_newAnimation"];
+            TRACE_2("AnimChanged",_unit,_newAnimation);
+            if (_unit == (vehicle _unit)) then {
                if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
                    TRACE_1("Handcuff animation interrupted",_newAnimation);
                    [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
                };
-            }];
-            _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
+            } else {

-        };
-    }, [_unit], 0.01, 0] call EFUNC(common,waitAndExecute);
+                _turretPath = [];
+                {
+                    _x params ["_xUnit", "", "", "_xTurretPath"];
+                    if (_unit == _xUnit) exitWith {_turretPath = _xTurretPath};
+                } forEach (fullCrew (vehicle _unit));
+                TRACE_1("turret Path",_turretPath);
+                if (_turretPath isEqualTo []) exitWith {};
+
+                TRACE_1("Handcuff (FFV) animation interrupted",_newAnimation);
+                [_unit, "ACE_HandcuffedFFV", 2] call EFUNC(common,doAnimation);
+                [_unit, "ACE_HandcuffedFFV", 1] call EFUNC(common,doAnimation);
+            };
+        }];
+        TRACE_2("Adding animChangedEH",_unit,_animChangedEHID);
+        _unit setVariable [QGVAR(handcuffAnimEHID), _animChangedEHID];
+
+    }, [_unit], 0.01] call EFUNC(common,waitAndExecute);
 } else {
    _unit setVariable [QGVAR(isHandcuffed), false, true];
    [_unit, QGVAR(Handcuffed), false] call EFUNC(common,setCaptivityStatus);
@ -68,6 +92,7 @@ if (_state) then {
    //remove AnimChanged EH
    private "_animChangedEHID";
    _animChangedEHID = _unit getVariable [QGVAR(handcuffAnimEHID), -1];
+    TRACE_1("removing animChanged EH",_animChangedEHID);
    _unit removeEventHandler ["AnimChanged", _animChangedEHID];
    _unit setVariable [QGVAR(handcuffAnimEHID), -1];

--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@ -17,6 +17,7 @@
 #include "script_component.hpp"

 params ["_unit","_state"];
+TRACE_2("params",_unit,_state);

 if (!local _unit) exitwith {
    ERROR("running surrender on remote unit");
@ -43,13 +44,13 @@ if (_state) then {

    // fix anim on mission start (should work on dedicated servers)
    [{
-        PARAMS_1(_unit);
+        params ["_unit"];
        if (_unit getVariable [QGVAR(isSurrendering), false] && {(vehicle _unit) == _unit}) then {
            //Adds an animation changed eh
            //If we get a change in animation then redo the animation (handles people vaulting to break the animation chain)
            private "_animChangedEHID";
            _animChangedEHID = _unit addEventHandler ["AnimChanged", {
-                PARAMS_2(_unit,_newAnimation);
+                params ["_unit", "_newAnimation"];
                if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
                    TRACE_1("Surrender animation interrupted",_newAnimation);
                    [_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
@ -57,7 +58,7 @@ if (_state) then {
            }];
            _unit setVariable [QGVAR(surrenderAnimEHID), _animChangedEHID];
        };
-    }, [_unit], 0.01, 0] call EFUNC(common,waitAndExecute);
+    }, [_unit], 0.01] call EFUNC(common,waitAndExecute);
 } else {
    _unit setVariable [QGVAR(isSurrendering), false, true];
    [_unit, QGVAR(Surrendered), false] call EFUNC(common,setCaptivityStatus);
@ -85,8 +86,8 @@ if (_state) then {
        //spin up a PFEH, to watching animationState for the next 20 seconds to make sure we don't enter "hands up"
        //Handles long animation chains
        [{
-            PARAMS_2(_args,_pfID);
-            EXPLODE_2_PVT(_args,_unit,_maxTime);
+            params ["_args", "_pfID"];
+            _args params ["_unit", "_maxTime"];
            //If waited long enough or they re-surrendered or they are unconscious, exit loop
            if ((ACE_time > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {_unit getVariable ["ACE_isUnconscious", false]}) exitWith {
                [_pfID] call CBA_fnc_removePerFrameHandler;
--- a/addons/captives/functions/fnc_vehicleCaptiveMoveIn.sqf
+++ b/addons/captives/functions/fnc_vehicleCaptiveMoveIn.sqf
@ -16,11 +16,17 @@
 */
 #include "script_component.hpp"

+params ["_target","_vehicle"];
+TRACE_2("params",_target,_vehicle);
+
 private ["_cargoIndex"];

-params ["_target","_vehicle"];
+_getSeat = [_vehicle] call FUNC(findEmptyNonFFVCargoSeat);
+TRACE_1("free cargo seat",_getSeat);
+_cargoIndex = _getSeat select 0;
+if (_cargoIndex == -1) exitWith {ERROR("cargo index -1");};
+
+_target moveInCargo [_vehicle, _cargoIndex];
+_target assignAsCargoIndex [_vehicle, _cargoIndex];

-_target moveInCargo _vehicle;
-_target assignAsCargo _vehicle;
-_cargoIndex = _vehicle getCargoIndex _target;
 _target setVariable [QGVAR(CargoIndex), _cargoIndex, true];
--- a/addons/captives/functions/fnc_vehicleCaptiveMoveOut.sqf
+++ b/addons/captives/functions/fnc_vehicleCaptiveMoveOut.sqf
@ -16,8 +16,11 @@
 #include "script_component.hpp"

 params ["_unit"];
+TRACE_1("params",_unit);
+
 _unit setVariable [QGVAR(CargoIndex), -1, true];

 moveOut _unit;
 [_unit, "ACE_AmovPercMstpScapWnonDnon", 2] call EFUNC(common,doAnimation);
+[_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
 unassignVehicle _unit;
--- a/addons/captives/script_component.hpp
+++ b/addons/captives/script_component.hpp
@ -1,6 +1,8 @@
 #define COMPONENT captives
 #include "\z\ace\addons\main\script_mod.hpp"

+// #define DEBUG_MODE_FULL
+
 #ifdef DEBUG_ENABLED_CAPTIVES
    #define DEBUG_MODE_FULL
 #endif
--- a/addons/cargo/ACE_Settings.hpp
+++ b/addons/cargo/ACE_Settings.hpp
@ -4,6 +4,6 @@ class ACE_Settings {
        description = CSTRING(ModuleSettings_enable_Description);
        typeName = "BOOL";
        value = 1;
-        category = CSTRING(settingsCategory);
+        category = ECSTRING(OptionsMenu,CategoryLogistics);
    };
 };
--- a/addons/cargo/CfgEventHandlers.hpp
+++ b/addons/cargo/CfgEventHandlers.hpp
@ -4,6 +4,12 @@ class Extended_PreInit_EventHandlers {
    };
 };

+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};
+
 class Extended_Killed_EventHandlers {
    class All {
        init = QUOTE(call FUNC(handleDestroyed));
@ -76,4 +82,22 @@ class Extended_Init_EventHandlers {
            init = QUOTE(_this call DFUNC(initVehicle));
        };
    };
+
+    class ACE_RepairItem_Base {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject));
+        };
+    };
+
+    class ACE_bodyBagObject {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject));
+        };
+    };
+
+    class ACE_ConcertinaWireCoil {
+        class ADDON {
+            init = QUOTE(_this call DFUNC(initObject));
+        };
+    };
 };
--- a/addons/cargo/CfgVehicles.hpp
+++ b/addons/cargo/CfgVehicles.hpp
@ -4,7 +4,7 @@ class CfgVehicles {
        scope = 2;
        displayName = CSTRING(SettingsModule_DisplayName);
        icon = QUOTE(PATHTOF(UI\Icon_Module_Cargo_ca.paa));
-        category = "ACE";
+        category = "ACE_Logistics";
        function = QFUNC(moduleSettings);
        functionPriority = 1;
        isGlobal = 1;
--- a/addons/cargo/README.md
+++ b/addons/cargo/README.md
@ -0,0 +1,12 @@
+ace_cargo
+============
+
+Adds cargo menu to vehicles and allows loading and unloading of cargo items.
+
+
+## Maintainers
+
+The people responsible for merging changes to this component or answering potential questions.
+
+- [commy2](https://github.com/commy2)
+- [Glowbal](https://github.com/Glowbal)
--- a/addons/cargo/XEH_postInit.sqf
+++ b/addons/cargo/XEH_postInit.sqf
@ -0,0 +1,5 @@
+#include "script_component.hpp"
+
+["LoadCargo", {_this call FUNC(loadItem)}] call EFUNC(common,addEventHandler);
+["UnloadCargo", {_this call FUNC(unloadItem)}] call EFUNC(common,addEventHandler);
+["AddCargoByClass", {_this call FUNC(addCargoItem)}] call EFUNC(common,addEventHandler);
--- a/addons/cargo/XEH_preInit.sqf
+++ b/addons/cargo/XEH_preInit.sqf
@ -2,6 +2,7 @@

 ADDON = false;

+PREP(addCargoItem);
 PREP(canLoad);
 PREP(canLoadItemIn);
 PREP(canUnloadItem);
@ -21,8 +22,4 @@ PREP(validateCargoSpace);

 GVAR(initializedItemClasses) = [];

-if (isServer) then {
-    ["cargo_hideItem", {params ["_object", "_status"]; _object hideObjectGlobal _status;}] call EFUNC(common,addEventHandler);
-};
-
 ADDON = true;
--- a/addons/cargo/functions/fnc_addCargoItem.sqf
+++ b/addons/cargo/functions/fnc_addCargoItem.sqf
@ -0,0 +1,38 @@
+/*
+ * Author: Glowbal, Jonpas
+ * Adds a cargo item to the vehicle.
+ *
+ * Arguments:
+ * 0: Item Classname <STRING>
+ * 1: Vehicle <OBJECT>
+ * 2: Amount <NUMBER> (default: 1)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * ["item", vehicle] call ace_cargo_fnc_addCargoItem
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+private ["_position", "_item", "_i"];
+params ["_itemClass", "_vehicle", ["_amount", 1]];
+TRACE_3("params",_itemClass,_vehicle,_amount);
+
+_position = getPos _vehicle;
+_position set [1, (_position select 1) + 1];
+_position set [2, (_position select 2) + 7.5];
+
+for "_i" from 1 to _amount do {
+    _item = createVehicle [_itemClass, _position, [], 0, "CAN_COLLIDE"];
+
+    // Load item or delete it if no space left
+    if !([_item, _vehicle] call FUNC(loadItem)) exitWith {
+        deleteVehicle _item;
+    };
+
+    // Invoke listenable event
+    ["cargoAddedByClass", [_itemClass, _vehicle, _amount]] call EFUNC(common,globalEvent);
+};
--- a/addons/cargo/functions/fnc_canLoad.sqf
+++ b/addons/cargo/functions/fnc_canLoad.sqf
@ -18,6 +18,8 @@

 params ["_player", "_object"];

+if (!([_player, _object, []] call EFUNC(common,canInteractWith))) exitWith {false};
+
 private ["_nearestVehicle"];
 _nearestVehicle = [_player] call FUNC(findNearestVehicle);

--- a/addons/cargo/functions/fnc_getSizeItem.sqf
+++ b/addons/cargo/functions/fnc_getSizeItem.sqf
@ -19,7 +19,7 @@ private "_config";

 params ["_item"];

-_config = (configFile >> "CfgVehicles" >> typeof _item >> QGVAR(size));
+_config = (configFile >> "CfgVehicles" >> typeOf _item >> QGVAR(size));

 if (isNumber (_config)) exitWith {
    _item getVariable [QGVAR(size), getNumber (_config)]
--- a/addons/cargo/functions/fnc_initVehicle.sqf
+++ b/addons/cargo/functions/fnc_initVehicle.sqf
@ -1,6 +1,6 @@
 /*
 * Author: Glowbal
- * Initializes vehicle, adds open caro menu action if available.
+ * Initializes vehicle, adds open cargo menu action if available.
 *
 * Arguments:
 * 0: Vehicle <OBJECT>
@ -25,20 +25,8 @@ _initializedClasses = GETMVAR(GVAR(initializedClasses),[]);
 if (isServer) then {
    {
        if (isClass _x) then {
-            private ["_className", "_amount","_position","_object"];
-            _className = getText (_x >> "type");
-            _amount = getNumber (_x >> "amount");
-            _position = getPos _vehicle;
-            _position set [1, (_position select 1) + 1];
-            _position set [2, (_position select 2) + 7.5];
-            for "_i" from 1 to _amount do {
-                _object = createVehicle [_className, _position, [], 0, "CAN_COLLIDE"];
-                if !([_object, _vehicle] call FUNC(loadItem)) exitWith {
-                    deleteVehicle _object;
-                };
-            };
+            ["AddCargoByClass", [getText (_x >> "type"), _vehicle, getNumber (_x >> "amount")]] call EFUNC(common,localEvent);
        };
-        nil
    } count ("true" configClasses (configFile >> "CfgVehicles" >> _type >> "ACE_Cargo" >> "Cargo"));
 };

@ -51,7 +39,10 @@ SETMVAR(GVAR(initializedClasses),_initializedClasses);
 if (getNumber (configFile >> "CfgVehicles" >> _type >> QGVAR(hasCargo)) != 1) exitWith {};

 private ["_text", "_condition", "_statement", "_icon", "_action"];
-_condition = {GVAR(enable)};
+_condition = {
+    params ["_target", "_player"];
+    GVAR(enable) && {[_player, _target, []] call EFUNC(common,canInteractWith)}
+};
 _text = localize LSTRING(openMenu);
 _statement = {GVAR(interactionVehicle) = _target; createDialog QGVAR(menu);};
 _icon = "";
--- a/addons/cargo/functions/fnc_loadItem.sqf
+++ b/addons/cargo/functions/fnc_loadItem.sqf
@ -32,6 +32,9 @@ _vehicle setVariable [QGVAR(space), _space - _itemSize, true];

 detach _item;
 _item attachTo [_vehicle,[0,0,100]];
-["cargo_hideItem", [_item, true]] call EFUNC(common,serverEvent);
+["hideObjectGlobal", [_item, true]] call EFUNC(common,serverEvent);
+
+// Invoke listenable event
+["cargoLoaded", [_item, _vehicle]] call EFUNC(common,globalEvent);

 true
--- a/addons/cargo/functions/fnc_unloadItem.sqf
+++ b/addons/cargo/functions/fnc_unloadItem.sqf
@ -58,8 +58,11 @@ _vehicle setVariable [QGVAR(space), (_space + _itemSize), true];

 detach _item;
 _item setPosASL (_emptyPos call EFUNC(common,PositiontoASL));
-["cargo_hideItem", [_item, false]] call EFUNC(common,serverEvent);
+["hideObjectGlobal", [_item, false]] call EFUNC(common,serverEvent);

 // TOOO maybe drag/carry the unloaded item?

+// Invoke listenable event
+["cargoUnloaded", [_item, _vehicle]] call EFUNC(common,globalEvent);
+
 true
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@ -3,33 +3,39 @@
    <Package name="Cargo">
        <Key ID="STR_ACE_Cargo_loadObject">
            <English>Load</English>
+            <Polish>Załaduj</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_unloadObject">
            <English>Unload</English>
+            <Polish>Wyładuj</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_openMenu">
            <English>Cargo</English>
+            <Polish>Ładunek</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_cargoMenu">
            <English>Cargo Menu</English>
+            <Polish>Menu ładunku</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_labelSpace">
            <English>Cargo space left: %1</English>
-        </Key>
-        <Key ID="STR_ACE_Cargo_settingsCategory">
-            <English>Cargo</English>
+            <Polish>Pozostałe miejsce: %1</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_ModuleSettings_enable">
            <English>Enable Cargo</English>
+            <Polish>Aktywuj cargo</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_ModuleSettings_enable_Description">
            <English>Enable the load in cargo module</English>
+            <Polish>Aktywuj możliwość załadunku skrzyń i przedmiotów do pojazdów.</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_SettingsModule_DisplayName">
            <English>Cargo Settings</English>
+            <Polish>Ustawienia cargo</Polish>
        </Key>
        <Key ID="STR_ACE_Cargo_SettingsModule_Description">
            <English>Configure the cargo module settings</English>
+            <Polish>Skonfiguruj ustawienia modułu cargo.</Polish>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@ -111,6 +111,7 @@ if(!isServer) then {
 if (isServer) then {
    [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
 };
+
 call FUNC(checkFiles);


@ -203,10 +204,11 @@ GVAR(OldCameraView) = cameraView;
 GVAR(OldPlayerVehicle) = vehicle ACE_player;
 GVAR(OldPlayerTurret) = [ACE_player] call FUNC(getTurretIndex);
 GVAR(OldPlayerWeapon) = currentWeapon ACE_player;
+GVAR(OldVisibleMap) = false;

 // PFH to raise varios events
 [{
-    private ["_newCameraView", "_newInventoryDisplayIsOpen", "_newPlayerInventory", "_newPlayerTurret", "_newPlayerVehicle", "_newPlayerVisionMode", "_newPlayerWeapon", "_newZeusDisplayIsOpen"];
+    private ["_newCameraView", "_newInventoryDisplayIsOpen", "_newPlayerInventory", "_newPlayerTurret", "_newPlayerVehicle", "_newPlayerVisionMode", "_newPlayerWeapon", "_newZeusDisplayIsOpen", "_newVisibleMap"];
    // "playerInventoryChanged" event
    _newPlayerInventory = [ACE_player] call FUNC(getAllGear);
    if !(_newPlayerInventory isEqualTo GVAR(OldPlayerInventory)) then {
@ -270,7 +272,15 @@ GVAR(OldPlayerWeapon) = currentWeapon ACE_player;
        GVAR(OldPlayerWeapon) = _newPlayerWeapon;
        ["playerWeaponChanged", [ACE_player, _newPlayerWeapon]] call FUNC(localEvent);
    };
-
+    
+    // "visibleMapChanged" event
+    _newVisibleMap = visibleMap;
+    if (!_newVisibleMap isEqualTo GVAR(OldVisibleMap)) then {
+        // Raise ACE event locally
+        GVAR(OldVisibleMap) = _newVisibleMap;
+        ["visibleMapChanged", [ACE_player, _newVisibleMap]] call FUNC(localEvent);
+    };
+    
 }, 0, []] call CBA_fnc_addPerFrameHandler;


@ -317,7 +327,7 @@ GVAR(OldIsCamera) = false;

 // Lastly, do JIP events
 // JIP Detection and event trigger. Run this at the very end, just in case anything uses it
-if(isMultiplayer && { ACE_time > 0 || isNull player } ) then {
+if (didJip) then {
    // We are jipping! Get ready and wait, and throw the event
    [{
        if(!(isNull player)) then {
--- a/addons/common/functions/fnc_disableUserInput.sqf
+++ b/addons/common/functions/fnc_disableUserInput.sqf
@ -84,7 +84,7 @@ if (_state) then {
            openMap true;
        };

-        if (serverCommandAvailable "#missions" || {player getVariable ["ACE_isUnconscious", false] && {(call FUNC(player)) getVariable [QEGVAR(medical,AllowChatWhileUnconscious), missionNamespace getVariable [QEGVAR(medical,AllowChatWhileUnconscious), false]]}}) then {
+        if (isServer || {serverCommandAvailable "#kick"} || {player getVariable ["ACE_isUnconscious", false] && {(call FUNC(player)) getVariable [QEGVAR(medical,AllowChatWhileUnconscious), missionNamespace getVariable [QEGVAR(medical,AllowChatWhileUnconscious), false]]}}) then {
            if (!(_key in (actionKeys "DefaultAction" + actionKeys "Throw")) && {_key in (actionKeys "Chat" + actionKeys "PrevChannel" + actionKeys "NextChannel")}) then {
                _key = 0;
            };
--- a/addons/common/functions/fnc_isFeatureCameraActive.sqf
+++ b/addons/common/functions/fnc_isFeatureCameraActive.sqf
@ -1,31 +1,35 @@
 /*
 * Author: Sniperwolf572
+ * Checks if one of the following common feature cameras is active:
 *
- * Checks if one of the following BI feature cameras are active:
- *
- * - Classic camera (BIS_fnc_cameraOld)
- * - Splendid camera (BIS_fnc_camera)
+ * - Curator
+ * - ACE Spectator
 * - Arsenal camera (BIS_fnc_arsenal)
- * - Animation viewer (BIS_fnc_animViewer)
 * - Establishing shot (BIS_fnc_establishingShot)
+ * - Splendid camera (BIS_fnc_camera)
+ * - Animation viewer (BIS_fnc_animViewer)
+ * - Classic camera (BIS_fnc_cameraOld)
 *
 * Arguments:
- * None
+ * 0: None <NIL>
 *
- * Return value:
- * Is BI feature camera active (bool)
+ * Return Value:
+ * A feature camera is active <BOOL>
 *
 * Example:
- * call ace_common_fnc_isFeatureCameraActive;
+ * [] call ace_common_fnc_isFeatureCameraActive
 *
+ * Public: No
 */

 #include "script_component.hpp"

-(
-    !isNull (missionNamespace getVariable ["BIS_DEBUG_CAM", objNull]) || // Classic camera
-    {!isNull (missionNamespace getVariable ["BIS_fnc_camera_cam", objNull])} || // Splendid camera
-    {!isNull (uiNamespace getVariable ["BIS_fnc_arsenal_cam", objNull])} || // Arsenal camera
-    {!isNull (uiNamespace getVariable ["BIS_fnc_animViewer_cam", objNull])} || // Animation viewer camera
-    {!isNull (missionNamespace getVariable ["BIS_fnc_establishingShot_fakeUAV", objNull])} // Establishing shot camera   
-)
+!(
+    isNull curatorCamera && // Curator
+    {isNull (GETMVAR(EGVAR(spectator,camera),objNull))} && // ACE Spectator
+    {isNull (GETUVAR(BIS_fnc_arsenal_cam, objNull))} && // Arsenal camera
+    {isNull (GETMVAR(BIS_fnc_establishingShot_fakeUAV, objNull))} && // Establishing shot camera
+    {isNull (GETMVAR(BIS_fnc_camera_cam, objNull))} && // Splendid camera
+    {isNull (GETUVAR(BIS_fnc_animViewer_cam, objNull))} && // Animation viewer camera
+    {isNull (GETMVAR(BIS_DEBUG_CAM, objNull))} // Classic camera
+)
--- a/addons/concertina_wire/CfgVehicles.hpp
+++ b/addons/concertina_wire/CfgVehicles.hpp
@ -3,7 +3,7 @@ class CfgVehicles {
    class Fence;
    class thingX;
    class NonStrategic;
-    
+
    class ACE_ConcertinaWireNoGeo: Fence {
        XEH_ENABLED;
        scope = 1;
@ -48,7 +48,7 @@ class CfgVehicles {
            class wire_16: wire_2{};
            class wire_17: wire_2{};
            class wire_18: wire_2{};
-            
+
            class wire_2_1: wire_2 {
                animPeriod = 8;
            };
@ -67,13 +67,14 @@ class CfgVehicles {
            class wire_15_1: wire_2_1 {};
            class wire_16_1: wire_2_1 {};
            class wire_17_1: wire_2_1 {};
-            class wire_18_1: wire_2_1 {};			
+            class wire_18_1: wire_2_1 {};
        };
    };
    class ACE_ConcertinaWire: ACE_ConcertinaWireNoGeo {
        scope = 2;
        displayName = $STR_ACE_CONCERTINA_WIRE;
        model = PATHTOF(data\ACE_ConcertinaWire.p3d);
+        EGVAR(logistics_wirecutter,isFence) = 1;
        class ACE_Actions {
            class ACE_MainActions {
                selection = "";
@ -113,6 +114,8 @@ class CfgVehicles {
        EGVAR(dragging,canDrag) = 1;
        EGVAR(dragging,dragPosition[]) = {0,0.5,0.5};
        EGVAR(dragging,dragDirection) = 0;
+        EGVAR(cargo,size) = 1;
+        EGVAR(cargo,canLoad) = 1;
        class ACE_Actions {
            class ACE_MainActions {
                selection = "";
@ -133,7 +136,7 @@ class CfgVehicles {
            };
        };
    };
-    
+
    class Land_Razorwire_F: NonStrategic {
        XEH_ENABLED;
    };
--- a/addons/concertina_wire/README.md
+++ b/addons/concertina_wire/README.md
@ -3,8 +3,9 @@ ace_concertina_wire

 Adds concertina wire.

+
 ## Maintainers

 The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
+- [Ruthberg](http://github.com/Ulteq)
--- a/addons/dagr/README.md
+++ b/addons/dagr/README.md
@ -1,10 +1,11 @@
 ace_dagr
 ===============

-Defense Advanced GPS Receiver
+Adds Defense Advanced GPS Receiver.
+

 ## Maintainers

 The people responsible for merging changes to this component or answering potential questions.

- [Ruthberg] (http://github.com/Ulteq)
+- [Ruthberg](http://github.com/Ulteq)
--- a/addons/disposable/README.md
+++ b/addons/disposable/README.md
@ -1,7 +1,7 @@
 ace_disposable
 ==============

-Makes the NLAW a disposable one-shot weapon.
+Makes the NLAW a disposable one-shot weapon and provides disposable launchers framework for use by other mods.


 ## Maintainers
--- a/addons/dragging/README.md
+++ b/addons/dragging/README.md
@ -0,0 +1,12 @@
+ace_dragging
+==============
+
+Adds ability to drag and carry objects.
+
+
+## Maintainers
+
+The people responsible for merging changes to this component or answering potential questions.
+
+- [Garth "L-H" de Wet](https://github.com/CorruptedHeart)
+- [commy2](https://github.com/commy2)
--- a/addons/dragging/XEH_clientInit.sqf
+++ b/addons/dragging/XEH_clientInit.sqf
@ -1,7 +1,7 @@
 // by PabstMirror, commy2
 #include "script_component.hpp"

-[{_this call DFUNC(handleScrollWheel)}] call EFUNC(common,addScrollWheelEventHandler);
+[DFUNC(handleScrollWheel)] call EFUNC(common,addScrollWheelEventHandler);

 if (isNil "ACE_maxWeightDrag") then {
    ACE_maxWeightDrag = 800;
@ -15,11 +15,11 @@ if (isNil "ACE_maxWeightCarry") then {
 ["isNotCarrying", {!((_this select 0) getVariable [QGVAR(isCarrying), false])}] call EFUNC(common,addCanInteractWithCondition);

 // release object on player change. This does work when returning to lobby, but not when hard disconnecting.
-["playerChanged", {_this call DFUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
+["playerChanged", DFUNC(handlePlayerChanged)] call EFUNC(common,addEventhandler);
 ["playerVehicleChanged", {[ACE_player, objNull] call DFUNC(handlePlayerChanged)}] call EFUNC(common,addEventhandler);
-["playerWeaponChanged", {_this call DFUNC(handlePlayerWeaponChanged)}] call EFUNC(common,addEventhandler);
+["playerWeaponChanged", DFUNC(handlePlayerWeaponChanged)] call EFUNC(common,addEventhandler);

 // handle waking up dragged unit and falling unconscious while dragging
-["medical_onUnconscious", {_this call DFUNC(handleUnconscious)}] call EFUNC(common,addEventhandler);
+["medical_onUnconscious", DFUNC(handleUnconscious)] call EFUNC(common,addEventhandler);

 //@todo Captivity?
--- a/addons/dragging/XEH_serverInit.sqf
+++ b/addons/dragging/XEH_serverInit.sqf
@ -2,4 +2,4 @@
 #include "script_component.hpp"

 // release object on hard disconnection. Function is identical to killed
-addMissionEventHandler ["HandleDisconnect", {_this call DFUNC(handleKilled)}];
+addMissionEventHandler ["HandleDisconnect", DFUNC(handleKilled)];
--- a/addons/dragging/config.cpp
+++ b/addons/dragging/config.cpp
@ -6,7 +6,7 @@ class CfgPatches {
        weapons[] = {};
        requiredVersion = REQUIRED_VERSION;
        requiredAddons[] = {"ace_interaction"};
-        author[] = {"Garth 'L-H' de Wet","commy2"};
+        author[] = {"Garth 'L-H' de Wet", "commy2"};
        authorUrl = "https://github.com/commy2/";
        VERSION_CONFIG;
    };
--- a/addons/dragging/functions/fnc_canCarry.sqf
+++ b/addons/dragging/functions/fnc_canCarry.sqf
@ -3,19 +3,18 @@
 *
 * Check if unit can carry the object. Doesn't check weight.
 *
- * Argument:
- * 0: Unit that should do the carrying (Object)
- * 1: Object to carry (Object)
+ * Arguments:
+ * 0: Unit that should do the carrying <OBJECT>
+ * 1: Object to carry <OBJECT>
 *
- * Return value:
- * Can the unit carry the object? (Bool)
+ * Return Value:
+ * Can the unit carry the object? <BOOL>
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false};

--- a/addons/dragging/functions/fnc_canDrag.sqf
+++ b/addons/dragging/functions/fnc_canDrag.sqf
@ -3,12 +3,14 @@
 *
 * Check if unit can drag the object. Doesn't check weight.
 *
- * Argument:
- * 0: Unit that should do the dragging (Object)
- * 1: Object to drag (Object)
+ * Arguments:
+ * 0: Unit that should do the dragging <OBJECT>
+ * 1: Object to drag <OBJECT>
 *
- * Return value:
- * Can the unit drag the object? (Bool)
+ * Return Value:
+ * Can the unit drag the object? <BOOL>
+ *
+ * Public: No
 */
 #include "script_component.hpp"

@ -22,4 +24,4 @@ if !([_unit, _target, []] call EFUNC(common,canInteractWith)) exitWith {false};
 // a static weapon has to be empty for dragging
 if ((typeOf _target) isKindOf "StaticWeapon" && {count crew _target > 0}) exitWith {false};

-alive _target && {vehicle _target == _target} && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})};
+alive _target && {vehicle _target == _target} && {_target getVariable [QGVAR(canDrag), false]} && {animationState _target in ["", "unconscious"] || (_target getvariable ["ACE_isUnconscious", false]) || (_target isKindOf "CAManBase" && {(_target getHitPointDamage "HitLegs") > 0.4})};
--- a/addons/dragging/functions/fnc_canDrop.sqf
+++ b/addons/dragging/functions/fnc_canDrop.sqf
@ -3,19 +3,18 @@
 *
 * Check if unit can drop the object.
 *
- * Argument:
- * 0: Unit that currently drags a object (Object)
- * 1: Object that is dragged (Object)
+ * Arguments:
+ * 0: Unit that currently drags a object <OBJECT>
+ * 1: Object that is dragged <OBJECT>
 *
- * Return value:
- * Can the unit drop the object? (Bool)
+ * Return Value:
+ * Can the unit drop the object? <BOOL>
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 if !([_unit, _target, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false};

--- a/addons/dragging/functions/fnc_canDrop_carry.sqf
+++ b/addons/dragging/functions/fnc_canDrop_carry.sqf
@ -3,19 +3,18 @@
 *
 * Check if unit can drop the carried object.
 *
- * Argument:
- * 0: Unit that currently carries a object (Object)
- * 1: Object that is carried (Object)
+ * Arguments:
+ * 0: Unit that currently carries a object <OBJECT>
+ * 1: Object that is carried <OBJECT>
 *
- * Return value:
- * Can the unit drop the object? (Bool)
+ * Return Value:
+ * Can the unit drop the object? <BOOL>
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 if !([_unit, _target, ["isNotCarrying"]] call EFUNC(common,canInteractWith)) exitWith {false};

--- a/addons/dragging/functions/fnc_carryObject.sqf
+++ b/addons/dragging/functions/fnc_carryObject.sqf
@ -3,19 +3,18 @@
 *
 * Carry an object.
 *
- * Argument:
- * 0: Unit that should do the carrying (Object)
- * 1: Object to carry (Object)
+ * Arguments:
+ * 0: Unit that should do the carrying <OBJECT>
+ * 1: Object to carry <OBJECT>
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 // get attachTo offset and direction.
 private ["_position", "_direction"];
--- a/addons/dragging/functions/fnc_carryObjectPFH.sqf
+++ b/addons/dragging/functions/fnc_carryObjectPFH.sqf
@ -1,21 +1,31 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * PFH for Carry Object
+ *
+ * Arguments:
+ * ?
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
 #include "script_component.hpp"

 #ifdef DEBUG_ENABLED_DRAGGING
    systemChat format ["%1 carryObjectPFH running", ACE_time];
 #endif

-private ["_unit", "_target"];
-
-_unit = _this select 0 select 0;
-_target = _this select 0 select 1;
+params ["_args", "_idPFH"];
+_args params ["_unit","_target"];

 if !(_unit getVariable [QGVAR(isCarrying), false]) exitWith {
-    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    [_idPFH] call CBA_fnc_removePerFrameHandler;
 };

 // drop if the crate is destroyed OR (target moved away from carrier (weapon disasembled))
 if ((!([_target] call EFUNC(common,isAlive))) || {(_unit distance _target) > 10}) then {
    [_unit, _target] call FUNC(dropObject_carry);
-    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
--- a/addons/dragging/functions/fnc_dragObject.sqf
+++ b/addons/dragging/functions/fnc_dragObject.sqf
@ -3,28 +3,25 @@
 *
 * Drag an object. Called from ace_dragging_fnc_startDrag
 *
- * Argument:
- * 0: Unit that should do the dragging (Object)
- * 1: Object to drag (Object)
+ * Arguments:
+ * 0: Unit that should do the dragging <OBJECT>
+ * 1: Object to drag <OBJECT>
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+private ["_position", "_direction", "_offset", "_actionID"];
+params ["_unit", "_target"];

 // get attachTo offset and direction.
-private ["_position", "_direction"];
-
 _position = _target getVariable [QGVAR(dragPosition), [0, 0, 0]];
 _direction = _target getVariable [QGVAR(dragDirection), 0];

 // add height offset of model
-private "_offset";
 _offset = (_target modelToWorldVisual [0, 0, 0] select 2) - (_unit modelToWorldVisual [0, 0, 0] select 2);

 _position = _position vectorAdd [0, 0, _offset];
@ -41,7 +38,6 @@ _unit setVariable [QGVAR(isDragging), true, true];
 _unit setVariable [QGVAR(draggedObject), _target, true];

 // add scrollwheel action to release object
-private "_actionID";
 _actionID = _unit getVariable [QGVAR(ReleaseActionID), -1];

 if (_actionID != -1) then {
--- a/addons/dragging/functions/fnc_dragObjectPFH.sqf
+++ b/addons/dragging/functions/fnc_dragObjectPFH.sqf
@ -1,21 +1,31 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * PFH for Drag Object
+ *
+ * Arguments:
+ * ?
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
 #include "script_component.hpp"

 #ifdef DEBUG_ENABLED_DRAGGING
    systemChat format ["%1 dragObjectPFH running", ACE_time];
 #endif

-private ["_unit", "_target"];
-
-_unit = _this select 0 select 0;
-_target = _this select 0 select 1;
+params ["_args", "_idPFH"];
+_args params ["_unit", "_target"];

 if !(_unit getVariable [QGVAR(isDragging), false]) exitWith {
-    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    [_idPFH] call CBA_fnc_removePerFrameHandler;
 };

 // drop if the crate is destroyed OR (target moved away from carrier (weapon disasembled))
 if ((!([_target] call EFUNC(common,isAlive))) || {(_unit distance _target) > 10}) then {
    [_unit, _target] call FUNC(dropObject);
-    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    [_idPFH] call CBA_fnc_removePerFrameHandler;
 };
--- a/addons/dragging/functions/fnc_dropObject.sqf
+++ b/addons/dragging/functions/fnc_dropObject.sqf
@ -3,19 +3,18 @@
 *
 * Drop a dragged object.
 *
- * Argument:
- * 0: Unit that drags the other object (Object)
- * 1: Dragged object to drop (Object)
+ * Arguments:
+ * 0: Unit that drags the other object <OBJECT>
+ * 1: Dragged object to drop <OBJECT>
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 // remove scroll wheel action
 _unit removeAction (_unit getVariable [QGVAR(ReleaseActionID), -1]);
--- a/addons/dragging/functions/fnc_dropObject_carry.sqf
+++ b/addons/dragging/functions/fnc_dropObject_carry.sqf
@ -3,19 +3,18 @@
 *
 * Drop a carried object.
 *
- * Argument:
- * 0: Unit that carries the other object (Object)
- * 1: Carried object to drop (Object)
+ * Arguments:
+ * 0: Unit that carries the other object <OBJECT>
+ * 1: Carried object to drop <OBJECT>
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private ["_unit", "_target"];
-
-_unit = _this select 0;
-_target = _this select 1;
+params ["_unit", "_target"];

 // remove scroll wheel action
 _unit removeAction (_unit getVariable [QGVAR(ReleaseActionID), -1]);
--- a/addons/dragging/functions/fnc_getWeight.sqf
+++ b/addons/dragging/functions/fnc_getWeight.sqf
@ -1,54 +1,45 @@
 /*
-     Name: AGM_Drag_fnc_GetWeight
-     
-     Author(s):
-        L-H, edited by commy2
-
-     Description:
-        Returns the weight of a crate.
-    
-    Parameters:
-        0: OBJECT - Crate to get weight of
-     
-     Returns:
-        NUMBER - Weight
-     
-     Example:
-        _weight = Crate1 call AGM_Drag_fnc_GetWeight;
+ * Author: L-H, edited by commy2, rewritten by joko // Jonas
+ *
+ * Returns the weight of a crate.
+ *
+ * Arguments:
+ * 0: Crate to get weight of <OBJECT>
+ *
+ * Return Value:
+ * Total Weight <NUMBER>
+ *
+ * Example:
+ * _weight = Crate1 call ace_dragging_fnc_getweight;
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private "_object";
-
-_object = _this select 0;
-
-private ["_totalWeight", "_fnc","_fnc_Extra"];
+private "_totalWeight";
+params ["_object"];
+// Initialize the total weight.
 _totalWeight = 0;
-_fnc_Extra = {
-    private ["_weight", "_items"];
-    _items = _this select 0;
-    _weight = 0;
-    {
-        _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> (_this select 2) >> "mass") * ((_items select 1) select _foreachIndex));
-    } foreach (_items select 0);
-    
-    _weight
-};
-_fnc = {
-    private ["_weight", "_items"];
-    _items = _this select 0;
-    _weight = 0;
-    {
-        _weight = _weight + (getNumber (ConfigFile >> (_this select 1) >> _x >> "mass") * ((_items select 1) select _foreachIndex));
-    } foreach (_items select 0);
-    
-    _weight
-};
-_totalWeight = ([getMagazineCargo _object, "CfgMagazines"] call _fnc);
-_totalWeight = _totalWeight + ([getItemCargo _object, "CfgWeapons", "ItemInfo"] call _fnc_Extra);
-_totalWeight = _totalWeight + ([getWeaponCargo _object, "CfgWeapons", "WeaponSlotsInfo"] call _fnc_Extra);
-_totalWeight = _totalWeight + ([getBackpackCargo _object, "CfgVehicles"] call _fnc);

-_totalWeight = _totalWeight * 0.5; // Mass in Arma isn't an exact amount but rather a volume/weight value. This attempts to work around that by making it a usable value. (sort of).
+// Cycle through all item types with their assigned config paths.
+{
+    _x params["_items","_getConfigCode"];
+    _items params ["_item", "_count"];
+    // Cycle through all items and read their mass out of the config.
+    {
+        // Multiply mass with amount of items and add the mass to the total weight.
+        _totalWeight = _totalWeight + (getNumber ((call _getConfigCode) >> "mass") * (_count select _forEachIndex));
+    } forEach _item;
+    true
+} count [
+    [getMagazineCargo _object, {configFile >> "CfgMagazines" >> _x}],
+    [getBackpackCargo _object, {configFile >> "CfgVehicles" >> _x}],
+    [getItemCargo _object, {configFile >> "CfgWeapons" >> _x >> "ItemInfo"}],
+    [getWeaponCargo _object, {configFile >> "CfgWeapons" >> _x >> "WeaponSlotsInfo"}]
+];

-_totalWeight
+// add Weight of create to totalWeight
+_totalWeight = _totalWeight + (getNumber (configFile >> "CfgVehicles" >> typeof _object >> "mass"));
+
+// Mass in Arma isn't an exact amount but rather a volume/weight value. This attempts to work around that by making it a usable value. (sort of).
+_totalWeight * 0.5
--- a/addons/dragging/functions/fnc_handleAnimChanged.sqf
+++ b/addons/dragging/functions/fnc_handleAnimChanged.sqf
@ -1,4 +1,20 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Handle the animaion for a Unit for Dragging Module
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: animaion <STRING>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_unit, "amovpercmstpsnonwnondnon"] call ace_dragging_fnc_handleAnimChanged;
+ *
+ * Public: No
+*/
 #include "script_component.hpp"

 private ["_unit", "_anim"];
--- a/addons/dragging/functions/fnc_handleKilled.sqf
+++ b/addons/dragging/functions/fnc_handleKilled.sqf
@ -1,9 +1,22 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Handle death of the dragger
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_unit] call ace_dragging_fnc_handleKilled;
+ *
+ * Public: No
+*/
 #include "script_component.hpp"

-private "_unit";
-
-_unit = _this select 0;
+params ["_unit"];

 if (_unit getVariable [QGVAR(isDragging), false]) then {
    private "_draggedObject";
--- a/addons/dragging/functions/fnc_handlePlayerChanged.sqf
+++ b/addons/dragging/functions/fnc_handlePlayerChanged.sqf
@ -1,10 +1,23 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Handle player changes.
+ *
+ * Arguments:
+ * 0: New Player Unit <OBJECT>
+ * 1: Old Player Unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_unitNew, _unitOld] call ace_dragging_fnc_handlePlayerChanged;
+ *
+ * Public: No
+*/
 #include "script_component.hpp"

-private ["_newPlayer", "_oldPlayer"];
-
-_newPlayer = _this select 0;
-_oldPlayer = _this select 1;
+params ["_newPlayer", "_oldPlayer"];

 {
    if (_x getVariable [QGVAR(isDragging), false]) then {
--- a/addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf
+++ b/addons/dragging/functions/fnc_handlePlayerWeaponChanged.sqf
@ -1,10 +1,23 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Handle the Weapon Changed Event
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon <STRING>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_unit, _currentWeapon] call ace_dragging_fnc_handlePlayerWeaponChanged;
+ *
+ * Public: No
+*/
 #include "script_component.hpp"

-private ["_unit", "_weapon"];
-
-_unit = _this select 0;
-_weapon = _this select 1;
+params ["_unit", "_weapon"];

 if (_unit getVariable [QGVAR(isDragging), false]) then {

--- a/addons/dragging/functions/fnc_handleScrollWheel.sqf
+++ b/addons/dragging/functions/fnc_handleScrollWheel.sqf
@ -3,38 +3,38 @@
 *
 * Handles raising and lowering the dragged weapon to be able to place it on top of objects.
 *
- * Argument:
- * 0: Scroll amount (Number)
+ * Arguments:
+ * 0: Scroll amount <NUMBER>
 *
- * Return value:
- * Handled or not. (Bool)
+ * Return Value:
+ * Handled or not. <BOOL>
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-// requires modifier key to be hold down
-if (GETMVAR(ACE_Modifier,0) == 0) exitWith {false};
+private ["_unit", "_carriedItem", "_position", "_maxHeight"];
+
+params ["_scrollAmount"];
+
+// requires modifier key to be hold down
+if (missionNamespace getVariable ["ACE_Modifier", 0] == 0) exitWith {false};

-private "_unit";
 _unit = ACE_player;

 // EH is always assigned. Exit and don't overwrite input if not carrying
 if !(_unit getVariable [QGVAR(isCarrying), false]) exitWith {false};

-private "_scrollAmount";

-_scrollAmount = _this select 0;

 // move carried item 15 cm per scroll interval
 _scrollAmount = _scrollAmount * 0.15;

-private "_carriedItem";
 _carriedItem = _unit getVariable [QGVAR(carriedObject), objNull];

 //disabled for persons
 if (_carriedItem isKindOf "CAManBase") exitWith {false};

-private ["_position", "_maxHeight"];
-
 _position = getPosATL _carriedItem;
 _maxHeight = (_unit modelToWorldVisual [0,0,0]) select 2;

--- a/addons/dragging/functions/fnc_handleUnconscious.sqf
+++ b/addons/dragging/functions/fnc_handleUnconscious.sqf
@ -1,17 +1,29 @@
-// by commy2
+/*
+ * Author: commy2
+ *
+ * Handle the Unconscious of a Unit while Dragging
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [_unit] call ace_dragging_fnc_handleUnconscious;
+ *
+ * Public: No
+*/
 #include "script_component.hpp"

-private ["_unit", "_isUnconscious"];
+private ["_player", "_draggedObject", "_carriedObject"];

-_unit = _this select 0;
-_isUnconscious = _this select 1;
+params ["_unit"];

-private "_player";
 _player = ACE_player;

 if (_player getVariable [QGVAR(isDragging), false]) then {

-    private "_draggedObject";
    _draggedObject = _player getVariable [QGVAR(draggedObject), objNull];

    // handle falling unconscious
@ -28,7 +40,6 @@ if (_player getVariable [QGVAR(isDragging), false]) then {

 if (_player getVariable [QGVAR(isCarrying), false]) then {

-    private "_carriedObject";
    _carriedObject = _player getVariable [QGVAR(carriedObject), objNull];

    // handle falling unconscious
--- a/addons/dragging/functions/fnc_initObject.sqf
+++ b/addons/dragging/functions/fnc_initObject.sqf
@ -4,23 +4,22 @@
 * Initialize variables for drag or carryable objects. Called from init EH.
 *
 * Argument:
- * 0: Any object (Object)
+ * 0: Any object <OBJECT>
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private "_object";
+private ["_position", "_direction", "_config"];

-_object = _this select 0;
+params ["_object"];

-private "_config";
 _config = configFile >> "CfgVehicles" >> typeOf _object;

 if (getNumber (_config >> QGVAR(canDrag)) == 1) then {
-    private ["_position", "_direction"];
-
    _position = getArray (_config >> QGVAR(dragPosition));
    _direction = getNumber (_config >> QGVAR(dragDirection));

@ -28,8 +27,6 @@ if (getNumber (_config >> QGVAR(canDrag)) == 1) then {
 };

 if (getNumber (_config >> QGVAR(canCarry)) == 1) then {
-    private ["_position", "_direction"];
-
    _position = getArray (_config >> QGVAR(carryPosition));
    _direction = getNumber (_config >> QGVAR(carryDirection));

--- a/addons/dragging/functions/fnc_initPerson.sqf
+++ b/addons/dragging/functions/fnc_initPerson.sqf
@ -4,16 +4,16 @@
 * Initialize variables for drag or carryable persons. Called from init EH.
 *
 * Argument:
- * 0: Any Unit (Object)
+ * 0: Unit <OBJECT>
 *
 * Return value:
- * NONE.
+ * None
+ *
+ * Public: No
 */
 #include "script_component.hpp"

-private "_unit";
-
-_unit = _this select 0;
+params ["_unit"];

 [_unit, true, [0,1.1,0.092], 180] call FUNC(setDraggable);
 [_unit, true, [0.4,-0.1,-1.25], 195] call FUNC(setCarryable); // hard-coded selection: "LeftShoulder"
--- a/addons/dragging/functions/fnc_isObjectOnObject.sqf
+++ b/addons/dragging/functions/fnc_isObjectOnObject.sqf
@ -1,6 +1,16 @@
-// by commy2
-
-private "_object";
-_object = _this select 0;
+/*
+ * Author: commy2
+ *
+ * Check if Object is Overlapping
+ *
+ * Argument:
+ * 0: Object <OBJECT>
+ *
+ * Return value:
+ * <BOOL>
+ *
+ * Public: No
+ */
+params ["_object"];

 (getPosATL _object select 2) - (getPos _object select 2) > 1E-5
--- a/addons/dragging/functions/fnc_setCarryable.sqf
+++ b/addons/dragging/functions/fnc_setCarryable.sqf
@ -4,25 +4,21 @@
 * Enable the object to be carried.
 *
 * Argument:
- * 0: Any object (Object)
- * 1: true to enable carrying, false to disable (Bool)
- * 2: Position offset for attachTo command (Array, optinal; default: [0,1,1])
- * 3: Direction in degree to rotate the object after attachTo (Number, optional; default: 0)
+ * 0: Any object <OBJECT>
+ * 1: true to enable carrying, false to disable <BOOL>
+ * 2: Position offset for attachTo command <ARRAY> (default: [0,1,1])
+ * 3: Direction in degree to rotate the object after attachTo <NUMBER> (default: 0)
 *
- * Return value:
- * NONE.
+ * Return Value:
+ * None
+ *
+ * Public: Yes
 */
 #include "script_component.hpp"

-private ["_carryAction", "_dropAction", "_object", "_enableCarry", "_position", "_direction"];
-//IGNORE_PRIVATE_WARNING("_player", "_target");
+private ["_carryAction", "_dropAction", "_type", "_initializedClasses"];

-_this resize 4;
-
-_object = _this select 0;
-_enableCarry = _this select 1;
-_position = _this select 2;
-_direction = _this select 3;
+params ["_object", "_enableCarry", "_position", "_direction"];

 if (isNil "_position") then {
    _position = _object getVariable [QGVAR(carryPosition), [0,1,1]];
@ -38,8 +34,6 @@ _object setVariable [QGVAR(carryPosition), _position];
 _object setVariable [QGVAR(carryDirection), _direction];

 // add action to class if it is not already present
-private ["_type", "_initializedClasses"];
-
 _type = typeOf _object;
 _initializedClasses = GETGVAR(initializedClasses_carry,[]);

--- a/addons/dragging/functions/fnc_setDraggable.sqf
+++ b/addons/dragging/functions/fnc_setDraggable.sqf
@ -10,19 +10,15 @@
 * 3: Direction in degree to rotate the object after attachTo (Number, optional; default: 0)
 *
 * Return value:
- * NONE.
+ * None
+ *
+ * Public: Yes
 */
 #include "script_component.hpp"

-private ["_dragAction", "_dropAction", "_object", "_enableDrag", "_position", "_direction"];
+private ["_dragAction", "_dropAction", "_type", "_initializedClasses"];
 //IGNORE_PRIVATE_WARNING("_player", "_target");
-
-_this resize 4;
-
-_object = _this select 0;
-_enableDrag = _this select 1;
-_position = _this select 2;
-_direction = _this select 3;
+params ["_object", "_enableDrag", "_position", "_direction"];

 if (isNil "_position") then {
    _position = _object getVariable [QGVAR(dragPosition), [0,0,0]];
@ -38,8 +34,6 @@ _object setVariable [QGVAR(dragPosition), _position];
 _object setVariable [QGVAR(dragDirection), _direction];

 // add action to class if it is not already present
-private ["_type", "_initializedClasses"];
-
 _type = typeOf _object;
 _initializedClasses = GETGVAR(initializedClasses,[]);

--- a/Show More
+++ b/Show More