Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve getArtilleryRanges, fix IFA mortar case #3266

Merged
merged 2 commits into from
Jun 8, 2024
Merged

Improve getArtilleryRanges, fix IFA mortar case #3266

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ca963
Changes to getArtilleryRanges:
jaj22 May 28, 2024
7b39b4e
Accurately replicate artillery computer min/max ranges in getArtiller…
jaj22 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions A3A/addons/core/functions/Supports/fn_getArtilleryRanges.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,21 @@ Return array:

Examples:
["UK3CB_ADA_I_BM21", "rhs_mag_m21of_1"] call A3A_fnc_getArtilleryRanges;
["O_MBT_02_arty_F", "32Rnd_155mm_Mo_shells_O"] call A3A_fnc_getArtileryRanges;
["O_MBT_02_arty_F", "32Rnd_155mm_Mo_shells_O"] call A3A_fnc_getArtilleryRanges;
*/

#include "..\..\script_component.hpp"
FIX_LINE_NUMBERS()

params ["_vehType", "_shellType"];

private _hmkey = _vehType + "_" + _shellType;
if (isNil "A3A_artyRangeHM") then { A3A_artyRangeHM = createHashMap };
if (_hmkey in A3A_artyRangeHM) exitWith { A3A_artyRangeHM get _hmkey };

private _turretCfg = call {
private _allTurrets = configProperties [configFile >> "CfgVehicles" >> _vehType >> "Turrets"];
private _idx = _allTurrets findIf { getNumber (_x >> "elevationMode") == 3 }; // no idea if this is a valid check
private _idx = _allTurrets findIf { getNumber (_x >> "elevationMode") != 0 }; // no idea if this is a valid check
if (_idx == -1) exitWith {
Error_1("Artillery turret not found on %1", _vehType);
configFile >> "CfgVehicles" >> _vehType >> "Turrets" >> "MainTurret";
Expand All @@ -37,13 +41,44 @@ private _weaponCfg = configFile >> "CfgWeapons" >> _weapon;

// Assume that there's no speed override on weapon, probably true for arty
private _initSpeed = getNumber (configFile >> "CfgMagazines" >> _shellType >> "initSpeed");
private _maxElev = getNumber (_turretCfg >> "maxElev");

// Find min and max charges
private _minCharge = 1;
private _maxCharge = 0;
{
private _modeCfg = if (_x == "this") then { _weaponCfg } else { _weaponCfg >> _x };
private _charge = getNumber (_modeCfg >> "artilleryCharge");
if (_charge == 0) then { continue };
_minCharge = _charge min _minCharge;
_maxCharge = _charge max _maxCharge;
} forEach getArray (_weaponCfg >> "modes");

if (_maxCharge == 0) then { Error_1("Artillery charge lookup failed for %1", _vehType); _minCharge = 1; _maxCharge = 1; };

// Now for the horror. There should be a saner way to do this but I couldn't find one.
private _baseElev = 45;
isNil {
private _veh = createVehicleLocal [_vehType, [0,0,-1000], [], 0, "NONE"];
_veh enableSimulation false;
private _gunBeg = _veh selectionPosition getText (_turretCfg >> "gunBeg");
private _gunEnd = _veh selectionPosition getText (_turretCfg >> "gunEnd");
// Arma bug? should be translated to world space (slightly different for LIB_M2_60) but isn't.
private _gunDir = _gunEnd vectorFromTo _gunBeg;
_baseElev = asin (_gunDir#2) - getNumber (_turretCfg >> "initElev");
deleteVehicle _veh;
};

// Artillery engine doesn't seem to consider minElev as a short-range option
private _maxElev = _baseElev + getNumber (_turretCfg >> "maxElev");
private _minElev = _baseElev + getNumber (_turretCfg >> "minElev");
private _longElev = [45, _minElev] select (_minElev > 45);

// Simple formula works because Arma doesn't calculate air resistance for artillery
private _maxRange = (_initSpeed)^2 * sin (2*45) / 9.807;
private _maxRange = (_initSpeed * _maxCharge)^2 * sin (2*_longElev) / 9.807;
private _minRange = (_initSpeed * _minCharge)^2 * sin (2*_maxElev) / 9.807;

// Assumes first fire mode is closest range, probably true because artillery computer
private _minCharge = getNumber (_weaponCfg >> getArray (_weaponCfg >> "modes")#0 >> "artilleryCharge");
if (_minCharge == 0) then { Error_1("Artillery charge lookup failed for %1", _vehType); _minCharge = 1 };
private _minRange = (_minCharge * _initSpeed)^2 * sin (2*_maxElev) / 9.807;
//private _reloadTime = getNumber (_weaponCfg >> "reloadTime");

[_minRange+100, _maxRange-100]; // make sure we can spread shots
private _result = [200 max (_minRange + 100), _maxRange - 100]; // make sure we can spread shots
A3A_artyRangeHM set [_hmkey, _result];
_result;