Merge branch 'master' into pike

2024-08-30 18:23:18 +00:00 · 2017-10-28 13:57:41 -05:00 · 2017-10-28 13:57:41 -05:00 · e27881cc78
commit e27881cc78
parent e9b4618d6a c815a9cae8
2150 changed files with 47039 additions and 19348 deletions
--- a/.gibot.yml
+++ b/.gibot.yml
@ -2,26 +2,25 @@ stages:
  mark_for_closing:
     days: 30
     labels:
-       - need more info
-       - invalid
-       - can't reproduce
-       - wontfix
-       - information required
+       - status/need more info
+       - status/invalid
+       - status/can't reproduce
+       - status/wontfix
     exclude:
-       - marked for cleanup
+       - status/marked for cleanup
     comment:
       - 'Hello @{author}! There has been no activity on this ticket for over a period of {days} days. I am automatically replying to let you know we will close this ticket within 1 week due to inactivity and consider this resolved.'
-       - 'If you believe this in error, please reply with the requested information.'
+       - 'If you believe this is in error, please reply with the requested information.'
       - 'Thank you. :robot:'
     action:
       close: false
       comment: true
       assign_label:
-         - marked for cleanup
+         - status/marked for cleanup
  clean_up:
     days: 7
     labels:
-       - marked for cleanup
+       - status/marked for cleanup
     comment:
       - 'Hello @{author}! We have detected no activity for {days} days on this ticket. We therefore assume that the original reporter has lost interest or the issue has been resolved.'
       - 'Since we have marked this ticket for deletion, we will be closing it.'
@ -31,25 +30,25 @@ stages:
       close: true
       comment: true
       assign_label:
-         - closed by bot
+         - status/closed by bot
       remove_label:
-         - marked for cleanup
+         - status/marked for cleanup
  remind_about_old_ticket:
-    days: 130
+    days: 160
    labels:
-      - bug
-      - critical bug
+      - kind/bug
+      - kind/critical bug
    exclude:
-      - need more info
-      - invalid
-      - can't reproduce
-      - wontfix
-      - information required
-      - marked for cleanup
-      - inactive
+      - status/need more info
+      - status/invalid
+      - status/can't reproduce
+      - status/wontfix
+      - status/marked for cleanup
+      - status/inactive
+      - status/stale
    comment:
      - 'Hello @acemod/maintainers. This ticket has been open for over {days} days without any activity.'
    action:
      comment: true
      assign_label:
-       - inactive
+       - status/inactive
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -3,8 +3,10 @@
 **ACE3 Version:** `3.x.x` (stable / dev + commit hash)

 **Mods:**
- `@CBA_A3`
- `@ace`
+```
+- CBA_A3
+- ace
+```

 **Description:**
 - Add a detailed description of the error. This makes it easier for us to fix the issue.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -2,4 +2,4 @@
 - Describe what this pull request will do
 - Each change in a separate line
 - Include documentation if applicable
- Respect the [Development Guidelines](http://ace3mod.com/wiki/development/)
+- Respect the [Development Guidelines](https://ace3mod.com/wiki/development/)
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@ -0,0 +1,20 @@
+# No issues and PRs without labels
+issues=false
+pr-wo-labels=false
+
+# Issues are disabled, don't fetch them
+max-issues=0
+
+# Label filters
+exclude-labels=by design,can't reproduce,duplicate,question,invalid,wontfix,ignore changelog
+
+# Tag is created before generating changelog for release candidates
+unreleased=false
+
+# No section labels, we only want a list of merged PRs (label separation only works for Issues)
+simple-list=true
+
+# Misc
+author=false
+compare-link=false
+header-label=## Change Log Summary
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@ texHeaders.bin
 *.swo
 *.biprivatekey
 Thumbs.db
+CHANGELOG.md
--- a/.travis.yml
+++ b/.travis.yml
@ -4,7 +4,7 @@ branches:
   - release
 language: python
 python:
- '3.4'
+- '3.5'
 before_script:
 - if [ -n "${GH_TOKEN}" ] && [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
    pip install pygithub;
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@ -1,4 +1,4 @@
-# ACE3 CONTRIBUTOR LIST
+# ACE3 CONTRIBUTOR LIST
 # If you contributed, but are not listed here, contact me:
 # koffeinflummi@gmail.com
 #
@ -29,6 +29,7 @@ Walter Pearce <jaynus@gmail.com>
 # CONTRIBUTORS
 [BIG]Bull
 11RDP-LoupVert <loupvert@11rdp.fr>
+654wak654 <ozanegitmen@gmail.com>
 ACCtomeek <tomeek99@gmail.com>
 adam3adam <br.ada@seznam.cz>
 Adanteh
@ -37,7 +38,9 @@ Aggr094 <bastards4glory@gmail.com>
 alef <alefor@gmail.com>
 Aleksey EpMAK Yermakov <epmak777@gmail.com>
 Alganthe <alganthe@live.fr>
+Andrea "AtixNeon" Verano <veranoandrea88@gmail.com>
 Anthariel <Contact@storm-simulation.com>
+Anton
 Arkhir <wonsz666@gmail.com >
 Asgar Serran <piechottaf@web.de>
 BaerMitUmlaut
@ -49,6 +52,8 @@ Brakoviejo
 Brisse <brisse@outlook.com>
 Brostrom.A | Evul <andreas.brostrom.ce@gmail.com>
 BullHorn <bullhorn7@gmail.com>
+chris579 <github@klemm.one>
+classicarma
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
 Coren <coren4@gmail.com>
@ -59,6 +64,7 @@ dixon13 <dixonbegay@gmail.com>
 Drill <drill87@gmail.com>
 Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
+ElTyranos
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
 F3 Project <alanr@ferstaberinde.com>
@ -82,13 +88,16 @@ Harakhti <shadowdragonphd@gmail.com>
 havena <silveredenis@gmail.com>
 Hawkins
 Head <brobergsebastian@gmail.com>
+Hybrid V
 Karneck <dschultz26@hotmail.com>
 Kavinsky <nmunozfernandez@gmail.com>
+Keithen <Keithen.Neu@gmail.com>
 Kllrt <kllrtik@gmail.com>
 legman <juicemelon@msn.com>
 Legolasindar "Viper" <legolasindar@gmail.com>
 licht-im-Norden87 <lichtimnorden87@gmail.com>
 looter <looter222@gmail.com>
+Luigi "Luigium" Myrini <luigium@outlook.fr>
 Macusercom <macusercom@gmail.com>
 MarcBook
 meat <p.humberdroz@gmail.com>
@ -100,6 +109,7 @@ nomisum <nomisum@gmail.com>
 OnkelDisMaster <onkeldismaster@gmail.com>
 oscarmolinadev
 PaxJaromeMalues <seemax1991@gmail.com>
+Phyma <sethramstrom@gmail.com>
 pokertour
 Professor <lukas.trneny@wo.cz>
 rakowozz
@ -118,8 +128,10 @@ Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
 Toaster <jonathan.pereira@gmail.com>
 Tonic
 Tourorist <tourorist@gmail.com>
+Tuupertunut
 Valentin Torikian <valentin.torikian@gmail.com>
 voiper
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Winter <simon@agius-muscat.net>
+xrufix
 zGuba
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@

 <p align="center">
    <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.7.0-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.11.0-blue.svg?style=flat-square" alt="ACE3 Version">
    </a>
    <a href="https://github.com/acemod/ACE3/issues">
        <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">
@ -18,8 +18,8 @@
    <a href="https://github.com/acemod/ACE3/blob/master/LICENSE">
        <img src="https://img.shields.io/badge/License-GPLv2-red.svg?style=flat-square" alt="ACE3 License">
    </a>
-    <a href="http://slackin.ace3mod.com/">
-        <img src="http://slackin.ace3mod.com/badge.svg?style=flat-square&label=Slack" alt="ACE3 Slack">
+    <a href="https://slackin.ace3mod.com/">
+        <img src="https://slackin.ace3mod.com/badge.svg?style=flat-square&label=Slack" alt="ACE3 Slack">
    </a>
    <a href="https://travis-ci.org/acemod/ACE3">
        <img src="https://img.shields.io/travis/acemod/ACE3.svg?style=flat-square&label=Build" alt="ACE3 Build Status">
@ -28,7 +28,7 @@

 <p align="center">
    <sup><strong>Requires the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a>.<br/>
-    Visit us on <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="http://www.reddit.com/r/arma/search?q=ACE&restrict_sr=on&sort=new&t=all">Reddit</a></strong></sup>
+    Visit us on <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="https://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.
@ -37,7 +37,8 @@ The project is entirely **open-source** and all contributions are welcome. Feel

 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
+## Core features
+
 - Brand new 3D interaction/action system
 - Performance and reliability framework
 - Focus on modularity and customization
@ -51,7 +52,8 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
 - Logistics
 - Advanced missile guidance and laser designation

-#### Additional features
+### Additional features
+
 - Carrying and dragging
 - Realistic names for vehicles and weapons
 - A fire control system (FCS) for armored vehicles and helicopters
@ -72,18 +74,56 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
 - 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:
- [Installation guide](http://ace3mod.com/wiki/user/installation-guide.html)
- [Information center](http://ace3mod.com/wiki/user/information-center.html)
+## Getting started

-#### 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 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.
+ACE3 requires Arma 3 and the latest version of <a href="https://github.com/CBATeam/CBA_A3/releases">CBA A3</a>. See the following pages for help and information on how to get started with ACE3: 
+
+- [Installation guide](https://ace3mod.com/wiki/user/installation-guide.html)
+- [Information center](https://ace3mod.com/wiki/user/information-center.html)
+
+## Contributing
+
+You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. We are always welcoming new pull requests containing bug fixes, refactors and new features. We have a list of tasks and bugs on our issue tracker on Github. Please comment on issues if you want to contribute with, to avoid duplicating effort.
+
+### Contribution guidelines
+
+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.
+
+### Submitting issues and requesting features

 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](https://ace3mod.com/wiki/user/how-to-report-an-issue.html)
+- [How to make a feature request](https://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
+
+### Testing & building

-#### 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 ACE3 for testing purposes.
+
+- [Setting up the development environment](https://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.
+
+### Get in touch
+
+<table>
+  <tr>
+    <td><a href="https://slackin.ace3mod.com/">Slack</a></td>
+    <td>We have a public Slack team that anyone can join. This is where all our developers and contributors hang out and where we make announcements</td>
+  </tr>
+
+  <tr>
+    <td><a href="https://twitter.com/ACE3Mod">Twitter</a></td>
+    <td>You can follow our Twitter account to get updates and various links to guides</td>
+  </tr>
+  <tr>
+    <td><a href="https://www.facebook.com/ACE3Mod">Facebook</a></td>
+    <td>You can follow our Facebook account to get updates and various links to guides</td>
+  </tr>
+
+  <tr>
+    <td><a href="https://forums.bistudio.com/topic/181341-ace3-a-collaborative-merger-between-agm-cse-and-ace/?p=2859670">Bohemia Forum</a></td>
+    <td>We have a dedicated thread on the Bohemia Forums for the ACE3 project</td>
+  </tr>  
+</table>
+
+## License
+
+ACE3 is licensed under the GNU General Public License ([GPLv2](https://github.com/acemod/ACE3/blob/master/LICENSE)).
--- a/ace_advanced_ballistics.dll
+++ b/ace_advanced_ballistics.dll
--- a/ace_advanced_ballistics_x64.dll
+++ b/ace_advanced_ballistics_x64.dll
--- a/ace_break_line_x64.dll
+++ b/ace_break_line_x64.dll
--- a/ace_clipboard_x64.dll
+++ b/ace_clipboard_x64.dll
--- a/ace_fcs_x64.dll
+++ b/ace_fcs_x64.dll
--- a/ace_medical_x64.dll
+++ b/ace_medical_x64.dll
--- a/ace_parse_imagepath_x64.dll
+++ b/ace_parse_imagepath_x64.dll
--- a/addons/advanced_ballistics/ACE_Settings.hpp
+++ b/addons/advanced_ballistics/ACE_Settings.hpp
@ -69,7 +69,7 @@ class ACE_Settings {
        displayName = CSTRING(simulationInterval_DisplayName);
        description = CSTRING(simulationInterval_Description);
        typeName = "SCALAR";
-        value = 0.0;
+        value = 0.05;
    };
    class GVAR(simulationRadius) {
        category = CSTRING(DisplayName);
--- a/addons/advanced_ballistics/CfgVehicles.hpp
+++ b/addons/advanced_ballistics/CfgVehicles.hpp
@ -71,7 +71,7 @@ class CfgVehicles {
                displayName = CSTRING(simulationInterval_DisplayName);
                description = CSTRING(simulationInterval_Description);
                typeName = "NUMBER";
-                defaultValue = 0.0;
+                defaultValue = 0.05;
            };
            class simulationRadius {
                displayName = CSTRING(simulationRadius_DisplayName);
--- a/addons/advanced_ballistics/XEH_preInit.sqf
+++ b/addons/advanced_ballistics/XEH_preInit.sqf
@ -2,6 +2,8 @@

 ADDON = false;

+PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;

 ADDON = true;
--- a/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf
@ -10,6 +10,9 @@
 * Return Value:
 * muzzle velocity shift - m/s <NUMBER>
 *
+ * Example:
+ * [[], 5] call ace_advanced_ballistics_fnc_calcilateAmmoTemperatureVelocityShift
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf
@ -13,6 +13,9 @@
 * Return Value:
 * corrected ballistic coefficient <NUMBER>
 *
+ * Example:
+ * [2, 5, 5, 0.5, "ASM"] call ace_advanced_ballistics_fnc_calculateAtmosphericCorrection
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
@ -4,7 +4,7 @@
 * Calculates the muzzle velocity shift caused by different barrel lengths
 *
 * Arguments:
- * 0: barrel length - mm
+ * 0: barrel length - mm <NUMBER>
 * 1: muzzle velocity lookup table - m/s <ARRAY>
 * 2: barrel length lookup table - mm <ARRAY>
 * 3: muzzle velocity - m/s <NUMBER>
@ -12,23 +12,23 @@
 * Return Value:
 * muzzle velocity shift - m/s <NUMBER>
 *
+ * Example:
+ * [5, [0,5], [0,5], 5] call ace_advanced_ballistics_fnc_calculateBarrelLengthVelocityShift
+ *
 * Public: No
 */
 #include "script_component.hpp"

 scopeName "main";

-private ["_muzzleVelocityTableCount", "_barrelLengthTableCount", "_lowerDataIndex",
-    "_upperDataIndex", "_lowerBarrelLength", "_upperBarrelLength", "_lowerMuzzleVelocity",
-    "_upperMuzzleVelocity", "_interpolationRatio"];
 params ["_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity"];
 TRACE_4("params",_barrelLength,_muzzleVelocityTable,_barrelLengthTable,_muzzleVelocity);

 // If barrel length is not defined, then there is no point in calculating muzzle velocity
 if (_barrelLength == 0) exitWith { 0 };

-_muzzleVelocityTableCount = count _muzzleVelocityTable;
-_barrelLengthTableCount = count _barrelLengthTable;
+private _muzzleVelocityTableCount = count _muzzleVelocityTable;
+private _barrelLengthTableCount = count _barrelLengthTable;

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

+private _upperDataIndex = -1;
+private _lowerDataIndex = -1;
+
 // Find closest bordering values for barrel length
 {
    if (_barrelLength <= _x) then {
@ -53,19 +56,15 @@ if (_barrelLength >= (_barrelLengthTable select _barrelLengthTableCount - 1)) ex
 } forEach _barrelLengthTable;

 // Worst case scenario
-if (isNil "_lowerDataIndex" || isNil "_upperDataIndex") exitWith {0};
+if (_upperDataIndex == -1 || _lowerDataIndex == -1) exitWith {0};

-_lowerBarrelLength = _barrelLengthTable select _lowerDataIndex;
-_upperBarrelLength = _barrelLengthTable select _upperDataIndex;
-_lowerMuzzleVelocity = _muzzleVelocityTable select _lowerDataIndex;
-_upperMuzzleVelocity = _muzzleVelocityTable select _upperDataIndex;
+private _lowerBarrelLength = _barrelLengthTable select _lowerDataIndex;
+private _upperBarrelLength = _barrelLengthTable select _upperDataIndex;
+private _lowerMuzzleVelocity = _muzzleVelocityTable select _lowerDataIndex;
+private _upperMuzzleVelocity = _muzzleVelocityTable select _upperDataIndex;

 // Calculate interpolation ratio
-_interpolationRatio = if (abs (_lowerBarrelLength - _upperBarrelLength) > 0) then {
-    (_upperBarrelLength - _barrelLength) / (_upperBarrelLength - _lowerBarrelLength)
-} else {
-    0
-};
+private _interpolationRatio = [0, (_upperBarrelLength - _barrelLength) / (_upperBarrelLength - _lowerBarrelLength)] select (abs (_lowerBarrelLength - _upperBarrelLength) > 0);

 // 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
@ -11,6 +11,9 @@
 * Return Value:
 * retardation - m/(s^2) <NUMBER>
 *
+ * Example:
+ * [5, 20, 10] call ace_advanced_ballistics_fnc_calculateRetardation
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf
@ -15,6 +15,9 @@
 * Return Value:
 * stability factor <NUMBER>
 *
+ * Example:
+ * [1, 2, 3, 4, 5, 6, 7] call ace_advanced_ballistics_fnc_calculateStabilityFactor
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
+++ b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
@ -10,6 +10,9 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [] call ace_advanced_ballistics_fnc_diagnoseWeapons
+ *
 * Public: No
 */
 #define DEBUG_MODE_FULL
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@ -9,6 +9,9 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [] call ace_advanced_ballistics_fnc_displayProtractor
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@ -8,12 +8,13 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [] call ace_advanced_ballistics_fnc_handleFirePFH
+ *
 * Public: No
 */
 #include "script_component.hpp"

-private _aceTimeSecond = floor CBA_missionTime;
-
 {
    _x params ["_bullet","_caliber","_bulletTraceVisible","_index"];

@ -30,7 +31,7 @@ private _aceTimeSecond = floor CBA_missionTime;
            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,"","",""];
        };

-        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, CBA_missionTime - _aceTimeSecond]);
+        _bullet setVelocity (_bulletVelocity vectorAdd (parseSimpleArray ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, CBA_missionTime toFixed 6])));
    };
    nil
 } count +GVAR(allBullets);
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@ -9,6 +9,9 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [] call ace_advanced_ballistics_fnc_handleFired
+ *
 * Public: No
 */
 #include "script_component.hpp"
@ -16,10 +19,7 @@
 //IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
 TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile, _vehicle, _gunner, _turret);

-// Parameterization
-private ["_abort", "_AmmoCacheEntry", "_WeaponCacheEntry", "_opticsName", "_opticType", "_bulletTraceVisible", "_temperature", "_barometricPressure", "_bulletMass", "_bulletLength", "_muzzleVelocity", "_muzzleVelocityShift", "_bulletVelocity", "_bulletLength", "_barrelTwist", "_stabilityFactor", "_aceTimeSecond", "_barrelVelocityShift", "_ammoTemperatureVelocityShift"];
-
-_abort = false;
+private _abort = false;

 if (!(_ammo isKindOf "BulletBase")) exitWith {};
 if (!alive _projectile) exitWith {};
@ -30,8 +30,8 @@ if (!GVAR(simulateForEveryone) && !(local _unit)) then {
    _abort = true;
    if (GVAR(simulateForSnipers)) then {
        if (currentWeapon _unit == primaryWeapon _unit && count primaryWeaponItems _unit > 2) then {
-            _opticsName = (primaryWeaponItems _unit) select 2;
-            _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
+            private _opticsName = (primaryWeaponItems _unit) select 2;
+            private _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
            _abort = _opticType != 2; // We only abort if the non local shooter is not a sniper
        };
    };
@ -42,18 +42,12 @@ if (!GVAR(simulateForEveryone) && !(local _unit)) then {
 //if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // We currently do not have firedEHs on vehicles
 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 [_projectile, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
-    };
-};
-
 // Get Weapon and Ammo Configurations
-_AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
+private _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
 if (isNil "_AmmoCacheEntry") then {
     _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
 };
-_WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
+private _WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
 if (isNil "_WeaponCacheEntry") then {
     _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
 };
@ -62,22 +56,24 @@ _AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMas
 _WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];


-_bulletVelocity = velocity _projectile;
-_muzzleVelocity = vectorMagnitude _bulletVelocity;
+private _bulletVelocity = velocity _projectile;
+private _muzzleVelocity = vectorMagnitude _bulletVelocity;

-_barrelVelocityShift = 0;
+private _barrelVelocityShift = 0;
 if (GVAR(barrelLengthInfluenceEnabled)) then {
    _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _muzzleVelocity] call FUNC(calculateBarrelLengthVelocityShift);
 };

-_ammoTemperatureVelocityShift = 0;
+private _ammoTemperatureVelocityShift = 0;
+private _temperature = nil; //Need the variable in this scope. So we need to init it here.
+
 if (GVAR(ammoTemperatureEnabled)) then {
    _temperature = ((getPosASL _unit) select 2) call EFUNC(weather,calculateTemperatureAtHeight);
    _ammoTemperatureVelocityShift = ([_ammoTempMuzzleVelocityShifts, _temperature] call FUNC(calculateAmmoTemperatureVelocityShift));
 };

 if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
-    _muzzleVelocityShift = _barrelVelocityShift + _ammoTemperatureVelocityShift;
+    private _muzzleVelocityShift = _barrelVelocityShift + _ammoTemperatureVelocityShift;
    TRACE_4("shift",_muzzleVelocity,_muzzleVelocityShift, _barrelVelocityShift, _ammoTemperatureVelocityShift);
    if (_muzzleVelocityShift != 0) then {
        _muzzleVelocity = _muzzleVelocity + _muzzleVelocityShift;
@ -86,32 +82,37 @@ if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
    };
 };

-_bulletTraceVisible = false;
+if (_abort || !(GVAR(extensionAvailable))) exitWith {
+    if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
+        EGVAR(windDeflection,trackedBullets) pushBack [_projectile, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
+    };
+};
+
+private _bulletTraceVisible = false;
 if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {
    if (currentWeapon ACE_player == binocular ACE_player) then {
        _bulletTraceVisible = true;
    } else {
        if (currentWeapon ACE_player == primaryWeapon ACE_player && count primaryWeaponItems ACE_player > 2) then {
-            _opticsName = (primaryWeaponItems ACE_player) select 2;
-            _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
+            private _opticsName = (primaryWeaponItems ACE_player) select 2;
+            private _opticType = getNumber(configFile >> "CfgWeapons" >> _opticsName >> "ItemInfo" >> "opticType");
            _bulletTraceVisible = _opticType == 2;
        };
    };
 };

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

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

-_aceTimeSecond = floor CBA_missionTime;
-"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 _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, CBA_missionTime - _aceTimeSecond];
+"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), EGVAR(weather,currentOvercast), CBA_missionTime toFixed 6];

 GVAR(allBullets) pushBack [_projectile, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];

--- a/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf
@ -10,6 +10,9 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [LOGIC, [bob, kevin], true] call ace_advanced_ballistics_fnc_initModuleSettings
+ *
 * Public: No
 */
 #include "script_component.hpp"
--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@ -8,6 +8,9 @@
 * Return Value:
 * None
 *
+ * Example:
+ * [] call ace_advanced_ballistics_fnc_initializeTerrainExtension
+ *
 * Public: No
 */
 #include "script_component.hpp"
@ -16,10 +19,8 @@ if (!hasInterface) exitWith {};
 if (!GVAR(enabled)) exitWith {};
 if (!GVAR(extensionAvailable)) exitWith {};

-private ["_initStartTime", "_mapSize", "_mapGrids", "_gridCells", "_x", "_y", "_gridCenter", "_gridHeight", "_gridNumObjects", "_gridSurfaceIsWater"];
-
-_initStartTime = CBA_missionTime;
-_mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
+private _initStartTime = CBA_missionTime;
+private _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");

 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
    INFO_1("Terrain already initialized [world: %1]", worldName);
@ -28,8 +29,8 @@ if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _ma
    #endif
 };

-_mapGrids = ceil(_mapSize / 50) + 1;
-_gridCells = _mapGrids * _mapGrids;
+private _mapGrids = ceil(_mapSize / 50) + 1;
+private _gridCells = _mapGrids * _mapGrids;

 GVAR(currentGrid) = 0;

@ -48,12 +49,12 @@ INFO_2("Starting Terrain Extension [cells: %1] [world: %2]", _gridCells, worldNa
    };

    for "_i" from 1 to 50 do {
-        _x = floor(GVAR(currentGrid) / _mapGrids) * 50;
-        _y = (GVAR(currentGrid) - floor(GVAR(currentGrid) / _mapGrids) * _mapGrids) * 50;
-        _gridCenter = [_x + 25, _y + 25];
-        _gridHeight = round(getTerrainHeightASL _gridCenter);
-        _gridNumObjects = count (_gridCenter nearObjects ["Building", 50]);
-        _gridSurfaceIsWater = if (surfaceIsWater _gridCenter) then {1} else {0};
+        private _x = floor(GVAR(currentGrid) / _mapGrids) * 50;
+        private _y = (GVAR(currentGrid) - floor(GVAR(currentGrid) / _mapGrids) * _mapGrids) * 50;
+        private _gridCenter = [_x + 25, _y + 25];
+        private _gridHeight = round(getTerrainHeightASL _gridCenter);
+        private _gridNumObjects = count (_gridCenter nearObjects ["Building", 50]);
+        private _gridSurfaceIsWater = if (surfaceIsWater _gridCenter) then {1} else {0};
        "ace_advanced_ballistics" callExtension format["set:%1:%2:%3", _gridHeight, _gridNumObjects, _gridSurfaceIsWater];
        GVAR(currentGrid) = GVAR(currentGrid) + 1;
        if (GVAR(currentGrid) >= _gridCells) exitWith {};
--- a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
@ -7,48 +7,51 @@
 * ammo - classname <STRING>
 *
 * Return Value:
- * 0: _airFriction
- * 1: _caliber
- * 2: _bulletLength
- * 3: _bulletMass
- * 4: _transonicStabilityCoef
- * 5: _dragModel
- * 6: _ballisticCoefficients
- * 7: _velocityBoundaries
- * 8: _atmosphereModel
- * 9: _ammoTempMuzzleVelocityShifts
- * 10: _muzzleVelocityTable
- * 11: _barrelLengthTable
+ * 0: _airFriction <NUMBER>
+ * 1: _caliber <NUMBER>
+ * 2: _bulletLength <NUMBER>
+ * 3: _bulletMass <NUMBER>
+ * 4: _transonicStabilityCoef <NUMBER>
+ * 5: _dragModel <NUMBER>
+ * 6: _ballisticCoefficients <NUMBER>
+ * 7: _velocityBoundaries <NUMBER>
+ * 8: _atmosphereModel <NUMBER>
+ * 9: _ammoTempMuzzleVelocityShifts <NUMBER>
+ * 10: _muzzleVelocityTable <NUMBER>
+ * 11: _barrelLengthTable <NUMBER>
+ *
+ * Example:
+ * ["ammo"] call ace_advanced_ballistics_fnc_readAmmoDataFromConfig
 *
 * Public: No
 */
 #include "script_component.hpp"

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

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

 //Handle subsonic ammo that would have a huge muzzle velocity shift (when ballistic configs not explicitly defined)
 private _typicalSpeed = getNumber (_ammoConfig >> "typicalSpeed");
@ -86,7 +89,7 @@ if ((_typicalSpeed > 0) && {_typicalSpeed < 360}) then {
    };
 };

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

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

--- a/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf
@ -7,9 +7,12 @@
 * weapon - classname <STRING>
 *
 * Return Value:
- * 0: _barrelTwist
- * 1: _twistDirection
- * 2: _barrelLength
+ * 0: _barrelTwist <NUMBER>
+ * 1: _twistDirection <NUMBER>
+ * 2: _barrelLength <NUMBER>
+ *
+ * Example:
+ * ["weapon"] call ace_advanced_ballistics_fnc_readWeaponDataFromConfig
 *
 * Public: No
 */
@ -30,6 +33,6 @@ private _barrelLength = getNumber(_weaponConfig >> "ACE_barrelLength");

 private _result = [_barrelTwist, _twistDirection, _barrelLength];

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

 _result
--- a/addons/advanced_ballistics/stringtable.xml
+++ b/addons/advanced_ballistics/stringtable.xml
@ -13,6 +13,9 @@
            <Czech>Zobrazit údaje o větru</Czech>
            <Portuguese>Mostrar Informação do Vento</Portuguese>
            <Japanese>風の情報を表示</Japanese>
+            <Korean>바람의 정보를 표시</Korean>
+            <Chinese>顯示風況</Chinese>
+            <Chinesesimp>显示风况</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_ProtractorKey">
            <English>Show Protractor</English>
@ -26,6 +29,9 @@
            <Czech>Zobrazit úhloměr</Czech>
            <Portuguese>Mostrar Transferidor</Portuguese>
            <Japanese>分度器を表示</Japanese>
+            <Korean>각도기 표시</Korean>
+            <Chinese>顯示量角器</Chinese>
+            <Chinesesimp>显示量角器</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_DisplayName">
            <English>Advanced Ballistics</English>
@ -39,6 +45,9 @@
            <Russian>Продвинутая баллистика</Russian>
            <Italian>Balistica Avanzata</Italian>
            <Japanese>アドバンスド バリスティックス</Japanese>
+            <Korean>고급 탄도학</Korean>
+            <Chinese>先進彈道系統</Chinese>
+            <Chinesesimp>先进弹道系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_enabled_DisplayName">
            <English>Advanced Ballistics</English>
@ -52,6 +61,9 @@
            <Russian>Продвинутая баллистика</Russian>
            <Italian>Balistica Avanzata</Italian>
            <Japanese>アドバンスド バリスティックス</Japanese>
+            <Korean>고급 탄도학</Korean>
+            <Chinese>先進彈道系統</Chinese>
+            <Chinesesimp>先进弹道系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_enabled_Description">
            <English>Enables advanced ballistics</English>
@ -65,6 +77,9 @@
            <Russian>Включает продвинутую баллистику</Russian>
            <Italian>Abilita Balistica Avanzata</Italian>
            <Japanese>アドバンスド バリスティックスを有効化</Japanese>
+            <Korean>고급 탄도학을 적용합니다</Korean>
+            <Chinese>啟用先進彈道系統</Chinese>
+            <Chinesesimp>启用先进弹道系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_DisplayName">
            <English>Enabled For Snipers</English>
@ -78,6 +93,9 @@
            <Russian>Включена для снайперов</Russian>
            <Italian>Abilita per Tiratori Scelti</Italian>
            <Japanese>狙撃手へ有効化</Japanese>
+            <Korean>저격수만 적용</Korean>
+            <Chinese>啟用給狙擊手</Chinese>
+            <Chinesesimp>启用给狙击手</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_Description">
            <English>Enables advanced ballistics for non local snipers (when using high power optics)</English>
@ -91,6 +109,9 @@
            <Russian>Включает продвинутую баллистику для нелокальных снайперов (при использовании мощной оптики)</Russian>
            <Italian>Abilita Balistica Avanzata per Tiratori Scelti non locali (con ottiche ad alto potenziale)</Italian>
            <Japanese>非ローカルの狙撃手 (高倍率スコープを使っている場合)へアドバンスド バリスティックスを有効化します</Japanese>
+            <Korean>고급 탄도학을 비-저격수 인원에게도 적용합니다(고성능 조준경을 사용시)</Korean>
+            <Chinese>啟用先進彈道系統給非本地狙擊手(當使用高倍率光學瞄鏡時)</Chinese>
+            <Chinesesimp>启用先进弹道系统给非本地狙击手(当使用高倍率光学瞄镜时)</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_DisplayName">
            <English>Enabled For Group Members</English>
@ -104,6 +125,9 @@
            <Russian>Включена для группы</Russian>
            <Italian>Abilita per Membri del Gruppo</Italian>
            <Japanese>グループ メンバーへ有効化</Japanese>
+            <Korean>그룹 멤버도 적용</Korean>
+            <Chinese>啟用給小隊成員</Chinese>
+            <Chinesesimp>启用给小队成员</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_Description">
            <English>Enables advanced ballistics for non local group members</English>
@ -117,6 +141,9 @@
            <Russian>Включает продвинутую баллистику для нелокальных членов группы</Russian>
            <Italian>Abilita Balistica Avanzata per Membri non locali del Gruppo</Italian>
            <Japanese>非ローカルのグループ メンバーへアドバンスド バリスティックスを有効化します</Japanese>
+            <Korean>고급 탄도학을 비-그룹멤버에게도 적용합니다</Korean>
+            <Chinese>啟用先進彈道系統給非本地小隊成員</Chinese>
+            <Chinesesimp>启用先进弹道系统给非本地小队成员</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_DisplayName">
            <English>Enabled For Everyone</English>
@ -130,6 +157,9 @@
            <Russian>Включена для всех</Russian>
            <Italian>Abilita per tutti</Italian>
            <Japanese>全員に有効化</Japanese>
+            <Korean>모두에게 적용</Korean>
+            <Chinese>啟用給所有人</Chinese>
+            <Chinesesimp>启用给所有人</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_Description">
            <English>Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)</English>
@ -141,8 +171,11 @@
            <French>Active la balistique avancée pour tous les joueurs non locaux (activer cette option peut avoir un impact sur les performance en multi durant les grands échanges de tirs)</French>
            <Hungarian>Engedélyezi a fejlett ballisztikát az összes nem-helyi játékosnak (ez a funkció leronthatja a teljesítményt intenzív többjátékos tűzharcok alatt)</Hungarian>
            <Russian>Включает продвинутую баллистику для всех нелокальных игроков (включение этой опции может снизить производительность при массовых перестрелках в мультиплеере)</Russian>
-            <Italian>Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe degradare le prestazioni durante scontri intensi in multiplayer)</Italian>
+            <Italian>Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe ridurre le prestazioni durante scontri intensi in multiplayer)</Italian>
            <Japanese>非ローカルの全プレイヤーへアドバンスド バリスティックスを有効化します (マルチプレイで大規模な銃撃戦がおこなわれると、動作の低下を招きます)</Japanese>
+            <Korean>고급 탄도학을 모든 비-로컬그룹에게도 적용합니다(적용 후 대규모 전투시 성능하락을 유발할 수 있습니다)</Korean>
+            <Chinese>啟用先進彈道系統給所有非本地玩家 (啟用此功能後,在多人連線大量交火時可能會降低效能)</Chinese>
+            <Chinesesimp>启用先进弹道系统给所有非本地玩家 (启用此功能后,在多人连线大量交火时可能会降低效能)</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_DisplayName">
            <English>Always Enabled For Group Members</English>
@ -156,6 +189,9 @@
            <Russian>Всегда включена для членов группы</Russian>
            <Italian>Sempre abilitato per Membri del Gruppo</Italian>
            <Japanese>常にグループ メンバーへ有効化</Japanese>
+            <Korean>그룹 멤버에게 항상 적용</Korean>
+            <Chinese>永遠啟用給小隊成員</Chinese>
+            <Chinesesimp>永远启用给小队成员</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_Description">
            <English>Always enables advanced ballistics when a group member fires</English>
@ -167,8 +203,11 @@
            <French>Active tout le temps la balistique avancée quand un membre du groupe ouvre le feu</French>
            <Hungarian>Mindig engedélyezi a fejlett ballisztikát, ha egy csoporttag tüzel</Hungarian>
            <Russian>Всегда включает продвинутую баллистику когда стреляет член группы</Russian>
-            <Italian>Abilita sempre Balistica Avanzata quando un Membro del Gruppo spara</Italian>
+            <Italian>Abilita sempre Balistica Avanzata quando un membro del gruppo spara</Italian>
            <Japanese>グループ メンバーが射撃した時、常にアドバンスド バリスティックスを有効化します</Japanese>
+            <Korean>그룹 멤버가 발사시 항상 고급 탄도학을 적용합니다</Korean>
+            <Chinese>當小隊成員開火時,永遠啟用先進彈道系統</Chinese>
+            <Chinesesimp>当小队成员开火时,永远启用先进弹道系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_DisplayName">
            <English>Disabled In FullAuto Mode</English>
@ -182,6 +221,9 @@
            <Russian>Выкл. для автомат. режима</Russian>
            <Italian>Disabilita in modalità di fuoco automatico</Italian>
            <Japanese>フルオートでは無効化</Japanese>
+            <Korean>조정간 자동시 비활성화</Korean>
+            <Chinese>在全自動模式時關閉</Chinese>
+            <Chinesesimp>在全自动模式时关闭</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_Description">
            <English>Disables the advanced ballistics during full auto fire</English>
@ -195,6 +237,9 @@
            <Russian>Выключает продвинутую баллистику при стрельбе в полностью автоматическом режиме</Russian>
            <Italian>Disabilita Balistica Avanzata durante fuoco automatico</Italian>
            <Japanese>フルオートで射撃中ではアドバンスド バリスティックスを無効化します</Japanese>
+            <Korean>조정간 자동시 고급 탄도학을 비활성화 합니다</Korean>
+            <Chinese>在全自動模式開火時,關閉先進彈道系統</Chinese>
+            <Chinesesimp>在全自动模式开火时,关闭先进弹道系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
            <English>Enable Ammo Temperature Simulation</English>
@ -208,6 +253,9 @@
            <Russian>Симуляция температуры для боеприпасов</Russian>
            <Italian>Abilita simulazione della temperatura delle munizioni</Italian>
            <Japanese>弾薬の温度シミュレーションを有効化</Japanese>
+            <Korean>탄약 온도 구현 적용</Korean>
+            <Chinese>啟用彈藥溫度模擬系統</Chinese>
+            <Chinesesimp>启用弹药温度模拟系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_Description">
            <English>Muzzle velocity varies with ammo temperature</English>
@ -219,8 +267,11 @@
            <French>La température de la munition influe sur la vélocité intiale</French>
            <Hungarian>A kezdősebesség a lőszer hőmérsékletétől függően változó</Hungarian>
            <Russian>Начальная скорость пули зависит от температуры</Russian>
-            <Italian>Velocità alla volata varia con la temperatura delle munizioni</Italian>
+            <Italian>La velocità dello sparo varia a seconda della temperatura delle munizioni</Italian>
            <Japanese>弾薬の温度により初速値を変化させます</Japanese>
+            <Korean>탄약 온도에 비례해 총구 속도가 달라집니다</Korean>
+            <Chinese>子彈初速將隨彈藥溫度而有所變化</Chinese>
+            <Chinesesimp>子弹初速将随弹药温度而有所变化</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_DisplayName">
            <English>Enable Barrel Length Simulation</English>
@ -234,6 +285,9 @@
            <Russian>Симуляция длины ствола</Russian>
            <Italian>Abilita simulazione della lunghezza della canna</Italian>
            <Japanese>銃身長のシミュレーションを有効化</Japanese>
+            <Korean>총열 길이 구현 적용</Korean>
+            <Chinese>啟用槍管長度模擬系統</Chinese>
+            <Chinesesimp>启用枪管长度模拟系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_Description">
            <English>Muzzle velocity varies with barrel length</English>
@ -245,8 +299,11 @@
            <French>La longueur du canon influe sur la vélocité initale</French>
            <Hungarian>A kezdősebesség a cső hosszától függően változó</Hungarian>
            <Russian>Начальная скорость пули зависит от длины ствола</Russian>
-            <Italian>Velocità alla volata varia con la lunghezza della canna</Italian>
+            <Italian>La velocità di sparo varia a seconda della lunghezza della canna</Italian>
            <Japanese>銃身長により初速値を変化させます</Japanese>
+            <Korean>총구 속도가 총열에 비례해 달라집니다</Korean>
+            <Chinese>子彈初速將隨槍管長度而有所變化</Chinese>
+            <Chinesesimp>子弹初速将随枪管长度而有所变化</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_DisplayName">
            <English>Enable Bullet Trace Effect</English>
@ -258,8 +315,11 @@
            <French>Activer l'effet balle traçante</French>
            <Hungarian>Nyomkövető-effekt engedélyezése</Hungarian>
            <Russian>Следы пуль</Russian>
-            <Italian>Abilita effetto di tracciatura dei proiettili</Italian>
+            <Italian>Abilita effetto dei Proiettili Traccianti</Italian>
            <Japanese>弾丸の痕跡表示を有効化</Japanese>
+            <Korean>예광탄 효과 적용</Korean>
+            <Chinese>啟用曳光彈效果</Chinese>
+            <Chinesesimp>启用曳光弹效果</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_Description">
            <English>Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)</English>
@ -271,8 +331,11 @@
            <French>Active une tracante pour les munitions de gros calibre (seulement visible en utilisant des optiques avancées)</French>
            <Hungarian>Engedélyezi a nagy kaliberű lövedékek nyomának vizuális követését (csak nagy teljesítményű optikán keresztül látható)</Hungarian>
            <Russian>Включает эффект следов пуль для больших калибров (видны только через мощную оптику)</Russian>
-            <Italian>Abilita effetto di tracciatura per proiettili di alto calibro (visibile solo attraverso ottiche ad alto potenziale)</Italian>
+            <Italian>Abilita effetto dei proiettili traccianti di alto calibro (visibile solo attraverso ottiche ad alto potenziale)</Italian>
            <Japanese>大口径の銃弾による弾丸の痕跡表示を有効化します (高倍率スコープを介してでしか見れません)</Japanese>
+            <Korean>대구경 탄환에 예광탄 효과를 적용합니다(오직 고성능 조준경 사용시에만 보입니다)</Korean>
+            <Chinese>啟用曳光彈效果給大口徑子彈 (只有透過高倍率光學瞄鏡才能看到)</Chinese>
+            <Chinesesimp>启用曳光弹效果给大口径子弹 (只有透过高倍率光学瞄镜才能看到)</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_DisplayName">
            <English>Simulation Interval</English>
@ -286,6 +349,9 @@
            <Russian>Интервал симуляции</Russian>
            <Italian>Intervallo Simulazione</Italian>
            <Japanese>シミュレーション間隔</Japanese>
+            <Korean>구현 간격</Korean>
+            <Chinese>模擬間隔</Chinese>
+            <Chinesesimp>模拟间隔</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_Description">
            <English>Defines the interval between every calculation step</English>
@ -299,6 +365,9 @@
            <Russian>Определяет временной интервал между вычислениями</Russian>
            <Italian>Definisce l'intervallo tra ogni step di calcolo</Italian>
            <Japanese>各計算ごとの間隔を定義します</Japanese>
+            <Korean>각 계산 단위의 간격을 정의합니다</Korean>
+            <Chinese>定義每個模擬計算之間的時間間隔</Chinese>
+            <Chinesesimp>定义每个模拟计算之间的时间间隔</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_DisplayName">
            <English>Simulation Radius</English>
@ -312,6 +381,9 @@
            <Russian>Радиус симуляции</Russian>
            <Italian>Raggio Simulazione</Italian>
            <Japanese>シミュレーションの適用範囲</Japanese>
+            <Korean>구현 범위</Korean>
+            <Chinese>模擬半徑</Chinese>
+            <Chinesesimp>模拟半径</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_Description">
            <English>Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles</English>
@ -325,6 +397,9 @@
            <Russian>Определяет радиус вокруг игрока (в метрах), в котором продвинутая баллистика применяется к снарядам</Russian>
            <Italian>Definisce il raggio attorno al giocatore (in metri) per cui la Balistica Avanzata è applicata ai proiettili</Italian>
            <Japanese>プレイヤーの周囲にアドバンスド バリスティックスによる弾道を適用させる範囲を半径で定義します (メートル)</Japanese>
+            <Korean>플레이어 주위의 발사체를 고급 탄도학으로 정의하는 범위를 정합니다(미터)</Korean>
+            <Chinese>以玩家的半徑距離(公尺)定義先進彈道系統啟用範圍</Chinese>
+            <Chinesesimp>以玩家的半径距离(公尺)定义先进弹道系统启用范围</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Ballistics_Description">
            <English>This module enables advanced ballistics simulation - meaning the trajectory of projectiles is influenced by variables like air temperature, atmospheric pressure, humidity, gravity, the type of ammunition and the weapon from which it was fired.</English>
@ -338,6 +413,9 @@
            <Spanish>Este módulo permite la simulación balística avanzada - es decir, la trayectoria de los proyectiles está influenciada por variables como la temperatura del aire, la presión atmosférica, la humedad, la gravedad, el tipo de municiones y el arma desde el que fue disparada.</Spanish>
            <Italian>Questo modulo abilita la simulazione della Balistica Avanzata - cioè la traiettoria dei proiettili è influenzata da variabili come la temperatura dell'aria, pressione atmosferica, umidità, gravità, il tipo di munizione e l'arma da cui è sparata</Italian>
            <Japanese>このモジュールはアドバンスド バリスティックスを有効化します。弾道は気温や気圧、湿度、重力、弾薬の種類、発射する武器から影響を受けるようになります。</Japanese>
+            <Korean>이 모듈은 고급 탄도학을 적용시킵니다 - 이는 발사체의 궤적이 기온, 대기압, 습도, 중력, 탄환의 종류와 어느 무기에서 발사되는지에 따라 영향을 받습니다.</Korean>
+            <Chinese>該模塊實現先進的彈道仿真 - 這意味著子彈的軌跡是由空氣溫度、大氣壓力、濕度、重力、彈藥類型以及射擊的武器所影響</Chinese>
+            <Chinesesimp>该模块实现先进的弹道仿真 - 这意味着子弹的轨迹是由空气温度、大气压力、湿度、重力、弹药类型以及射击的武器所影响</Chinesesimp>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/advanced_fatigue/ACE_Settings.hpp
+++ b/addons/advanced_fatigue/ACE_Settings.hpp
@ -1,13 +1,13 @@
 class ACE_Settings {
    class GVAR(enabled) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(Enabled);
        description = CSTRING(Enabled_Description);
        typeName = "BOOL";
        value = 1;
    };
    class GVAR(enableStaminaBar) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(EnableStaminaBar);
        description = CSTRING(EnableStaminaBar_Description);
        typeName = "BOOL";
@ -15,28 +15,28 @@ class ACE_Settings {
        isClientSettable = 1;
    };
    class GVAR(performanceFactor) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(PerformanceFactor);
        description = CSTRING(PerformanceFactor_Description);
        typeName = "SCALAR";
        value = 1;
    };
    class GVAR(recoveryFactor) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(RecoveryFactor);
        description = CSTRING(RecoveryFactor_Description);
        typeName = "SCALAR";
        value = 1;
    };
    class GVAR(loadFactor) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(LoadFactor);
        description = CSTRING(LoadFactor_Description);
        typeName = "SCALAR";
        value = 1;
    };
    class GVAR(terrainGradientFactor) {
-        category = "Advanced Fatigue";
+        category = CSTRING(DisplayName);
        displayName = CSTRING(TerrainGradientFactor);
        description = CSTRING(TerrainGradientFactor_Description);
        typeName = "SCALAR";
--- a/addons/advanced_fatigue/CfgVehicles.hpp
+++ b/addons/advanced_fatigue/CfgVehicles.hpp
@ -3,7 +3,7 @@ class CfgVehicles {
    class GVAR(moduleSettings): ACE_Module {
        author = ECSTRING(common,ACETeam);
        category = "ACE";
-        displayName = "Advanced Fatigue";
+        displayName = CSTRING(DisplayName);
        function = QFUNC(moduleSettings);
        scope = 2;
        isGlobal = 1;
--- a/addons/advanced_fatigue/XEH_postInit.sqf
+++ b/addons/advanced_fatigue/XEH_postInit.sqf
@ -12,10 +12,17 @@ if (!hasInterface) exitWith {};
    GVAR(ppeBlackout) ppEffectCommit 0.4;

    // - GVAR updating and initialization -----------------------------------------
-    if !(isNull ACE_player) then {
-        [ACE_player, objNull] call FUNC(handlePlayerChanged);
-    };
-    ["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+    ["unit", FUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
+
+    ["visibleMap", {
+        params ["", "_visibleMap"]; // command visibleMap is updated one frame later
+        private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
+        _staminaBarContainer ctrlShow ((!_visibleMap) && {(vehicle ACE_player) == ACE_player});
+    }, true] call CBA_fnc_addPlayerEventHandler;
+    ["vehicle", {
+        private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
+        _staminaBarContainer ctrlShow ((!visibleMap) && {(vehicle ACE_player) == ACE_player});
+    }, true] call CBA_fnc_addPlayerEventHandler;

    // - Duty factors -------------------------------------------------------------
    if (["ACE_Medical"] call EFUNC(common,isModLoaded)) then {
--- a/addons/advanced_fatigue/XEH_preInit.sqf
+++ b/addons/advanced_fatigue/XEH_preInit.sqf
@ -2,7 +2,9 @@

 ADDON = false;

+PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
 //#include "initSettings.sqf"

 GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
--- a/addons/advanced_fatigue/functions/fnc_addDutyFactor.sqf
+++ b/addons/advanced_fatigue/functions/fnc_addDutyFactor.sqf
@ -8,6 +8,11 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * ["ID", 5] call ace_advanced_fatigue_fnc_addDutyFactor
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params [["_id", "", [""]], ["_factor", 1, [0, {}]]];
--- a/addons/advanced_fatigue/functions/fnc_createStaminaBar.sqf
+++ b/addons/advanced_fatigue/functions/fnc_createStaminaBar.sqf
@ -7,6 +7,11 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * [DISPLAY] call ace_advanced_fatigue_fnc_createStaminaBar
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params ["_display"];
--- a/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
+++ b/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
@ -21,14 +21,16 @@ private _duty = 1;
 private _animType = _animName select [1, 3];

 GVAR(isSwimming) = false;
+GVAR(isProne) = (stance _unit) == "PRONE";

-if (_animType in ["idl", "mov"]) then {
+if (_animType in ["idl", "mov", "adj"]) then {
    switch (_animName select [5, 3]) do {
        case ("knl"): {
            _duty = 1.5;
        };
        case ("pne"): {
-            _duty = 12;
+            _duty = 10;
+            GVAR(isProne) = true; // #4880 - Unarmed sprint->prone has wrong `stance`
        };
        default {
            _duty = 1;
@ -47,9 +49,15 @@ if (_animType in ["idl", "mov"]) then {
    };
 } else {
    // swimming and diving
-    if (_animType in ["swm", "ssw", "bsw", "dve", "sdv", "bdv"]) then {
-        _duty = 5;
-        GVAR(isSwimming) = true;
+    switch (true) do {
+        case (_animType in ["swm", "ssw", "bsw"]): {
+            _duty = 6.5;
+            GVAR(isSwimming) = true;
+        };
+        case (_animType in ["dve", "sdv", "bdv"]): {
+            _duty = 2.5;
+            GVAR(isSwimming) = true;
+        };
    };
 };

--- a/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf
+++ b/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf
@ -18,18 +18,8 @@
 #include "script_component.hpp"
 params ["_unit", "_velocity"];

-private _virtualLoad = 0;
-{
-    _virtualLoad = _virtualLoad + (_x getVariable [QEGVAR(movement,vLoad), 0]);
-} forEach [
-    _unit,
-    uniformContainer _unit,
-    vestContainer _unit,
-    backpackContainer _unit
-];
+private _gearMass = ((_unit getVariable [QEGVAR(movement,totalLoad), loadAbs _unit]) / 22.046) * GVAR(loadFactor);

-private _gearMass = ((loadAbs _unit + _virtualLoad) * 0.1 / 2.2046) * GVAR(loadFactor);
-private _terrainFactor = 1;
 private _terrainAngle = asin (1 - ((surfaceNormal getPosASL _unit) select 2));
 private _terrainGradient = (_terrainAngle / 45 min 1) * 5 * GVAR(terrainGradientFactor);
 private _duty = GVAR(animDuty);
@ -50,12 +40,12 @@ if (_velocity > 2) then {
    (
        2.10 * SIM_BODYMASS
        + 4 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2)
-        + _terrainFactor * (SIM_BODYMASS + _gearMass) * (0.90 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
+        + (SIM_BODYMASS + _gearMass) * (0.90 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
    ) * 0.23 * _duty
 } else {
    (
        1.05 * SIM_BODYMASS
        + 4 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2)
-        + _terrainFactor * (SIM_BODYMASS + _gearMass) * (1.15 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
+        + (SIM_BODYMASS + _gearMass) * (1.15 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
    ) * 0.23 * _duty
 };
--- a/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
@ -58,7 +58,18 @@ if (GVAR(ppeBlackoutLast) == 1) then {

 // - Physical effects ---------------------------------------------------------
 if (GVAR(isSwimming)) exitWith {
-    _unit setAnimSpeedCoef (1 - _fatigue / 3);
+    _unit setAnimSpeedCoef linearConversion [0.7, 0.9, _fatigue, 1, 0.5, true];
+
+    if ((isSprintAllowed _unit) && {_fatigue > 0.7}) then {
+        [_unit, "blockSprint", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
+    } else {
+        if ((!isSprintAllowed _unit) && {_fatigue < 0.7}) then {
+            [_unit, "blockSprint", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
+        };
+    };
+};
+if ((getAnimSpeedCoef _unit) != 1) then {
+    _unit setAnimSpeedCoef 1;
 };

 if (_overexhausted) then {
--- a/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
@ -8,13 +8,21 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * [newbob, oldbob] call ace_advanced_fatigue_fnc_handlePlayerChanged
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params ["_newUnit", "_oldUnit"];
+TRACE_2("unit changed",_newUnit,_oldUnit);

 if !(isNull _oldUnit) then {
    _oldUnit enableStamina true;
    _oldUnit removeEventHandler ["AnimChanged", _oldUnit getVariable [QGVAR(animHandler), -1]];
+    _oldUnit setVariable [QGVAR(animHandler), nil];
+    TRACE_1("remove old",_oldUnit getVariable QGVAR(animHandler));

    _oldUnit setVariable [QGVAR(ae1Reserve), GVAR(ae1Reserve)];
    _oldUnit setVariable [QGVAR(ae2Reserve), GVAR(ae2Reserve)];
@ -30,6 +38,7 @@ if (_newUnit getVariable [QGVAR(animHandler), -1] == -1) then {
    private _animHandler = _newUnit addEventHandler ["AnimChanged", {
        GVAR(animDuty) = _this call FUNC(getAnimDuty);
    }];
+    TRACE_1("add new",_animHandler);
    _newUnit setVariable [QGVAR(animHandler), _animHandler];
 };

@ -50,7 +59,6 @@ GVAR(peakPower)       = VO2MAX_STRENGTH * GVAR(VO2MaxPower);

 GVAR(ae1PathwayPower) = GVAR(peakPower) / (13.3 + 16.7 + 113.3) * 13.3 * ANTPERCENT ^ 1.28 * 1.362;
 GVAR(ae2PathwayPower) = GVAR(peakPower) / (13.3 + 16.7 + 113.3) * 16.7 * ANTPERCENT ^ 1.28 * 1.362;
-GVAR(anPathwayPower)  = GVAR(peakPower) - _ae1PathwayPower - _ae2PathwayPower;

 GVAR(ppeBlackoutLast) = 100;
 GVAR(lastBreath)      = 0;
--- a/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf
@ -7,6 +7,11 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * [0.5] call ace_advanced_fatigue_fnc_handleStaminaBar
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params ["_stamina"];
--- a/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
+++ b/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
@ -7,17 +7,25 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * [] call ace_advanced_fatigue_fnc_mainLoop
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 if (!alive ACE_player) exitWith { // Dead people don't breath, Will also handle null (Map intros)
    [FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
+    private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
+    _staminaBarContainer ctrlSetFade 1;
+    _staminaBarContainer ctrlCommit 1;
 };

 private _currentWork = REE;
 private _currentSpeed = (vectorMagnitude (velocity ACE_player)) min 6;

 // fix #4481. Diving to the ground is recorded as PRONE stance with running speed velocity. Cap maximum speed to fix.
-if (stance ACE_player == "PRONE") then {
+if (GVAR(isProne)) then {
    _currentSpeed = _currentSpeed min 1.5;
 };

@ -29,11 +37,11 @@ if ((vehicle ACE_player == ACE_player) && {_currentSpeed > 0.1} && {isTouchingGr
 // Calculate muscle damage increase
 // Note: Muscle damage recovery is ignored as it takes multiple days
 GVAR(muscleDamage) = GVAR(muscleDamage) + (_currentWork / GVAR(peakPower)) ^ 3.2 * 0.00004;
-private _muscleIntegrity = 1 - GVAR(muscleDamage);
+private _muscleIntegritySqrt = sqrt (1 - GVAR(muscleDamage));

 // Calculate available power
-private _ae1PathwayPowerFatigued = GVAR(ae1PathwayPower) * sqrt (GVAR(ae1Reserve) / AE1_MAXRESERVE) * OXYGEN * sqrt _muscleIntegrity;
-private _ae2PathwayPowerFatigued = GVAR(ae2PathwayPower) * sqrt (GVAR(ae2Reserve) / AE2_MAXRESERVE) * OXYGEN * sqrt _muscleIntegrity;
+private _ae1PathwayPowerFatigued = GVAR(ae1PathwayPower) * sqrt (GVAR(ae1Reserve) / AE1_MAXRESERVE) * OXYGEN * _muscleIntegritySqrt;
+private _ae2PathwayPowerFatigued = GVAR(ae2PathwayPower) * sqrt (GVAR(ae2Reserve) / AE2_MAXRESERVE) * OXYGEN * _muscleIntegritySqrt;

 // Calculate how much power is consumed from each reserve
 private _ae1Power = _currentWork min _ae1PathwayPowerFatigued;
--- a/addons/advanced_fatigue/functions/fnc_moduleSettings.sqf
+++ b/addons/advanced_fatigue/functions/fnc_moduleSettings.sqf
@ -7,6 +7,11 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * [MODULE] call ace_advanced_fatigue_fnc_moduleSettings
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params ["_logic"];
--- a/addons/advanced_fatigue/functions/fnc_removeDutyFactor.sqf
+++ b/addons/advanced_fatigue/functions/fnc_removeDutyFactor.sqf
@ -7,6 +7,11 @@
 *
 * Return Value:
 * None
+ *
+ * Example:
+ * ["ID"] call ace_advanced_fatigue_fnc_removeDutyFactor
+ *
+ * Public: No
 */
 #include "script_component.hpp"
 params [["_id", "", [""]]];
--- a/addons/advanced_fatigue/stringtable.xml
+++ b/addons/advanced_fatigue/stringtable.xml
@ -1,83 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="Advanced_Fatigue">
+        <Key ID="STR_ACE_Advanced_Fatigue_DisplayName">
+            <English>Advanced Fatigue</English>
+            <German>Erweiterte Ausdauer</German>
+            <Chinese>進階疲勞</Chinese>
+            <Chinesesimp>进阶疲劳</Chinesesimp>
+            <Japanese>アドバンスド疲労</Japanese>
+            <Italian>Fatica Avanzata</Italian>
+        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
            <English>Performance Factor</English>
            <German>Leistungsfaktor</German>
            <Japanese>パフォーマンス要因</Japanese>
            <Polish>Współczynnik wydolności</Polish>
+            <Korean>성능 요인</Korean>
+            <French>Facteur de performance</French>
+            <Italian>Fattore Prestazione</Italian>
+            <Chinese>體力值</Chinese>
+            <Chinesesimp>体力值</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor_Description">
            <English>Influences the overall performance of all players with no custom factor. Higher means better.</English>
            <German>Beinflusst die Leistungsfähigkeit aller Spieler ohne eigenen Leistungsfaktor. Ein höherer Wert bedeutet bessere Leistung.</German>
-            <Japanese>非カスタム要因をもつ全プレイヤーへ全体的に動作を影響させます。高いほど影響がでます。</Japanese>
+            <Japanese>非カスタム要因をもつ全プレイヤーへ全体的に動作を影響させます。高いほど良い効果があります。</Japanese>
            <Polish>Wpływa na ogólną wydolność organizmu u wszystkich graczy bez ustawionego niestandardowego współczynnika. Więcej znaczy lepiej.</Polish>
+            <Korean>모든 성능이 임의로 설정된 값 없이 영향받습니다. 값이 클수록 더 나은 성능을 발휘합니다</Korean>
+            <French>Influence les performances générales de tous les joueurs sans facteurs personalisés. Une valeur plus élevée implique de meilleures performances.</French>
+            <Italian>Influenza qualsiasi prestazione di tutti i giocatori smuniti di un fattore personalizzato. Maggiore significa migliore.</Italian>
+            <Chinese>影響所有玩家的體力表現，值越高代表體力越好</Chinese>
+            <Chinesesimp>影响所有玩家的体力表现，值越高代表体力越好</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor_EdenDescription">
            <English>Influences the overall performance of this unit. Higher means better.</English>
            <German>Beinflusst die Leistungsfähigkeit dieser Einheit. Ein höherer Wert bedeutet bessere Leistung.</German>
-            <Japanese>非カスタム要因をもつ全プレイヤーへ全体的に動作を影響させます。高いほど影響がでます。</Japanese>
+            <Japanese>このユニットの全体的な動作に影響させます。高いほど良い効果があります。</Japanese>
            <Polish>Wpływa na ogólną wydolność tej jednostki. Więcej znaczy lepiej.</Polish>
+            <Korean>모든 성능이 이 단위로 영향을 받습니다. 값이 클수록 더 나은 성능을 발휘합니다</Korean>
+            <French>Influence les performances générales de cette unité. Une valeur plus élevée implique de meilleures performances.</French>
+            <Italian>Influenza qualsiasi prestazione di questa unità. Maggiore significa migliore.</Italian>
+            <Chinese>影響這個單位的體力表現，值越高代表體力越好</Chinese>
+            <Chinesesimp>影响这个单位的体力表现，值越高代表体力越好</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_RecoveryFactor">
            <English>Recovery Factor</English>
            <German>Erholungsfaktor</German>
            <Japanese>回復要因</Japanese>
            <Polish>Współczynnik regeneracji</Polish>
+            <Korean>회복 요인</Korean>
+            <French>Facteur de récupération</French>
+            <Italian>Fattore Recupero</Italian>
+            <Chinese>回復值</Chinese>
+            <Chinesesimp>回复值</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_RecoveryFactor_Description">
            <English>Changes how fast the player recovers when resting. Higher is faster.</English>
            <German>Ändert, wie schnell ein Spieler Ausdauer regeneriert. Ein höherer Wert bedeutet eine schnellere Regeneration.</German>
-            <Japanese>休憩時は、プレイヤーが早く回復します。高いほど早くなります。</Japanese>
+            <Japanese>休憩時はプレイヤーが早く回復します。高いほど早くなります。</Japanese>
            <Polish>Wpływa na czas regeneracji podczas postoju. Więcej znaczy szybciej.</Polish>
+            <Korean>얼마나 빨리 회복하는지를 바꿉니다. 값이 클수록 더 나은 성능을 발휘합니다</Korean>
+            <French>Change la vitesse à laquelle les joueurs récupèrent leur endurance lorsqu'ils se reposent. Une valeur plus élevée implique une récupération plus rapide.</French>
+            <Italian>Determina in quanto tempo il giocatore recupera quando rilassato. Maggiore significa migliore.</Italian>
+            <Chinese>決定玩家休息多久就能回復體力，值越高恢復越快</Chinese>
+            <Chinesesimp>决定玩家休息多久就能回复体力，值越高恢复越快</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_LoadFactor">
            <English>Load Factor</English>
            <German>Gewichtsfaktor</German>
            <Japanese>負荷要因</Japanese>
            <Polish>Współczynnik masy ekwipunku</Polish>
+            <Korean>부담 요인</Korean>
+            <French>Facteur d'encombrement</French>
+            <Italian>Fattore Caricamento</Italian>
+            <Chinese>負重量</Chinese>
+            <Chinesesimp>负重量</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_LoadFactor_Description">
            <English>Increases or decreases how much weight influences the players performance. Zero means equipment weight has no performance influence.</English>
            <German>Erhöht oder verringert, wie viel Einfluss das Ausrüstungsgewicht auf die Leistung hat. Null heißt, dass es keinen Einfluss hat.</German>
-            <Japanese>重量によりプレイヤーの動作への影響下増加したり、低下します。装備を持っていない場合、影響はしません。</Japanese>
+            <Japanese>重量の増減によりプレイヤーの動作へ影響を与えます。装備を持っていない場合、影響はしません。</Japanese>
            <Polish>Zmniejsza lub zwiększa wpływ ciężaru ekwipunku na wydolność gracza. Zero oznacza kompletny brak wpływu na wydolność.</Polish>
+            <Korean>플레이어가 무게에 따라 얼마나 영향받는지를 증가시키거나 감소시킵니다. 0의 경우 플레이어가 장비 무게에 영향받지 않습니다.</Korean>
+            <French>Augmente ou réduit l'influence que le poids à sur les performances des joueurs. Zéro implique que le poids de l'équipement n'a pas d'influence sur les performances.</French>
+            <Italian>Incrementa o decrementa quanto il peso influenza le prestazioni dei giocatori. Zero significa che il peso dell'equipaggiamento non ha alcuna influenza nelle prestazioni.</Italian>
+            <Chinese>增加或降低玩家所能承受的負重量. 如設定值為0, 代表裝備的重量將不會影響到玩家的體力表現</Chinese>
+            <Chinesesimp>增加或降低玩家所能承受的负重量. 如设定值为0, 代表装备的重量将不会影响到玩家的体力表现</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_TerrainGradientFactor">
            <English>Terrain Gradient Factor</English>
            <German>Terrainsteigungsfaktor</German>
            <Japanese>地形の勾配による要因</Japanese>
            <Polish>Współczynnik terenu</Polish>
+            <Korean>지형 경사도 요인</Korean>
+            <French>Facteur d'inclinaison du terrain</French>
+            <Italian>Fattore Pendenza Terreno</Italian>
+            <Chinese>地形陡峭影響值</Chinese>
+            <Chinesesimp>地形陡峭影响值</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_TerrainGradientFactor_Description">
            <English>Sets how much steep terrain increases stamina loss. Higher means higher stamina loss.</English>
            <German>Beeinflusst, wie stark Steigungen den Ausdauerverbrauch erhöhen. Ein höherer Wert erhöht den Ausdauerverbrauch.</German>
            <Japanese>地形によって影響する体力の消費量を決定します。高数値ではより体力を消費します。</Japanese>
            <Polish>Wpływa na to w jakim stopniu stromy teren wpływa na utratę wytrzymałości. Więcej oznacza szybszą utratę wytrzymałości.</Polish>
+            <Korean>경사도에 따라 얼마나 피로해지는지를 정합니다.  값이 클수록 더 많은 피로를 유발합니다.</Korean>
+            <French>Configure l'influence de l'inclinaison du terrain sur la perte d'endurance. Une valeur plus élevée implique une perte d'endurance plus importante.</French>
+            <Italian>Stabilisce quanto la pendenza del terreno incrementa la perdita della stamina. Maggiore significa più stamina persa.</Italian>
+            <Chinese>設定陡峭的地形將會影響多少體力的流失，值越高代表體力流失越快</Chinese>
+            <Chinesesimp>设定陡峭的地形将会影响多少体力的流，失值越高代表体力流失越快</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_Enabled">
            <English>Enabled</English>
            <German>Aktiv</German>
            <Japanese>有効化</Japanese>
            <Polish>Włączone</Polish>
+            <Korean>활성화</Korean>
+            <French>Activé</French>
+            <Italian>Abilitato</Italian>
+            <Chinese>啟用</Chinese>
+            <Chinesesimp>启用</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_Enabled_Description">
            <English>Enables/disables Advanced Fatigue.</English>
            <German>Aktiviert/deaktiviert Advanced Fatigue.</German>
            <Japanese>アドバンスド疲労の有効化と無効化</Japanese>
            <Polish>Włącza/wyłącza zaawansowaną wytrzymałość</Polish>
+            <Korean>고급 피로도 활성화/비활성화</Korean>
+            <French>Active/désactive la fatigue avancée.</French>
+            <Italian>Abilita/disabilita la Fatica Avanzata.</Italian>
+            <Chinese>啟用/關閉進階體力.</Chinese>
+            <Chinesesimp>启用/关闭进阶体力.</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_EnableStaminaBar">
            <English>Show stamina bar</English>
            <German>Zeige Ausdauerleiste</German>
            <Japanese>体力バーを表示</Japanese>
            <Polish>Pokaż pasek wytrzymałości</Polish>
+            <Korean>피로도 막대</Korean>
+            <French>Afficher la barre d'endurance</French>
+            <Italian>Mostra barra stamina</Italian>
+            <Chinese>顯示體力條</Chinese>
+            <Chinesesimp>显示体力条</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Fatigue_EnableStaminaBar_Description">
            <English>Shows the stamina bar.</English>
            <German>Zeigt die Ausdauerleiste an.</German>
            <Japanese>体力バーを表示します。</Japanese>
            <Polish>Pokazuje pasek wytrzymałości.</Polish>
+            <Korean>피로도 막대를 보여줍니다.</Korean>
+            <French>Affiche la barre d'endurance.</French>
+            <Italian>Mostra la barra della stamina.</Italian>
+            <Chinese>顯示體力條</Chinese>
+            <Chinesesimp>显示体力条</Chinesesimp>
        </Key>
    </Package>
 </Project>
--- a/addons/advanced_throwing/CfgAmmo.hpp
+++ b/addons/advanced_throwing/CfgAmmo.hpp
@ -0,0 +1,7 @@
+class CfgAmmo {
+    class Default;
+    class Grenade: Default {
+        GVAR(torqueDirection)[] = {1, 1, 0};
+        GVAR(torqueMagnitude) = "(50 + random 100) * selectRandom [1, -1]";
+    };
+};
--- a/addons/advanced_throwing/CfgVehicles.hpp
+++ b/addons/advanced_throwing/CfgVehicles.hpp
@ -60,6 +60,7 @@ class CfgVehicles {
                displayName = CSTRING(PickUp);
                condition = QUOTE([ARR_2(_player,true)] call FUNC(canPrepare));
                statement = QUOTE(_this call FUNC(pickUp));
+                exceptions[] = {"isNotSwimming"};
                distance = 1.8; // Requires >1.7 to work when standing with weapon on back
                icon = "\a3\ui_f\data\igui\cfg\actions\obsolete\ui_action_takemine_ca.paa";
            };
--- a/addons/advanced_throwing/XEH_postInit.sqf
+++ b/addons/advanced_throwing/XEH_postInit.sqf
@ -11,7 +11,7 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
 {
    {
        private _ammo = getText (configFile >> "CfgMagazines" >> _x >> "ammo");
-        GVAR(ammoMagLookup) setVariable [_ammo, _x];
+        if (_ammo != "") then { GVAR(ammoMagLookup) setVariable [_ammo, _x]; };
    } count (getArray (configFile >> "CfgWeapons" >> "Throw" >> _x >> "magazines"));
    nil
 } count getArray (configFile >> "CfgWeapons" >> "Throw" >> "muzzles");
@ -21,6 +21,7 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
 ["ACE3 Weapons", QGVAR(prepare), localize LSTRING(Prepare), {
    // Condition
    if (!([ACE_player] call FUNC(canPrepare))) exitWith {false};
+    if (EGVAR(common,isReloading)) exitWith {true};

    // Statement
    [ACE_player] call FUNC(prepare);
@ -30,7 +31,7 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;

 ["ACE3 Weapons", QGVAR(dropModeToggle), localize LSTRING(DropModeToggle), {
    // Condition
-    if !(ACE_player getVariable [QGVAR(inHand), false]) exitWith {false};
+    if (!(ACE_player getVariable [QGVAR(inHand), false]) || {underwater ACE_player}) exitWith {false};

    // Statement
    private _currentDropMode = ACE_player getVariable [QGVAR(dropMode), false];
@ -67,7 +68,8 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
 }] call CBA_fnc_addPlayerEventhandler;

 ["visibleMap", {
-    if (visibleMap && {ACE_player getVariable [QGVAR(inHand), false]}) then {
+    params ["", "_visibleMap"]; // command visibleMap is updated one frame later
+    if (_visibleMap && {ACE_player getVariable [QGVAR(inHand), false]}) then {
        [ACE_player, "Opened Map"] call FUNC(exitThrowMode);
    };
 }] call CBA_fnc_addPlayerEventhandler;
@ -92,6 +94,7 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;

 // Set last thrown time on Vanilla Throwing and Advanced Throwing
 ["ace_firedPlayer", {
+    //IGNORE_PRIVATE_WARNING ["_unit", "_weapon"];
    if (_weapon == "Throw") then {
        _unit setVariable [QGVAR(lastThrownTime), CBA_missionTime];
    };
@ -114,8 +117,9 @@ addMissionEventHandler ["Draw3D", { // Blue is predicted before throw, red is re
        drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [0,0,1,1], _newTrajAGL, 1, 1, 0, "", 2];
    } forEach GVAR(predictedPath);
    {
-        _newTrajAGL = _x;
-        drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [1,0,0,1], _newTrajAGL, 1, 1, 0, "", 2];
-    } forEach GVAR(flightPath)
+        _x params ["_pos", "_vectorUp"];
+        drawIcon3D ["\a3\ui_f\data\gui\cfg\hints\icon_text\group_1_ca.paa", [1,0,0,1], _pos, 1, 1, 0, "", 2];
+        drawLine3D [_pos, _pos vectorAdd _vectorUp, [1,0,1,1]];
+    } forEach GVAR(flightPath);
 }];
 #endif
--- a/addons/advanced_throwing/XEH_preInit.sqf
+++ b/addons/advanced_throwing/XEH_preInit.sqf
@ -2,6 +2,8 @@

 ADDON = false;

+PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;

 ADDON = true;
--- a/addons/advanced_throwing/config.cpp
+++ b/addons/advanced_throwing/config.cpp
@ -15,5 +15,6 @@ class CfgPatches {
 };

 #include "ACE_Settings.hpp"
+#include "CfgAmmo.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
--- a/addons/advanced_throwing/functions/fnc_canPrepare.sqf
+++ b/addons/advanced_throwing/functions/fnc_canPrepare.sqf
@ -32,6 +32,5 @@ GVAR(enabled) &&
 #endif

 {!(call EFUNC(common,isFeatureCameraActive))} &&
-{!EGVAR(common,isReloading)} &&
-{[_unit, objNull, ["isNotInside", "isNotSitting"/*, "isNotOnLadder"*/]] call EFUNC(common,canInteractWith)} && // Ladder needs positioning fixes on throw
+{[_unit, objNull, ["isNotInside", "isNotSwimming", "isNotSitting"/*, "isNotOnLadder"*/]] call EFUNC(common,canInteractWith)} && // Ladder needs positioning fixes on throw
 {_unit call CBA_fnc_canUseWeapon} // Disable in non-FFV seats due to surface detection issues
--- a/addons/advanced_throwing/functions/fnc_drawArc.sqf
+++ b/addons/advanced_throwing/functions/fnc_drawArc.sqf
@ -67,7 +67,7 @@ for "_i" from 0.05 to 1.45 step 0.1 do {
        private _col = [ [1, 1, 1, _alpha], [0, 1, 0, _alpha], [1, 0, 0, _alpha], [1, 1, 0, _alpha] ] select _cross;

        if (_cross != 2 && {lineIntersects [eyePos ACE_player, _newTrajASL]}) then {
-            _col set [3, 0.1]
+            _col set [3, 0.1];
        };

        _pathData pushBack [_col, ASLToAGL _newTrajASL, _iDim];
--- a/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
+++ b/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
@ -36,6 +36,11 @@ if (_throwable isEqualTo [] && {!_primed}) exitWith {

 private _throwableMag = _throwable param [0, "#none"];

+// If not primed, double check we actually have the magazine in inventory
+if ((!_primed) && {!((_throwableMag in (uniformItems ACE_player)) || {_throwableMag in (vestItems ACE_player)} || {_throwableMag in (backpackItems ACE_player)})}) exitWith {
+    [ACE_player, "No valid throwable (glitched currentThrowable)"] call FUNC(exitThrowMode);
+};
+
 // Get correct throw power for primed grenade
 if (_primed) then {
    private _ammoType = typeOf _activeThrowable;
@ -123,6 +128,10 @@ _activeThrowable setDir (_unitDirVisual + 90);
 private _pitch = [-30, -90] select (_throwType == "high");
 [_activeThrowable, _pitch, 0] call BIS_fnc_setPitchBank;

+// Force drop mode if underwater
+if (underwater player) then {
+    ACE_player setVariable [QGVAR(dropMode), true];
+};

 if (ACE_player getVariable [QGVAR(dropMode), false]) then {
    _posFin = _posFin vectorAdd (AGLToASL (positionCameraToWorld [_leanCoef, 0, ACE_player getVariable [QGVAR(dropDistance), DROP_DISTANCE_DEFAULT]]));
--- a/addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
+++ b/addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
@ -32,6 +32,10 @@ if !(_unit getVariable [QGVAR(primed), false]) then {
    _unit setVariable [QGVAR(lastThrownTime), CBA_missionTime];
    // Fix floating for throwables without proper physics (eg. IR Grenade)
    _activeThrowable setVelocity [0, 0, -0.1];
+
+    // Set thrower
+    private _instigator = (getShotParents _activeThrowable) param [1, _unit]; // getShotParents could be [] on replaced grenades (like IR chemlight)
+    [QEGVAR(common,setShotParents), [_activeThrowable, _unit, _instigator]] call CBA_fnc_serverEvent;
 };

 // Restore muzzle ammo (setAmmo 1 has no impact if no appliccable throwable in inventory)
--- a/addons/advanced_throwing/functions/fnc_moduleInit.sqf
+++ b/addons/advanced_throwing/functions/fnc_moduleInit.sqf
@ -13,8 +13,7 @@
 * Example:
 * [logic, [unit1, unit2], true] call ace_advanced_throwing_fnc_moduleInit
 *
- * Public:
- * No
+ * Public: No
 */
 #include "script_component.hpp"

--- a/addons/advanced_throwing/functions/fnc_prime.sqf
+++ b/addons/advanced_throwing/functions/fnc_prime.sqf
@ -54,6 +54,9 @@ deleteVehicle _activeThrowableOld;
    _activeThrowable // projectile
 ]] call CBA_fnc_globalEvent;

+// Set prime instigator
+[QEGVAR(common,setShotParents), [_activeThrowable, _unit, _unit]] call CBA_fnc_serverEvent;
+
 if (_showHint) then {
    // Show primed hint
    private _displayNameShort = getText (configFile >> "CfgMagazines" >> _throwableMag >> "displayNameShort");
--- a/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
+++ b/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
@ -7,7 +7,7 @@
 * None
 *
 * Return Value:
- * Nothing
+ * None
 *
 * Example:
 * call ace_advanced_throwing_fnc_renderPickUpInteraction
--- a/addons/advanced_throwing/functions/fnc_throw.sqf
+++ b/addons/advanced_throwing/functions/fnc_throw.sqf
@ -49,9 +49,15 @@ if (!(_unit getVariable [QGVAR(primed), false])) then {
        _newVelocity = _newVelocity vectorAdd (velocity (vehicle _unit));
    };

+    private _config = configFile >> "CfgAmmo" >> typeOf _activeThrowable;
+    private _torqueDir = vectorNormalized (getArray (_config >> QGVAR(torqueDirection)));
+    private _torqueMag = getNumber (_config >> QGVAR(torqueMagnitude));
+    private _torque = _torqueDir vectorMultiply _torqueMag;
+
    // Drop if unit dies during throw process
    if (alive _unit) then {
        _activeThrowable setVelocity _newVelocity;
+        _activeThrowable addTorque (_unit vectorModelToWorld _torque);
    };

    // Invoke listenable event
@ -67,12 +73,12 @@ if (!(_unit getVariable [QGVAR(primed), false])) then {


 #ifdef DRAW_THROW_PATH
-GVAR(predictedPath) = call FUNC(drawArc); // save the current throw arc
+GVAR(predictedPath) = call FUNC(drawArc); // Save the current throw arc
 GVAR(flightPath) = [];
-[_unit getVariable QGVAR(activeThrowable)] spawn {
-    params ["_grenade"];
-    while {!isNull _grenade} do {
-        GVAR(flightPath) pushBack ASLtoAGL getPosASL _grenade;
+GVAR(flightRotation) = [];
+(_unit getVariable QGVAR(activeThrowable)) spawn {
+    while {!isNull _this && {(getPosATL _this) select 2 > 0.05}} do {
+        GVAR(flightPath) pushBack [ASLtoAGL (getPosASL _this), vectorUp _this];
        sleep 0.05;
    };
 };
--- a/addons/advanced_throwing/stringtable.xml
+++ b/addons/advanced_throwing/stringtable.xml
@ -6,126 +6,252 @@
            <Russian>Улучшенный бросок гранат</Russian>
            <Japanese>アドバンスド投てき</Japanese>
            <Polish>Zaawansowane rzucanie</Polish>
+            <German>Erweitertes Wurfsystem</German>
+            <Korean>고급 투척</Korean>
+            <French>Lancé amélioré</French>
+            <Italian>Lancio Avanzato</Italian>
+            <Chinese>進階投擲</Chinese>
+            <Chinesesimp>进阶投掷</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Module_Description">
            <English>Allows changing advanced throwing behaviour.</English>
            <Russian>Позволяет настраивать поведение улучшенного броска гранат.</Russian>
            <Japanese>アドバンスド投てきの挙動変更を許可します。</Japanese>
            <Polish>Zezwala na zmianę zachowania zaawansowanego trybu rzucania.</Polish>
+            <German>Erlaubt es, das Verhalten des erweiterten Wurfsystems zu ändern.</German>
+            <Korean>고급 투척 행위를 허가합니다</Korean>
+            <French>Permet de changer la configuration du lancé amélioré.</French>
+            <Italian>Permette il cambiamento della modalità di tiro.</Italian>
+            <Chinese>允許使用更多不同的投擲方式</Chinese>
+            <Chinesesimp>允许使用更多不同的投掷方式</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Enable_DisplayName">
            <English>Enable Advanced Throwing</English>
            <Russian>Включить улучшенный бросок</Russian>
            <Japanese>アドバンスド投てきを有効化</Japanese>
            <Polish>Aktywuj zaawansowane rzucanie</Polish>
+            <German>Aktiviere erweitertes Wurfsystem</German>
+            <Korean>고급 투척 활성화 </Korean>
+            <French>Active le lancé amélioré</French>
+            <Italian>Abilita Lancio Avanzato</Italian>
+            <Chinese>啟用進階投擲</Chinese>
+            <Chinesesimp>启用进阶投掷</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Enable_Description">
            <English>Enables advanced throwing system.</English>
            <Russian>Включает систему улучшенного броска.</Russian>
            <Japanese>アドバンスド投てきシステムを有効化</Japanese>
            <Polish>Aktywuje system zaawansowanego rzucania.</Polish>
+            <German>Aktiviert das erweiterte Wurfsystem.</German>
+            <Korean>고급 투척을 활성화 합니다</Korean>
+            <French>Active le système de lancé amélioré.</French>
+            <Italian>Abilita il sistema di lancio avanzato.</Italian>
+            <Chinese>啟用進階投擲系統</Chinese>
+            <Chinesesimp>启用进阶投掷系统</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_DisplayName">
            <English>Show Throw Arc</English>
            <Russian>Показать траекторию броска</Russian>
            <Japanese>軌道を表示</Japanese>
            <Polish>Pokaż trasę lotu</Polish>
+            <German>Zeige Wurfbogen</German>
+            <Korean>투척 궤적 표시</Korean>
+            <French>Afficher l'arc de lancé</French>
+            <Italian>Mostra Arco di Tiro</Italian>
+            <Chinese>顯示投擲軌道</Chinese>
+            <Chinesesimp>显示投掷轨道</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_Description">
            <English>Enables visualization of the throw arc (where throwable will fly).</English>
            <Russian>Включает визуализацию траектории броска (как полетит граната).</Russian>
            <Japanese>投てき物の予測軌道の表示を有効化します。</Japanese>
            <Polish>Wyświetla wizualizację trasy przelotu granatu.</Polish>
+            <German>Aktiviert die Visualisierung des Wurfbogens (wohin das Objekt geworfen werden wird).</German>
+            <Korean>투척 궤도를 시각화 합니다(투척물이 어디로 갈지)</Korean>
+            <French>Active la visualisation de l'arc de lancé (où l'objet lancé va atterrir).</French>
+            <Italian>Abilita la visualizzazione dell'arco del tiro (dove l'oggetto lanciabile volerà).</Italian>
+            <Chinese>顯示投擲軌道幫助投擲</Chinese>
+            <Chinesesimp>显示投掷轨道帮助投掷</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_DisplayName">
            <English>Show Throwing Mouse Controls</English>
            <Russian>Показывать управление мышью</Russian>
            <Japanese>投てきのマウス操作を表示</Japanese>
            <Polish>Pokaż podpowiedzi sterowania myszą</Polish>
+            <German>Zeige Maussteuerung beim Werfen</German>
+            <Korean>마우스 조작 표시</Korean>
+            <French>Afficher les contrôles à la souris du lancé</French>
+            <Italian>Mostra Comandi Mouse Lancio</Italian>
+            <Chinese>顯示滑鼠投擲控制提示</Chinese>
+            <Chinesesimp>显示滑鼠投掷控制提示</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_Description">
            <English>Enables visual cues for mouse controls when throwable is prepared.</English>
            <Russian>Включает отображение подсказок по управлению мышью, когда граната подготовлена.</Russian>
            <Japanese>投てき物を投げるとき、マウス操作の説明表示を有効化します。</Japanese>
            <Polish>Wyświetla podpowiedzi sterowania myszą kiedy obiekt miotany jest w ręku.</Polish>
+            <German>Aktiviert visuelle Hinweise zur Maussteuerung, wenn ein Objekt zum Werfen vorbereitet wird.</German>
+            <Korean>투척물을 준비시 마우스 조작을 시각화해서 보여줍니다</Korean>
+            <French>Active les aides visuels pour les controles à la souris lorsqu'un lancé est préparé.</French>
+            <Italian>Abilita la visualizzazione dei controlli del mouse quando l'oggetto lanciabile è pronto.</Italian>
+            <Chinese>開啟後會在準備投擲時, 顯示滑鼠相關操作</Chinese>
+            <Chinesesimp>开启后会在准备投掷时, 显示滑鼠相关操作</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_DisplayName">
            <English>Enable Throwables Pick Up</English>
            <Russian>Включить подбор гранат</Russian>
            <Japanese>投てき物の拾い上げを有効化</Japanese>
            <Polish>Zezwól na podnoszenie obiektów miotanych</Polish>
+            <German>Aktiviere Aufheben von Wurfobjekten</German>
+            <Korean>투척물 줍기 활성화</Korean>
+            <French>Active la récupération des objets lancés</French>
+            <Italian>Abilita Raccogli Oggetti</Italian>
+            <Chinese>啟用可撿取地面投擲物</Chinese>
+            <Chinesesimp>启用可捡取地面投掷物</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_Description">
            <English>Enables ability to pick up throwables from the ground.</English>
            <Russian>Включает возможность подбирать гранаты с земли.</Russian>
            <Japanese>地面に落ちている投てき物の拾い上げ動作を有効化します。</Japanese>
            <Polish>Umożliwia podnoszenie obiektów miotanych z ziemi.</Polish>
+            <German>Aktiviert die Möglichkeit, geworfene Objekte wieder vom Boden aufzuheben.</German>
+            <Korean>땅에 떨어진 투척물을 주울 수 있게 해줍니다.</Korean>
+            <French>Active la capacité de récupérer les objets lancés sur le sol.</French>
+            <Italian>Abilita la possibilità di raccogliere un oggetto lanciabile da terra.</Italian>
+            <Chinese>啟用後, 可撿取地面上的投擲物</Chinese>
+            <Chinesesimp>启用后, 可捡取地面上的投掷物</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_DisplayName">
            <English>Enable Attached Throwables Pick Up</English>
            <Russian>Включить подбор прикрепленных гранат</Russian>
            <Japanese>拾い上げた投てき物の取り付けを有効化</Japanese>
            <Polish>Zezwól na podnoszenie przyczepionych obiektów miotanych</Polish>
+            <German>Aktiviere erneute Aufnahme befestigter Wurfobjekte</German>
+            <Korean>부착 투척물 줍기 활성화</Korean>
+            <French>Active le ramassage d'objets lançables attachés</French>
+            <Italian>Abilita Raccogli Oggetti Lanciabili da altri Oggetti</Italian>
+            <Chinese>啟用可撿取附著投擲物</Chinese>
+            <Chinesesimp>启用可捡取附着投掷物</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_Description">
            <English>Enables ability to pick up throwables from attached objects.</English>
            <Russian>Включает возможность подбирать гранаты, прикрепленные к объектам.</Russian>
            <Japanese>オブジェクトに取り付けられていた投てき物を拾い上げられるようにします。</Japanese>
            <Polish>Umożliwia podnoszenie obiektów miotanych przyczepionych do innych obiektów.</Polish>
+            <German>Aktiviert die Möglichkeit, befestigte Wurfobjekte erneut aufzunehmen.</German>
+            <Korean>부착된 투척물을 주울 수 있게 해줍니다.</Korean>
+            <French>Active la capacité à ramasser les objets lançables attaché à d'autres objets.</French>
+            <Italian>Abilita la possibilità di raccogliere gli oggetti lanciabili dagli altri oggetti. </Italian>
+            <Chinese>啟用後, 可撿取附著在物件上的投擲物</Chinese>
+            <Chinesesimp>启用后, 可捡取附着在物件上的投掷物</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Prepare">
            <English>Prepare/Change Throwable</English>
            <Russian>Подготовить/заменить гранату</Russian>
-            <Japanese>機能の起動/変更</Japanese>
+            <Japanese>投てき物の準備/変更</Japanese>
            <Polish>Przygotuj/zmień ob. miotany</Polish>
+            <German>Wurfobjekt vorbereiten/wechseln</German>
+            <Korean>투척물 준비/변경</Korean>
+            <French>Préparer/changer d'objet</French>
+            <Italian>Prepara/Cambia Oggetto lanciabile</Italian>
+            <Chinese>準備/變更投擲物</Chinese>
+            <Chinesesimp>准备/变更投掷物</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_dropModeHold">
            <English>Throwable Drop Mode (Hold)</English>
            <Russian>Режим броска гранаты (удерживать)</Russian>
            <Japanese>投てきモード (押しっぱ)</Japanese>
            <Polish>Tryb upuszczania ob. miotanego (przytrzymaj)</Polish>
+            <German>Wurfobjekt Fallmodus (halten)</German>
+            <Korean>투척물 떨어뜨리기 모드(꾹눌러서)</Korean>
+            <French>Mode de lancé de l'objet (Tenir)</French>
+            <Italian>Modalità Oggetto Gettabile (Mantenere)</Italian>
+            <Chinese>投擲模式 (按住)</Chinese>
+            <Chinesesimp>投掷模式 (按住)</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_DropModeToggle">
            <English>Throwable Drop Mode (Toggle)</English>
            <Russian>Режим броска гранаты (переключить)</Russian>
-            <Japanese>投てきモード (トグル)</Japanese>
+            <Japanese>投てきモード (切り替え)</Japanese>
            <Polish>Tryb upuszczania ob. miotanego (przełącz)</Polish>
+            <German>Wurfobjekt Fallmodus (umschalten)</German>
+            <Korean>투척물 떨어뜨리기 모드(토글)</Korean>
+            <French>Mode de lancé de l'objet (Basculer)</French>
+            <Italian>Modalità Oggetto lanciabile Gettabile (Interruttore)</Italian>
+            <Chinese>投擲模式 (切換)</Chinese>
+            <Chinesesimp>投掷模式 (切换)</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Primed">
            <English>Primed</English>
            <Russian>Подготовлена</Russian>
            <Japanese>起動した</Japanese>
            <Polish>Odbezpieczony</Polish>
+            <German>Scharf gemacht</German>
+            <Korean>뇌관 작동</Korean>
+            <French>Amorcer</French>
+            <Italian>Armato</Italian>
+            <Chinese>引信開始燃燒</Chinese>
+            <Chinesesimp>引信开始燃烧</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Throw">
            <English>Throw</English>
            <Russian>Бросить</Russian>
            <Japanese>投げる</Japanese>
            <Polish>Rzuć</Polish>
+            <German>Werfen</German>
+            <Korean>던지기</Korean>
+            <French>Lancer</French>
+            <Italian>Lanciare</Italian>
+            <Chinese>投擲</Chinese>
+            <Chinesesimp>投掷</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_ChangeMode">
            <English>(Scroll) Change Mode</English>
            <Russian>(Скролл) Изменить режим</Russian>
            <Japanese>(スクロール) モード変更</Japanese>
            <Polish>(Kółko m.) zmień tryb</Polish>
+            <German>(Scrollen) Modus wechseln</German>
+            <Korean>(마우스 휠) 모드 변경</Korean>
+            <French>(Molette souris) Changer de mode</French>
+            <Italian>(Scorrere) Cambio Modalità</Italian>
+            <Chinese>(滾輪) 變更模式</Chinese>
+            <Chinesesimp>(滚轮) 变更模式</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Extend">
            <English>(Scroll) Extend</English>
            <Russian>(Скролл) Увеличить</Russian>
            <Japanese>(スクロール) 遠くに</Japanese>
            <Polish>(Kółko m.) przedłuż</Polish>
+            <German>(Scrollen) Erweitern</German>
+            <Korean>(마우스 휠) 연장</Korean>
+            <French>(Molette souris) Etendre</French>
+            <Italian>(Scorrere) Estendere</Italian>
+            <Chinese>(滾輪) 延長</Chinese>
+            <Chinesesimp>(滚轮) 延长</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_Cook">
            <English>(Click) Cook</English>
            <Russian>(Клик) Подготовить</Russian>
            <Japanese>(クリック) 起爆</Japanese>
            <Polish>(Kliknięcie) Odbezpiecz</Polish>
+            <German>(Klicken) Abkochen</German>
+            <Korean>(클릭) 예열</Korean>
+            <French>(Clique) Dégoupiller</French>
+            <Italian>(Click) Arma</Italian>
+            <Chinese>(點擊) 提早拉開引信</Chinese>
+            <Chinesesimp>(点击) 提早拉开引信</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Advanced_Throwing_PickUp">
            <English>Pick Up</English>
            <Russian>Подобрать</Russian>
            <Japanese>拾い上げる</Japanese>
            <Polish>Podnieś</Polish>
+            <German>Aufheben</German>
+            <Korean>줍기</Korean>
+            <French>Ramasser</French>
+            <Italian>Raccogli</Italian>
+            <Chinese>撿取</Chinese>
+            <Chinesesimp>捡取</Chinesesimp>
        </Key>
    </Package>
 </Project>
--- a/addons/ai/CfgAISkill.hpp
+++ b/addons/ai/CfgAISkill.hpp
@ -1,28 +0,0 @@
-
-/*
- * Documentation:
- * https://community.bistudio.com/wiki/AI_Sub-skills
- *
- * The idea here is to reduce the AI's godlike aiming
- * capabilties while retaining it's high intelligence.
- * The AI should be smart enough to move through a town,
- * but also be 'human' in their reaction time and aim.
- *
- * Note: All these values can still be adjusted via
- *       scripts, these arrays just change what 0 & 1
- *       are for setSkill.
- */
-
-class CfgAISkill {
-    aimingAccuracy[] = {0,0, 1,0.8};  // {0,0,1,1};   v1.26 defaults
-    aimingShake[]    = {0,0, 1,0.6};  // {0,0,1,1};
-    aimingSpeed[]    = {0,0, 1,0.7};  // {0,0.5,1,1};
-    commanding[]     = {0,0, 1,0.8};  // {0,0,1,1};
-    courage[]        = {0,0, 1,0.7};  // {0,0,1,1};
-    endurance[]      = {0,0, 1,0.7};  // {0,0,1,1};
-    general[]        = {0,0, 1,0.9};  // {0,0,1,1};
-    // apparently breaks rapid firing in single fire mode for players
-    //reloadSpeed[]    = {0,0, 1,0.8};  // {0,0,1,1};
-    spotDistance[]   = {0,0, 1,0.9};  // {0,0.2,1,0.4};
-    spotTime[]       = {0,0, 1,0.7};  // {0,0,1,0.7};
-};
--- a/addons/ai/CfgEventHandlers.hpp
+++ b/addons/ai/CfgEventHandlers.hpp
@ -0,0 +1,18 @@
+
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};
--- a/addons/ai/CfgWeapons.hpp
+++ b/addons/ai/CfgWeapons.hpp
@ -467,7 +467,7 @@ class CfgWeapons {
    };

    // Scorpion EVO
-    class SMG_02_base_F: Rifle_Base_F {
+    class SMG_02_base_F: Rifle_Short_Base_F  {

        class Single: Mode_SemiAuto {
            minRange = 50;  //2;
--- a/addons/ai/README.md
+++ b/addons/ai/README.md
@ -1,7 +1,7 @@
 ace_ai
 ======

-Minor changes of AI skill and overhaul of AI firing modes of vanilla weapons, encouraging the AI to use full-auto and bursts more often.
+Overhaul of AI firing modes of vanilla weapons, encouraging the AI to use full-auto and bursts more often.


 ## Maintainers
--- a/addons/ai/XEH_PREP.hpp
+++ b/addons/ai/XEH_PREP.hpp
@ -0,0 +1,3 @@
+PREP(garrison);
+PREP(unGarrison);
+PREP(garrisonMove);
--- a/addons/ai/XEH_postInit.sqf
+++ b/addons/ai/XEH_postInit.sqf
@ -0,0 +1,84 @@
+#include "script_component.hpp"
+
+[QGVAR(AISection), {
+    params [["_units", [], [[]]], ["_sections", [], [[]]], ["_bool", true, [true]]];
+    {
+        private _section = _x;
+        {
+            if (_bool) then {
+                _x enableAI _section;
+            } else {
+                _x disableAI _section;
+            };
+            LOG(format [ARR_4("XEH_postInit: %1 disableAI %2 | ID %3", _x, _section, clientOwner)]);
+        } foreach (_units select {local _x});
+    } foreach _sections
+}] call CBA_fnc_addEventHandler;
+
+[QGVAR(unGarrison), FUNC(unGarrison)] call CBA_fnc_addEventHandler;
+[QGVAR(doMove), {
+    params ["_unitsArray"];
+    {  
+        _x params ["_unit", "_pos"];
+        //_unit doFollow leader _unit;
+        _unit setDestination [_pos, "LEADER PLANNED", true];
+        _unit doMove _pos;
+        LOG(format [ARR_4("XEH_postInit: %1 doMove %2 | ID %3", _unit, _pos, clientOwner)]);
+    } foreach _unitsArray
+}] call CBA_fnc_addEventHandler;
+[QGVAR(setBehaviour), {
+    params ["_groupsArray", "_behaviour"];
+    {  
+        _x params ["_group"];
+        _group setBehaviour _behaviour;
+        LOG(format [ARR_4("XEH_postInit: %1 setBehaviour %2 | ID %3", _group, _behaviour, clientOwner)]);
+    } foreach _groupsArray
+}] call CBA_fnc_addEventHandler;
+[QGVAR(enableAttack), {
+    params ["_unitsArray", "_mode"];
+    {
+        _x params ["_unit"];
+        _unit enableAttack _mode;
+        LOG(format [ARR_4("XEH_postInit: %1 enableAttack %2 | ID %3", _unit, _mode, clientOwner)]);
+    } foreach _unitsArray
+}] call CBA_fnc_addEventHandler;
+
+#ifdef DEBUG_MODE_FULL
+    addMissionEventHandler ["Draw3D", {
+        private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+
+        {
+            _x params  ["_unit", "_pos"];
+
+            switch true do {
+                case (surfaceIsWater (getPos _unit) && {surfaceIsWater _pos}) : {
+                    for "_i" from 0 to 3 do {
+                        drawLine3D [_unit modelToWorldVisualWorld [0,0,1], (AGLtoASL _pos), [1,0,0,1]];
+                    };
+                    drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLtoASL _pos), 0.75, 0.75, 0.75];
+                };
+
+                case (!surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
+                    for "_i" from 0 to 3 do {
+                        drawLine3D [_unit modelToWorldVisual [0,0,1], _pos, [1,0,0,1]];
+                    };
+                    drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], _pos, 0.75, 0.75, 0.75];
+                };
+
+                case (!surfaceIsWater (getPos _unit) && {surfaceIsWater _pos}) : {
+                    for "_i" from 0 to 3 do {
+                        drawLine3D [_unit modelToWorldVisual [0,0,1], (AGLToASL _pos), [1,0,0,1]];
+                    };
+                    drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], (AGLtoASL _pos), 0.75, 0.75, 0.75];
+                };
+
+                case (surfaceIsWater (getPos _unit) && {!surfaceIsWater _pos}) : {
+                    for "_i" from 0 to 3 do {
+                        drawLine3D [_unit modelToWorldVisualWorld  [0,0,1], _pos, [1,0,0,1]];
+                    };
+                    drawIcon3D ["\a3\ui_f\data\map\groupicons\waypoint.paa", [1,0,0,1], _pos, 0.75, 0.75, 0.75];
+                };
+            };
+        } foreach _unitMoveList;
+    }];
+#endif
--- a/addons/ai/XEH_preInit.sqf
+++ b/addons/ai/XEH_preInit.sqf
@ -0,0 +1,9 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+ADDON = true;
--- a/addons/javelin/XEH_post_init.sqf
+++ b/addons/javelin/XEH_post_init.sqf
@ -1,2 +1,3 @@
 #include "script_component.hpp"

+#include "XEH_PREP.hpp"
--- a/addons/ai/config.cpp
+++ b/addons/ai/config.cpp
@ -14,5 +14,5 @@ class CfgPatches {
    };
 };

-#include "CfgAISkill.hpp"
 #include "CfgWeapons.hpp"
+#include "CfgEventHandlers.hpp"
--- a/addons/ai/functions/fnc_garrison.sqf
+++ b/addons/ai/functions/fnc_garrison.sqf
@ -0,0 +1,278 @@
+/*
+ * Author: alganthe
+ * Garrison function used to garrison AI inside buildings.
+ *
+ * Arguments:
+ * 0: The building(s) nearest this position are used <POSITION>
+ * 1: Limit the building search to those type of building <ARRAY>
+ * 2: Units that will be garrisoned <ARRAY>
+ * 3: Radius to fill building(s) <SCALAR> (default: 50)
+ * 4: 0: even filling, 1: building by building, 2: random filling <SCALAR> (default: 0)
+ * 5: True to fill building(s) from top to bottom <BOOL> (default: false) (note: only works with filling mode 0 and 1)
+ * 6: Teleport units <BOOL> (default: false)
+
+ * Return Value:
+ * Units not garrisoned <ARRAY>
+ *
+ * Example:
+ * [position, nil, [unit1, unit2, unit3, unitN], 200, 1, false, false] call ace_ai_fnc_garrison
+ *
+ * Public: Yes
+*/
+#include "script_component.hpp"
+
+params [["_startingPos",[0,0,0], [[]], 3], ["_buildingTypes", ["Building"], [[]]], ["_unitsArray", [], [[]]], ["_fillingRadius", 50, [0]], ["_fillingType", 0, [0]], ["_topDownFilling", false, [true]], ["_teleport", false, [true]]];
+
+TRACE_6("fnc_garrison: Start",_startingPos,_buldingTypes,count _unitsArray,_fillingRadius,_fillingTYpe,_topDownFilling);
+
+_unitsArray = _unitsArray select {alive _x && {!isPlayer _x}};
+
+if (_startingPos isEqualTo [0,0,0]) exitWith {
+    TRACE_1("fnc_garrison: StartingPos error",_startingPos);
+    [LSTRING(GarrisonInvalidPosition)] call EFUNC(common,displayTextStructured);
+};
+
+if (count _unitsArray == 0 || {isNull (_unitsArray select 0)}) exitWith {
+    TRACE_1("fnc_garrison: Units error",_unitsArray);
+    [LSTRING(GarrisonNoUnits)] call EFUNC(common,displayTextStructured);
+};
+
+private _buildings = nearestObjects [_startingPos, _buildingTypes, ([_fillingRadius, 50] select (_fillingRadius < 50))];
+if (_fillingRadius >= 50) then {
+    _buildings = [_buildings] call CBA_fnc_shuffle;
+};
+
+if (count _buildings == 0) exitWith {
+    TRACE_1("fnc_garrison: Building error",_buildings);
+    [LSTRING(GarrisonNoBuilding)] call EFUNC(common,displayTextStructured);
+};
+
+private _buildingsIndex = [];
+
+if (_topDownFilling) then {
+    {
+        private _buildingPos = _x buildingPos -1;
+
+        // Those reverse are necessary, as dumb as it is there's no better way to sort those subarrays in sqf
+        {
+            reverse _x;
+        } foreach _buildingPos;
+
+        _buildingPos sort false;
+
+        {
+            reverse _x;
+        } foreach _buildingPos;
+
+        _buildingsIndex pushBack _buildingPos;
+    } foreach _buildings;
+} else {
+    {
+        _buildingsIndex pushBack (_x buildingPos -1);
+    } foreach _buildings;
+};
+
+// Remove buildings without positions
+{
+    _buildingsIndex deleteAt (_buildingsIndex find _x);
+} foreach (_buildingsIndex select {count _x == 0});
+
+//Remove positions units are already pathing to
+_buildingsIndex = _buildingsIndex apply {
+    private _testedBuilding = _x;
+
+    _testedBuilding select {
+        private _testedPos = _x;
+        (({(_x select 1) isEqualTo _testedPos} count (missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []])) == 0)
+    }
+};
+
+// Warn the user that there's not enough positions to place all units
+private _count = 0;
+{_count = _count + count _x} foreach _buildingsIndex;
+if ( (count _unitsArray) - _count > 0) then {
+    TRACE_4("fnc_garrison: Not enough spots to place all units",_unitsArray,count _unitsArray,_count,((count _unitsArray) - _count > 0));
+    [LSTRING(GarrisonNotEnoughPos)] call EFUNC(common,displayTextStructured);
+};
+
+private _placedUnits = [];
+private _unitMoveList = [];
+
+// Force all units to un-garrison
+[QGVAR(unGarrison), [_unitsArray], _unitsArray] call CBA_fnc_targetEvent;
+
+private _fnc_comparePos = {
+    params ["_nearestUnits", "_pos"];
+    ({
+        if (surfaceIsWater getPos _x) then {
+            floor ((getPosASL _x) select 2) == floor ((AGLtoASL _pos) select 2)
+        } else {
+            floor ((getPosATL _x) select 2) == floor (_pos select 2)
+        };
+    } count _nearestUnits) > 0
+};
+
+// Do the placement
+switch (_fillingType) do {
+
+    // Even filling
+    case 0: {
+
+        while {count _unitsArray > 0} do {
+            if (count _buildingsIndex == 0) exitWith {};
+            private _building = _buildingsIndex select 0;
+
+            if (_building isEqualTo []) then {
+                LOG(format [ARR_2("fnc_garrison: Empty building array | removing building from buildingsIndex | %1 buildings remaining",count _buildingsIndex)]);
+                _buildingsIndex deleteAt 0;
+
+            } else {
+                private _pos = _building select 0;
+                private _nearestUnits = (_pos nearEntities ["CAManBase", 2]);
+                LOG(format [ARR_3("fnc_garrison: Unit detection | %1 units nearby | %2 units within height",count _nearestUnits, {floor ((getPos _x) select 2) == floor (_pos select 2)} count _nearestUnits)]);
+
+                if (count _nearestUnits  > 0 && {[_nearestUnits, _pos] call _fnc_comparePos}) then {
+                    LOG(format [ARR_2("fnc_garrison: Unit present | removing position | %1 positions remaining for this building",count (_buildingsIndex select (_buildingsIndex find _building)) - 1)]);
+                    _buildingsIndex set [0,  _building - [_pos]];
+
+                } else {
+                    private _unit = _unitsArray select 0;
+                    private _posSurface = surfaceIsWater _pos;
+
+                    if (_teleport) then {
+                        doStop _unit;
+                        if (_posSurface) then {
+                            _unit setPosASL (AGLtoASL _pos);
+                        } else {
+                            _unit setPosATL _pos;
+                        };
+
+                    } else {
+                        _unitMoveList pushBack [_unit,[_pos, AGLToASL _pos] select (_posSurface)];
+                    };
+
+                    _placedUnits pushBack _unit;
+                    _unitsArray deleteAt (_unitsArray find _unit);
+                    _building deleteAt 0;
+                    _buildingsIndex deleteAt 0;
+                    _buildingsIndex pushBackUnique _building;
+                    _unit setVariable [QGVAR(garrisonned), true, true];
+                };
+            };
+        };
+    };
+
+    // Building by building
+    case 1: {
+
+        while {count _unitsArray > 0} do {
+            if (count _buildingsIndex == 0) exitWith {};
+            private _building = _buildingsIndex select 0;
+
+            if (_building isEqualTo []) then {
+                LOG(format [ARR_2("fnc_garrison: empty building array | removing building from buildingsIndex | %1 buildings remaining",count _buildingsIndex)]);
+                _buildingsIndex deleteAt 0;
+
+            } else {
+                private _pos = _building select 0;
+                private _nearestUnits = (_pos nearEntities ["CAManBase", 2]);
+                LOG(format [ARR_3("fnc_garrison: Unit detection | %1 units nearby | %2 units within height",count _nearestUnits, {floor ((getPos _x) select 2) == floor (_pos select 2)} count _nearestUnits)]);
+
+                if (count _nearestUnits  > 0 && {[_nearestUnits, _pos] call _fnc_comparePos}) then {
+                    LOG(format [ARR_2("fnc_garrison: Unit present | removing position | %1 positions remaining for this building",count (_buildingsIndex select (_buildingsIndex find _building)) - 1)]);
+                    _buildingsIndex set [0, _building - [_pos]];
+
+                } else {
+                    private _unit = _unitsArray select 0;
+                    private _posSurface = surfaceIsWater _pos;
+
+                    if (_teleport) then {
+                        doStop _unit;
+                        if (_posSurface) then {
+                            _unit setPosASL (AGLtoASL _pos);
+                        } else {
+                            _unit setPosATL _pos;
+                        };
+
+                    } else {
+                        _unitMoveList pushBack [_unit,[_pos, AGLToASL _pos] select (_posSurface)];
+                    };
+
+                    _placedUnits pushBack _unit;
+                    _unitsArray deleteAt (_unitsArray find _unit);
+                    _buildingsIndex set [0, _building - [_pos]];
+                    _unit setVariable [QGVAR(garrisonned), true, true];
+                };
+            };
+        };
+    };
+
+    // Random
+    case 2: {
+
+        while {count _unitsArray > 0} do {
+            if (count _buildingsIndex == 0) exitWith {};
+            private _building = selectRandom _buildingsIndex;
+
+            if (_building isEqualTo []) then {
+                LOG(format [ARR_2("fnc_garrison: empty building array | removing building from buildingsIndex | %1 buildings remaining",count _buildingsIndex)]);
+                _buildingsIndex deleteAt (_buildingsIndex find _building);
+
+            } else {
+                private _pos = selectRandom _building;
+                private _nearestUnits = (_pos nearEntities ["CAManBase", 2]);
+                LOG(format [ARR_3("fnc_garrison: Unit detection | %1 units nearby | %2 units within height",count _nearestUnits, {floor ((getPos _x) select 2) == floor (_pos select 2)} count _nearestUnits)]);
+
+                if (count _nearestUnits  > 0 && {[_nearestUnits, _pos] call _fnc_comparePos}) then {
+                    LOG(format [ARR_2("fnc_garrison: Unit present | removing position | %1 positions remaining for this building",count (_buildingsIndex select (_buildingsIndex find _building)) - 1)]);
+                    _buildingsIndex set [(_buildingsIndex find _building), _building - [_pos]];
+
+                } else {
+                    private _unit = _unitsArray select 0;
+                   private _posSurface = surfaceIsWater _pos;
+
+                    if (_teleport) then {
+                        doStop _unit;
+                        if (_posSurface) then {
+                            _unit setPosASL (AGLtoASL _pos);
+                        } else {
+                            _unit setPosATL _pos;
+                        };
+
+                    } else {
+                        _unitMoveList pushBack [_unit,[_pos, AGLToASL _pos] select (_posSurface)];
+                    };
+
+                    _placedUnits pushBack _unit;
+                    _unitsArray deleteAt (_unitsArray find _unit);
+                    _buildingsIndex set [(_buildingsIndex find _building), _building - [_pos]];
+                    _unit setVariable [QGVAR(garrisonned), true, true];
+                };
+            };
+        };
+    };
+};
+
+TRACE_1(format [ARR_2("fnc_garrison: while loop ended | %1 units ready to be treated by PFH",count _unitMoveList)], _teleport);
+
+// Update the unit list and remove duplicate positions and units
+private _garrison_unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+
+_garrison_unitMoveList = _garrison_unitMoveList select {
+    _x params ["_testedUnit", "_testedPos"];
+    ({(_x select 0) isEqualTo _testedUnit} count _unitMoveList == 0)
+};
+
+_garrison_unitMoveList append _unitMoveList;
+
+missionNameSpace setVariable [QGVAR(garrison_unitMoveList), _garrison_unitMoveList, true];
+
+if (_teleport) then {
+    [QGVAR(AISection), [_placedUnits, ["PATH"], false], _placedUnits] call CBA_fnc_targetEvent;
+
+} else {
+    [_unitMoveList] call FUNC(garrisonMove);
+};
+
+TRACE_1(format [ARR_3("fnc_garrison: End | %1 units left | %2 buildings left", count _unitsArray, count _buildingsIndex)], _unitsArray);
+_unitsArray
--- a/addons/ai/functions/fnc_garrisonMove.sqf
+++ b/addons/ai/functions/fnc_garrisonMove.sqf
@ -0,0 +1,149 @@
+/*
+ * Author: alganthe
+ * Internal function used by ace_ai_fnc_garrison to make the units move to the positions it picked.
+ *
+ * Arguments:
+ * 0: Array of arrays <ARRAY>
+ *    0: Unit needing to be placed <UNIT>
+ *    1: Position the unit need to be placed at <POSITION>
+ *
+ * Return Value:
+ * Nothing
+ *
+ * Example:
+ * [ [unit1, [10, 10, 10]], [unit2, [30, 30, 30]], [unitN, getPos player] ] call ace_ai_fnc_garrisonMove
+ *
+ * Public: No
+*/
+#include "script_component.hpp"
+
+params [ ["_unitMoveList", nil, [[]]] ];
+
+if (isNil "_unitMoveList") exitWith {};
+
+// Start initial movement
+private _unitMoveListUnits = (_unitMoveList apply {_x select 0});
+[QGVAR(setBehaviour), [(_unitMoveListUnits select {leader _x == _x}), "AWARE"], _unitMoveListUnits] call CBA_fnc_targetEvent;
+[QGVAR(AISection), [_unitMoveListUnits, ["FSM"], false], _unitMoveListUnits] call CBA_fnc_targetEvent;
+[QGVAR(doMove), [_unitMoveList], _unitMoveListUnits] call CBA_fnc_targetEvent;
+[QGVAR(enableAttack), [_unitMoveListUnits select {leader _x == _x}, false], _unitMoveListUnits] call CBA_fnc_targetEvent;
+
+{
+    _x setVariable [QGVAR(garrisonMove_failSafe), nil, true];
+    _x setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
+} foreach _unitMoveListUnits;
+
+// Avoid duplicate PFHs 
+if (isNil QGVAR(garrison_moveUnitPFH)) then {
+    missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), true, true];
+
+    // PFH checking if the units have reached their destination
+    [{
+        params ["_args", "_pfhID"];
+
+        private _unitMoveList = missionNameSpace getVariable [QGVAR(garrison_unitMoveList), []];
+
+        // End PFH if all units are placed / unable to reach position
+        if (_unitMoveList isEqualTo []) then {
+            missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), nil, true];
+            LOG("garrisonMove PFH: PFH finished it's job | deleting PFH");
+            _pfhID call CBA_fnc_removePerFrameHandler;
+
+        } else {
+            {
+                _x params  ["_unit", "_pos"];
+
+                // Check if unit is alive or even existing
+                if (!alive _unit) then {
+                    _unitMoveList deleteAt (_unitMoveList find _x);
+                    LOG(format [ARR_2("garrisonMove PFH: unit dead or deleted | %1 units left", count _unitMoveList)]);
+
+                } else {
+                    private _unitPos = getPos _unit;
+                    if (surfaceisWater _unitPos) then {
+                        _unitPos = getPosASL _unit;
+                    } else {
+                        _unitPos = getPosATL _unit;
+                    };
+
+                    if (unitReady _unit) then {
+                        // Check for distance, doMove and AI are moody and may stop for no reason, within 6 meters and ready should be fine
+                        if (_unitPos distance _pos < 3) then { 
+                            _unit setVariable [QGVAR(garrisonMove_failSafe), nil, true];
+                            _unit setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
+                            _unit setVariable [QGVAR(garrisonned), true, true];
+                            _unitMoveList deleteAt (_unitMoveList find _x);
+
+                            [QGVAR(AISection), [[_unit], ["PATH"], false], _unit] call CBA_fnc_targetEvent;
+                            [QGVAR(AISection), [[_unit], ["FSM"], true], _unit] call CBA_fnc_targetEvent;
+
+                            if ({(_x select 0) in units _unit && {!isPlayer (_x select 0)}} count _unitMoveList == 0) then {
+                                [QGVAR(enableAttack), [[_unit], true], _unit] call CBA_fnc_targetEvent;
+                            };
+                            
+                            LOG(format [ARR_2("garrisonMove PFH: unit in position | %1 units left", count _unitMoveList)]);
+
+                        } else {
+                            // Tell the unit to move if an order wasn't given within 30s, avoid doMove spam
+                           (_unit getVariable [QGVAR(garrisonMove_failSafe), [CBA_missionTime, 5]]) params ["_failSafeTimer", "_failSafeRemainingAttemps"];
+
+                            if (_failSafeTimer <= CBA_missionTime) then {
+                                if (_failSafeRemainingAttemps == 0 ) then {
+                                    _unit setVariable [QGVAR(garrisonMove_failSafe), nil, true];
+                                    _unit setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
+                                    [QGVAR(unGarrison), [[_unit]], _unit] call CBA_fnc_targetEvent;
+                                    _unitMoveList deleteAt (_unitMoveList find _x);
+                                    LOG("garrisonMove PFH unitReady: all moving commands failed | restoring AI capabilities");
+
+                                } else {
+                                    _unit setVariable [QGVAR(garrisonMove_failSafe), [_failSafeTimer + 15, _failSafeRemainingAttemps - 1]];
+                                    [QGVAR(doMove), [[[_unit, _pos]]], _unit] call CBA_fnc_targetEvent;
+                                    LOG("garrisonMove PFH unitReady: unit not close enough | Sending another doMove command");
+                                };
+                            };
+                        };
+                    } else {
+                        (_unit getVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, [0,0,0]]]) params ["_unitPosTimer", "_unitOldPos"];
+
+                        // AI may sometimes not be able to report unitReady, this is to avoid the PFH running forever
+                        switch true do { 
+                            case ((_unitPosTimer + 15) < CBA_missionTime && {(_unitPos distance _pos) < 3}) : {
+                                TRACE_1("case 1",_unit);
+                                _unit setVariable [QGVAR(garrisonMove_failSafe), nil, true];
+                                _unit setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
+                                _unit setVariable [QGVAR(garrisonned), true, true];
+                                _unitMoveList deleteAt (_unitMoveList find _x);
+
+                                [QGVAR(AISection), [[_unit], ["PATH"], false], _unit] call CBA_fnc_targetEvent;
+                                [QGVAR(AISection), [[_unit], ["FSM"], true], _unit] call CBA_fnc_targetEvent;
+
+                                if ({(_x select 0) in units _unit && {!isPlayer (_x select 0)}} count _unitMoveList == 0) then {
+                                    [QGVAR(enableAttack), [[_unit], true], _unit] call CBA_fnc_targetEvent;
+                                };
+
+                                LOG(format [ARR_2("garrisonMove PFH unitNotReady: unit in position | %1 units left", count _unitMoveList)]);
+                            };
+
+                            case ((_unitPosTimer + 15) < CBA_missionTime && {_unitOldPos distance _unitPos < 0.5}) : {
+                                TRACE_3("case 2",_unit, ((_unitPosTimer + 15) < CBA_missionTime), (_unitOldPos distance _unitPos < 0.5));
+                                _unit setVariable [QGVAR(garrisonMove_failSafe), nil, true];
+                                _unit setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true];
+                                [QGVAR(unGarrison), [[_unit]], _unit] call CBA_fnc_targetEvent;
+                                _unitMoveList deleteAt (_unitMoveList find _x);
+                                LOG("garrisonMove PFH unitNotReady: all moving commands failed | restoring AI capabilities");
+                            };
+
+                            case (_unitOldPos distance _unitPos < 0.5) : {};
+
+                            default {
+                                _unit setVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, _unitPos]];
+                            }; 
+                        };
+                    };
+                };
+            } foreach _unitMoveList;
+
+            missionNameSpace setVariable [QGVAR(garrison_unitMoveList), _unitMoveList, true];
+        };
+    }, 0.5, []] call CBA_fnc_addPerFrameHandler;
+};
--- a/addons/ai/functions/fnc_unGarrison.sqf
+++ b/addons/ai/functions/fnc_unGarrison.sqf
@ -0,0 +1,57 @@
+/*
+ * Author: alganthe
+ * Used to un-garrison units.
+ *
+ * Arguments:
+ * 0: Units to un-garrison <ARRAY>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [unit1, unit2, unit3] call ace_ai_fnc_unGarrison
+ *
+ * Public: Yes
+ *
+*/
+#include "script_component.hpp"
+
+params [["_units", [], [[]]]];
+
+_units = _units select {local _x};
+
+{
+    if (!isPlayer _x && {local _x}) then {
+        _x enableAI "PATH";
+        _x enableAI "FSM";
+
+        private _leader = leader _x;
+
+        TRACE_3("fnc_ungarrison: unit and leader",_x , _leader, (_leader == _x));
+
+        _x setVariable [QGVAR(garrisonned), false, true];
+
+        if (_leader != _x) then {
+            doStop _x;
+            _x doFollow _leader;
+
+        } else {
+            _x doMove ((nearestBuilding (getPos _x)) buildingExit 0);
+        };
+
+        private _fnc_countGarrisonnedUnits = {
+            params ["_unit", "_bool"];
+            if (_bool) then {
+                ({(_x getVariable [QGVAR(garrisonned), false]) && {!isPlayer _x}} count units _unit)
+            } else {
+                ({!(_x getVariable [QGVAR(garrisonned), false]) && {!isPlayer _x}} count units _unit)
+            };
+            
+        };
+
+        if ([_x, true] call _fnc_countGarrisonnedUnits == ({!isPlayer _x} count (units _x)) - 1 || {[_x, false] call _fnc_countGarrisonnedUnits == {!isPlayer _x} count (units _x)}) then {
+            LOG("fnc_ungarrison: enableAttack true");
+            (group _x) enableAttack true;
+        };
+    };
+} foreach _units;
--- a/addons/ai/functions/script_component.hpp
+++ b/addons/ai/functions/script_component.hpp
@ -0,0 +1 @@
+#include "\z\ace\addons\ai\script_component.hpp"
--- a/addons/ai/script_component.hpp
+++ b/addons/ai/script_component.hpp
@ -2,8 +2,8 @@
 #define COMPONENT_BEAUTIFIED AI
 #include "\z\ace\addons\main\script_mod.hpp"

-// #define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
+//#define DEBUG_MODE_FULL
+//#define DISABLE_COMPILE_CACHE
 // #define ENABLE_PERFORMANCE_COUNTERS

 #ifdef DEBUG_ENABLED_AI
--- a/addons/ai/stringtable.xml
+++ b/addons/ai/stringtable.xml
@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="ai">
+        <Key ID="STR_ACE_ai_GarrisonInvalidPosition">
+            <English>Invalid position provided.</English>
+            <French>Position invalide fourni</French>
+            <Japanese>位置が無効です。</Japanese>
+            <Italian>Posizione invalida fornita.</Italian>
+            <Chinese>提供的位置無效。</Chinese>
+            <Chinesesimp>提供的位置无效。</Chinesesimp>
+        </Key>
+        <Key ID="STR_ACE_ai_GarrisonNoUnits">
+            <English>No units provided.</English>
+            <French>Aucune unité fourni</French>
+            <Japanese>ユニットがありません。</Japanese>
+            <Italian>Nessuna unità fornita.</Italian>
+            <Chinese>找不到可用的單位。</Chinese>
+            <Chinesesimp>找不到可用的单位。</Chinesesimp>
+        </Key>
+        <Key ID="STR_ACE_ai_GarrisonNotEnoughPos">
+            <English>There aren't enough positions to place all units.</English>
+            <French>Il n'y a pas assez de positions pour placer toutes les unités</French>
+            <Japanese>全ユニットを置くために十分な位置がありません。</Japanese>
+            <Italian>Non ci sono abbastanza posizioni per piazzare tutte le unità.</Italian>
+            <Chinese>沒有足夠的位置能擺放所有單位。</Chinese>
+            <Chinesesimp>没有足够的位置能摆放所有单位。</Chinesesimp>
+        </Key>
+        <Key ID="STR_ACE_ai_GarrisonNoBuilding">
+            <English>No building found.</English>
+            <French>Aucun bâtiment trouvé</French>
+            <Japanese>建物がありません。</Japanese>
+            <Italian>Nessun edificio trovato.</Italian>
+            <Chinese>沒找到建築物。</Chinese>
+            <Chinesesimp>没找到建筑物。</Chinesesimp>
+        </Key>
+    </Package>
+</Project>
--- a/addons/aircraft/CfgAmmo.hpp
+++ b/addons/aircraft/CfgAmmo.hpp
@ -1,4 +1,3 @@
-
 class CfgAmmo {
    class BulletBase;
    class B_20mm : BulletBase {
@ -11,11 +10,11 @@ class CfgAmmo {
        explosive = 1.8;
        tracersEvery = 3;
        tracerEndTime = 3.5;
-
        CraterEffects = "ExploAmmoCrater";
        explosionEffects = "ExploAmmoExplosion";
        model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
    };
+
    class ACE_20mm_HE : B_20mm {};
    class ACE_20mm_AP : B_20mm {
        hit = 50;
@ -40,30 +39,20 @@ class CfgAmmo {

    // also adjust tracer, "muh lightshow"; also adjust splash damage radius
    class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase {
-        hit = 80;
-        indirectHit = 12;
-        indirectHitRange = 3; //2;
-        caliber = 1.4;
-        deflecting = 3;
-        fuseDistance = 3;
-        tracerStartTime = 0.02;
-        timeToLive = 40;
+        hit = 80; // default: 180
+        indirectHit = 12; // default: 4
+        indirectHitRange = 3; // default: 3
+        caliber = 1.4; // default: 5
+        deflecting = 3; // default: 5
+        fuseDistance = 3; // default: 10
+        tracerStartTime = 0.02; // default: 0.1
+        timeToLive = 40; // default: 6
    };

-    // helper projectiles to simulate a rof > fps
-    class ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy: Gatling_30mm_HE_Plane_CAS_01_F {
-        simulation = "shotSubmunitions";
-        triggerTime = 0;
-        submunitionAmmo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Sub";
-        submunitionConeType[] = {"custom", {{0,0}, {0,0}, {0,0}} };
-    };
-
-    class ACE_Gatling_30mm_HE_Plane_CAS_01_Sub: Gatling_30mm_HE_Plane_CAS_01_F {};
-
    // adjust damage and splash damage, closer to bluefor gatling with same caliber
    class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {
-        hit = 70; //40;
-        indirectHit = 11; //14;
-        indirectHitRange = 3;
+        hit = 70; // default: 150
+        indirectHit = 11; // default: 4
+        indirectHitRange = 3; // default: 3
    };
 };
--- a/addons/aircraft/CfgEventHandlers.hpp
+++ b/addons/aircraft/CfgEventHandlers.hpp
@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));
+    };
+};
--- a/addons/aircraft/CfgMagazines.hpp
+++ b/addons/aircraft/CfgMagazines.hpp
@ -1,9 +1,7 @@
-
 class CfgMagazines {
    // shoot helper object to tripple rof
    class VehicleMagazine;
    class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine {
-        ammo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy";
        count = 1170;
    };

--- a/addons/aircraft/CfgVehicles.hpp
+++ b/addons/aircraft/CfgVehicles.hpp
@ -1,4 +1,3 @@
-
 class CfgVehicles {
    class All {
        class Turrets;
@ -11,7 +10,6 @@ class CfgVehicles {
    };

    class Air: AllVehicles {};
-
    class Helicopter: Air {
        class Turrets {
            class MainTurret;
@ -19,13 +17,11 @@ class CfgVehicles {
    };

    class Plane: Air {};
-
    class ParachuteBase: Helicopter {
        class Turrets;
    };

    class UAV: Plane {};
-
    class Helicopter_Base_F: Helicopter {
        class Turrets: Turrets {
            class CopilotTurret;
@ -37,53 +33,27 @@ class CfgVehicles {
        class Turrets: Turrets {
            class CopilotTurret;
        };
-        //class UserActions;
    };

    class Heli_Light_01_base_F: Helicopter_Base_H {
-        lockDetectionSystem = 0;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
+        incomingMissileDetectionSystem = 16; // Vanilla: 0

        class Turrets: Turrets {
            class CopilotTurret: CopilotTurret {
-                canEject = 1;
                showHMD = 1;
            };
        };
    };

-    class Heli_Light_01_unarmed_base_F: Heli_Light_01_base_F {};
-
-    class B_Heli_Light_01_F: Heli_Light_01_unarmed_base_F {
-        /*class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {};
-        };*/
-    };
-
    class Heli_Light_01_armed_base_F: Heli_Light_01_base_F {
-        lockDetectionSystem = 0;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
-
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-        };
+        incomingMissileDetectionSystem = 16; // Vanilla: 0
    };
-
-    class B_Heli_Light_01_armed_F: Heli_Light_01_armed_base_F {};
-
    class Heli_Light_02_base_F: Helicopter_Base_H {
-        driverCanEject = 1;
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        magazines[] = {"2000Rnd_762x51_Belt_T_Green","12Rnd_PG_missiles","168Rnd_CMFlare_Chaff_Magazine"};
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
+        magazines[] = {"2000Rnd_762x51_Belt_T_Green", "12Rnd_PG_missiles", "168Rnd_CMFlare_Chaff_Magazine"}; // Switch gun magazine to 7.62mm from 6.5mm

        class Turrets: Turrets {
            class CopilotTurret: CopilotTurret {
-                canEject = 1;
                showHMD = 1;
            };
        };
@ -97,248 +67,81 @@ class CfgVehicles {

    #include "Heli_Attack_01_base_F.hpp"

-    class B_Heli_Attack_01_F: Heli_Attack_01_base_F {};
-
    class Heli_Attack_02_base_F: Helicopter_Base_F {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
-
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {
-                canEject = 1;
-            };
-        };
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };

    class Heli_Transport_01_base_F: Helicopter_Base_H {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
+        incomingMissileDetectionSystem = 16; // Vanilla: 24

        class Turrets: Turrets {
            class CopilotTurret: CopilotTurret {
-                canEject = 1;
                showHMD = 1;
            };
+
            class MainTurret: MainTurret {
-                magazines[] = {"2000Rnd_762x51_Belt_T_Red"};
-                canEject = 1;
+                magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; // Switch gun magazine to 7.62mm from 6.5mm
            };
+
            class RightDoorGun: MainTurret {
-                magazines[] = {"2000Rnd_762x51_Belt_T_Red"};
-                canEject = 1;
+                magazines[] = {"2000Rnd_762x51_Belt_T_Red"}; // Switch gun magazine to 7.62mm from 6.5mm
            };
        };
-
-        /*class UserActions {
-            class DoorL1_Open {
-                available = 1;
-                condition = "((this doorPhase 'door_L') == 0) AND Alive(this) AND driver this != player AND gunner this != player";
-            };
-            class DoorR1_Open: DoorL1_Open {
-                condition = "((this doorPhase 'door_R') == 0) AND Alive(this) AND driver this != player AND gunner this != player";
-            };
-            class DoorL1_Close: DoorL1_Open {
-                condition = "((this doorPhase 'door_L') > 0) AND Alive(this) AND driver this != player AND gunner this != player";
-            };
-            class DoorR1_Close: DoorL1_Close {
-                condition = "((this doorPhase 'door_R') > 0) AND Alive(this) AND driver this != player AND gunner this != player";
-            };
-        };*/
    };

    class Heli_Transport_02_base_F: Helicopter_Base_H {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
+        incomingMissileDetectionSystem = 16; // Vanilla: 24

        class Turrets: Turrets {
            class CopilotTurret: CopilotTurret {
-                canEject = 1;
                showHMD = 1;
            };
        };
-
-        /*class UserActions: UserActions {
-            class DoorL1_Open {
-                available = 1;
-                condition = "this animationPhase ""door_back_L"" < 0.5 AND Alive(this)";
-            };
-            class DoorR1_Open: DoorL1_Open {
-                condition = "this animationPhase ""door_back_R"" < 0.5 AND Alive(this)";
-            };
-            class DoorL1_Close: DoorL1_Open {
-                condition = "this animationPhase ""door_back_L"" > 0.5 AND Alive(this)";
-            };
-            class DoorR1_Close: DoorL1_Close {
-                condition = "this animationPhase ""door_back_R"" > 0.5 AND Alive(this)";
-            };
-            class CargoRamp_Open: DoorL1_Open {
-                userActionID = 52;
-                displayName = CSTRING(OpenCargoRamp);
-                textToolTip = CSTRING(OpenCargoRamp);
-                position = "action_cargoramp";
-                radius = 3.0;
-                condition = "this animationPhase ""cargoramp_open"" < 0.5 AND Alive(this)";
-                statement = "this animateDoor ['cargoramp_open', 1]";
-            };
-            class CargoRamp_Close: DoorL1_Close {
-                userActionID = 55;
-                displayName = CSTRING(CloseCargoRamp);
-                textToolTip = CSTRING(CloseCargoRamp);
-                position = "action_cargoramp";
-                radius = 3.0;
-                condition = "this animationPhase ""cargoramp_open"" > 0.5 AND Alive(this)";
-                statement = "this animateDoor ['cargoramp_open', 0]";
-            };
-        };*/
    };

-    class Heli_light_03_base_F: Helicopter_Base_F {};
-    class I_Heli_light_03_base_F: Heli_light_03_base_F {
-        lockDetectionSystem = 0;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
-        weapons[] = {"M134_minigun","missiles_DAR","CMFlareLauncher", "ACE_AIR_SAFETY" };
-        magazines[] = {"5000Rnd_762x51_Yellow_Belt","24Rnd_missiles","168Rnd_CMFlare_Chaff_Magazine"};
+    class Heli_light_03_base_F: Helicopter_Base_F {
+        lockDetectionSystem = 0; // Vanilla: 12
+        incomingMissileDetectionSystem = 16; // Vanilla: 24

        class Turrets: Turrets {
            class MainTurret: MainTurret {
-                canEject = 1;
                showHMD = 1;
-                gunBeg = "commanderview";
-                gunEnd = "laserstart";
-                memoryPointGun = "laserstart";
-                stabilizedInAxes = 3;
-                weapons[] = {"Laserdesignator_mounted"};
-                soundServo[] = {"",0.01,1,30};
+                weapons[] = {"Laserdesignator_mounted"}; // Add Laser Designator
                magazines[] = {"Laserbatteries"};
-                inGunnerMayFire = 1;
            };
        };
    };

-    class I_Heli_light_03_F: Heli_light_03_base_F {
-        class Turrets: Turrets {
-            class MainTurret: MainTurret {};
-        };
-    };
-
-    class Heli_light_03_unarmed_base_F: Heli_light_03_base_F {};
-
-    class I_Heli_light_03_unarmed_F: Heli_light_03_unarmed_base_F {};

    class Plane_CAS_01_base_F: Plane_Base_F {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-
-        class Turrets;
-
-        #include <flightmodel_thunderbolt.hpp>
+        lockDetectionSystem = 12; // Vanilla: 8
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };

    class Plane_CAS_02_base_F: Plane_Base_F {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-
-        class Turrets;
-
-        #include <flightmodel_yak.hpp>
+        lockDetectionSystem = 12; // Vanilla: 8
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };

    class Plane_Fighter_03_base_F: Plane_Base_F {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-
-        class Turrets;
-
-        #include <flightmodel_alca.hpp>
-    };
-
-    class UAV_01_base_F: Helicopter_Base_F {
-        /*class Turrets: Turrets {
-            class MainTurret: MainTurret {};
-        };*/
+        lockDetectionSystem = 12; // Vanilla: 8
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };

    class UAV_02_base_F: UAV {
-        weapons[] = {};
+        weapons[] = {}; // Remove flare launcher
        magazines[] = {};
-
-        class Turrets {
-            class MainTurret;
-        };
    };

    class UAV_02_CAS_base_F: UAV_02_base_F {
-        weapons[] = {};
+        weapons[] = {}; // Remove flare launcher
        magazines[] = {};
-
-        /*class Turrets: Turrets {
-            class MainTurret: MainTurret {};
-        };*/
    };

-    class Heli_Transport_03_base_F: Helicopter_Base_H {};
-    class B_Heli_Transport_03_base_F: Heli_Transport_03_base_F {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
-
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-            //class MainTurret: MainTurret {};
-            class RightDoorGun: MainTurret {};
-        };
+    class Heli_Transport_03_base_F: Helicopter_Base_H {
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };
-
-    class B_Heli_Transport_03_unarmed_base_F: Heli_Transport_03_base_F {
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-            //class MainTurret: MainTurret {};
-            //class RightDoorGun: MainTurret {};
-        };
-    };
-
    class Heli_Transport_04_base_F: Helicopter_Base_H {
-        lockDetectionSystem = 12;
-        incomingMissileDetectionSystem = 16;
-        driverCanEject = 1;
-
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-            class LoadmasterTurret: MainTurret {
-                canEject = 1;
-            };
-        };
-    };
-
-    class O_Heli_Transport_04_bench_F: Heli_Transport_04_base_F {
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-            class LoadmasterTurret: LoadmasterTurret {
-                canEject = 1;
-            };
-        };
-    };
-
-    class O_Heli_Transport_04_covered_F: Heli_Transport_04_base_F {
-        class Turrets: Turrets {
-            class CopilotTurret: CopilotTurret {
-                canEject = 1;
-            };
-            class LoadmasterTurret: LoadmasterTurret {
-                canEject = 1;
-            };
-        };
+        incomingMissileDetectionSystem = 16; // Vanilla: 24
    };
 };
--- a/addons/aircraft/CfgWeapons.hpp
+++ b/addons/aircraft/CfgWeapons.hpp
@ -1,13 +1,8 @@
-
-class Mode_SemiAuto;
-class Mode_Burst;
 class Mode_FullAuto;

 class CfgWeapons {
-
    class RocketPods;
-    class ACE_AIR_SAFETY : RocketPods
-    {
+    class ACE_AIR_SAFETY : RocketPods {
        CanLock = 0;
        displayName = "SAFE";
        displayNameMagazine = "SAFE";
@ -21,18 +16,6 @@ class CfgWeapons {
        magazineReloadTime = 0.1;
    };

-    // Manual Switching Of Flare Mode
-    class SmokeLauncher;
-    class CMFlareLauncher: SmokeLauncher {
-        modes[] = {"Single","Burst","AIBurst"};
-        class Single: Mode_SemiAuto {
-            reloadTime = 0.1;
-        };
-        class Burst: Mode_Burst {
-            displayName = CSTRING(CMFlareLauncher_Burst_Name);
-        };
-    };
-
    // bigger mag for comanche
    class CannonCore;
    class gatling_20mm: CannonCore {
@ -43,6 +26,7 @@ class CfgWeapons {
            reloadTime = 0.023; //0.04;
            dispersion = 0.006; //0.0022;
        };
+
        class close: manual {};
        class short: close {};
        class medium: close {};
@ -57,18 +41,22 @@ class CfgWeapons {
            dispersion = 0.006;
            displayName = CSTRING(gatling_20mm_Name);
        };
+
        class close: close {
            reloadTime = 0.04;
            dispersion = 0.006;
        };
+
        class short: short {
            reloadTime = 0.04;
            dispersion = 0.006;
        };
+
        class medium: medium {
            reloadTime = 0.04;
            dispersion = 0.006;
        };
+
        class far: far {
            reloadTime = 0.04;
            dispersion = 0.006;
@ -78,14 +66,13 @@ class CfgWeapons {
    // buff gatling rof
    class MGunCore;
    class MGun: MGunCore {};
-
    class LMG_RCWS: MGun {};
-
    class LMG_Minigun: LMG_RCWS {
        class manual: MGun {
            reloadTime = 0.075; //0.015;
            dispersion = 0.00093; //0.006;
        };
+
        class close: manual {};
        class short: close {};
        class medium: close {};
@ -94,10 +81,12 @@ class CfgWeapons {

    class LMG_Minigun_heli: LMG_Minigun {
        showAimCursorInternal = 0;
+
        class manual: manual {
            reloadTime = 0.015; //0.033;    Note: This is a way to fast ROF (requires over 60 FPS)  @todo
            dispersion = 0.006; //0.0087;
        };
+
        class close: manual {};
        class short: close {};
        class medium: close {};
@ -110,30 +99,16 @@ class CfgWeapons {
            dispersion = 0.0064; //0.0023;
            multiplier = 1;
        };
+
        class HighROF: LowROF {
            reloadTime = 0.02; //0.03;
            dispersion = 0.0064; //0.0023;
            multiplier = 1;
        };
+
        class close: HighROF {};
        class short: close {};
        class medium: LowROF {};
        class far: medium {};
    };
-
-    class Gatling_30mm_Plane_CAS_01_F: CannonCore {
-        autoFire = 1;
-        burst = 1;
-        class LowROF: Mode_FullAuto {
-            autoFire = 0;
-            burst = 22; //65;
-            reloadTime = 0.0462; //0.0154; //0.034;
-            multiplier = 3;
-        };
-        class close: LowROF {};
-        class near: close {};
-        class short: close {};
-        class medium: close {};
-        class far: close {};
-    };
 };
--- a/addons/aircraft/Heli_Attack_01_base_F.hpp
+++ b/addons/aircraft/Heli_Attack_01_base_F.hpp
--- a/addons/aircraft/README.md
+++ b/addons/aircraft/README.md
@ -1,7 +1,7 @@
 ace_aircraft
 ============

-Changes to air weaponry, flight models and HUDs.
+Changes to air weaponry, ejection and HUDs.

 - Contributions by Kimi (geraldbolso1899) for HUD updates

--- a/addons/aircraft/RscInGameUI.hpp
+++ b/addons/aircraft/RscInGameUI.hpp
@ -10,572 +10,568 @@ class HScrollbar;
 class RscLadderPicture;
 class RscControlsGroupNoScrollbars;

-
-class RscInGameUI
-{
+class RscInGameUI {
    class RscUnitInfo;
-    class Rsc_ACE_Helo_UI_Turret: RscUnitInfo
-    {
+    class Rsc_ACE_Helo_UI_Turret: RscUnitInfo {
        idd = 300;
-        controls[] = {"CA_IGUI_elements_group","CA_VehicleToggles"};
+        controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
+
        class VScrollbar;
        class HScrollbar;
-        class CA_IGUI_elements_group: RscControlsGroup
-        {
+        class CA_IGUI_elements_group: RscControlsGroup {
            idc = 170;
-            class VScrollbar: VScrollbar
-            {
+
+            class VScrollbar: VScrollbar {
                width = 0;
            };
-            class HScrollbar: HScrollbar
-            {
+
+            class HScrollbar: HScrollbar {
                height = 0;
            };
-            x = "0 *         (0.01875 * SafezoneH) +         (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
-            y = "0 *         (0.025 * SafezoneH) +         (SafezoneY)";
-            w = "53.5 *         (0.01875 * SafezoneH)";
-            h = "40 *         (0.025 * SafezoneH)";
-            class controls
-            {
-                class CA_Distance: RscText
-                {
+
+            x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
+            y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
+            w = "53.5 * (0.01875 * SafezoneH)";
+            h = "40 * (0.025 * SafezoneH)";
+
+            class controls {
+                class CA_Distance: RscText {
                    idc = 151;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
-                    x = "24.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "24.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_Speed: RangeText
-                {
+
+                class CA_Speed: RangeText {
                    idc = 188;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "120";
-                    x = "14.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "14.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_Alt: RangeText
-                {
+
+                class CA_Alt: RangeText {
                    idc = 189;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "3825";
-                    x = "34.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "34.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_VisionMode: RscText
-                {
+
+                class CA_VisionMode: RscText {
                    idc = 152;
                    style = 0;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "VIS";
-                    x = "12.58 *         (0.01875 * SafezoneH)";
-                    y = "8 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "12.58 * (0.01875 * SafezoneH)";
+                    y = "8 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_FlirMode: RscText
-                {
+
+                class CA_FlirMode: RscText {
                    idc = 153;
                    style = 0;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "BHOT";
-                    x = "15.78 *         (0.01875 * SafezoneH)";
-                    y = "8 *         (0.025 * SafezoneH)";
-                    w = "4.5 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "15.78 * (0.01875 * SafezoneH)";
+                    y = "8 * (0.025 * SafezoneH)";
+                    w = "4.5 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class ValueGrid: RangeText
-                {
+
+                class ValueGrid: RangeText {
                    idc = 172;
                    font = "EtelkaMonospacePro";
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "12.20 *         (0.01875 * SafezoneH)";
-                    y = "3.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "12.20 * (0.01875 * SafezoneH)";
+                    y = "3.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class TextTADS: RangeText
-                {
+
+                class TextTADS: RangeText {
                    idc = 1010;
                    text = "TADS";
                    font = "EtelkaMonospacePro";
                    style = 2;
                    shadow = 0;
-                    x = "12.30 *         (0.01875 * SafezoneH)";
-                    y = "5 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "12.30 * (0.01875 * SafezoneH)";
+                    y = "5 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class ValueTime: RangeText
-                {
+
+                class ValueTime: RangeText {
                    idc = 190;
                    text = "20:28:35";
                    font = "EtelkaMonospacePro";
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "12.1 *         (0.01875 * SafezoneH)";
-                    y = "6.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "12.1 * (0.01875 * SafezoneH)";
+                    y = "6.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class CA_Laser: RscText
-                {
+
+                class CA_Laser: RscText {
                    idc = 158;
                    style = "0x30 + 0x800";
-                    sizeEx = "0.038*SafezoneH";
+                    sizeEx = "0.038 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = QPATHTOF(data\Helo_LaserON.paa);
-                    x = "20.45 *         (0.01875 * SafezoneH)";
-                    y = "14.1 *         (0.025 * SafezoneH)";
-                    w = "12.5 *         (0.01875 * SafezoneH)";
-                    h = "12 *         (0.025 * SafezoneH)";
+                    x = "20.45 * (0.01875 * SafezoneH)";
+                    y = "14.1 * (0.025 * SafezoneH)";
+                    w = "12.5 * (0.01875 * SafezoneH)";
+                    h = "12 * (0.025 * SafezoneH)";
                };
-                class CA_Heading: RscText
-                {
+
+                class CA_Heading: RscText {
                    idc = 156;
                    style = 0;
-                    sizeEx = "0.038*SafezoneH";
+                    sizeEx = "0.038 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "023";
-                    x = "24.83 *         (0.01875 * SafezoneH)";
-                    y = "6 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "24.83 * (0.01875 * SafezoneH)";
+                    y = "6 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
            };
        };
    };
-    class Rsc_ACE_Helo_UI_01: RscUnitInfo
-    {
-        controls[] = {"WeaponInfoControlsGroupRight","CA_TextFlaresMode","CA_TextFlares","CA_VehicleToggles","CA_Radar"};
+
+    class Rsc_ACE_Helo_UI_01: RscUnitInfo {
+        controls[] = {"WeaponInfoControlsGroupRight", "CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"};
    };
-    class Rsc_ACE_Helo_UI_02: RscUnitInfo
-    {
-        controls[] = {"CA_TextFlaresMode","CA_TextFlares","CA_VehicleToggles","CA_Radar"};
+
+    class Rsc_ACE_Helo_UI_02: RscUnitInfo {
+        controls[] = {"CA_TextFlaresMode", "CA_TextFlares", "CA_VehicleToggles", "CA_Radar"};
    };
-    class Rsc_ACE_Drones_UI_Turret: RscUnitInfo
-    {
+
+    class Rsc_ACE_Drones_UI_Turret: RscUnitInfo {
        idd = 300;
-        controls[] = {"CA_Zeroing","CA_IGUI_elements_group","CA_VehicleToggles"};
-        class CA_IGUI_elements_group: RscControlsGroup
-        {
+        controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"};
+
+        class CA_IGUI_elements_group: RscControlsGroup {
            idc = 170;
-            class VScrollbar: VScrollbar
-            {
+
+            class VScrollbar: VScrollbar {
                width = 0;
            };
-            class HScrollbar: HScrollbar
-            {
+
+            class HScrollbar: HScrollbar {
                height = 0;
            };
-            x = "0 *         (0.01875 * SafezoneH) +         (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
-            y = "0 *         (0.025 * SafezoneH) +         (SafezoneY)";
-            w = "53.5 *         (0.01875 * SafezoneH)";
-            h = "40 *         (0.025 * SafezoneH)";
-            class controls
-            {
-                class CA_Distance: RscText
-                {
+
+            x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
+            y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
+            w = "53.5 * (0.01875 * SafezoneH)";
+            h = "40 * (0.025 * SafezoneH)";
+
+            class controls {
+                class CA_Distance: RscText {
                    idc = 151;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
-                    x = "24.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "24.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_Speed: RangeText
-                {
+
+                class CA_Speed: RangeText {
                    idc = 188;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "120";
-                    x = "14.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "14.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class CA_Alt: RangeText
-                {
+
+                class CA_Alt: RangeText {
                    idc = 189;
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "3825";
-                    x = "34.78 *         (0.01875 * SafezoneH)";
-                    y = "30.88 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "34.78 * (0.01875 * SafezoneH)";
+                    y = "30.88 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class ValueTime: RangeText
-                {
+
+                class ValueTime: RangeText {
                    idc = 190;
                    text = "20:28:35";
                    font = "EtelkaMonospacePro";
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "1.75 *         (0.01875 * SafezoneH)";
-                    y = "10.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "1.75 * (0.01875 * SafezoneH)";
+                    y = "10.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class CA_VisionMode: RscText
-                {
+
+                class CA_VisionMode: RscText {
                    idc = 152;
                    style = 0;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "VIS";
                    align = "right";
-                    x = "2.6 *         (0.01875 * SafezoneH)";
-                    y = "12.0 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.0 *         (0.025 * SafezoneH)";
+                    x = "2.6 * (0.01875 * SafezoneH)";
+                    y = "12.0 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.0 * (0.025 * SafezoneH)";
                };
-                class CA_FlirMode: RscText
-                {
+
+                class CA_FlirMode: RscText {
                    idc = 153;
                    style = 0;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "BHOT";
                    align = "right";
-                    x = "6.18 *         (0.01875 * SafezoneH)";
-                    y = "12.0 *         (0.025 * SafezoneH)";
-                    w = "4.5 *         (0.01875 * SafezoneH)";
-                    h = "1.0 *         (0.025 * SafezoneH)";
+                    x = "6.18 * (0.01875 * SafezoneH)";
+                    y = "12.0 * (0.025 * SafezoneH)";
+                    w = "4.5 * (0.01875 * SafezoneH)";
+                    h = "1.0 * (0.025 * SafezoneH)";
                };
-                class TgT_Grid_text: RangeText
-                {
+
+                class TgT_Grid_text: RangeText {
                    idc = 1005;
                    text = "TGT:";
                    font = "EtelkaMonospacePro";
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "1.20 *         (0.01875 * SafezoneH)";
-                    y = "13.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "1.20 * (0.01875 * SafezoneH)";
+                    y = "13.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class TGT_ValueGrid: RangeText
-                {
+
+                class TGT_ValueGrid: RangeText {
                    idc = 172;
                    font = "EtelkaMonospacePro";
-                    colorText[] = {0.706,0.0745,0.0196,0.8};
+                    colorText[] = {0.706, 0.0745, 0.0196, 0.8};
                    style = 2;
                    sizeEx = "0.0295*SafezoneH";
                    shadow = 0;
-                    x = "5.20 *         (0.01875 * SafezoneH)";
-                    y = "13.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "5.20 * (0.01875 * SafezoneH)";
+                    y = "13.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class OWN_Grid_text: RangeText
-                {
+
+                class OWN_Grid_text: RangeText {
                    idc = 1005;
                    text = "OWN:";
                    font = "EtelkaMonospacePro";
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "1.20 *         (0.01875 * SafezoneH)";
-                    y = "15 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "1.20 * (0.01875 * SafezoneH)";
+                    y = "15 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class OWN_ValueGrid: RangeText
-                {
+
+                class OWN_ValueGrid: RangeText {
                    idc = 171;
                    font = "EtelkaMonospacePro";
-                    colorText[] = {0.15,1,0.15,0.8};
+                    colorText[] = {0.15, 1, 0.15, 0.8};
                    style = 2;
-                    sizeEx = "0.0295*SafezoneH";
+                    sizeEx = "0.0295 * SafezoneH";
                    shadow = 0;
-                    x = "5.20 *         (0.01875 * SafezoneH)";
-                    y = "15 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "5.20 * (0.01875 * SafezoneH)";
+                    y = "15 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class CA_Laser: RscText
-                {
+
+                class CA_Laser: RscText {
                    idc = 158;
                    style = "0x30 + 0x800";
-                    sizeEx = "0.038*SafezoneH";
+                    sizeEx = "0.038 * SafezoneH";
                    shadow = 0;
                    align = "right";
                    font = "EtelkaMonospacePro";
                    text = QPATHTOF(data\Helo_LaserON.paa);
-                    x = "20.45 *         (0.01875 * SafezoneH)";
-                    y = "14.1 *         (0.025 * SafezoneH)";
-                    w = "12.5 *         (0.01875 * SafezoneH)";
-                    h = "12 *         (0.025 * SafezoneH)";
+                    x = "20.45 * (0.01875 * SafezoneH)";
+                    y = "14.1 * (0.025 * SafezoneH)";
+                    w = "12.5 * (0.01875 * SafezoneH)";
+                    h = "12 * (0.025 * SafezoneH)";
                };
-                class CA_Heading: RscText
-                {
+
+                class CA_Heading: RscText {
                    idc = 156;
                    style = 0;
-                    sizeEx = "0.038*SafezoneH";
+                    sizeEx = "0.038 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    text = "023";
                    align = "right";
-                    x = "25 *         (0.01875 * SafezoneH)";
-                    y = "5 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "25 * (0.01875 * SafezoneH)";
+                    y = "5 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
            };
        };
    };
-    class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo
-    {
+
+    class Rsc_ACE_Drones_UI_Pilots: RscUnitInfo {
        idd = 300;
-        controls[] = {"WeaponInfoControlsGroupRight","CA_BackgroundVehicle","CA_BackgroundVehicleTitle","CA_BackgroundVehicleTitleDark","CA_BackgroundFuel","CA_Vehicle","CA_VehicleRole","CA_HitZones","CA_SpeedBackground","CA_SpeedUnits","CA_Speed","CA_ValueFuel","CA_AltBackground","CA_AltUnits","CA_Alt","CA_VehicleToggles","CA_Radar","DriverOpticsGroup"};
-        class DriverOpticsGroup: RscControlsGroup
-        {
+        controls[] = {"WeaponInfoControlsGroupRight", "CA_BackgroundVehicle", "CA_BackgroundVehicleTitle", "CA_BackgroundVehicleTitleDark", "CA_BackgroundFuel", "CA_Vehicle", "CA_VehicleRole", "CA_HitZones", "CA_SpeedBackground", "CA_SpeedUnits", "CA_Speed", "CA_ValueFuel", "CA_AltBackground", "CA_AltUnits", "CA_Alt", "CA_VehicleToggles", "CA_Radar", "DriverOpticsGroup"};
+
+        class DriverOpticsGroup: RscControlsGroup {
            idc = 392;
-            class VScrollbar: VScrollbar
-            {
+
+            class VScrollbar: VScrollbar {
                width = 0;
            };
-            class HScrollbar: HScrollbar
-            {
+
+            class HScrollbar: HScrollbar {
                height = 0;
            };
-            x = "0 *         (0.01875 * SafezoneH) +         (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
-            y = "0 *         (0.025 * SafezoneH) +         (SafezoneY)";
-            w = "53.5 *         (0.01875 * SafezoneH)";
-            h = "40 *         (0.025 * SafezoneH)";
-            class controls
-            {
-                class TextGrid: RscText
-                {
+            x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
+            y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
+            w = "53.5 * (0.01875 * SafezoneH)";
+            h = "40 * (0.025 * SafezoneH)";
+
+            class controls {
+                class TextGrid: RscText {
                    style = 0;
-                    sizeEx = "0.02*SafezoneH";
+                    sizeEx = "0.02 * SafezoneH";
                    shadow = 0;
                    font = "EtelkaMonospacePro";
                    idc = 1005;
                    text = "GRID:";
-                    x = "5.8 *         (0.01875 * SafezoneH)";
-                    y = "31.8 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "5.8 * (0.01875 * SafezoneH)";
+                    y = "31.8 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class ValueGrid: TextGrid
-                {
+
+                class ValueGrid: TextGrid {
                    idc = 189;
                    text = "382546";
-                    x = "10.3 *         (0.01875 * SafezoneH)";
-                    y = "31.8 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "10.3 * (0.01875 * SafezoneH)";
+                    y = "31.8 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class TextTime: TextGrid
-                {
+
+                class TextTime: TextGrid {
                    idc = 1010;
                    text = "TIME [UTC]:";
-                    x = "5.8 *         (0.01875 * SafezoneH)";
-                    y = "32.6 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "5.8 * (0.01875 * SafezoneH)";
+                    y = "32.6 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class ValueTime: TextGrid
-                {
+
+                class ValueTime: TextGrid {
                    idc = 101;
                    text = "20:28:35";
-                    x = "10 *         (0.01875 * SafezoneH)";
-                    y = "32.6 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "10 * (0.01875 * SafezoneH)";
+                    y = "32.6 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class TextMag: TextGrid
-                {
+
+                class TextMag: TextGrid {
                    idc = 1011;
                    text = "CAM MAG:";
-                    x = "5.8 *         (0.01875 * SafezoneH)";
-                    y = "7 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "5.8 * (0.01875 * SafezoneH)";
+                    y = "7 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class OpticsZoom: TextGrid
-                {
+
+                class OpticsZoom: TextGrid {
                    idc = 192;
                    text = "28x";
-                    x = "10.3 *         (0.01875 * SafezoneH)";
-                    y = "7 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "10.3 * (0.01875 * SafezoneH)";
+                    y = "7 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class BorderLineSpdTop: RscPicture
-                {
+
+                class BorderLineSpdTop: RscPicture {
                    idc = 1203;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
-                    x = "3.343 *         (0.01875 * SafezoneH)";
-                    y = "12.4 *         (0.025 * SafezoneH)";
-                    w = "3 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "3.343 * (0.01875 * SafezoneH)";
+                    y = "12.4 * (0.025 * SafezoneH)";
+                    w = "3 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class BorderLineSpdBottom: RscPicture
-                {
+
+                class BorderLineSpdBottom: RscPicture {
                    idc = 1207;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
-                    x = "3.343 *         (0.01875 * SafezoneH)";
-                    y = "26.5 *         (0.025 * SafezoneH)";
-                    w = "3 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "3.343 * (0.01875 * SafezoneH)";
+                    y = "26.5 * (0.025 * SafezoneH)";
+                    w = "3 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class BorderLineAltTop: RscPicture
-                {
+
+                class BorderLineAltTop: RscPicture {
                    idc = 1205;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
-                    x = "47.16 *         (0.01875 * SafezoneH)";
-                    y = "12.4 *         (0.025 * SafezoneH)";
-                    w = "3 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "47.16 * (0.01875 * SafezoneH)";
+                    y = "12.4 * (0.025 * SafezoneH)";
+                    w = "3 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class BorderLineAltBottom: RscPicture
-                {
+
+                class BorderLineAltBottom: RscPicture {
                    idc = 1206;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\border_line_ca.paa";
-                    x = "47.16 *         (0.01875 * SafezoneH)";
-                    y = "26.5 *         (0.025 * SafezoneH)";
-                    w = "3 *         (0.01875 * SafezoneH)";
-                    h = "1 *         (0.025 * SafezoneH)";
+                    x = "47.16 * (0.01875 * SafezoneH)";
+                    y = "26.5 * (0.025 * SafezoneH)";
+                    w = "3 * (0.01875 * SafezoneH)";
+                    h = "1 * (0.025 * SafezoneH)";
                };
-                class TextSpd: TextGrid
-                {
+
+                class TextSpd: TextGrid {
                    idc = 1004;
                    text = "SPD";
-                    x = "4.8 *         (0.01875 * SafezoneH)";
-                    y = "11.8 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "4.8 * (0.01875 * SafezoneH)";
+                    y = "11.8 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class SpeedValueBorder: RscPicture
-                {
+
+                class SpeedValueBorder: RscPicture {
                    idc = 1200;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\altimeter_value_ca.paa";
-                    x = "6.3 *         (0.01875 * SafezoneH)";
-                    y = "19 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "2 *         (0.025 * SafezoneH)";
+                    x = "6.3 * (0.01875 * SafezoneH)";
+                    y = "19 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "2 * (0.025 * SafezoneH)";
                };
-                class CA_Speed: TextGrid
-                {
+
+                class CA_Speed: TextGrid {
                    idc = 190;
                    sizeEx = "0.03*SafezoneH";
                    text = "120";
-                    x = "7.5 *         (0.01875 * SafezoneH)";
-                    y = "19.5 *         (0.025 * SafezoneH)";
-                    w = "6 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "7.5 * (0.01875 * SafezoneH)";
+                    y = "19.5 * (0.025 * SafezoneH)";
+                    w = "6 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class AnalogueSpeed: RscLadderPicture
-                {
+
+                class AnalogueSpeed: RscLadderPicture {
                    idc = 384;
                    topValue = 1312;
                    bottomValue = -345;
                    visibleRange = -1;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\UAVspeedLadder_ca.paa";
-                    x = "1.5 *         (0.01875 * SafezoneH)";
-                    y = "13 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "14 *         (0.025 * SafezoneH)";
+                    x = "1.5 * (0.01875 * SafezoneH)";
+                    y = "13 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "14 * (0.025 * SafezoneH)";
                };
-                class TextAlt: TextGrid
-                {
+
+                class TextAlt: TextGrid {
                    idc = 1006;
                    text = "ALT";
-                    x = "46.9 *         (0.01875 * SafezoneH)";
-                    y = "11.8 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "46.9 * (0.01875 * SafezoneH)";
+                    y = "11.8 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class AltValueBorder: RscPicture
-                {
+
+                class AltValueBorder: RscPicture {
                    idc = 1201;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\airspeed_value_ca.paa";
-                    x = "42.25 *         (0.01875 * SafezoneH)";
-                    y = "19 *         (0.025 * SafezoneH)";
-                    w = "5 *         (0.01875 * SafezoneH)";
-                    h = "2 *         (0.025 * SafezoneH)";
+                    x = "42.25 * (0.01875 * SafezoneH)";
+                    y = "19 * (0.025 * SafezoneH)";
+                    w = "5 * (0.01875 * SafezoneH)";
+                    h = "2 * (0.025 * SafezoneH)";
                };
-                class CA_Alt: TextGrid
-                {
+
+                class CA_Alt: TextGrid {
                    idc = 191;
-                    sizeEx = "0.03*SafezoneH";
+                    sizeEx = "0.03 * SafezoneH";
                    style = 1;
                    text = "3825";
-                    x = "43 *         (0.01875 * SafezoneH)";
-                    y = "19.5 *         (0.025 * SafezoneH)";
-                    w = "3.2 *         (0.01875 * SafezoneH)";
-                    h = "1.2 *         (0.025 * SafezoneH)";
+                    x = "43 * (0.01875 * SafezoneH)";
+                    y = "19.5 * (0.025 * SafezoneH)";
+                    w = "3.2 * (0.01875 * SafezoneH)";
+                    h = "1.2 * (0.025 * SafezoneH)";
                };
-                class AnalogueAlt: RscLadderPicture
-                {
+
+                class AnalogueAlt: RscLadderPicture {
                    idc = 385;
                    topValue = 14430;
                    bottomValue = -2110;
                    visibleRange = -1;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\UAValtLadder_ca.paa";
-                    x = "47 *         (0.01875 * SafezoneH)";
-                    y = "13 *         (0.025 * SafezoneH)";
-                    w = "2.5 *         (0.01875 * SafezoneH)";
-                    h = "14 *         (0.025 * SafezoneH)";
+                    x = "47 * (0.01875 * SafezoneH)";
+                    y = "13 * (0.025 * SafezoneH)";
+                    w = "2.5 * (0.01875 * SafezoneH)";
+                    h = "14 * (0.025 * SafezoneH)";
                };
-                class AnalogueHorizon: RscLadderPicture
-                {
+
+                class AnalogueHorizon: RscLadderPicture {
                    idc = 383;
                    topValue = 90;
                    bottomValue = -90;
                    visibleRange = -1;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_ladder_ca.paa";
-                    x = "16.75 *         (0.01875 * SafezoneH)";
-                    y = "5 *         (0.025 * SafezoneH)";
-                    w = "20 *         (0.01875 * SafezoneH)";
-                    h = "30 *         (0.025 * SafezoneH)";
+                    x = "16.75 * (0.01875 * SafezoneH)";
+                    y = "5 * (0.025 * SafezoneH)";
+                    w = "20 * (0.01875 * SafezoneH)";
+                    h = "30 * (0.025 * SafezoneH)";
                };
-                class HorizonCenter: RscPicture
-                {
+
+                class HorizonCenter: RscPicture {
                    idc = 1202;
                    text = "\A3\Ui_f\data\IGUI\Cfg\HelicopterHUD\horizon_aircraft_ca.paa";
-                    x = "24.75 *         (0.01875 * SafezoneH)";
-                    y = "19 *         (0.025 * SafezoneH)";
-                    w = "4 *         (0.01875 * SafezoneH)";
-                    h = "2 *         (0.025 * SafezoneH)";
+                    x = "24.75 * (0.01875 * SafezoneH)";
+                    y = "19 * (0.025 * SafezoneH)";
+                    w = "4 * (0.01875 * SafezoneH)";
+                    h = "2 * (0.025 * SafezoneH)";
                };
            };
        };
    };
-};
+};
--- a/addons/aircraft/XEH_PREP.hpp
+++ b/addons/aircraft/XEH_PREP.hpp
@ -0,0 +1,2 @@
+PREP(initEjectAction);
+PREP(canShowEject);
--- a/addons/aircraft/XEH_postInitClient.sqf
+++ b/addons/aircraft/XEH_postInitClient.sqf
@ -0,0 +1,29 @@
+#include "script_component.hpp"
+
+if (!hasInterface) exitWith {};
+
+private _cfgAction = configFile >> "CfgActions" >> "Eject";
+GVAR(ejectActionParams) = [
+    [
+        "", // will be set with setUserActionText
+        {
+            params ["_vehicle", "_unit"];
+            private _preserveEngineOn = (_unit == driver _vehicle) && {isEngineOn _vehicle};
+            moveOut _unit;
+            if (_preserveEngineOn) then {
+                // vehicle is local to last driver, no need to care
+                _vehicle engineOn true;
+            };
+        },
+        nil,
+        getNumber (_cfgAction >> "priority"),
+        false,
+        true,
+        getText (_cfgAction >> "shortcut"),
+        '[_this, _target] call DFUNC(canShowEject)'
+    ],
+    getText (_cfgAction >> "text"),
+    getText (_cfgAction >> "textDefault")
+];
+
+["Helicopter", "initPost", LINKFUNC(initEjectAction)] call CBA_fnc_addClassEventHandler;
--- a/addons/aircraft/XEH_preInit.sqf
+++ b/addons/aircraft/XEH_preInit.sqf
@ -0,0 +1,9 @@
+#include "script_component.hpp"
+
+ADDON = false;
+
+PREP_RECOMPILE_START;
+#include "XEH_PREP.hpp"
+PREP_RECOMPILE_END;
+
+ADDON = true;
--- a/addons/aircraft/XEH_preStart.sqf
+++ b/addons/aircraft/XEH_preStart.sqf
@ -0,0 +1,3 @@
+#include "script_component.hpp"
+
+#include "XEH_PREP.hpp"
--- a/addons/aircraft/config.cpp
+++ b/addons/aircraft/config.cpp
@ -8,7 +8,7 @@ class CfgPatches {
        requiredVersion = REQUIRED_VERSION;
        requiredAddons[] = {"ace_common"};
        author = ECSTRING(common,ACETeam);
-        authors[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
+        authors[] = {"KoffeinFlummi", "Crusty", "commy2", "jaynus", "Kimi"};
        url = ECSTRING(main,URL);
        VERSION_CONFIG;

@ -18,7 +18,8 @@ class CfgPatches {
 };

 #include "CfgAmmo.hpp"
+#include "CfgEventHandlers.hpp"
 #include "CfgMagazines.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
-#include "RscInGameUI.hpp"
+#include "RscInGameUI.hpp"
--- a/addons/aircraft/flightmodel_alca.hpp
+++ b/addons/aircraft/flightmodel_alca.hpp
@ -1,24 +0,0 @@
-
-acceleration = 300;
-maxSpeed = 936;
-irScanRangeMin = 500;
-irScanRangeMax = 5000;
-aileronSensitivity = 0.64;
-elevatorSensitivity = 0.682;
-rudderInfluence = 0.001;
-aileronControlsSensitivityCoef = 3;
-elevatorControlsSensitivity = 2;
-rudderControlsSensitivityoef = 4;
-elevatorCoef[] = {0.6,0.73,0.62,0.52,0.39,0.33,0.28};
-aileronCoef[] = {0.5,0.68,0.75,0.86,0.92,0.96,1};
-rudderCoef[] = {0.9,0.75,0.58,0.45,0.38,0.35,0.3};
-envelope[] = {0,0.06,1.2,3,3.6,3.75,3.65,3.45,3.3,2.8,2.4,1.9,1.5};
-angleOfIndicence = 0.0523599;  //determines velocity vector behaviour, how quickly it catches up with where your nose is pointing, I think
-draconicForceXCoef = 7.5;  //max angle of attack, lower value gives higher aoa
-draconicForceYCoef = 0.2198;  //Something to do with bleed off of speed, low values seem to increase bleed off
-draconicForceZCoef = 5.12;  //????
-draconicTorqueXCoef = 0.18;  //resistance to elevator input, also impacts speed degradation
-draconicTorqueYCoef = 0.000017;
-thrustCoef[] = {1.3,1.27,1.24,1.2,1.17,1.15,1.13,1.1,1.06,1,0.94,0.72,0.51,0.4,0.25,0};
-gunAimDown = 0.029;
-flapsFrictionCoef = 0.32;
--- a/addons/aircraft/flightmodel_thunderbolt.hpp
+++ b/addons/aircraft/flightmodel_thunderbolt.hpp
@ -1,22 +0,0 @@
-
-maxSpeed = 736;
-aileronSensitivity = 0.85;
-elevatorSensitivity = 0.75;
-rudderInfluence = 0.001;
-aileronControlsSensitivityCoef = 3;
-elevatorControlsSensitivity = 2;
-rudderControlsSensitivityoef = 4;
-elevatorCoef[] = {0.7,0.75,0.75,0.65,0.55,0.45,0.35};
-aileronCoef[] = {0.6,0.85,0.88,0.92,0.95,0.97,1};
-rudderCoef[] = {0.8,0.75,0.65,0.5,0.4,0.33,0.3};
-flapsFrictionCoef = 0.35;
-angleOfIndicence = 0.0523599;
-draconicForceXCoef = 9.5;
-draconicForceYCoef = 0.56;
-draconicForceZCoef = 0.1;
-draconicTorqueXCoef = 0.58;
-draconicTorqueYCoef = 0.00013;
-envelope[] = {0,0,0.75,2.4,3.6,3.8,3.7,3.2,2.2,1.7,0.9};
-thrustCoef[] = {1,1.2,1.3,1.25,1.06,1.01,1,0.92,0.75,0.65,0.5,0.25,0};
-acceleration = 265;
-landingSpeed = 220;
--- a/addons/aircraft/flightmodel_yak.hpp
+++ b/addons/aircraft/flightmodel_yak.hpp
@ -1,21 +0,0 @@
-
-maxSpeed = 1059;
-acceleration = 300;
-aileronSensitivity = 0.635;
-elevatorSensitivity = 0.814;
-rudderInfluence = 0.001;
-aileronControlsSensitivityCoef = 3;
-elevatorControlsSensitivity = 2;
-rudderControlsSensitivityoef = 4;
-elevatorCoef[] = {0.6,0.76,0.7,0.65,0.58,0.47,0.43};
-aileronCoef[] = {0.5,0.85,0.87,0.89,0.92,0.95,1};
-rudderCoef[] = {0.8,0.7,0.6,0.5,0.4,0.32,0.27};
-angleOfIndicence = 0.0523599;
-draconicForceXCoef = 7.6;
-draconicForceYCoef = 0.75;
-draconicForceZCoef = 0.085;
-draconicTorqueXCoef = 0.815;
-draconicTorqueYCoef = 0.000152;
-envelope[] = {0,0.446,1.5,3.9,5.2,4.8,4.2,3.5,2,1,0.5};
-thrustCoef[] = {1,1.2,1.7,1.7,1.65,1.54,1.32,1.1,0.95,0.75,0.5,0.35,0};
-flapsFrictionCoef = 0.32;
--- a/addons/aircraft/functions/fnc_canShowEject.sqf
+++ b/addons/aircraft/functions/fnc_canShowEject.sqf
@ -0,0 +1,34 @@
+/*
+ * Author: Dystopian
+ * Check if Eject action can be shown.
+ *
+ * Arguments:
+ * 0: Unit who calls action <OBJECT>
+ * 1: Vehicle which action is attached to <OBJECT>
+ *
+ * Return Value:
+ * Can show <BOOL>
+ *
+ * Example:
+ * [player, vehicle player] call ace_aircraft_fnc_canShowEject
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+#define FULLCREW_UNIT       0
+#define FULLCREW_ROLE       1
+#define FULLCREW_TURRETPATH 3
+
+params ["_unit", "_vehicle"];
+
+_vehicle == vehicle _unit
+&& {
+    private _ejectVarName = "";
+    {
+        if (_unit == _x select FULLCREW_UNIT) exitWith {
+            _ejectVarName = format [QGVAR(ejectAction_%1_%2), _x select FULLCREW_ROLE, _x select FULLCREW_TURRETPATH];
+        };
+    } count fullCrew _vehicle;
+    _vehicle getVariable [_ejectVarName, false]
+}
--- a/addons/aircraft/functions/fnc_initEjectAction.sqf
+++ b/addons/aircraft/functions/fnc_initEjectAction.sqf
@ -0,0 +1,48 @@
+/*
+ * Author: Dystopian
+ * Add Eject action to vehicle if needed.
+ *
+ * Arguments:
+ * 0: Vehicle <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorObject] call ace_aircraft_fnc_initEjectAction
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+params ["_vehicle"];
+
+if (unitIsUAV _vehicle) exitWith {};
+
+private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
+
+private _addAction = false;
+
+if (0 == getNumber (_config >> "driverCanEject")) then {
+    TRACE_2("eject action",typeOf _vehicle,"driver");
+    _vehicle setVariable [QGVAR(ejectAction_driver_[]), true];
+    _addAction = true;
+};
+
+{
+    {
+        _x params ["", "_role", "", "_turretPath"];
+        if (0 == getNumber (([_config, _turretPath] call CBA_fnc_getTurret) >> "canEject")) then {
+            TRACE_2("eject action",typeOf _vehicle,_turretPath);
+            _vehicle setVariable [format [QGVAR(ejectAction_%1_%2), _role, _turretPath], true];
+            _addAction = true;
+        };
+    } forEach fullCrew [_vehicle, _x, true];
+} forEach ["gunner", "commander", "turret"];
+
+if (!_addAction) exitWith {};
+
+GVAR(ejectActionParams) params ["_params", "_text", "_picture"];
+private _actionID = _vehicle addAction _params;
+_vehicle setUserActionText [_actionID, _text, "", _picture];
+_vehicle setVariable [QGVAR(ejectAction), _actionID];
--- a/addons/aircraft/functions/script_component.hpp
+++ b/addons/aircraft/functions/script_component.hpp
@ -0,0 +1 @@
+#include "\z\ace\addons\aircraft\script_component.hpp"
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@ -1,19 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
    <Package name="Aircraft">
-        <Key ID="STR_ACE_Aircraft_CMFlareLauncher_Burst_Name">
-            <English>Burst</English>
-            <German>Feuerstoß</German>
-            <Spanish>Ráfaga</Spanish>
-            <Polish>Seria</Polish>
-            <Czech>Dávka</Czech>
-            <French>Rafale</French>
-            <Russian>Очередь</Russian>
-            <Hungarian>Sorozat</Hungarian>
-            <Portuguese>Rajada</Portuguese>
-            <Italian>Raffica</Italian>
-            <Japanese>バースト</Japanese>
-        </Key>
        <Key ID="STR_ACE_Aircraft_gatling_20mm_Name">
            <English>XM301</English>
            <German>XM301</German>
@ -26,6 +13,9 @@
            <Portuguese>XM301</Portuguese>
            <Italian>XM301</Italian>
            <Japanese>XM301</Japanese>
+            <Korean>XM301</Korean>
+            <Chinese>XM301</Chinese>
+            <Chinesesimp>XM301</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Aircraft_OpenCargoRamp">
            <English>Open Cargo Door</English>
@ -39,6 +29,9 @@
            <Italian>Apri la rampa di carico</Italian>
            <Portuguese>Abrir porta de carga</Portuguese>
            <Japanese>カーゴ ドアを開く</Japanese>
+            <Korean>화물칸 개방</Korean>
+            <Chinese>開啟貨艙門</Chinese>
+            <Chinesesimp>开启货舱门</Chinesesimp>
        </Key>
        <Key ID="STR_ACE_Aircraft_CloseCargoRamp">
            <English>Close Cargo Door</English>
@ -52,6 +45,9 @@
            <Italian>Chiudi la rampa di carico</Italian>
            <Portuguese>Fechar porta de carga</Portuguese>
            <Japanese>カーゴ ドアを閉じる</Japanese>
+            <Korean>화물칸 폐쇄</Korean>
+            <Chinese>關閉貨艙門</Chinese>
+            <Chinesesimp>关闭货舱门</Chinesesimp>
        </Key>
    </Package>
-</Project>
+</Project>
--- a/addons/apl/functions/script_component.hpp
+++ b/addons/apl/functions/script_component.hpp
@ -1 +0,0 @@
-#include "\z\ace\addons\apl\script_component.hpp"
--- a/addons/atragmx/CfgWeapons.hpp
+++ b/addons/atragmx/CfgWeapons.hpp
@ -1,7 +1,7 @@

 class CfgWeapons {
    class ACE_ItemCore;
-    class InventoryItem_Base_F;
+    class CBA_MiscItem_ItemInfo;

    class ACE_ATragMX: ACE_ItemCore {
        author = "Ruthberg";
@ -13,7 +13,7 @@ class CfgWeapons {
        icon = "iconObject_circle";
        mapSize = 0.034;

-        class ItemInfo: InventoryItem_Base_F {
+        class ItemInfo: CBA_MiscItem_ItemInfo {
            mass = 2;
        };
    };
--- a/addons/atragmx/RscTitles.hpp
+++ b/addons/atragmx/RscTitles.hpp
@ -2,6 +2,10 @@
 #define ST_RIGHT 1
 #define ST_CENTER 2

+#define ST_WITH_RECT 160
+
+#define LB_TEXTURES 0x10
+
 class ATragMX_RscText {
    idc=-1;
    type=0;
@ -48,7 +52,6 @@ class ATragMX_RscButton {
    shadow=0;
 };
 class ATragMX_RscEdit {
-    access=0;
    type=2;
    style=ST_RIGHT;
    x=0;
@ -93,7 +96,7 @@ class ATragMX_RscToolbox {
 class ATragMX_RscListBox {
    idc=-1;
    type=5;
-    style=0;
+    style=LB_TEXTURES;
    font="TahomaB";
    sizeEx=0.028;
    rowHeight=0.03;
@ -113,13 +116,14 @@ class ATragMX_RscListBox {
    soundSelect[]={"",0.09,1};

    class ScrollBar {
-        color[]={1,1,1,0.6};
-        colorActive[]={1,1,1,1};
-        colorDisabled[]={1,1,1,0.3};
-        //thumb="\ca\ui\data\igui_scrollbar_thumb_ca.paa";
-        //arrowFull="\ca\ui\data\igui_arrow_top_active_ca.paa";
-        //arrowEmpty="\ca\ui\data\igui_arrow_top_ca.paa";
-        //border="\ca\ui\data\igui_border_scroll_ca.paa";
+        width=0.05;
+        color[]={0.15,0.21,0.23,0.3};
+        colorActive[]={0.15,0.21,0.23,0.3};
+        colorDisabled[]={0.15,0.21,0.23,0.3};
+        arrowEmpty="\A3\ui_f\data\gui\cfg\scrollbar\arrowEmpty_ca.paa";
+        arrowFull="\A3\ui_f\data\gui\cfg\scrollbar\arrowFull_ca.paa";
+        border="\A3\ui_f\data\gui\cfg\scrollbar\border_ca.paa";
+        thumb="\A3\ui_f\data\gui\cfg\scrollbar\thumb_ca.paa";
    };

    class ListScrollBar : ScrollBar {
@ -128,7 +132,6 @@ class ATragMX_RscListBox {
 class ATragMX_RscListNBox: ATragMX_RscListBox {
    idc=-1;
    type=102;
-    columns[]={0.0, 0.225, 0.475, 0.7};
    drawSideArrows=0;
    idcLeft=-1;
    idcRight=-1;
@ -350,6 +353,7 @@ class ATragMX_Display {
            colorBackground[]={0.15,0.21,0.23,0.3};
            colorFocused[]={0.15,0.21,0.23,0.2};
            text="MV";
+            action=QUOTE(0 call FUNC(toggle_muzzle_velocity_data));
        };
        class TEXT_MUZZLE_VELOCITY_OUTPUT: TEXT_BORE_HEIGHT_OUTPUT {
            idc=130;
@ -383,18 +387,18 @@ class ATragMX_Display {
            y=0.265*safezoneH+safezoneY+0.320;
            text="";
        };
-        class TEXT_BAROMETRIC_PRESSURE: TEXT_AIR_FRICTION {
+        class TEXT_BAROMETRIC_PRESSURE: TEXT_TEMPERATURE {
            idc=21;
            x=0.550*safezoneW+safezoneX+0.20;
+            y=0.265*safezoneH+safezoneY+0.355;
            text="BP";
        };
        class TEXT_BAROMETRIC_PRESSURE_OUTPUT: TEXT_TEMPERATURE_OUTPUT {
            idc=210;
            y=0.265*safezoneH+safezoneY+0.355;
        };
-        class TEXT_RELATIVE_HUMIDITY: TEXT_AIR_FRICTION {
+        class TEXT_RELATIVE_HUMIDITY: TEXT_BAROMETRIC_PRESSURE {
            idc=22;
-            x=0.550*safezoneW+safezoneX+0.20;
            y=0.265*safezoneH+safezoneY+0.390;
            text="RH";
        };
@ -526,7 +530,7 @@ class ATragMX_Display {
        };
        class TEXT_ELEVATION_OUTPUT_ABSOLUTE: ATragMX_RscText {
            idc=400;
-            style=160;
+            style=ST_WITH_RECT+ST_RIGHT;
            sizeEx=0.025;
            w=0.065;
            h=0.032;
@ -606,17 +610,40 @@ class ATragMX_Display {
        class TEXT_SCOPE_CLICK_NUMBER: TEXT_GUN_LIST {
            idc=2001;
            style=ST_CENTER;
-            w=0.03;
+            w=0.025;
            x=0.550*safezoneW+safezoneX+0.27;
            text="4";
            action=QUOTE(call FUNC(toggle_solution_setup));
        };
-        class TEXT_CALCULATE: TEXT_SCOPE_UNIT {
+        class TEXT_OPTIONS: TEXT_GUN_LIST {
            idc=3000;
            style=ST_RIGHT;
            x=0.550*safezoneW+safezoneX+0.3;
-            text="Calc";
-            action=QUOTE(call FUNC(calculate_target_solution));
+            text="Options";
+            action=QUOTE(false call FUNC(toggle_option_menu));
+        };
+        class TEXT_OPTIONS_BACKGROUND: ATragMX_RscButton {
+            idc=3001;
+            colorBackground[]={0.15,0.21,0.23,0.2};
+            colorBackgroundActive[]={0.15,0.21,0.23,0.2};
+            colorFocused[]={0.15,0.21,0.23,0.2};
+            x=0.550*safezoneW+safezoneX+0.105;
+            y=0.265*safezoneH+safezoneY+0.17;
+            w=0.3;
+            h=0.535;
+            offsetPressedX=0.0;
+            offsetPressedY=0.0;
+            action=QUOTE(false call FUNC(toggle_option_menu));
+        };
+        class TEXT_OPTIONS_LIST_OUTPUT: ATragMX_RscListBox {
+            idc=3002;
+            style=0;
+            w=0.17;
+            h=0.28;
+            x=0.550*safezoneW+safezoneX+0.225;
+            y=0.265*safezoneH+safezoneY+0.355;
+            sizeEx=0.025;
+            onMouseButtonClick=QUOTE(true call FUNC(toggle_option_menu));
        };

        class TEXT_RANGE_CARD_SCOPE_UNIT: TEXT_GUN_PROFILE {
@ -666,6 +693,7 @@ class ATragMX_Display {
        };
        class TEXT_RANGE_CARD_OUTPUT: ATragMX_RscListNBox {
            idc=5007;
+            columns[]={0.0, 0.225, 0.475, 0.7};
            idcLeft=50061;
            idcRight=50062;
            w=0.285;
@ -674,16 +702,17 @@ class ATragMX_Display {
            y=0.265*safezoneH+safezoneY+0.27;
        };

-        class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListBox {
+        class TEXT_GUN_LIST_OUTPUT: ATragMX_RscListNBox {
            idc=6000;
+            columns[]={-0.05};
            w=0.16;
            h=0.45;
            x=0.550*safezoneW+safezoneX+0.11;
            y=0.265*safezoneH+safezoneY+0.24;
-            sizeEx=0.025;
+            sizeEx=0.018;
            colorSelectBackground[]={0.15,0.21,0.23,0.3};
            colorSelectBackground2[]={0.15,0.21,0.23,0.3};
-            onMouseButtonDblClick=QUOTE(true call FUNC(toggle_gun_list));
+            onLBDblClick=QUOTE(true call FUNC(toggle_gun_list));
        };
        class TEXT_GUN_LIST_COLUMN_CAPTION: TEXT_GUN_PROFILE {
            idc=6001;
@ -766,8 +795,9 @@ class ATragMX_Display {
        class TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE: TEXT_TARGET_RANGE_ASSIST_MEASUREMENT_METHOD {
            idc=7003;
            style=ST_RIGHT;
-            x=0.550*safezoneW+safezoneX+0.10;
+            x=0.550*safezoneW+safezoneX+0.092;
            y=0.265*safezoneH+safezoneY+0.4;
+            w=0.128;
            text="Target Size";
        };
        class TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
@ -874,22 +904,22 @@ class ATragMX_Display {

        class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE {
            idc=8000;
-            x=0.550*safezoneW+safezoneX+0.13;
+            x=0.550*safezoneW+safezoneX+0.12;
            text="Target Range";
        };
        class TEXT_TARGET_SPEED_ASSIST_NUM_TICKS: TEXT_TARGET_RANGE_ASSIST_IMAGE_SIZE {
            idc=8001;
-            x=0.550*safezoneW+safezoneX+0.13;
+            x=0.550*safezoneW+safezoneX+0.12;
            text="Num Ticks";
        };
        class TEXT_TARGET_SPEED_ASSIST_TIME: TEXT_TARGET_RANGE_ASSIST_ANGLE {
            idc=8002;
-            x=0.550*safezoneW+safezoneX+0.13;
+            x=0.550*safezoneW+safezoneX+0.12;
            text="Time (secs)";
        };
        class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE {
            idc=8003;
-            x=0.550*safezoneW+safezoneX+0.13;
+            x=0.550*safezoneW+safezoneX+0.12;
            text="Est Speed";
        };
        class TEXT_TARGET_SPEED_ASSIST_TARGET_RANGE_INPUT: TEXT_TARGET_RANGE_ASSIST_TARGET_SIZE_INPUT {
@ -1040,6 +1070,8 @@ class ATragMX_Display {
            x=0.550*safezoneW+safezoneX+0.12;
            y=0.265*safezoneH+safezoneY+0.28;
            text="";
+            onKeyDown=QUOTE(call FUNC(trim_gun_name));
+            onKeyUp=QUOTE(call FUNC(trim_gun_name));
        };
        class TEXT_ADD_NEW_GUN_OK: ATragMX_RscButton {
            idc=11002;
@ -1468,5 +1500,343 @@ class ATragMX_Display {
            y=0.265*safezoneH+safezoneY+0.55;
            action=QUOTE(0 call FUNC(toggle_solution_setup));
        };
+
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE: TEXT_BORE_HEIGHT {
+            idc=16000;
+            w=0.22;
+            y=0.265*safezoneH+safezoneY+0.25;
+            sizeEx=0.022;
+            text="Temperature";
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE {
+            idc=16001;
+            x=0.550*safezoneW+safezoneX+0.215;
+            sizeEx=0.022;
+            text="Muzzle velocity";
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1: ATragMX_RscEdit {
+            idc=160021;
+            w=0.082;
+            h=0.035;
+            x=0.550*safezoneW+safezoneX+0.128;
+            y=0.265*safezoneH+safezoneY+0.29;
+            text="0";
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160022;
+            y=0.265*safezoneH+safezoneY+0.325;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160023;
+            y=0.265*safezoneH+safezoneY+0.360;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160024;
+            y=0.265*safezoneH+safezoneY+0.395;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160025;
+            y=0.265*safezoneH+safezoneY+0.430;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160026;
+            y=0.265*safezoneH+safezoneY+0.465;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160027;
+            y=0.265*safezoneH+safezoneY+0.500;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_1: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_1 {
+            idc=160031;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_2: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_2 {
+            idc=160032;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_3: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_3 {
+            idc=160033;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_4: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_4 {
+            idc=160034;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_5: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_5 {
+            idc=160035;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_6: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_6 {
+            idc=160036;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_MUZZLE_VELOCITY_INPUT_7: TEXT_MUZZLE_VELOCITY_DATA_TEMPERATURE_INPUT_7 {
+            idc=160037;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_CLEAR: TEXT_TARGET_DATA_NEXT {
+            idc=16004;
+            style=ST_CENTER;
+            h=0.035;
+            y=0.265*safezoneH+safezoneY+0.3625;
+            text="Clear";
+            action=QUOTE(call FUNC(clear_muzzle_velocity_data));
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_QUESTIONMARK: TEXT_MUZZLE_VELOCITY_DATA_CLEAR {
+            idc=16005;
+            y=0.265*safezoneH+safezoneY+0.430;
+            text="?";
+            action="";
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_DONE: TEXT_TARGET_DATA_DONE {
+            idc=16006;
+            action=QUOTE(1 call FUNC(toggle_muzzle_velocity_data));
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_CANCEL: TEXT_TARGET_DATA_CANCEL {
+            idc=16007;
+            action=QUOTE(0 call FUNC(toggle_muzzle_velocity_data));
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_PREV: TEXT_TARGET_DATA_PREV {
+            idc=16008;
+        };
+        class TEXT_MUZZLE_VELOCITY_DATA_NEXT: TEXT_TARGET_DATA_NEXT {
+            idc=16009;
+        };
+
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE: TEXT_BORE_HEIGHT {
+            idc=17000;
+            w=0.22;
+            x=0.550*safezoneW+safezoneX+0.15;
+            y=0.265*safezoneH+safezoneY+0.25;
+            sizeEx=0.022;
+            text="Meters";
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE {
+            idc=17001;
+            x=0.550*safezoneW+safezoneX+0.235;
+            sizeEx=0.022;
+            text="BC-Coef";
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1: ATragMX_RscEdit {
+            idc=170021;
+            w=0.082;
+            h=0.035;
+            x=0.550*safezoneW+safezoneX+0.128;
+            y=0.265*safezoneH+safezoneY+0.29;
+            text="0";
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170022;
+            y=0.265*safezoneH+safezoneY+0.325;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170023;
+            y=0.265*safezoneH+safezoneY+0.360;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170024;
+            y=0.265*safezoneH+safezoneY+0.395;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170025;
+            y=0.265*safezoneH+safezoneY+0.430;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170026;
+            y=0.265*safezoneH+safezoneY+0.465;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170027;
+            y=0.265*safezoneH+safezoneY+0.500;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_1: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_1 {
+            idc=170031;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_2: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_2 {
+            idc=170032;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_3: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_3 {
+            idc=170033;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_4: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_4 {
+            idc=170034;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_5: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_5 {
+            idc=170035;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_6: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_6 {
+            idc=170036;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_C1_BALLISTIC_COEFFICIENT_INPUT_7: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DISTANCE_INPUT_7 {
+            idc=170037;
+            x=0.550*safezoneW+safezoneX+0.225;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK: TEXT_TARGET_DATA_NEXT {
+            idc=17004;
+            style=ST_CENTER;
+            w=0.04;
+            h=0.035;
+            y=0.265*safezoneH+safezoneY+0.35;
+            text="?";
+            action="";
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_CLEAR: TEXT_C1_BALLISTIC_COEFFICIENT_DATA_QUESTIONMARK {
+            idc=17005;
+            w=0.07;
+            y=0.265*safezoneH+safezoneY+0.4175;
+            text="Clear";
+            action=QUOTE(call FUNC(clear_c1_ballistic_coefficient_data));
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_DONE: TEXT_TARGET_DATA_DONE {
+            idc=17006;
+            action=QUOTE(1 call FUNC(toggle_c1_ballistic_coefficient_data));
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_CANCEL: TEXT_TARGET_DATA_CANCEL {
+            idc=17007;
+            action=QUOTE(0 call FUNC(toggle_c1_ballistic_coefficient_data));
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_PREV: TEXT_TARGET_DATA_PREV {
+            idc=17008;
+        };
+        class TEXT_C1_BALLISTIC_COEFFICIENT_DATA_NEXT: TEXT_TARGET_DATA_NEXT {
+            idc=17009;
+        };
+
+        class TEXT_TRUING_DROP_ZERO_RANGE: ATragMX_RscText {
+            idc=18000;
+            style=ST_LEFT;
+            x=0.550*safezoneW+safezoneX+0.115;
+            y=0.265*safezoneH+safezoneY+0.220;
+            w=0.135;
+            h=0.03;
+            sizeEx=0.025;
+            text="ZR=100meters";
+        };
+        class TEXT_TRUING_DROP_DROP_UNIT: TEXT_TRUING_DROP_ZERO_RANGE {
+            idc=18001;
+            style=ST_LEFT;
+            x=0.550*safezoneW+safezoneX+0.25;
+            text="Drop=mil";
+        };
+        class TEXT_TRUING_DROP_TARGET_RANGE: TEXT_TRUING_DROP_ZERO_RANGE {
+            idc=18002;
+            y=0.265*safezoneH+safezoneY+0.35;
+            sizeEx=0.027;
+            text="Target Range";
+        };
+        class TEXT_TRUING_DROP_DROP: TEXT_TRUING_DROP_TARGET_RANGE {
+            idc=18003;
+            w=0.07;
+            y=0.265*safezoneH+safezoneY+0.40;
+            text="Drop";
+        };
+        class TEXT_TRUING_DROP_MUZZLE_VELOCITY: TEXT_TRUING_DROP_DROP {
+            idc=18004;
+            y=0.265*safezoneH+safezoneY+0.50;
+            text="MV";
+        };
+        class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT: TEXT_TRUING_DROP_DROP {
+            idc=18005;
+            y=0.265*safezoneH+safezoneY+0.55;
+            text="C1";
+        };
+        class TEXT_TRUING_DROP_DROP_OUTPUT: ATragMX_RscEdit {
+            idc=18006;
+            style=ST_WITH_RECT+ST_RIGHT;
+            colorBackground[]={0.15,0.21,0.23,0.3};
+            colorDisabled[]={0,0,0,1};
+            w=0.06;
+            y=0.265*safezoneH+safezoneY+0.40;
+            x=0.550*safezoneW+safezoneX+0.17;
+            text="";
+        };
+        class TEXT_TRUING_DROP_MUZZLE_VELOCITY_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT {
+            idc=18007;
+            y=0.265*safezoneH+safezoneY+0.50;
+            text="";
+        };
+        class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_OUTPUT: TEXT_TRUING_DROP_DROP_OUTPUT {
+            idc=18008;
+            y=0.265*safezoneH+safezoneY+0.55;
+            text="";
+        };
+        class TEXT_TRUING_DROP_SUPER: TEXT_TARGET_A {
+            idc=18009;
+            w=0.06;
+            x=0.550*safezoneW+safezoneX+0.25;
+            y=0.265*safezoneH+safezoneY+0.30;
+            text="SUPER";
+            action=QUOTE(GVAR(truingDropMode) = 0; call FUNC(update_truing_drop_selection));
+        };
+        class TEXT_TRUING_DROP_SUB: TEXT_TRUING_DROP_SUPER {
+            idc=18010;
+            x=0.550*safezoneW+safezoneX+0.32;
+            text="SUB";
+            action=QUOTE(GVAR(truingDropMode) = 1; call FUNC(update_truing_drop_selection));
+        };
+        class TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT: ATragMX_RscEdit {
+            idc=18011;
+            style=ST_WITH_RECT+ST_RIGHT;
+            colorDisabled[]={0,0,0,0.6};
+            w=0.06;
+            x=0.550*safezoneW+safezoneX+0.25;
+            y=0.265*safezoneH+safezoneY+0.35;
+        };
+        class TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
+            idc=18012;
+            x=0.550*safezoneW+safezoneX+0.32;
+        };
+        class TEXT_TRUING_DROP_DROP_SUPER_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
+            idc=18013;
+            y=0.265*safezoneH+safezoneY+0.40;
+        };
+        class TEXT_TRUING_DROP_DROP_SUB_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT {
+            idc=18014;
+            y=0.265*safezoneH+safezoneY+0.40;
+        };
+        class TEXT_TRUING_DROP_CALC: TEXT_GUN_LIST {
+            idc=18015;
+            style=ST_CENTER;
+            w=0.11;
+            x=0.550*safezoneW+safezoneX+0.26;
+            y=0.265*safezoneH+safezoneY+0.45;
+            text="Calc";
+            action=QUOTE(true call FUNC(calculate_truing_drop));
+        };
+        class TEXT_TRUING_DROP_MV_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUPER_INPUT {
+            idc=18016;
+            y=0.265*safezoneH+safezoneY+0.50;
+        };
+        class TEXT_TRUING_DROP_C1_BALLISTIC_COEFFICIENT_INPUT: TEXT_TRUING_DROP_TARGET_RANGE_SUB_INPUT {
+            idc=18017;
+            y=0.265*safezoneH+safezoneY+0.55;
+        };
+        class TEXT_TRUING_DROP_ACCEPT: TEXT_GUN_LIST {
+            idc=18018;
+            w=0.085;
+            h=0.04;
+            x=0.550*safezoneW+safezoneX+0.125;
+            y=0.265*safezoneH+safezoneY+0.60;
+            text="Accept";
+            action=QUOTE(1 call FUNC(toggle_truing_drop));
+        };
+        class TEXT_TRUING_DROP_CANCEL: TEXT_TRUING_DROP_ACCEPT {
+            idc=18019;
+            x=0.550*safezoneW+safezoneX+0.210;
+            text="Cancel";
+            action=QUOTE(0 call FUNC(toggle_truing_drop));
+        };
+        class TEXT_TRUING_DROP_RESTORE: TEXT_TRUING_DROP_CANCEL {
+            idc=18020;
+            x=0.550*safezoneW+safezoneX+0.29525;
+            text="Restore";
+            action=QUOTE(true call FUNC(restore_truing_drop));
+        };
    };
 };
--- a/addons/atragmx/XEH_PREP.hpp
+++ b/addons/atragmx/XEH_PREP.hpp
@ -1,13 +1,17 @@

 PREP(add_new_gun);
+PREP(calculate_distance_at_velocity);
 PREP(calculate_range_card);
 PREP(calculate_solution);
 PREP(calculate_target_range_assist);
 PREP(calculate_target_solution);
 PREP(calculate_target_speed_assist);
+PREP(calculate_truing_drop);
 PREP(can_show);
 PREP(change_gun);
 PREP(change_target_slot);
+PREP(clear_c1_ballistic_coefficient_data);
+PREP(clear_muzzle_velocity_data);
 PREP(clear_user_data);
 PREP(create_dialog);
 PREP(cycle_gun_list);
@ -18,17 +22,29 @@ PREP(cycle_scope_unit);
 PREP(cycle_target_size_units);
 PREP(cycle_target_speed_direction);
 PREP(delete_gun);
+PREP(evaluate_option_menu_input);
 PREP(init);
+PREP(initGunList);
+PREP(insert_c1_ballistic_coefficient_data);
+PREP(insert_muzzle_velocity_data);
 PREP(parse_input);
+PREP(read_gun_list_entries_from_config);
+PREP(recalculate_c1_ballistic_coefficient);
+PREP(recalculate_muzzle_velocity);
 PREP(reset_relative_click_memory);
 PREP(restore_atmo_default);
+PREP(restore_truing_drop);
 PREP(restore_user_data);
 PREP(save_gun);
+PREP(shift_c1_ballistic_coefficient_data);
+PREP(shift_muzzle_velocity_data);
 PREP(show_add_new_gun);
 PREP(show_atmo_env_data);
+PREP(show_c1_ballistic_coefficient_data);
 PREP(show_gun_ammo_data);
 PREP(show_gun_list);
 PREP(show_main_page);
+PREP(show_muzzle_velocity_data);
 PREP(show_range_card);
 PREP(show_range_card_setup);
 PREP(show_solution_setup);
@ -36,24 +52,36 @@ PREP(show_target_data);
 PREP(show_target_range_assist);
 PREP(show_target_speed_assist);
 PREP(show_target_speed_assist_timer);
+PREP(show_truing_drop);
 PREP(sord);
+PREP(store_gun_list);
 PREP(store_user_data);
 PREP(target_speed_assist_timer);
 PREP(toggle_atmo_env_data);
+PREP(toggle_c1_ballistic_coefficient_data);
+PREP(toggle_coriolis);
 PREP(toggle_gun_ammo_data);
 PREP(toggle_gun_list);
+PREP(toggle_muzzle_velocity_data);
+PREP(toggle_option_menu);
 PREP(toggle_range_card);
 PREP(toggle_range_card_setup);
 PREP(toggle_solution_setup);
 PREP(toggle_target_data);
 PREP(toggle_target_range_assist);
 PREP(toggle_target_speed_assist);
+PREP(toggle_truing_drop);
+PREP(trim_gun_name);
+PREP(true_c1_ballistic_coefficient);
+PREP(true_muzzle_velocity);
 PREP(update_atmosphere);
 PREP(update_atmo_env_data);
 PREP(update_atmo_selection);
+PREP(update_c1_ballistic_coefficient_data);
 PREP(update_gun);
 PREP(update_gun_ammo_data);
 PREP(update_inclination_angle);
+PREP(update_muzzle_velocity_data);
 PREP(update_range_card);
 PREP(update_relative_click_memory);
 PREP(update_result);
@ -62,6 +90,8 @@ PREP(update_solution_setup);
 PREP(update_target);
 PREP(update_target_data);
 PREP(update_target_selection);
+PREP(update_truing_drop_data);
+PREP(update_truing_drop_selection);
 PREP(update_unit_selection);
 PREP(update_zero_range);
 PREP(on_close_dialog);
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`#include "\z\ace\addons\ai\script_component.hpp"`
				`@ -0,0 +1 @@`
				`#include "\z\ace\addons\aircraft\script_component.hpp"`
				`@ -1 +0,0 @@`
				`#include "\z\ace\addons\apl\script_component.hpp"`