Merge branch 'master' into markerQuikcNumbering

Author: PabstMirror

.github/workflows/arma.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Validate Config
       run: python3 tools/config_style_checker.py
     - name: Validate Stringtables
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
       with:
@@ -39,7 +39,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@ace
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ace3-${{ github.sha }}-nobin
         path: .hemttout/@*

.github/workflows/documentation.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Install Python packages
       run: |
         pip3 install wheel
@@ -33,7 +33,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Extract Dependencies
       run: python3 tools/extract_dependencies.py --markdown
@@ -47,7 +47,7 @@ jobs:
         destination: docs/_site/
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: jekyll-site
         path: docs/_site/
@@ -63,7 +63,7 @@ jobs:
 
     steps:
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v6
       with:
         name: jekyll-site
         path: _site/

.github/workflows/extensions.yml

@@ -45,7 +45,7 @@ jobs:
     runs-on: ${{ matrix.arrays.os.tag }}
     steps:
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Install stable Rust
       uses: actions-rs/toolchain@v1
       with:
@@ -57,7 +57,7 @@ jobs:
     - name: Build
       run: cargo build --verbose
     - name: Upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ matrix.arrays.os.target }}
         path: target/debug/ace.dll

.github/workflows/hemtt.yml

@@ -15,11 +15,11 @@ jobs:
       with:
         toolsUrl: ${{ secrets.ARMA3_TOOLS_URL }}
     - name: Checkout the source code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Setup HEMTT
       uses: arma-actions/hemtt@v1
     - name: Checkout pull request
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       if: ${{ github.event_name == 'pull_request_target' }}
       with:
         path: pullrequest
@@ -40,7 +40,7 @@ jobs:
     - name: Rename build folder
       run: mv .hemttout/build .hemttout/@ace
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ace3-${{ github.sha }}
         path: .hemttout/@*

addons/advanced_ballistics/XEH_preInit.sqf

@@ -2,6 +2,10 @@
 
 ADDON = false;
 
+GVAR(ammoData) = createHashMap;
+GVAR(weaponData) = createHashMap;
+GVAR(maxRange) = createHashMap;
+
 PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;

addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf

@@ -53,16 +53,8 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
 
                 // AB initial speed --------------------------------
                 // Get Weapon and Ammo Configurations
-                private _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
-                if (isNil "_AmmoCacheEntry") then {
-                     _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
-                };
-                private _WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
-                if (isNil "_WeaponCacheEntry") then {
-                     _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
-                };
-                _AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocityVariationSD"];
-                _WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];
+                (_ammo call FUNC(readAmmoDataFromConfig)) params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocityVariationSD"];
+                (_weapon call FUNC(readWeaponDataFromConfig)) params ["_barrelTwist", "_twistDirection", "_barrelLength"];
 
                 private _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _vanillaInitialSpeed] call FUNC(calculateBarrelLengthVelocityShift);
                 if (_barrelLength > 0) then {

addons/advanced_ballistics/functions/fnc_handleFired.sqf

@@ -28,19 +28,21 @@ if (_abort) then {
     private _bulletVelocity = velocity _projectile;
     private _muzzleVelocity = vectorMagnitude _bulletVelocity;
 
-    private _maxRange = uiNamespace getVariable format[QGVAR(maxRange_%1), _ammo];
-    if (isNil "_maxRange") then {
-        private _airFriction = getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction");
+    private _maxRange = GVAR(maxRange) getOrDefaultCall [_ammo, {
+        private _ammoConfig = configFile >> "CfgAmmo" >> _ammo;
+        private _airFriction = getNumber(_ammoConfig >> "airFriction");
         private _vanillaInitialSpeed = getNumber (configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
-        _maxRange = if (_airFriction < 0) then {
-            private _maxTime = ((_vanillaInitialSpeed - BULLET_TRACE_MIN_VELOCITY) / (BULLET_TRACE_MIN_VELOCITY * -_airFriction * _vanillaInitialSpeed)) max getNumber(configFile >> "CfgAmmo" >> _ammo >> "tracerEndTime");
+
+        private _maxRange = if (_airFriction < 0) then {
+            private _maxTime = ((_vanillaInitialSpeed - BULLET_TRACE_MIN_VELOCITY) / (BULLET_TRACE_MIN_VELOCITY * -_airFriction * _vanillaInitialSpeed)) max getNumber(_ammoConfig >> "tracerEndTime");
             -ln(1 - _airFriction * _vanillaInitialSpeed * _maxTime) / _airFriction
         } else {
-            _vanillaInitialSpeed * getNumber(configFile >> "CfgAmmo" >> _ammo >> "tracerEndTime")
+            _vanillaInitialSpeed * getNumber(_ammoConfig >> "tracerEndTime")
         };
-        _maxRange = _maxRange * 1.3; // Adding 30% more to range just to be safe
-        uiNamespace setVariable [format[QGVAR(maxRange_%1), _ammo], _maxRange];
-    };
+
+        _maxRange * 1.3 // Adding 30% more to range just to be safe
+    }, true];
+
     if (ACE_player distance _unit > _maxRange && {ACE_player distance ((getPosASL _unit) vectorAdd ((vectorNormalized _bulletVelocity) vectorMultiply _maxRange)) > _maxRange}) exitWith {};
 
     if (_projectile getShotInfo 4) exitWith { _abort = false }; // 4=shownTracer
@@ -57,17 +59,8 @@ if (_abort) then {
 if (_abort) exitWith {};
 
 // Get Weapon and Ammo Configurations
-private _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
-if (isNil "_AmmoCacheEntry") then {
-    _AmmoCacheEntry = _ammo call FUNC(readAmmoDataFromConfig);
-};
-private _WeaponCacheEntry = uiNamespace getVariable format[QGVAR(%1), _weapon];
-if (isNil "_WeaponCacheEntry") then {
-    _WeaponCacheEntry = _weapon call FUNC(readWeaponDataFromConfig);
-};
-
-_AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocityVariationSD"];
-_WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];
+(_ammo call FUNC(readAmmoDataFromConfig)) params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocityVariationSD"];
+([_weapon, _muzzle] call FUNC(readWeaponDataFromConfig)) params ["_barrelTwist", "_twistDirection", "_barrelLength"];
 
 private _temperature = nil; // We need the variable in this scope. So we need to init it here.
 

addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf

@@ -27,77 +27,77 @@
  * Public: No
  */
 
-TRACE_1("Reading Ammo Config",_this);
+params ["_ammo"]
 
-private _ammoConfig = configFile >> "CfgAmmo" >> _this;
+TRACE_1("Reading Ammo Config",_ammo);
 
-private _airFriction = getNumber(_ammoConfig >> "airFriction");
-private _caliber = 0 max getNumber(_ammoConfig >> "ACE_caliber");
-private _bulletLength = 0 max getNumber(_ammoConfig >> "ACE_bulletLength");
-private _bulletMass = 0 max getNumber(_ammoConfig >> "ACE_bulletMass");
-private _transonicStabilityCoef = 0 max getNumber(_ammoConfig >> "ACE_transonicStabilityCoef") min 1;
-if (_transonicStabilityCoef == 0) then {
-    _transonicStabilityCoef = 0.5;
-};
-private _dragModel = getNumber(_ammoConfig >> "ACE_dragModel");
-if !(_dragModel in [1, 2, 5, 6, 7, 8]) then {
-    _dragModel = 1;
-};
-private _ballisticCoefficients = getArray(_ammoConfig >> "ACE_ballisticCoefficients");
-if (_ballisticCoefficients isEqualTo []) then {
-    _ballisticCoefficients = [0.5];
-};
-private _velocityBoundaries = getArray(_ammoConfig >> "ACE_velocityBoundaries");
-private _atmosphereModel = getText(_ammoConfig >> "ACE_standardAtmosphere");
-if (_atmosphereModel isEqualTo "") then {
-    _atmosphereModel = "ICAO";
-};
-private _muzzleVelocityVariationSD = DEFAULT_MUZZLE_VELOCITY_VARIATION_SD;
-if (isNumber (_ammoConfig >> "ACE_muzzleVelocityVariationSD")) then {
-    _muzzleVelocityVariationSD = getNumber(_ammoConfig >> "ACE_muzzleVelocityVariationSD") / 100;
-};
-private _ammoTempMuzzleVelocityShifts = getArray(_ammoConfig >> "ACE_ammoTempMuzzleVelocityShifts");
-private _muzzleVelocityTable = getArray(_ammoConfig >> "ACE_muzzleVelocities");
-private _barrelLengthTable = getArray(_ammoConfig >> "ACE_barrelLengths");
+GVAR(ammoData) getOrDefaultCall [_ammo, {
+    private _ammoConfig = configFile >> "CfgAmmo" >> _ammo;
 
-//Handle subsonic ammo that would have a huge muzzle velocity shift (when ballistic configs not explicitly defined)
-private _typicalSpeed = getNumber (_ammoConfig >> "typicalSpeed");
-if ((_typicalSpeed > 0) && {_typicalSpeed < 360}) then {
-    private _inheritedBarrelConfig = (_muzzleVelocityTable isNotEqualTo []) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isEqualTo []};
-    private _inheritedTempConfig = (_ammoTempMuzzleVelocityShifts isNotEqualTo []) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isEqualTo []};
-    TRACE_3("subsonic",_typicalSpeed,_inheritedBarrelConfig,_inheritedTempConfig);
-    if (_inheritedBarrelConfig || _inheritedTempConfig) then {
-        private _parentConfig = inheritsFrom _ammoConfig;
-        private _parentSpeed = getNumber (_parentConfig >> "typicalSpeed");
-        WARNING_4("Subsonic Ammo %1 (%2 m/s) missing `ACE_muzzleVelocities` or `ACE_ammoTempMuzzleVelocityShifts` configs, attempting to use parent %3 (%4m/s)",_this,_typicalSpeed,configName _parentConfig,_parentSpeed);
-        if (_parentSpeed <= 0) exitWith {//Handle weird or null parent
-            _muzzleVelocityTable = [];
-            _ammoTempMuzzleVelocityShifts = [];
-        };
-        private _linearMuliplier = _typicalSpeed / _parentSpeed;
-        if (_inheritedBarrelConfig) then {
-            if ((configProperties [_parentConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isNotEqualTo []) then {
-                TRACE_2("Parent Has Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
-                { _muzzleVelocityTable set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _muzzleVelocityTable;
-            } else {
-                TRACE_2("Parent DOES NOT Have Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
+    private _airFriction = getNumber(_ammoConfig >> "airFriction");
+    private _caliber = 0 max getNumber(_ammoConfig >> "ACE_caliber");
+    private _bulletLength = 0 max getNumber(_ammoConfig >> "ACE_bulletLength");
+    private _bulletMass = 0 max getNumber(_ammoConfig >> "ACE_bulletMass");
+    private _transonicStabilityCoef = 0 max getNumber(_ammoConfig >> "ACE_transonicStabilityCoef") min 1;
+    if (_transonicStabilityCoef == 0) then {
+        _transonicStabilityCoef = 0.5;
+    };
+    private _dragModel = getNumber(_ammoConfig >> "ACE_dragModel");
+    if !(_dragModel in [1, 2, 5, 6, 7, 8]) then {
+        _dragModel = 1;
+    };
+    private _ballisticCoefficients = getArray(_ammoConfig >> "ACE_ballisticCoefficients");
+    if (_ballisticCoefficients isEqualTo []) then {
+        _ballisticCoefficients = [0.5];
+    };
+    private _velocityBoundaries = getArray(_ammoConfig >> "ACE_velocityBoundaries");
+    private _atmosphereModel = getText(_ammoConfig >> "ACE_standardAtmosphere");
+    if (_atmosphereModel isEqualTo "") then {
+        _atmosphereModel = "ICAO";
+    };
+    private _muzzleVelocityVariationSD = DEFAULT_MUZZLE_VELOCITY_VARIATION_SD;
+    if (isNumber (_ammoConfig >> "ACE_muzzleVelocityVariationSD")) then {
+        _muzzleVelocityVariationSD = getNumber(_ammoConfig >> "ACE_muzzleVelocityVariationSD") / 100;
+    };
+    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");
+    if ((_typicalSpeed > 0) && {_typicalSpeed < 360}) then {
+        private _inheritedBarrelConfig = (_muzzleVelocityTable isNotEqualTo []) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isEqualTo []};
+        private _inheritedTempConfig = (_ammoTempMuzzleVelocityShifts isNotEqualTo []) && {(configProperties [_ammoConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isEqualTo []};
+        TRACE_3("subsonic",_typicalSpeed,_inheritedBarrelConfig,_inheritedTempConfig);
+        if (_inheritedBarrelConfig || _inheritedTempConfig) then {
+            private _parentConfig = inheritsFrom _ammoConfig;
+            private _parentSpeed = getNumber (_parentConfig >> "typicalSpeed");
+            WARNING_4("Subsonic Ammo %1 (%2 m/s) missing `ACE_muzzleVelocities` or `ACE_ammoTempMuzzleVelocityShifts` configs, attempting to use parent %3 (%4m/s)",_ammo,_typicalSpeed,configName _parentConfig,_parentSpeed);
+            if (_parentSpeed <= 0) exitWith {//Handle weird or null parent
                 _muzzleVelocityTable = [];
-            };
-        };
-        if (_inheritedTempConfig) then {
-            if ((configProperties [_parentConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isNotEqualTo []) then {
-                TRACE_2("Parent Has Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
-                { _ammoTempMuzzleVelocityShifts set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _ammoTempMuzzleVelocityShifts;
-            } else {
-                TRACE_2("Parent DOES NOT Have Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
                 _ammoTempMuzzleVelocityShifts = [];
             };
+            private _linearMuliplier = _typicalSpeed / _parentSpeed;
+            if (_inheritedBarrelConfig) then {
+                if ((configProperties [_parentConfig, "(configName _x) == 'ACE_muzzleVelocities'", false]) isNotEqualTo []) then {
+                    TRACE_2("Parent Has Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
+                    { _muzzleVelocityTable set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _muzzleVelocityTable;
+                } else {
+                    TRACE_2("Parent DOES NOT Have Defined Barrel MV",_linearMuliplier,_muzzleVelocityTable);
+                    _muzzleVelocityTable = [];
+                };
+            };
+            if (_inheritedTempConfig) then {
+                if ((configProperties [_parentConfig, "(configName _x) == 'ACE_ammoTempMuzzleVelocityShifts'", false]) isNotEqualTo []) then {
+                    TRACE_2("Parent Has Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
+                    { _ammoTempMuzzleVelocityShifts set [_forEachIndex, (_x * _linearMuliplier)]; } forEach _ammoTempMuzzleVelocityShifts;
+                } else {
+                    TRACE_2("Parent DOES NOT Have Defined Ammo Temp Shifts",_linearMuliplier,_muzzleVelocityTable);
+                    _ammoTempMuzzleVelocityShifts = [];
+                };
+            };
         };
     };
-};
-
-private _result = [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable, _muzzleVelocityVariationSD];
-
-uiNamespace setVariable [format[QGVAR(%1), _this], _result];
 
-_result
+    [_airFriction, _caliber, _bulletLength, _bulletMass, _transonicStabilityCoef, _dragModel, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _ammoTempMuzzleVelocityShifts, _muzzleVelocityTable, _barrelLengthTable, _muzzleVelocityVariationSD]
+}, true] // return

addons/advanced_ballistics/functions/fnc_readWeaponDataFromConfig.sqf

@@ -5,34 +5,42 @@
  * Reads the weapon class config and updates the config cache
  *
  * Arguments:
- * weapon - classname <STRING>
+ * 0: Weapon <STRING>
+ * 1: Muzzle <STRING> (optional)
  *
  * Return Value:
  * 0: _barrelTwist <NUMBER>
  * 1: _twistDirection <NUMBER>
  * 2: _barrelLength <NUMBER>
  *
  * Example:
- * ["weapon"] call ace_advanced_ballistics_fnc_readWeaponDataFromConfig
+ * [currentWeapon player, currentMuzzle player] call ace_advanced_ballistics_fnc_readWeaponDataFromConfig
  *
  * Public: No
  */
 
-private _weaponConfig = (configFile >> "CfgWeapons" >> _this);
+params ["_weapon"];
 
-private _barrelTwist = 0 max getNumber(_weaponConfig >> "ACE_barrelTwist");
-private _twistDirection = parseNumber (_barrelTwist != 0);
-if (isNumber (_weaponConfig >> "ACE_twistDirection")) then {
-    _twistDirection = getNumber (_weaponConfig >> "ACE_twistDirection");
-    if !(_twistDirection in [-1, 0, 1]) then {
-        _twistDirection = 1;
-    };
-};
+private _muzzle = param [1, _weapon];
 
-private _barrelLength = 0 max getNumber(_weaponConfig >> "ACE_barrelLength");
+GVAR(weaponData) getOrDefaultCall [[_weapon, _muzzle], {
+    // For most weapons muzzle == weapon (config value of "this" for muzzle)
+    private _weaponConfig = if (_muzzle == _weapon) then {
+        configFile >> "CfgWeapons" >> _weapon
+    } else {
+        configFile >> "CfgWeapons" >> _weapon >> _muzzle
+    };
 
-private _result = [_barrelTwist, _twistDirection, _barrelLength];
+    private _barrelTwist = 0 max getNumber(_weaponConfig >> "ACE_barrelTwist");
+    private _twistDirection = parseNumber (_barrelTwist != 0);
+    if (isNumber (_weaponConfig >> "ACE_twistDirection")) then {
+        _twistDirection = getNumber (_weaponConfig >> "ACE_twistDirection");
+        if !(_twistDirection in [-1, 0, 1]) then {
+            _twistDirection = 1;
+        };
+    };
 
-uiNamespace setVariable [format[QGVAR(%1), _this], _result];
+    private _barrelLength = 0 max getNumber(_weaponConfig >> "ACE_barrelLength");
 
-_result
+    [_barrelTwist, _twistDirection, _barrelLength]
+}, true] // return