Airburst

Author: PabstMirror

addons/xm157/XEH_PREP.hpp

@@ -1,5 +1,6 @@
 LOG("prep");
 
+PREP(airburst_ammoFired);
 PREP(ballistics_calculator);
 PREP(ballistics_getData);
 PREP(keyPress);

addons/xm157/functions/fnc_airburst_ammoFired.sqf

@@ -0,0 +1,29 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Handles ammo fired event for airburst ammo. Called from the ammo's fired EH.
+ *
+ * Arguments:
+ * FiredEH
+ *
+ * Return Value:
+ * Nothing
+ *
+ * Example:
+ * [] call ace_xm157_fnc_airburst_ammoFired
+ *
+ * Public: No
+ */
+
+params ["", "", "", "", "_ammo", "", "_projectile", "_gunner"];
+if (!local _gunner) exitWith {};
+if (isNull _projectile) exitWith {};
+TRACE_3("ammoFired local",_ammo,_projectile,_gunner);
+
+private _tof = missionNamespace getVariable [QGVAR(timeOfFlight), -1];
+if (_tof < 0.1) exitWith {}; // ~20m safety check
+
+[{
+    TRACE_1("triggerAmmo",_this);
+    triggerAmmo _this;   
+}, _projectile, _tof] call CBA_fnc_waitAndExecute;

addons/xm157/functions/fnc_ballistics_calculator.sqf

@@ -10,7 +10,7 @@
  * 3: Bank (deg) - Roll <NUMBER>
  *
  * Return Value:
- * Elevation and Windage in MRAD <ARRAY>
+ * Elevation and Windage in MRAD, Time Of Flight <ARRAY>
  *
  * Example:
  * [500, 90, 0, 0] call ace_xm157_fnc_ballistics_calculator
@@ -21,7 +21,7 @@
 params ["_targetRange", "_directionOfFire", "_inclinationAngle", "_bank"];
 
 private _weaponInfo = [] call FUNC(ballistics_getData);
-if (_weaponInfo isEqualTo []) exitWith { [0,0] };
+if (_weaponInfo isEqualTo []) exitWith { [0,0,0] };
 _weaponInfo params ["_scopeBaseAngle","_boreHeight","_airFriction","_muzzleVelocity","_bc",
     "_dragModel","_atmosphereModel","_barrelTwist","_twistDirection","_caliber","_bulletLength","_bulletMass"];
 
@@ -98,4 +98,4 @@ if (_useAB && {(_bulletPos select 1) > 0}) then {
     _windage = _windage + _spinDrift;
 };
 
-[17.453*_elevation, 17.453*_windage] // Convert to MRAD and return
+[17.453*_elevation, 17.453*_windage, _TOF] // Convert to MRAD and return

addons/xm157/functions/fnc_weaponInfo_draw.sqf

@@ -20,6 +20,7 @@ _thisArgs params ["_display"];
 if (isNull _display) exitWith {
     TRACE_1("cleaning up display",_thisEventHandler);
     GVAR(shown) = false;
+    GVAR(timeOfFlight) = nil;
     removeMissionEventHandler ["Draw3D", _thisEventHandler];
 };
 private _ctrlScopeObject = _display displayCtrl IDC_SCOPE_OBJECT;
@@ -131,13 +132,15 @@ if (_needsUpdate || {_nonMagnified isNotEqualTo _lastMagnified}) then {
 // Screen - update reticle position based on ballistics computer
 if (_range > 0 && {_size > 0}) then {
     BEGIN_COUNTER(ballistics_calculator);
-    ([_range, _weaponDir, _weaponPitch, _weaponBank] call FUNC(ballistics_calculator)) params ["_elevMRAD", "_windMRAD"];
+    ([_range, _weaponDir, _weaponPitch, _weaponBank] call FUNC(ballistics_calculator)) params ["_elevMRAD", "_windMRAD", "_TOF"];
     END_COUNTER(ballistics_calculator);
     _ctrl ctrlSetPosition [-_windMRAD / _fovMRAD + 0.5 - _size / 2,  + 4/3 * (_elevMRAD / _fovMRAD + 0.5 - _size/2), _size, _size*4/3];
     _ctrl ctrlCommit 0;
+    GVAR(timeOfFlight) = _TOF;
 } else {
     _ctrl ctrlSetPosition [0.5 - _size / 2,  + 4/3 * (0.5 - _size/2), _size, _size*4/3];
     _ctrl ctrlCommit 0;
+    GVAR(timeOfFlight) = nil;
 };