mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
9ea1f6839f
* Fixed typo in the module setting parsing (reference temperature was way off) * Fixed bug in the zero angle calculator (muzzle velocity was off in most cases)
74 lines
3.7 KiB
Plaintext
74 lines
3.7 KiB
Plaintext
/*
|
|
* Author: Ruthberg
|
|
* Calculates the zero angle correction for the new zero range based on current zero range and bore height (distance between bore- and sight axis)
|
|
*
|
|
* Arguments:
|
|
* 0: Zero range <NUMBER>
|
|
* 1: Bore height <NUMBER>
|
|
* 2: Weapon <OBJECT>
|
|
* 3: Ammo <CLASS>
|
|
* 4: Magazine <CLASS>
|
|
* 5: Advanced Ballistics enabled? <BOOL>
|
|
*
|
|
* Return Value:
|
|
* zeroAngleCorrection <NUMBER>
|
|
*
|
|
* Example:
|
|
* [5, 6, gun, ammo, magazine, true] call ace_scopes_fnc_calculateZeroAngleCorrection
|
|
*
|
|
* Public: No
|
|
*/
|
|
#include "script_component.hpp"
|
|
|
|
params ["_oldZeroRange", "_newZeroRange", "_boreHeight"/*in cm*/, "_weapon", "_ammo", "_magazine", "_advancedBallistics"];
|
|
|
|
private _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction");
|
|
private _initSpeed = getNumber(configFile >> "CfgMagazines" >> _magazine >> "initSpeed");
|
|
private _initSpeedCoef = getNumber(configFile >> "CfgWeapons" >> _weapon >> "initSpeed");
|
|
if (_initSpeedCoef > 0) then {
|
|
_initSpeed = _initSpeedCoef;
|
|
};
|
|
if (_initSpeedCoef < 0) then {
|
|
_initSpeed = _initSpeed * (-1 * _initSpeedCoef);
|
|
};
|
|
|
|
private _zeroAngle = "ace_advanced_ballistics" callExtension format ["zeroAngleVanilla:%1:%2:%3:%4", _oldZeroRange, _initSpeed, _airFriction, 0];
|
|
private _vanillaZero = parseNumber _zeroAngle;
|
|
|
|
private _trueZero = if (!_advancedBallistics) then {
|
|
_zeroAngle = "ace_advanced_ballistics" callExtension format ["zeroAngleVanilla:%1:%2:%3:%4", _newZeroRange, _initSpeed, _airFriction, _boreHeight];
|
|
(parseNumber _zeroAngle)
|
|
} else {
|
|
// Get Weapon and Ammo Configurations
|
|
private _AmmoCacheEntry = uiNamespace getVariable format[QEGVAR(advanced_ballistics,%1), _ammo];
|
|
if (isNil "_AmmoCacheEntry") then {
|
|
_AmmoCacheEntry = _ammo call EFUNC(advanced_ballistics,readAmmoDataFromConfig);
|
|
};
|
|
private _WeaponCacheEntry = uiNamespace getVariable format[QEGVAR(advanced_ballistics,%1), _weapon];
|
|
if (isNil "_WeaponCacheEntry") then {
|
|
_WeaponCacheEntry = _weapon call EFUNC(advanced_ballistics,readWeaponDataFromConfig);
|
|
};
|
|
|
|
_AmmoCacheEntry params ["_airFriction", "_caliber", "_bulletLength", "_bulletMass", "_transonicStabilityCoef", "_dragModel", "_ballisticCoefficients", "_velocityBoundaries", "_atmosphereModel", "_ammoTempMuzzleVelocityShifts", "_muzzleVelocityTable", "_barrelLengthTable"];
|
|
_WeaponCacheEntry params ["_barrelTwist", "_twistDirection", "_barrelLength"];
|
|
|
|
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,barrelLengthInfluenceEnabled), false]) then {
|
|
private _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _initSpeed] call EFUNC(advanced_ballistics,calculateBarrelLengthVelocityShift);
|
|
_initSpeed = _initSpeed + _barrelVelocityShift;
|
|
};
|
|
|
|
if (missionNamespace getVariable [QEGVAR(advanced_ballistics,ammoTemperatureEnabled), false]) then {
|
|
private _ammoTemperatureVelocityShift = ([_ammoTempMuzzleVelocityShifts, GVAR(zeroReferenceTemperature)] call EFUNC(advanced_ballistics,calculateAmmoTemperatureVelocityShift));
|
|
_initSpeed = _initSpeed + _ammoTemperatureVelocityShift;
|
|
};
|
|
|
|
_zeroAngle = "ace_advanced_ballistics" callExtension format ["zeroAngle:%1:%2:%3:%4:%5:%6:%7:%8:%9", _newZeroRange, _initSpeed, _boreHeight, GVAR(zeroReferenceTemperature), GVAR(zeroReferenceBarometricPressure), GVAR(zeroReferenceHumidity), _ballisticCoefficients select 0, _dragModel, _atmosphereModel];
|
|
(parseNumber _zeroAngle)
|
|
};
|
|
|
|
private _zeroAngleCorrection = _trueZero - _vanillaZero;
|
|
|
|
missionNamespace setVariable [format[QGVAR(%1_%2_%3_%4_%5_%6_%7), _oldZeroRange, _newZeroRange, _boreHeight, _weapon, _ammo, _magazine, _advancedBallistics], _zeroAngleCorrection];
|
|
|
|
_zeroAngleCorrection
|